From 571e821ddf340cf66151f902eb89afa48e70ca8d Mon Sep 17 00:00:00 2001 From: cfif Date: Mon, 31 Aug 2026 13:27:03 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B0=20=D0=BE=D0=B1=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=BA?= =?UTF-8?q?=D0=B0=20Pack=5Fdbg=5FCCU=5FInfo=5Fcandb=5Fdbg2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- MODULES/HVAC_M7_CAN_DEBUG_SPAM/candb_dbg_fixed.c | 7 +++++-- MODULES/HVAC_M7_DataNonVolatile/VIN_DATA.c | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/MODULES/HVAC_M7_CAN_DEBUG_SPAM/candb_dbg_fixed.c b/MODULES/HVAC_M7_CAN_DEBUG_SPAM/candb_dbg_fixed.c index 9219e05..06bd710 100644 --- a/MODULES/HVAC_M7_CAN_DEBUG_SPAM/candb_dbg_fixed.c +++ b/MODULES/HVAC_M7_CAN_DEBUG_SPAM/candb_dbg_fixed.c @@ -245,11 +245,14 @@ uint32_t Pack_dbg_CCU_Info_candb_dbg2(dbg_CCU_Info_t *_m, uint8_t *_d, uint8_t * (hex_to_bcd(firmwareMetaMap_Main->internal_SW_Version.SW.month) * 100) + hex_to_bcd(firmwareMetaMap_Main->internal_SW_Version.SW.day); dbg_CCU_Info_Frame0->dbg_Info_CCU_SW_Ver_Rev = firmwareMetaMap_Main->internal_SW_Version.SW.revision; - dbg_CCU_Info_Frame0->dbg_Info_ActivatedCAL = 0; + dbg_CCU_Info_Frame0->dbg_Info_ActivatedCAL = g_ucCAL_VARIANT; dbg_CCU_Info_Frame0->dbg_Info_CCU_Aroma_Cfg = statusData.ecu.Status_CCU_Configuration.AromaConfiguration; dbg_CCU_Info_Frame0->dbg_Info_CCU_Algorithm_Cfg = statusData.ecu.Status_CCU_Configuration.AlgorithmConfiguration; dbg_CCU_Info_Frame0->reserved0 = 0; - dbg_CCU_Info_Frame0->dbg_Info_VehicleBody = 0; + + uint16_t typeCode = ((uint16_t)(uint8_t)statusData.ecu.Vehicle_Identification[3] << 8) | (uint8_t)statusData.ecu.Vehicle_Identification[4]; + + dbg_CCU_Info_Frame0->dbg_Info_VehicleBody = typeCode; // _d[0] |= (uint8_t)((_m->dbg_Info_Calibration_Ver_Date & 0x3F) << 2); // _d[1] |= (uint8_t)((_m->dbg_Info_Calibration_Ver_Date >> 6) & 0xFF); diff --git a/MODULES/HVAC_M7_DataNonVolatile/VIN_DATA.c b/MODULES/HVAC_M7_DataNonVolatile/VIN_DATA.c index a553977..7e053b9 100644 --- a/MODULES/HVAC_M7_DataNonVolatile/VIN_DATA.c +++ b/MODULES/HVAC_M7_DataNonVolatile/VIN_DATA.c @@ -7,7 +7,7 @@ static uint8_t getVehicleTypeFromVin(const char* vin) { // Преобразуем два байта в 16-битное значение - uint16_t typeCode = ((uint16_t)(unsigned char)vin[3] << 8) | (unsigned char)vin[4]; + uint16_t typeCode = ((uint16_t)(uint8_t)vin[3] << 8) | (uint8_t)vin[4]; // Определяем Vehicle TYPE по коду switch (typeCode) {