Обновление
This commit is contained in:
parent
9a5cab4c66
commit
364b8dbd9c
|
|
@ -47,7 +47,7 @@ void LoadDataInFromModel(tMma *env) {
|
||||||
if (osMutexAcquire(env->adcTask0.access, 1000) == osOK) {
|
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[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);
|
osMutexRelease(env->adcTask0.access);
|
||||||
//LoggerFormatInfo(LOGGER, LOG_TASK_ARB, "Temp1 = %d", temp1)
|
//LoggerFormatInfo(LOGGER, LOG_TASK_ARB, "Temp1 = %d", temp1)
|
||||||
|
|
@ -69,15 +69,14 @@ void LoadDataInFromModel(tMma *env) {
|
||||||
if (env->ModelTask.isUpdate) {
|
if (env->ModelTask.isUpdate) {
|
||||||
env->ModelTask.isUpdate = false;
|
env->ModelTask.isUpdate = false;
|
||||||
|
|
||||||
|
|
||||||
//bool IncarFLErr;
|
//bool IncarFLErr;
|
||||||
//bool IncarFRErr;
|
//bool IncarFRErr;
|
||||||
//bool IncarRLErr;
|
//bool IncarRLErr;
|
||||||
//bool IncarRRErr;
|
//bool IncarRRErr;
|
||||||
|
|
||||||
|
|
||||||
env->CCU_Errors.CCU_IncarTempErrF_Stat = 0; // CANIncarTempErrF
|
env->CCU_Errors.CCU_IncarTempErrF_Stat = IncarError.CANIncarTempErrF; // CANIncarTempErrF
|
||||||
env->CCU_Errors.CCU_IncarTempErrR_Stat = 0; // CANIncarTempErrR
|
env->CCU_Errors.CCU_IncarTempErrR_Stat = IncarError.CANIncarTempErrR; // CANIncarTempErrR
|
||||||
set_CCU_Errors(&env->canSpamTransmitter, &env->CCU_Errors);
|
set_CCU_Errors(&env->canSpamTransmitter, &env->CCU_Errors);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@ const DMA_InitType dmaInitCfg =
|
||||||
};
|
};
|
||||||
|
|
||||||
void InitPeripheralInterfaces() {
|
void InitPeripheralInterfaces() {
|
||||||
Gpios_Init();
|
// Gpios_Init();
|
||||||
|
|
||||||
DMA_Init(DMA_INSTANCE_0, &dmaInitCfg);
|
DMA_Init(DMA_INSTANCE_0, &dmaInitCfg);
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue