From 3ff912900d81b629a634fd41bdd960de2c752465 Mon Sep 17 00:00:00 2001 From: cfif Date: Mon, 26 Oct 2026 16:23:12 +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=D1=8B=20Debug=20=D1=81=D0=BE=D0=BE=D0=B1=D1=89=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D1=8F=20Info?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CanSpamDebugTransmitter.c | 2 +- .../HVAC_M7_CAN_DEBUG_SPAM/candb_dbg_fixed.c | 32 ++++++++----------- .../HVAC_M7_CAN_DEBUG_SPAM/candb_dbg_fixed.h | 18 +++++++++-- 3 files changed, 30 insertions(+), 22 deletions(-) diff --git a/MODULES/HVAC_M7_CAN_DEBUG_SPAM/CanSpamDebugTransmitter.c b/MODULES/HVAC_M7_CAN_DEBUG_SPAM/CanSpamDebugTransmitter.c index a30fbaa..76b31e5 100644 --- a/MODULES/HVAC_M7_CAN_DEBUG_SPAM/CanSpamDebugTransmitter.c +++ b/MODULES/HVAC_M7_CAN_DEBUG_SPAM/CanSpamDebugTransmitter.c @@ -153,7 +153,7 @@ static eTimeEventDbgTransmit isEventTransmitter(tCanSpamDebugTransmitter *env) { env->time_dbg_CCU_Info_CYC = env->timeMs + dbg_CCU_Info_CYC; ++env->dbg_CCU_Info_MultMsg_Idx; - if (env->dbg_CCU_Info_MultMsg_Idx > 1) { + if (env->dbg_CCU_Info_MultMsg_Idx > 2) { env->dbg_CCU_Info_MultMsg_Idx = 0; } 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 aad5503..4b19ee0 100644 --- a/MODULES/HVAC_M7_CAN_DEBUG_SPAM/candb_dbg_fixed.c +++ b/MODULES/HVAC_M7_CAN_DEBUG_SPAM/candb_dbg_fixed.c @@ -308,6 +308,7 @@ uint32_t Pack_dbg_CCU_Info_candb_dbg2(dbg_CCU_Info_t *_m, uint8_t *_d, uint8_t * dbg_CCU_Info_Frame0_t *dbg_CCU_Info_Frame0 = (dbg_CCU_Info_Frame0_t *) _d; dbg_CCU_Info_Frame1_t *dbg_CCU_Info_Frame1 = (dbg_CCU_Info_Frame1_t *) _d; + dbg_CCU_Info_Frame2_t *dbg_CCU_Info_Frame2 = (dbg_CCU_Info_Frame2_t *) _d; tFirmwareMetaMap *firmwareMetaMap_Main = (tFirmwareMetaMap *) ADR_META_MAIN; @@ -322,18 +323,16 @@ 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.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 = 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; - 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_Rear_Installed_Act_Num = 0; + dbg_CCU_Info_Frame0->dbg_Info_ActNum_Mismatch = 0; + dbg_CCU_Info_Frame0->dbg_Info_VIN_Mismatch = 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); - // _d[2] |= (uint8_t)((_m->dbg_Info_Calibration_Ver_Date >> 14) & 0xFF); - // _d[3] |= (uint8_t)(_m->dbg_Info_Calibration_Ver_Rev & 0xFF); break; case 1: // Кадр 1: Информация о SW @@ -350,20 +349,17 @@ 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.MDB.day); //34 dbg_CCU_Info_Frame1->dbg_Info_MBD_Ver_Rev = firmwareMetaMap_Main->internal_SW_Version.MDB.revision;;//56 - // _d[0] |= (uint8_t)((_m->dbg_Info_CCU_SW_Ver_Date & 0x3F) << 2); - // _d[1] |= (uint8_t)((_m->dbg_Info_CCU_SW_Ver_Date >> 6) & 0xFF); - // _d[2] |= (uint8_t)((_m->dbg_Info_CCU_SW_Ver_Date >> 14) & 0xFF); - // _d[3] |= (uint8_t)(_m->dbg_Info_CCU_SW_Ver_Rev & 0xFF); + break; case 2: // Кадр 2: Конфигурация и MBD версия - // _d[4] |= (uint8_t)(_m->dbg_Info_ActivatedCAL & 0x0F); - // _d[4] |= (uint8_t)((_m->dbg_Info_CCU_Aroma_Cfg & 0x0F) << 4); - // _d[5] |= (uint8_t)(_m->dbg_Info_CCU_Algorithm_Cfg & 0x0F); - // _d[5] |= (uint8_t)((_m->dbg_Info_MBD_Ver_Date & 0x3F) << 2); - // _d[6] |= (uint8_t)((_m->dbg_Info_MBD_Ver_Date >> 6) & 0xFF); - // _d[7] |= (uint8_t)((_m->dbg_Info_MBD_Ver_Date >> 14) & 0xFF); - // _d[7] |= (uint8_t)(_m->dbg_Info_MBD_Ver_Rev & 0xFF); + dbg_CCU_Info_Frame2->dbg_Info_MultMsg_Idx = _m->dbg_Info_MultMsg_Idx; + dbg_CCU_Info_Frame2->dbg_Info_CCU_Aroma_Cfg = statusData.ecu.Status_CCU_Configuration.AromaConfiguration; + dbg_CCU_Info_Frame2->reserved0 = 0; + dbg_CCU_Info_Frame2->dbg_Info_CCU_Algorithm_Cfg = statusData.ecu.Status_CCU_Configuration.AlgorithmConfiguration; + dbg_CCU_Info_Frame2->dbg_Info_CCU_RearHvac_Cfg = statusData.ecu.Status_CCU_Configuration.RearHVACConfiguration; + dbg_CCU_Info_Frame2->reserved1 = 0; + dbg_CCU_Info_Frame2->reserved2 = 0; break; case 3: // Кадр 3: Информация о кузове diff --git a/MODULES/HVAC_M7_CAN_DEBUG_SPAM/candb_dbg_fixed.h b/MODULES/HVAC_M7_CAN_DEBUG_SPAM/candb_dbg_fixed.h index e07b46b..fa5d458 100644 --- a/MODULES/HVAC_M7_CAN_DEBUG_SPAM/candb_dbg_fixed.h +++ b/MODULES/HVAC_M7_CAN_DEBUG_SPAM/candb_dbg_fixed.h @@ -66,9 +66,10 @@ typedef struct { uint32_t dbg_Info_CCU_SW_Ver_Date: 22; uint32_t dbg_Info_CCU_SW_Ver_Rev: 8; uint32_t dbg_Info_ActivatedCAL: 4; - uint32_t dbg_Info_CCU_Aroma_Cfg: 4; - uint32_t dbg_Info_CCU_Algorithm_Cfg: 4; - uint32_t reserved0: 4; + uint32_t reserved0: 8; + uint32_t dbg_Info_Rear_Installed_Act_Num: 2; + uint32_t dbg_Info_ActNum_Mismatch: 1; + uint32_t dbg_Info_VIN_Mismatch: 1; uint32_t dbg_Info_VehicleBody: 16; } __attribute__((packed)) dbg_CCU_Info_Frame0_t; @@ -81,6 +82,17 @@ typedef struct { uint32_t dbg_Info_MBD_Ver_Rev: 8;//56 } __attribute__((packed)) dbg_CCU_Info_Frame1_t; + +typedef struct { + uint32_t dbg_Info_MultMsg_Idx: 2; + uint32_t dbg_Info_CCU_Aroma_Cfg:4; + uint32_t reserved0: 2; + uint32_t dbg_Info_CCU_Algorithm_Cfg:4; + uint32_t dbg_Info_CCU_RearHvac_Cfg:4; + uint8_t reserved1; + uint32_t reserved2; +} __attribute__((packed)) dbg_CCU_Info_Frame2_t; + typedef struct { uint32_t dbg_PID_MultMsg_Idx: 4; uint32_t dbg_P: 12;