diff --git a/MODULES/CmakeConfig_RandomBuildIdGenerator/VersionRandID.h b/MODULES/CmakeConfig_RandomBuildIdGenerator/VersionRandID.h index 0b1f802..5ac4492 100644 --- a/MODULES/CmakeConfig_RandomBuildIdGenerator/VersionRandID.h +++ b/MODULES/CmakeConfig_RandomBuildIdGenerator/VersionRandID.h @@ -1 +1 @@ -#define VERSION_RANDOM_BUILD_IDENTIFIER "RPcyf" +#define VERSION_RANDOM_BUILD_IDENTIFIER "SbbbJ" diff --git a/MODULES/HVAC_M7_DataNonVolatile/DataNonVolatile.h b/MODULES/HVAC_M7_DataNonVolatile/DataNonVolatile.h index 68e4e76..19e4968 100644 --- a/MODULES/HVAC_M7_DataNonVolatile/DataNonVolatile.h +++ b/MODULES/HVAC_M7_DataNonVolatile/DataNonVolatile.h @@ -9,7 +9,7 @@ #include "HVAC_preDefine.h" #define DEVICE_DATA_VERSION_CALIB 0x01 -#define DEVICE_DATA_VERSION_PARAM 0x02 +#define DEVICE_DATA_VERSION_PARAM 0x03 // BCD в двоичное число #define bcd_to_binary(bcd) (((bcd >> 4) * 10) + (bcd & 0x0F)) diff --git a/MODULES/HVAC_M7_DebugTesting/MainModesArbiter_InitStage.c b/MODULES/HVAC_M7_DebugTesting/MainModesArbiter_InitStage.c index a717e45..6b466b5 100644 --- a/MODULES/HVAC_M7_DebugTesting/MainModesArbiter_InitStage.c +++ b/MODULES/HVAC_M7_DebugTesting/MainModesArbiter_InitStage.c @@ -63,7 +63,7 @@ static void Mma_InitSubSystems(tMma *env) { memset(dataTmp, 0, sizeof(dataTmp)); memcpy(dataTmp, firmwareMetaMap_Boot->fingerprint.testerCode, 9); - LoggerFormatInfo(LOGGER, LOG_TASK_MAIN, "Boot: ModuleID: %d, testerCode: %s, year: 0x%02X, month: 0x%02X day: 0x%02X", + LoggerFormatInfo(LOGGER, LOG_TASK_MAIN, "Fingerprint Boot: ModuleID: %d, testerCode: %s, year: 0x%02X, month: 0x%02X day: 0x%02X", firmwareMetaMap_Boot->fingerprint.ModuleID, dataTmp, firmwareMetaMap_Boot->fingerprint.year, @@ -72,13 +72,30 @@ static void Mma_InitSubSystems(tMma *env) { memcpy(dataTmp, firmwareMetaMap_Main->fingerprint.testerCode, 9); - LoggerFormatInfo(LOGGER, LOG_TASK_MAIN, "Main: ModuleID: %d, testerCode: %s, year: 0x%02X, month: 0x%02X day: 0x%02X", + LoggerFormatInfo(LOGGER, LOG_TASK_MAIN, "Fingerprint Main: ModuleID: %d, testerCode: %s, year: 0x%02X, month: 0x%02X day: 0x%02X", firmwareMetaMap_Main->fingerprint.ModuleID, dataTmp, firmwareMetaMap_Main->fingerprint.year, firmwareMetaMap_Main->fingerprint.month, firmwareMetaMap_Main->fingerprint.day); + LoggerFormatInfo(LOGGER, LOG_TASK_MAIN, "Internal Version HW: year: %02d, month: %02d day: %02d, revision: %02d", + firmwareMetaMap_Main->HW.year, + firmwareMetaMap_Main->HW.month, + firmwareMetaMap_Main->HW.day, + firmwareMetaMap_Main->HW.revision); + + LoggerFormatInfo(LOGGER, LOG_TASK_MAIN, "Internal Version SW: year: %02d, month: %02d day: %02d, revision: %02d", + firmwareMetaMap_Main->internal_SW_Version.SW.year, + firmwareMetaMap_Main->internal_SW_Version.SW.month, + firmwareMetaMap_Main->internal_SW_Version.SW.day, + firmwareMetaMap_Main->internal_SW_Version.SW.revision); + + LoggerFormatInfo(LOGGER, LOG_TASK_MAIN, "Internal Version MDB: year: %02d, month: %02d day: %02d, revision: %02d", + firmwareMetaMap_Main->internal_SW_Version.MDB.year, + firmwareMetaMap_Main->internal_SW_Version.MDB.month, + firmwareMetaMap_Main->internal_SW_Version.MDB.day, + firmwareMetaMap_Main->internal_SW_Version.MDB.revision); if (hardFault_magic == 0xDEADBEEF) { @@ -124,6 +141,18 @@ static void Mma_InitSubSystems(tMma *env) { bool result = DeviceStorage_Init(&env->storage, true, &env->flash->interface_calib, &env->flash->interface_param, &env->slog.logger); + + memcpy(dataTmp, env->storage.dataParam->device.identification.Tester_Fingerprint.tester_serial, 9); + + LoggerFormatInfo(LOGGER, LOG_TASK_MAIN, "Fingerprint Tester: testerCode: %s, year: 0x%02X, month: 0x%02X day: 0x%02X", + dataTmp, + env->storage.dataParam->device.identification.Tester_Fingerprint.year, + env->storage.dataParam->device.identification.Tester_Fingerprint.month, + env->storage.dataParam->device.identification.Tester_Fingerprint.day); + + + + Rs_Cal_0_SedanL(); VarsTabDumpObserver_StartThread(&env->storage.dumpObserver);