From d62bffa09ec3b01a267eff38899d4207e01536e5 Mon Sep 17 00:00:00 2001 From: cfif Date: Thu, 7 May 2026 16:07:16 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=BF=D0=BB=D0=B0=D1=82=D1=8B=20=D0=BD?= =?UTF-8?q?=D0=B0=20V2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AdcTasks.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/AdcTasks.c b/AdcTasks.c index 7b370f0..3650180 100644 --- a/AdcTasks.c +++ b/AdcTasks.c @@ -105,10 +105,10 @@ void ANALOG_SENSOR(tAdcTask *env, char *desc, uint16_t adc_value, eNtcTable NtcT case TABLE_DUCT: if (R == 3000) { - temp = get_temperature_by_adc(temperature_table_duct_KST45_table_3000, 1024, adc_value); + temp = get_temperature_by_adc(temperature_table_duct_KST45_table_3000, 4096, adc_value); } if (R == 20000) { - temp = get_temperature_by_adc(temperature_table_duct_KST45_table_20000, 1024, adc_value); + temp = get_temperature_by_adc(temperature_table_duct_KST45_table_20000, 4096, adc_value); } break; @@ -119,7 +119,7 @@ void ANALOG_SENSOR(tAdcTask *env, char *desc, uint16_t adc_value, eNtcTable NtcT } - LoggerFormatInfo(LOGGER, LOG_SIGN, "%s: U = %f (adc = %d) Temp = %f", desc, U, adc_value, temp) + LoggerFormatInfo(LOGGER, LOG_SIGN, "%s: U = %f (adc = %d) Temp = %f", desc, U, adc_value, temp / 10) } } @@ -219,6 +219,7 @@ static _Noreturn void Adc0_Thread(tAdcTask *env) { //////////////////////////////////////----DEBUG----//////////////////////////////////////////////////////////////////// + BTS5180_120(env, "BTS5120_2EKA_ShutoffValvePowerTXV1", rtDW.ADC_Data_Model.BTS5120_2EKA_ShutoffValvePowerTXV1); BTS5180_120(env, "BTS5120_2EKA_ShutoffValvePowerTXV2", @@ -258,14 +259,16 @@ static _Noreturn void Adc0_Thread(tAdcTask *env) { ANALOG_SENSOR(env, "Sensor_Rear_Duct6", rtDW.ADC_Data_Model.Sensor_Rear_Duct6, TABLE_DUCT, 3000); 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_Duct5", rtDW.ADC_Data_Model.Sensor_Front_Duct5, TABLE_DUCT, 3000); - ANALOG_SENSOR(env, "Sensor_Front_Duct6", rtDW.ADC_Data_Model.Sensor_Front_Duct6, TABLE_DUCT, 3000); +// ANALOG_SENSOR(env, "Sensor_Front_Duct5", rtDW.ADC_Data_Model.Sensor_Front_Duct5, TABLE_DUCT, 3000); + + ANALOG_SENSOR(env, "Sensor_Front_Duct6", rtDW.ADC_Data_Model.Sensor_Front_Duct6, TABLE_DUCT, 3000); +/* ANALOG_SENSOR(env, "Pressure_DIAG", rtDW.ADC_Data_Model.Pressure_DIAG, TABLE_NONE, 0); ANALOG_SENSOR(env, "Reserve_Sensor_Duct_Temp_2", rtDW.ADC_Data_Model.Reserve_Sensor_Duct_Temp_2, TABLE_DUCT, 20000); - +*/ /* ANALOG_SENSOR(env, "Sensor_PT_rHVAC_P", rtDW.ADC_Data_Model.Sensor_PT_rHVAC_P); @@ -379,7 +382,7 @@ static _Noreturn void Adc1_Thread(tAdcTask *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", rtDW.ADC_Data_Model.VN7008AJ_DIAG_FrontLINActuatorPowerDriverAB, TABLE_NONE, 0); ANALOG_SENSOR(env, "VN7008AJ_DIAG_RearLINActuatorPowerDriverC", @@ -390,7 +393,7 @@ static _Noreturn void Adc1_Thread(tAdcTask *env) { VN7008AJ(env, "VN7008AJ_RearLINActuatorPowerDriverC", rtDW.ADC_Data_Model.VN7008AJ_RearLINActuatorPowerDriverC); //////////////////////////////////////----DEBUG----//////////////////////////////////////////////////////////////////// - +*/ osMutexRelease(env->modelTaskAccess); } else {