From 633ce3250ef192981b3bbb09a1aa332d61e6d8ed Mon Sep 17 00:00:00 2001 From: cfif Date: Mon, 31 Aug 2026 13:22:40 +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=20Status=5FActivated=5FCal=5FNum?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- MODULES/HVAC_M7_DebugTesting/MainModesArbiter_InitStage.c | 5 +++++ MODULES/HVAC_M7_StatusData/DiagnosticTask.h | 2 +- MODULES/HVAC_M7_StatusData/StatusData.c | 2 +- MODULES/HVAC_M7_StatusData/StatusData.h | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/MODULES/HVAC_M7_DebugTesting/MainModesArbiter_InitStage.c b/MODULES/HVAC_M7_DebugTesting/MainModesArbiter_InitStage.c index 653111d..3b0c3d4 100644 --- a/MODULES/HVAC_M7_DebugTesting/MainModesArbiter_InitStage.c +++ b/MODULES/HVAC_M7_DebugTesting/MainModesArbiter_InitStage.c @@ -165,6 +165,11 @@ static void Mma_InitSubSystems(tMma *env) { setVehicleTypeFromVinToCalib(env->storage.dataParam->device.identification.Vehicle_Identification); + statusData.Status_Activated_Cal_Num.Calibration_Num = g_aucCAL_VERSION[1]; + statusData.Status_Activated_Cal_Num.Internal_Cal_Ver[0] = g_aucCAL_FP_DATE[0]; + statusData.Status_Activated_Cal_Num.Internal_Cal_Ver[1] = g_aucCAL_FP_DATE[1]; + statusData.Status_Activated_Cal_Num.Internal_Cal_Ver[2] = g_aucCAL_FP_DATE[2]; + statusData.Status_Activated_Cal_Num.Internal_Cal_Ver[3] = g_aucCAL_VERSION[0]; // Rs_Cal_0_SedanL(); diff --git a/MODULES/HVAC_M7_StatusData/DiagnosticTask.h b/MODULES/HVAC_M7_StatusData/DiagnosticTask.h index 3bcd603..22fe409 100644 --- a/MODULES/HVAC_M7_StatusData/DiagnosticTask.h +++ b/MODULES/HVAC_M7_StatusData/DiagnosticTask.h @@ -24,7 +24,7 @@ typedef struct { } tDiagnostic; void Diagnostic_Init(tDiagnostic *env, tLoggerInterface *logger); - +void set_NoBitsDTC(tDiagnostic *env, bool noBitsDTC); void set_Dtc_state(tDiagnostic *env, CCU_Errors_t *CCU_Errors, uint8_t *dtc_state_error_model, char *VIN); uint32_t diagnostic_ClearDiagnosticInformation_14(tDiagnostic *env); diff --git a/MODULES/HVAC_M7_StatusData/StatusData.c b/MODULES/HVAC_M7_StatusData/StatusData.c index bbb300d..165a0ea 100644 --- a/MODULES/HVAC_M7_StatusData/StatusData.c +++ b/MODULES/HVAC_M7_StatusData/StatusData.c @@ -1655,7 +1655,7 @@ void setDefaultStatus() { memset(&statusData.Status_Actuator_DoorsActuator, 0xFF, sizeof(tStatus_Actuator)); memset(&statusData.Status_Duct_Tgt, 0xFF, sizeof(tStatus_Duct_Tgt)); memset(&statusData.Status_Eva_Tgt, 0xFF, sizeof(tStatus_Eva_Tgt)); - memset(&statusData.Status_Activated_Cal_Num, 0xFF, sizeof(tStatus_Activated_Cal_Num)); +// memset(&statusData.Status_Activated_Cal_Num, 0xFF, sizeof(tStatus_Activated_Cal_Num)); memset(&statusData.Status_IO, 0xFF, sizeof(tStatus_IO)); memset(&statusData.Status_Pwm, 0xFF, sizeof(tStatus_Pwm)); memset(&statusData.Status_eComp, 0xFF, sizeof(tStatus_eComp)); diff --git a/MODULES/HVAC_M7_StatusData/StatusData.h b/MODULES/HVAC_M7_StatusData/StatusData.h index 66b9b95..ccb013b 100644 --- a/MODULES/HVAC_M7_StatusData/StatusData.h +++ b/MODULES/HVAC_M7_StatusData/StatusData.h @@ -199,7 +199,7 @@ typedef struct __attribute__ ((packed)) { typedef struct __attribute__ ((packed)) { // 2 Byte; HighLow (Motorola) - uint16_t Calibration_Num; + uint8_t Calibration_Num; // Packet [4] Byte //Data Objects: //[0:0] Date year (yy), Unsigned (1Byte)