diff --git a/MainModesArbiter.c b/MainModesArbiter.c index 71a28a2..43c634d 100644 --- a/MainModesArbiter.c +++ b/MainModesArbiter.c @@ -47,7 +47,7 @@ void LoadDataInFromModel(tMma *env) { if (osMutexAcquire(env->adcTask0.access, 1000) == osOK) { temp1 = get_temperature_fast(env->adcTask0.ADC_Data[0], fast_lookup_Incar, 512); - env->rtDW.controllerDataIncarInput.InIncarFL = env->adcTask0.ADC_Data[0]; + env->rtDW.controllerDataIncarInput.InIncarFL = 0;//env->adcTask0.ADC_Data[0]; osMutexRelease(env->adcTask0.access); //LoggerFormatInfo(LOGGER, LOG_TASK_ARB, "Temp1 = %d", temp1) @@ -69,15 +69,14 @@ void LoadDataInFromModel(tMma *env) { if (env->ModelTask.isUpdate) { env->ModelTask.isUpdate = false; - //bool IncarFLErr; //bool IncarFRErr; //bool IncarRLErr; //bool IncarRRErr; - env->CCU_Errors.CCU_IncarTempErrF_Stat = 0; // CANIncarTempErrF - env->CCU_Errors.CCU_IncarTempErrR_Stat = 0; // CANIncarTempErrR + env->CCU_Errors.CCU_IncarTempErrF_Stat = IncarError.CANIncarTempErrF; // CANIncarTempErrF + env->CCU_Errors.CCU_IncarTempErrR_Stat = IncarError.CANIncarTempErrR; // CANIncarTempErrR set_CCU_Errors(&env->canSpamTransmitter, &env->CCU_Errors); } diff --git a/PeripheralInterfaces.c b/PeripheralInterfaces.c index bb32eda..2fc485e 100644 --- a/PeripheralInterfaces.c +++ b/PeripheralInterfaces.c @@ -11,7 +11,7 @@ const DMA_InitType dmaInitCfg = }; void InitPeripheralInterfaces() { - Gpios_Init(); +// Gpios_Init(); DMA_Init(DMA_INSTANCE_0, &dmaInitCfg);