updated BATT and BATTBL in network.yml

CooperUnion · Aug 28, 2024 · 0dfd2d0 · 0dfd2d0
1 parent ade072d
commit 0dfd2d0
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 1 deletion.
diff --git a/can/network.yml b/can/network.yml
@@ -703,6 +703,11 @@ nodes:
         - THROTTLE_NodeStatus
         - THROTTLEBL_IsoTpTx
         - THROTTLEBL_Status
+
+        - BATT_NodeStatus
+        - BATTBL_IsoTpTx
+        - BATTBL_Status
+
       messages:
         - IsoTpTx_BBC:
             id: 0x531
@@ -714,6 +719,8 @@ nodes:
             id: 0x534
         - IsoTpTx_THROTTLE:
             id: 0x535
+        - IsoTpTx_BATT:
+            id: 0x536
         - UpdateControl_BBC:
             from_template: UpdateControl
             id: 0x5A1
@@ -729,6 +736,9 @@ nodes:
         - UpdateControl_THROTTLE:
             from_template: UpdateControl
             id: 0x5A5
+        - UpdateControl_BATT:
+            from_template: UpdateControl
+            id: 0x5A6
 
   - THROTTLE:
       rx:
@@ -806,11 +816,30 @@ nodes:
                   description: Bar.
                   width: 40
   - BATT:
+      rx:
+        - DBW_ESTOP
+        - UPD_UpdateControl_BATT
       messages:
+        - NodeInfo:
+            from_template: DBWNodeInfo
+            id: 0x12A
+        - NodeStatus:
+            from_template: DBWNodeStatus
+            id: 0x12D
         - BatteryStatus:
             id: 0x12C
             cycletime: 10
             signals:
               - batteryPercent:
                   description: Battery percentage.
                   width: 10
+  - BATTBL:
+      rx:
+        - UPD_IsoTpTx_BATT
+        - UPD_UpdateControl_BATT
+      messages:
+        - IsoTpTx:
+            id: 0x12E
+        - Status:
+            from_template: BlStatus
+            id: 0x12F
diff --git a/components/batt/src/batt.c b/components/batt/src/batt.c
@@ -19,7 +19,7 @@ static void batt_1Hz()
 	batteryPercent = 0;
 }
 
-void CANTX_populate_BatteryStatus(
+void CANTX_populate_BATT_BatteryStatus(
 	struct CAN_Message_BATT_BatteryStatus * const m)
 {
 	m->BATT_batteryPercent = batteryPercent;