Skip to content

Commit 6093e52

Browse files
committed
(gui): fix falsy thrown out telemetry messages
1 parent 61236e9 commit 6093e52

1 file changed

Lines changed: 9 additions & 9 deletions

File tree

gui/src/backend/udp.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@ impl UdpBackend {
125125

126126
// Schema reader
127127
fn interpret_buffer_with_schema(schema: &TelemetrySchema, buffer: &[u8], fc_time: u32) -> Result<(), ()> {
128+
// info!("Interpreting as schema: {:?}", schema);
128129
let count: usize = 0;
129130
let mut bit_pointer: usize = 0;
130131

@@ -135,16 +136,15 @@ fn interpret_buffer_with_schema(schema: &TelemetrySchema, buffer: &[u8], fc_time
135136
}
136137
}
137138
let Some(msg_def) = msg_def else {
138-
// error!("Interpretation as schema: {:?} failed because of mismatched time offsets", schema);
139+
error!("Interpretation as schema failed because of mismatched time offsets");
139140
return Err(());
140141
};
141142
let expected_size_bits: usize = msg_def.0.iter().map(|(_, repr)| repr.bits()).sum();
142143
let expected_size = expected_size_bits / 8;
143-
// info!("expected_size: {} bytes ({} bits), buffer size: {}", expected_size, expected_size_bits, buffer.len());
144-
// info!("detected MessageDefinition: {:?}", msg_def);
144+
info!("detected MessageDefinition: {:?}", msg_def);
145145
if expected_size != buffer.len() {
146-
// error!("MessageDefinition does not match buffer lenght");
147-
return Err(());
146+
warn!("MessageDefinition does not match buffer length");
147+
warn!("expected_size: {} bytes ({} bits), buffer size: {}", expected_size, expected_size_bits, buffer.len());
148148
}
149149

150150
for (metr, repr) in msg_def.0 {
@@ -156,13 +156,13 @@ fn interpret_buffer_with_schema(schema: &TelemetrySchema, buffer: &[u8], fc_time
156156

157157
//Check if the representation is valid
158158
if repr.bits() % 8 != 0 || repr.bits() > 64 {
159-
// error!("Interpretation as schema failed because some representation was (comp time) invalid");
159+
error!("Interpretation as schema failed because some representation was (comp time) invalid");
160160
return Err(());
161161
}
162162

163163
//Check that buffer contains a complete value
164164
if ((bit_pointer + repr.bits()) / 8) > buffer.len() {
165-
// error!("Interpretation as schema failed because buffer was shorter than MessageDefinition required");
165+
error!("Interpretation as schema failed because buffer was shorter than MessageDefinition required");
166166
return Err(());
167167
}
168168

@@ -226,8 +226,8 @@ impl BackendVariant for UdpBackend {
226226
DownlinkMessage::Telemetry(time, message) if message.len() != 0 => {
227227
if interpret_buffer_with_schema(&LORA_SCHEMA, message.as_slice(), time).is_ok() {
228228
self.data_store.ingest_message(&LORA_SCHEMA, time, message);
229-
} else if interpret_buffer_with_schema(&USB_SCHEMA, message.as_slice(), time).is_ok() {
230-
self.data_store.ingest_message(&USB_SCHEMA, time, message);
229+
// } else if interpret_buffer_with_schema(&USB_SCHEMA, message.as_slice(), time).is_ok() {
230+
// self.data_store.ingest_message(&USB_SCHEMA, time, message);
231231
} else {
232232
error!("Could not identify DownlinkMessage as LORA_SCHEMA nor as USB_SCHEMA, ignoring");
233233
}

0 commit comments

Comments
 (0)