diff --git a/MainModesArbiter.c b/MainModesArbiter.c index b363b73..00af964 100644 --- a/MainModesArbiter.c +++ b/MainModesArbiter.c @@ -112,14 +112,15 @@ void LoadDataInFromModel(tMma *env) { if (env->adcTask0.ADC_isUpdate) { env->adcTask0.ADC_isUpdate = false; - +/* temp1 = get_temperature_fast(env->adcTask0.ADC0_Data.Sensor_Ambient_Temp); temp2 = get_temperature_from_adc(env->adcTask0.ADC0_Data.Sensor_Ambient_Temp, ALG_STEINHART); env->rtDW.ADC_Data_Model.Sensor_Incar_Temp_FL = env->adcTask0.ADC0_Data.Sensor_Ambient_Temp; LoggerFormatInfo(LOGGER, LOG_TASK_ARB, "Temp1 = %d; Temp2 = %d; ADC = %d", temp1, (int16_t) (temp2 * 10.0f), env->adcTask0.ADC0_Data.Sensor_Ambient_Temp) -/* +*/ + // R1 = 91000 R2 = 20000 ((5 * (91000 + 20000)) / 20000 = 27.75 В) float U_IGN_CHECK = ((float) env->adcTask0.ADC0_Data.IGN_ANS * 27.75f) / 4095.0f; LoggerFormatInfo(LOGGER, LOG_TASK_ARB, "U_IGN_CHECK = %f", U_IGN_CHECK) @@ -165,7 +166,7 @@ void LoadDataInFromModel(tMma *env) { ANALOG_SENSOR(env, "Sensor_Front_Duct6", env->adcTask0.ADC0_Data.Sensor_Front_Duct6); ANALOG_SENSOR(env, "Pressure_DIAG", env->adcTask0.ADC0_Data.Pressure_DIAG); ANALOG_SENSOR(env, "Reserve_Sensor_Duct_Temp_2", env->adcTask0.ADC0_Data.Reserve_Sensor_Duct_Temp_2); -*/ + } osMutexRelease(env->adcTask0.access); @@ -176,7 +177,7 @@ void LoadDataInFromModel(tMma *env) { if (env->adcTask1.ADC_isUpdate) { env->adcTask1.ADC_isUpdate = false; -/* + // R1 = 91000 R2 = 16000 ((5 * (91000 + 16000)) / 16000 = 33.4375 В) float U_PBATT_CHECK = ((float) env->adcTask1.ADC1_Data.PBATT_CHECK * 33.4375f) / 4095.0f; LoggerFormatInfo(LOGGER, LOG_TASK_ARB, "U_PBATT_CHECK = %f", U_PBATT_CHECK) @@ -195,7 +196,7 @@ void LoadDataInFromModel(tMma *env) { VN7008AJ(env, "VN7008AJ_FrontLINActuatorPowerDriverAB", env->adcTask1.ADC1_Data.VN7008AJ_FrontLINActuatorPowerDriverAB); VN7008AJ(env, "VN7008AJ_RearLINActuatorPowerDriverC", env->adcTask1.ADC1_Data.VN7008AJ_RearLINActuatorPowerDriverC); -*/ + } //temp2 = get_temperature_fast(env->adcTask1.ADC_Data[0], fast_lookup_KST45, 512);