Merge fix

dalathegreat · Dec 21, 2024 · 605f416 · 605f416
1 parent b12480b
commit 605f416
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/Software/Software.ino b/Software/Software.ino
@@ -110,6 +110,9 @@ void setup() {
   setup_battery();
 #ifdef EQUIPMENT_STOP_BUTTON
   init_equipment_stop_button();
+#endif
+#ifdef CAN_SHUNT_SELECTED
+  setup_can_shunt();
 #endif
   // BOOT button at runtime is used as an input for various things
   pinMode(0, INPUT_PULLUP);

diff --git a/Software/src/communication/can/comm_can.cpp b/Software/src/communication/can/comm_can.cpp
@@ -177,6 +177,9 @@ void send_can() {
 #ifdef CHARGER_SELECTED
   send_can_charger();
 #endif  // CHARGER_SELECTED
+#ifdef CAN_SHUNT_SELECTED
+  send_can_shunt();
+#endif  // CAN_SHUNT_SELECTED
 }
 
 // Receive functions
@@ -203,6 +206,11 @@ void receive_can(CAN_frame* rx_frame, int interface) {
   if (interface == can_config.charger) {
 #ifdef CHARGER_SELECTED
     receive_can_charger(*rx_frame);
+#endif
+  }
+  if (interface == can_config.shunt) {
+#ifdef CAN_SHUNT_SELECTED
+    receive_can_shunt(*rx_frame);
 #endif
   }
 }