bruh jsoncan fix

Author: j-ackyao

scripts/code_generation/jsoncan-rust/src/can_database/from_jsonparser.rs

@@ -186,28 +186,27 @@ fn parse_tx_msg_signals(
     let mut next_available_bit: u16 = 0;
     let mut occupied_bits: Vec<Option<String>> = vec![None; MAX_LEN_BITS];
 
-    // bombastic side eye
-    if json_signals.iter().any(|(_, s)| match s {
-        JsonTxSignal::ScaleOffsetBits { start_bit, .. }
-        | JsonTxSignal::BitsMinMax { start_bit, .. }
-        | JsonTxSignal::ResolutionMinMax { start_bit, .. }
-        | JsonTxSignal::Enum { start_bit, .. }
-        | JsonTxSignal::Bits { start_bit, .. } => start_bit.is_some(),
-    }) != json_signals.iter().all(|(_, s)| match s {
-        JsonTxSignal::ScaleOffsetBits { start_bit, .. }
-        | JsonTxSignal::BitsMinMax { start_bit, .. }
-        | JsonTxSignal::ResolutionMinMax { start_bit, .. }
-        | JsonTxSignal::Enum { start_bit, .. }
-        | JsonTxSignal::Bits { start_bit, .. } => start_bit.is_some(),
-    }) {
-        panic!(
-            "In message '{}', either all signals must specify start bits, or none of them should.",
-            msg_name
-        );
-    }
-
     // Parse message signals
     for (signal_name, signal_data) in json_signals {
+        if match signal_data {
+            JsonTxSignal::ScaleOffsetBits { start_bit, .. }
+            | JsonTxSignal::BitsMinMax { start_bit, .. }
+            | JsonTxSignal::ResolutionMinMax { start_bit, .. }
+            | JsonTxSignal::Enum { start_bit, .. }
+            | JsonTxSignal::Bits { start_bit, .. } => start_bit.is_some(),
+        } != match signal_data {
+            JsonTxSignal::ScaleOffsetBits { start_bit, .. }
+            | JsonTxSignal::BitsMinMax { start_bit, .. }
+            | JsonTxSignal::ResolutionMinMax { start_bit, .. }
+            | JsonTxSignal::Enum { start_bit, .. }
+            | JsonTxSignal::Bits { start_bit, .. } => start_bit.is_some(),
+        } {
+            panic!(
+                "In message '{}', either all signals must specify start bits, or none of them should.",
+                msg_name
+            );
+        }
+
         let signal = parse_signal(
             format!("{}_{}", tx_node_name, signal_name),
             signal_data,

scripts/code_generation/jsoncan-rust/src/can_database/queries.rs

@@ -201,20 +201,18 @@ impl CanDatabase {
         };
 
         let mut decoded_signals: Vec<DecodedSignal> = Vec::new();
+        
+        let mut buf = [0u8; 4];
+        let len = data.len().min(4);
+        buf[..len].copy_from_slice(&data[..len]);
 
-        let data_uint: u32 = match data.try_into() {
-            Ok(d) => u32::from_le_bytes(d),
-            Err(_) => {
-                eprintln!("Failed to convert bytes to u32");
-                return Vec::new();
-            }
-        };
+        let data_uint = u32::from_le_bytes(buf);
 
         for signal in msgs.signals {
             // Extract the bits representing the current signal.
-            let data_shifted = data_uint >> signal.start_bit;
+            let data_shifted = data_uint as u64 >> signal.start_bit;
 
-            let bitmask = (1 << signal.bits) - 1;
+            let bitmask = (1u64 << signal.bits) - 1;
             let raw_value = {
                 let val = data_shifted & bitmask;
                 // Handle signed values via 2's complement

scripts/code_generation/jsoncan-rust/src/parsing/parse_alert.rs

@@ -49,7 +49,14 @@ pub fn parse_alert_data(can_data_dir: &String, node_name: &String) -> Option<Jso
         },
     };
 
-    let alerts_json: AlertsSchema = match serde_json::from_str(&file_content) {
+    let value: serde_json::Value = serde_json::from_str(&file_content)
+        .expect(&format!("Failed to parse Alerts JSON file for node {}", node_name));
+
+    if value == serde_json::json!({}) {
+        return None;
+    }
+
+    let alerts_json: AlertsSchema = match serde_json::from_value(value) {
         Ok(v) => v,
         Err(e) => panic!(
             "Alerts JSON file is not valid JSON for node {}: {}",