From 0dfd2d038619c2fe4061d82cc45ee55627d47798 Mon Sep 17 00:00:00 2001 From: Siann Date: Wed, 28 Aug 2024 17:24:18 -0400 Subject: [PATCH] updated BATT and BATTBL in network.yml --- can/network.yml | 29 +++++++++++++++++++++++++++++ components/batt/src/batt.c | 2 +- 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/can/network.yml b/can/network.yml index 9e273f604..39f100a40 100644 --- 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,7 +816,16 @@ 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 @@ -814,3 +833,13 @@ nodes: - 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 index 9ca1a746e..bcb2dccc9 100644 --- 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;