tobimai/protocol_300
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: tobimai:137c8328f3388ed8d2b43f5ef909ab621eb1ca74
Branches Tags
tobimai:main
...
compare: tobimai:f5d777d945fe9c3a756f2b47c57512d6acbe4f2c
Branches Tags
tobimai:main

2 Commits
137c8328f3 ... f5d777d945

Author SHA1 Message Date
Tobias Maier
f5d777d945 Revert "Hotfix" 
This reverts commit c5e2d1dd31.
 2026-03-06 16:40:47 +01:00
Tobias Maier
c76996ceb7 Revert "More hotfix" and "Hotfix" 
This reverts commit 137c8328f3.
 2026-03-06 16:40:37 +01:00
1 changed files with 9 additions and 9 deletions
Expand all files Collapse all files

18
src/message.rs
View File

@@ -188,7 +188,7 @@ impl Protocol300Message {
return Err(MessageDecodingError::LengthMismatch());
}
let message_identifier = match MessageIdentifier::try_from(bytes[2] & 0x0F) {
let message_identifier = match MessageIdentifier::try_from(bytes[2]) {
Ok(id) => id,
Err(e) => {
error!("Failed to decode message: invalid message identifier byte 0x{:02X}", bytes[2]);
@@ -196,7 +196,7 @@ impl Protocol300Message {
}
};
let function_code = match FunctionCode::try_from(bytes[3] & 0x0F) {
let function_code = match FunctionCode::try_from(bytes[3]) {
Ok(fc) => fc,
Err(e) => {
error!("Failed to decode message: invalid function code byte 0x{:02X}", bytes[3]);
@@ -231,14 +231,14 @@ impl Protocol300Message {
let checksum = bytes[telegram_length as usize + 2];
// Fail if the checksums do not match
// if checksum != checksum_calculated {
// #[cfg(feature = "log")]
// error!("Failed to decode message: checksum mismatch - received: 0x{checksum:02X}, calculated: 0x{checksum_calculated:02X}, address: 0x{data_address:04X}, message_id: {message_identifier}, function: {function_code}");
// #[cfg(feature = "defmt")]
// error!("Failed to decode message: checksum mismatch - received: 0x{:02X}, calculated: 0x{:02X}, address: 0x{:04X}, message_id: {}, function: {}", checksum, checksum_calculated, data_address, defmt::Debug2Format(&message_identifier), defmt::Debug2Format(&function_code));
if checksum != checksum_calculated {
#[cfg(feature = "log")]
error!("Failed to decode message: checksum mismatch - received: 0x{checksum:02X}, calculated: 0x{checksum_calculated:02X}, address: 0x{data_address:04X}, message_id: {message_identifier}, function: {function_code}");
#[cfg(feature = "defmt")]
error!("Failed to decode message: checksum mismatch - received: 0x{:02X}, calculated: 0x{:02X}, address: 0x{:04X}, message_id: {}, function: {}", checksum, checksum_calculated, data_address, defmt::Debug2Format(&message_identifier), defmt::Debug2Format(&function_code));
// return Err(MessageDecodingError::Checksum)
// }
return Err(MessageDecodingError::Checksum)
}
Ok(Self {
telegram_length,