Rename ImprovPacket to RawPacket

This commit is contained in:
2024-12-18 20:14:25 +01:00
parent c61e437ef8
commit e63d279229
2 changed files with 15 additions and 15 deletions

View File

@@ -17,7 +17,7 @@ use improv_setup::improv::{
calculate_checksum,
ImprovDataToPacket,
ImprovDataFromPacket,
ImprovPacket,
RawPacket,
CurrentStateResponse,
RequestCurrentStateCommand,
};
@@ -121,7 +121,7 @@ async fn main() -> Result<()>{
.fold(String::new(), |a, b| a + &b + &String::from("\n")));
},
Commands::Device {path, baud_rate, device_command} => {
let request_current_state_packet = (RequestCurrentStateCommand {}).to_packet();
let request_current_state_packet = (RequestCurrentStateCommand {}).to_raw_packet();
println!("{}", hex::encode(&request_current_state_packet.to_bytes()));
println!("{}", to_ascii_debug(&request_current_state_packet.to_bytes()));
@@ -141,16 +141,16 @@ async fn main() -> Result<()>{
println!("{}", improv_packet_offset);
let improv_packet_end = improv_packet_offset + 10 + <u8 as Into<usize>>::into(buffer[improv_packet_offset+8]);
let improv_packet = ImprovPacket::try_from_bytes(&buffer[improv_packet_offset..improv_packet_end].to_vec()).unwrap();
let raw_packet = RawPacket::try_from_bytes(&buffer[improv_packet_offset..improv_packet_end].to_vec()).unwrap();
// version
println!("Version: {}", &improv_packet.version);
println!("Version: {}", &raw_packet.version);
// type
println!("Type: {}", &improv_packet.r#type);
println!("Type: {}", &raw_packet.r#type);
if improv_packet.r#type == PacketType::CurrentState {
let current_state_response = CurrentStateResponse::try_from_packet(&improv_packet).unwrap();
if raw_packet.r#type == PacketType::CurrentState {
let current_state_response = CurrentStateResponse::try_from_raw_packet(&raw_packet).unwrap();
println!("Current state: {}", &current_state_response.current_state);
}