From 5c69c9771f96421fc1163ebd4bd49718f737bbb9 Mon Sep 17 00:00:00 2001 From: JoshLafleur Date: Sat, 2 Nov 2024 22:50:19 -0400 Subject: [PATCH] Fix BMSB UDS message clash --- components/bms_boss/HW/HW_can.c | 4 +++- components/bms_boss/include/UDS.h | 2 +- components/bms_boss/src/UDS.c | 2 +- components/bms_boss/variants.yaml | 2 +- components/bootloaders/STM/stm32f103/variants.yaml | 8 ++++---- .../data/components/bmsb/bmsb-message.yaml | 2 +- network/definition/data/components/bmsb/bmsb-rx.yaml | 4 ++-- .../data/components/udsClient/udsClient-message.yaml | 12 ++++++------ .../data/components/udsClient/udsClient-rx.yaml | 2 +- 9 files changed, 20 insertions(+), 18 deletions(-) diff --git a/components/bms_boss/HW/HW_can.c b/components/bms_boss/HW/HW_can.c index ee6018c4..93f8a666 100644 --- a/components/bms_boss/HW/HW_can.c +++ b/components/bms_boss/HW/HW_can.c @@ -21,7 +21,9 @@ #include "Sys.h" #include "MessageUnpack_generated.h" +#include "uds.h" #include "uds_componentSpecific.h" +#include "LIB_app.h" /****************************************************************************** * D E F I N E S @@ -206,7 +208,7 @@ static HAL_StatusTypeDef CAN_sendMsg(CAN_HandleTypeDef* canHandle, CAN_TxMessage */ bool CAN_sendMsgBus0(CAN_TX_Priorities_E priority, CAN_data_T data, uint16_t id, uint8_t len) { - CAN_TxMessage_T msg; + CAN_TxMessage_T msg = {0}; msg.id = id; msg.data = data; diff --git a/components/bms_boss/include/UDS.h b/components/bms_boss/include/UDS.h index ebd46054..c1263be3 100644 --- a/components/bms_boss/include/UDS.h +++ b/components/bms_boss/include/UDS.h @@ -10,7 +10,7 @@ ******************************************************************************/ #include "FeatureDefines_generated.h" -#if FEATURE_UDS +#if APP_UDS // component-specific UDS configuration #include "uds_componentSpecific.h" diff --git a/components/bms_boss/src/UDS.c b/components/bms_boss/src/UDS.c index 6c936f6e..f52a2eec 100644 --- a/components/bms_boss/src/UDS.c +++ b/components/bms_boss/src/UDS.c @@ -26,12 +26,12 @@ #include "ModuleDesc.h" #include "task.h" #include "uds.h" +#include "LIB_app.h" #include "Utility.h" // system includes #include - /****************************************************************************** * E X T E R N S ******************************************************************************/ diff --git a/components/bms_boss/variants.yaml b/components/bms_boss/variants.yaml index 230b5b65..1f34ee34 100644 --- a/components/bms_boss/variants.yaml +++ b/components/bms_boss/variants.yaml @@ -9,6 +9,6 @@ configs: - "#/components/shared/FeatureSels/APP_V1_FeatureSels.yaml" - "FeatureSels.yaml" overrides: - app_uds: false #False because of CAN ID clash with charger + app_uds: true app_component_id: bmsb app_pcba_id: 0 diff --git a/components/bootloaders/STM/stm32f103/variants.yaml b/components/bootloaders/STM/stm32f103/variants.yaml index 48cc2e4f..cc119f94 100644 --- a/components/bootloaders/STM/stm32f103/variants.yaml +++ b/components/bootloaders/STM/stm32f103/variants.yaml @@ -206,8 +206,8 @@ configs: 10: description: BMS Boss Bootloader options: - udsRequestId: 0x610 - udsResponseId: 0x650 + udsRequestId: 0x609 + udsResponseId: 0x649 features: selections: - "#/components/shared/FeatureSels/STM32F103xB_FeatureSels.yaml" @@ -221,8 +221,8 @@ configs: 1010: description: BMS Boss Bootloader Updater options: - udsRequestId: 0x610 - udsResponseId: 0x650 + udsRequestId: 0x609 + udsResponseId: 0x649 features: selections: - "#/components/shared/FeatureSels/STM32F103xB_FeatureSels.yaml" diff --git a/network/definition/data/components/bmsb/bmsb-message.yaml b/network/definition/data/components/bmsb/bmsb-message.yaml index b1581b39..e0479967 100644 --- a/network/definition/data/components/bmsb/bmsb-message.yaml +++ b/network/definition/data/components/bmsb/bmsb-message.yaml @@ -30,7 +30,7 @@ messages: udsResponse: description: UDS response message from the BMSB unscheduled: true - id: 0x650 + id: 0x649 lengthBytes: 8 signals: udsPayload: diff --git a/network/definition/data/components/bmsb/bmsb-rx.yaml b/network/definition/data/components/bmsb/bmsb-rx.yaml index e86f4875..45574327 100644 --- a/network/definition/data/components/bmsb/bmsb-rx.yaml +++ b/network/definition/data/components/bmsb/bmsb-rx.yaml @@ -7,6 +7,6 @@ messages: BMSW5_criticalData: BRUSA513_criticalData: PM100DX_criticalData: - # UDSCLIENT_bmsbUdsRequest: - # unrecorded: true + UDSCLIENT_bmsbUdsRequest: + unrecorded: true signals: diff --git a/network/definition/data/components/udsClient/udsClient-message.yaml b/network/definition/data/components/udsClient/udsClient-message.yaml index 12e95391..36e7098e 100644 --- a/network/definition/data/components/udsClient/udsClient-message.yaml +++ b/network/definition/data/components/udsClient/udsClient-message.yaml @@ -41,12 +41,12 @@ messages: signals: udsPayload: - # bmsbUdsRequest: - # description: UDS request message for the BMS Boss - # id: 0x610 - # lengthBytes: 8 - # signals: - # udsPayload: + bmsbUdsRequest: + description: UDS request message for the BMS Boss + id: 0x609 + lengthBytes: 8 + signals: + udsPayload: stwUdsRequest: description: UDS request message for the Steering Wheel diff --git a/network/definition/data/components/udsClient/udsClient-rx.yaml b/network/definition/data/components/udsClient/udsClient-rx.yaml index 99b3c75a..94764c6f 100644 --- a/network/definition/data/components/udsClient/udsClient-rx.yaml +++ b/network/definition/data/components/udsClient/udsClient-rx.yaml @@ -1,5 +1,5 @@ messages: -# BMSB_udsResponse: + BMSB_udsResponse: BMSW0_udsResponse: BMSW1_udsResponse: BMSW2_udsResponse: