Обновление командировка 10.06.2026

AdcTasks.c

@@ -82,9 +82,9 @@ void BTS5180_120(tAdc0Task *env, char *desc, uint16_t adc_value) {
     uint16_t ERROR_THRESHOLD_HIGH_CODE = (uint16_t) (ERROR_THRESHOLD_HIGH_V * 4095.0f / 5.0f);
 //    uint16_t ERROR_THRESHOLD_LOW_CODE = (uint16_t) (ERROR_THRESHOLD_LOW_V * 4095.0f / 5.0f);
 
-    if (adc_value >= ERROR_THRESHOLD_HIGH_CODE) {
+//    if (adc_value >= ERROR_THRESHOLD_HIGH_CODE) {
-        LoggerFormatInfo(LOGGER, LOG_SIGN, "%s: Error !!! (adc = %d)", desc, adc_value)
+//        LoggerFormatInfo(LOGGER, LOG_SIGN, "%s: Error !!! (adc = %d)", desc, adc_value)
-    } else {
+//    } else {
         // Преобразование в напряжение
         float U = (float) adc_value * 5.0f / 4095.0f;
         float I = U / 1200; // Ток диагностики R = 1200
@@ -92,7 +92,7 @@ void BTS5180_120(tAdc0Task *env, char *desc, uint16_t adc_value) {
         LoggerFormatInfo(LOGGER, LOG_SIGN,
                          "%s: U = %f I = %f Iout = %f",
                          desc, U, I, Iout)
-    }
+//    }
 
 }
 
@@ -107,9 +107,9 @@ void VN7008AJ(tAdc0Task *env, char *desc, uint16_t adc_value) {
 //    uint16_t ERROR_THRESHOLD_LOW_CODE = (uint16_t) (ERROR_THRESHOLD_LOW_V * 4095.0f / 5.0f);
 
     // 1. Проверка на ошибку
-    if (adc_value >= ERROR_THRESHOLD_HIGH_CODE) {
+//    if (adc_value >= ERROR_THRESHOLD_HIGH_CODE) {
-        LoggerFormatInfo(LOGGER, LOG_SIGN, "%s: Error !!! (adc = %d)", desc, adc_value)
+//        LoggerFormatInfo(LOGGER, LOG_SIGN, "%s: Error !!! (adc = %d)", desc, adc_value)
-    } else {
+//    } else {
 
         // 2. Преобразование в напряжение
         float vsense = (float) adc_value * 5.0f / 4095.0f;
@@ -121,7 +121,7 @@ void VN7008AJ(tAdc0Task *env, char *desc, uint16_t adc_value) {
         LoggerFormatInfo(LOGGER, LOG_SIGN,
                          "%s: U = %f I = %f Iout = %f",
                          desc, vsense, Isense, Iout)
-    }
+//    }
 
 }
 
@@ -438,8 +438,16 @@ static _Noreturn void Adc0_Thread(tAdc0Task *env) {
 
 //////////////////////////////////////----DEBUG----////////////////////////////////////////////////////////////////////
 
+
+
+
+
+
+
 /*
 
+            LoggerErrorStatic(LOGGER, LOG_SIGN, "======================================================================");
+
             BTS5180_120(env, "BTS5120_2EKA_ShutoffValvePowerTXV1",
                         rtDW.ADC_Data_Model.BTS5120_2EKA_ShutoffValvePowerTXV1);
             BTS5180_120(env, "BTS5120_2EKA_ShutoffValvePowerTXV2",
@@ -459,36 +467,59 @@ static _Noreturn void Adc0_Thread(tAdc0Task *env) {
             BTS5180_120(env, "BTS5180_2EKA_ChannelPTCPower2", rtDW.ADC_Data_Model.BTS5180_2EKA_ChannelPTCPower2);
 
 
+            LoggerErrorStatic(LOGGER, LOG_SIGN, "======================================================================");
+
             ANALOG_SENSOR(env, "Sensor_Ambient_Temp", rtDW.ADC_Data_Model.Sensor_Ambient_Temp, TABLE_AMBIENT, 20000);
             ANALOG_SENSOR(env, "Sensor_AC_Pressure", rtDW.ADC_Data_Model.Sensor_AC_Pressure, TABLE_NONE, 0);
 
+            LoggerErrorStatic(LOGGER, LOG_SIGN, "======================================================================");
+
             ANALOG_SENSOR(env, "Sensor_Incar_Temp_FL", rtDW.ADC_Data_Model.Sensor_Incar_Temp_FL, TABLE_INCAR, 20000);
             ANALOG_SENSOR(env, "Sensor_Incar_Temp_RL", rtDW.ADC_Data_Model.Sensor_Incar_Temp_RL, TABLE_INCAR, 20000);
             ANALOG_SENSOR(env, "Sensor_Incar_Temp_FR", rtDW.ADC_Data_Model.Sensor_Incar_Temp_FR, TABLE_INCAR, 20000);
             ANALOG_SENSOR(env, "Sensor_Incar_Temp_RR", rtDW.ADC_Data_Model.Sensor_Incar_Temp_RR, TABLE_INCAR, 20000);
 
+            LoggerErrorStatic(LOGGER, LOG_SIGN, "======================================================================");
+
             ANALOG_SENSOR(env, "Sensor_Rear_Evap_Temp", rtDW.ADC_Data_Model.Sensor_Rear_Evap_Temp, TABLE_DUCT, 20000);
             ANALOG_SENSOR(env, "Sensor_Evap_Temp", rtDW.ADC_Data_Model.Sensor_Evap_Temp, TABLE_DUCT, 20000);
 
+            LoggerErrorStatic(LOGGER, LOG_SIGN, "======================================================================");
             ANALOG_SENSOR(env, "Sensor_Rear_Duct1 (dbg_Sen_Duct_RL_Fb)", rtDW.ADC_Data_Model.Sensor_Rear_Duct1, TABLE_DUCT, 3000);
             ANALOG_SENSOR(env, "Sensor_Rear_Duct2 (dbg_Sen_Duct_RR_Fb)", rtDW.ADC_Data_Model.Sensor_Rear_Duct2, TABLE_DUCT, 3000);
             ANALOG_SENSOR(env, "Sensor_Rear_Duct3 (dbg_Sen_Duct_RL_Side_Fb)", rtDW.ADC_Data_Model.Sensor_Rear_Duct3, TABLE_DUCT, 3000);
             ANALOG_SENSOR(env, "Sensor_Rear_Duct4 (dbg_Sen_Duct_RR_Side_Fb)", rtDW.ADC_Data_Model.Sensor_Rear_Duct4, TABLE_DUCT, 3000);
-            ANALOG_SENSOR(env, "Sensor_Rear_Duct5", rtDW.ADC_Data_Model.Sensor_Rear_Duct5, TABLE_DUCT, 3000);
+  //          ANALOG_SENSOR(env, "Sensor_Rear_Duct5", rtDW.ADC_Data_Model.Sensor_Rear_Duct5, TABLE_DUCT, 3000);
-            ANALOG_SENSOR(env, "Sensor_Rear_Duct6", rtDW.ADC_Data_Model.Sensor_Rear_Duct6, TABLE_DUCT, 3000);
+  //          ANALOG_SENSOR(env, "Sensor_Rear_Duct6", rtDW.ADC_Data_Model.Sensor_Rear_Duct6, TABLE_DUCT, 3000);
-
+            LoggerErrorStatic(LOGGER, LOG_SIGN, "======================================================================");
-
             ANALOG_SENSOR(env, "Sensor_Front_Duct1 (dbg_Sen_Duct_FL_Upper_Fb)", rtDW.ADC_Data_Model.Sensor_Front_Duct1, TABLE_DUCT, 3000);
             ANALOG_SENSOR(env, "Sensor_Front_Duct2 (dbg_Sen_Duct_FR_Upper_Fb)", rtDW.ADC_Data_Model.Sensor_Front_Duct2, TABLE_DUCT, 3000);
             ANALOG_SENSOR(env, "Sensor_Front_Duct3 (dbg_Sen_Duct_FL_Lower_Fb)", rtDW.ADC_Data_Model.Sensor_Front_Duct3, TABLE_DUCT, 3000);
             ANALOG_SENSOR(env, "Sensor_Front_Duct4 (dbg_Sen_Duct_FR_Lower_Fb)", rtDW.ADC_Data_Model.Sensor_Front_Duct4, TABLE_DUCT, 3000);
             ANALOG_SENSOR(env, "Sensor_Front_Duct5 (dbg_Sen_Duct_FL_Side_Fb)", rtDW.ADC_Data_Model.Sensor_Front_Duct5, TABLE_DUCT, 3000);
             ANALOG_SENSOR(env, "Sensor_Front_Duct6 (dbg_Sen_Duct_FR_Side_Fb)", rtDW.ADC_Data_Model.Sensor_Front_Duct6, TABLE_DUCT, 3000);
-
+            LoggerErrorStatic(LOGGER, LOG_SIGN, "======================================================================");
-
-            ANALOG_SENSOR(env, "Reserve_Sensor_Duct_Temp_1", rtDW.ADC_Data_Model.Reserve_Sensor_Duct_Temp_1, TABLE_DUCT,20000);
 */
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+//            ANALOG_SENSOR(env, "Reserve_Sensor_Duct_Temp_1", rtDW.ADC_Data_Model.Reserve_Sensor_Duct_Temp_1, TABLE_DUCT,20000);
+
+
 /*
             ANALOG_SENSOR(env, "Sensor_Front_Duct1 (dbg_Sen_Duct_FL_Upper_Fb)", rtDW.ADC_Data_Model.Sensor_Front_Duct1, TABLE_DUCT, 3000);
             ANALOG_SENSOR(env, "Sensor_Front_Duct2 (dbg_Sen_Duct_FR_Upper_Fb)", rtDW.ADC_Data_Model.Sensor_Front_Duct2, TABLE_DUCT, 3000);
@@ -676,19 +707,38 @@ static _Noreturn void Adc1_Thread(tAdc1Task *env) {
             ANALOG_SENSOR(env, "Sensor_PT_T_reserve", rtDW.ADC_Data_Model.Sensor_PT_T_reserve);
             ANALOG_SENSOR(env, "Sensor_B_T_reserve", rtDW.ADC_Data_Model.Sensor_B_T_reserve);
 */
+
+
+
+
+
+
+
 /*
-            ANALOG_SENSOR(env, "VN7008AJ_DIAG_FrontLINActuatorPowerDriverAB",
+            LoggerErrorStatic(LOGGER, LOG_SIGN, "======================================================================");
+            ANALOG_SENSOR((tAdc0Task*)env, "VN7008AJ_DIAG_FrontLINActuatorPowerDriverAB",
                           rtDW.ADC_Data_Model.VN7008AJ_DIAG_FrontLINActuatorPowerDriverAB, TABLE_NONE, 0);
-            ANALOG_SENSOR(env, "VN7008AJ_DIAG_RearLINActuatorPowerDriverC",
+            ANALOG_SENSOR((tAdc0Task*)env, "VN7008AJ_DIAG_RearLINActuatorPowerDriverC",
                           rtDW.ADC_Data_Model.VN7008AJ_DIAG_RearLINActuatorPowerDriverC, TABLE_NONE, 0);
 
-            VN7008AJ(env, "VN7008AJ_FrontLINActuatorPowerDriverAB",
+            VN7008AJ((tAdc0Task*)env, "VN7008AJ_FrontLINActuatorPowerDriverAB",
                      rtDW.ADC_Data_Model.VN7008AJ_FrontLINActuatorPowerDriverAB);
-            VN7008AJ(env, "VN7008AJ_RearLINActuatorPowerDriverC",
+            VN7008AJ((tAdc0Task*)env, "VN7008AJ_RearLINActuatorPowerDriverC",
                      rtDW.ADC_Data_Model.VN7008AJ_RearLINActuatorPowerDriverC);
-//////////////////////////////////////----DEBUG----////////////////////////////////////////////////////////////////////
+            LoggerErrorStatic(LOGGER, LOG_SIGN, "======================================================================");
 */
 
+
+
+
+
+
+
+
+
+//////////////////////////////////////----DEBUG----////////////////////////////////////////////////////////////////////
+
+
 //            float V_ref = (float) pData[16] / 4095.0f * 5.0f;
 //            LoggerFormatInfo(LOGGER, LOG_SIGN, "V_ref = %f", V_ref)
 

AdcTasks.h

@@ -155,6 +155,7 @@ typedef struct {
 
     tAdcIO *adcIO;
     osMutexId_t access;
+    tLoggerInterface *logger;
 
     tADC0_data ADC0_Data;
     tADC0_Filter_data ADC0_Filter_data;
@@ -169,7 +170,7 @@ typedef struct {
 
     osMessageQueueId_t queueRandom;
 
-    tLoggerInterface *logger;
+
 
     uint32_t step;
 
@@ -186,6 +187,7 @@ typedef struct {
 
     tAdcIO *adcIO;
     osMutexId_t access;
+    tLoggerInterface *logger;
 
     tADC1_data ADC1_Data;
     tADC1_Filter_data ADC1_Filter_data;
@@ -196,7 +198,6 @@ typedef struct {
 
     tGpios *gpios;
 
-    tLoggerInterface *logger;
 
     uint32_t step;