HVAC_M7
/
HVAC_M7_ADC_TASKS
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Обновление платы на V2

This commit is contained in:
cfif 2026-05-07 16:07:16 +03:00
parent a96c4a8a1f
commit d62bffa09e
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
AdcTasks.c
View File

@ -105,10 +105,10 @@ void ANALOG_SENSOR(tAdcTask *env, char *desc, uint16_t adc_value, eNtcTable NtcT
case TABLE_DUCT: case TABLE_DUCT:
if (R == 3000) { 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) { 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; 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----//////////////////////////////////////////////////////////////////// //////////////////////////////////////----DEBUG----////////////////////////////////////////////////////////////////////
BTS5180_120(env, "BTS5120_2EKA_ShutoffValvePowerTXV1", BTS5180_120(env, "BTS5120_2EKA_ShutoffValvePowerTXV1",
rtDW.ADC_Data_Model.BTS5120_2EKA_ShutoffValvePowerTXV1); rtDW.ADC_Data_Model.BTS5120_2EKA_ShutoffValvePowerTXV1);
BTS5180_120(env, "BTS5120_2EKA_ShutoffValvePowerTXV2", 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, "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, ANALOG_SENSOR(env, "Reserve_Sensor_Duct_Temp_1", rtDW.ADC_Data_Model.Reserve_Sensor_Duct_Temp_1, TABLE_DUCT,
20000); 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, "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, ANALOG_SENSOR(env, "Reserve_Sensor_Duct_Temp_2", rtDW.ADC_Data_Model.Reserve_Sensor_Duct_Temp_2, TABLE_DUCT,
20000); 20000);
*/
/* /*
ANALOG_SENSOR(env, "Sensor_PT_rHVAC_P", rtDW.ADC_Data_Model.Sensor_PT_rHVAC_P); 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_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, "Sensor_B_T_reserve", rtDW.ADC_Data_Model.Sensor_B_T_reserve);
*/ */
/*
ANALOG_SENSOR(env, "VN7008AJ_DIAG_FrontLINActuatorPowerDriverAB", ANALOG_SENSOR(env, "VN7008AJ_DIAG_FrontLINActuatorPowerDriverAB",
rtDW.ADC_Data_Model.VN7008AJ_DIAG_FrontLINActuatorPowerDriverAB, TABLE_NONE, 0); rtDW.ADC_Data_Model.VN7008AJ_DIAG_FrontLINActuatorPowerDriverAB, TABLE_NONE, 0);
ANALOG_SENSOR(env, "VN7008AJ_DIAG_RearLINActuatorPowerDriverC", ANALOG_SENSOR(env, "VN7008AJ_DIAG_RearLINActuatorPowerDriverC",
@ -390,7 +393,7 @@ static _Noreturn void Adc1_Thread(tAdcTask *env) {
VN7008AJ(env, "VN7008AJ_RearLINActuatorPowerDriverC", VN7008AJ(env, "VN7008AJ_RearLINActuatorPowerDriverC",
rtDW.ADC_Data_Model.VN7008AJ_RearLINActuatorPowerDriverC); rtDW.ADC_Data_Model.VN7008AJ_RearLINActuatorPowerDriverC);
//////////////////////////////////////----DEBUG----//////////////////////////////////////////////////////////////////// //////////////////////////////////////----DEBUG----////////////////////////////////////////////////////////////////////
*/
osMutexRelease(env->modelTaskAccess); osMutexRelease(env->modelTaskAccess);
} else { } else {