Merge branch 'main' into feature/sim-enums

Northeastern-Electric-Racing · Nov 29, 2024 · ae5ff0a · ae5ff0a
2 parents 6579c49 + 970cceb
commit ae5ff0a
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 1 deletion.
diff --git a/cangen/can-messages/bms.json b/cangen/can-messages/bms.json
@@ -993,4 +993,4 @@
             }
         ]
     }
-]
+]
diff --git a/cangen/can-messages/mpu.json b/cangen/can-messages/mpu.json
@@ -131,6 +131,21 @@
           }
         ]
       }
+      ,
+      {
+        "name": "MPU/State/TorqueLimit",
+        "unit": "percentage",
+        "sim_min": 0,
+        "sim_max": 1,
+        "sim_inc_min": 0.1,
+        "sim_inc_max": 0.1,
+        "points": [
+          {
+            "size": 8,
+            "format": "divide100"
+          }
+        ]
+      }
     ]
   },
   {

diff --git a/platforms/stm32f405/include/stm32xx_hal.h b/platforms/stm32f405/include/stm32xx_hal.h
@@ -13,4 +13,8 @@
 #include "stm32g4xx_hal.h"
 #endif
 
+#ifdef STM32F103xB
+#include "stm32f1xx_hal.h"
+#endif
+
 #endif /* STM32XX_HAL_H*/
-Original file line number
+Diff line change
@@ Expand Up / @@ -993,4 +993,4 @@ @@
                 }
             ]
         }
-    ]
+    ]