diff --git a/MainModesArbiter.c b/MainModesArbiter.c index 43c634d..80cb2d5 100644 --- a/MainModesArbiter.c +++ b/MainModesArbiter.c @@ -45,18 +45,18 @@ void LoadDataInFromModel(tMma *env) { int16_t temp2 = 0; if (osMutexAcquire(env->adcTask0.access, 1000) == osOK) { - temp1 = get_temperature_fast(env->adcTask0.ADC_Data[0], fast_lookup_Incar, 512); + temp1 = get_temperature_fast(env->adcTask0.ADC_Data.Sensor_Ambient_Temp, fast_lookup_Incar, 512); - env->rtDW.controllerDataIncarInput.InIncarFL = 0;//env->adcTask0.ADC_Data[0]; + env->rtDW.controllerDataIncarInput.InIncarFL = env->adcTask0.ADC_Data.Sensor_Ambient_Temp; osMutexRelease(env->adcTask0.access); - //LoggerFormatInfo(LOGGER, LOG_TASK_ARB, "Temp1 = %d", temp1) + LoggerFormatInfo(LOGGER, LOG_TASK_ARB, "Temp1 = %d", temp1) } if (osMutexAcquire(env->adcTask1.access, 1000) == osOK) { - temp2 = get_temperature_fast(env->adcTask1.ADC_Data[0], fast_lookup_KST45, 512); + //temp2 = get_temperature_fast(env->adcTask1.ADC_Data[0], fast_lookup_KST45, 512); - env->rtDW.controllerDataIncarInput.InIncarFR = env->adcTask1.ADC_Data[0]; + //env->rtDW.controllerDataIncarInput.InIncarFR = env->adcTask1.ADC_Data[0]; osMutexRelease(env->adcTask1.access); //LoggerFormatInfo(LOGGER, LOG_TASK_ARB, "Temp2 = %d", temp2)