Добавлена обработка Pack_dbg_CCU_Info_candb_dbg2

This commit is contained in:
cfif 2026-08-31 13:27:03 +03:00
parent 633ce3250e
commit 571e821ddf
2 changed files with 6 additions and 3 deletions

View File

@ -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);

View File

@ -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) {