diff --git a/MainModesArbiter.c b/MainModesArbiter.c index d34623b..a0954ce 100644 --- a/MainModesArbiter.c +++ b/MainModesArbiter.c @@ -247,15 +247,12 @@ void LoadDataInFromModel(tMma *env) { env->pwms->pwmRearIo.setActivePercent(env->pwms->pwmRearIo.env, rtDW.PWM_Set_Model.pwmPercentRear); env->pwms->pwmFrontReservedIo.setActivePercent(env->pwms->pwmFrontReservedIo.env, rtDW.PWM_Set_Model.pwmPercentFrontReserved); env->pwms->pwmRearReservedIo.setActivePercent(env->pwms->pwmRearReservedIo.env, rtDW.PWM_Set_Model.pwmPercentRearReserved); -*/ - -/* - rtDW.PWM_Set_Model.pwmPercentFront = env->pwms->pwmFrontCaptureIO.getPwm(env->pwms->pwmFrontCaptureIO.env); - rtDW.PWM_Set_Model.pwmPercentRear = env->pwms->pwmRearCaptureIO.getPwm(env->pwms->pwmRearCaptureIO.env); - rtDW.PWM_Set_Model.pwmPercentFrontReserved = env->pwms->pwmFrontCaptureIO.getPwm( + PWM_Get.pwmPercentFront = env->pwms->pwmFrontCaptureIO.getPwm(env->pwms->pwmFrontCaptureIO.env); + PWM_Get.pwmPercentRear = env->pwms->pwmRearCaptureIO.getPwm(env->pwms->pwmRearCaptureIO.env); + PWM_Get.pwmPercentFrontReserved = env->pwms->pwmFrontCaptureIO.getPwm( env->pwms->pwmFrontReservedCaptureIO.env); - rtDW.PWM_Set_Model.pwmPercentRearReserved = env->pwms->pwmRearCaptureIO.getPwm( + PWM_Get.pwmPercentRearReserved = env->pwms->pwmRearCaptureIO.getPwm( env->pwms->pwmRearReservedCaptureIO.env); @@ -364,11 +361,11 @@ static _Noreturn void Mma_Thread(tMma *env) { // } - env->pwms->pwmFrontIo.setActivePercent(env->pwms->pwmFrontIo.env, 10); - env->pwms->pwmRearIo.setActivePercent(env->pwms->pwmRearIo.env, 10); + env->pwms->pwmFrontIo.setActivePercent(env->pwms->pwmFrontIo.env, 95); + env->pwms->pwmRearIo.setActivePercent(env->pwms->pwmRearIo.env, 95); env->pwms->pwmFrontReservedIo.setActivePercent(env->pwms->pwmFrontReservedIo.env, 10); env->pwms->pwmRearReservedIo.setActivePercent(env->pwms->pwmRearReservedIo.env, 20); - +/* SystemDelayMs(10); uint8_t pwm1 = env->pwms->pwmFrontCaptureIO.getPwm(env->pwms->pwmFrontCaptureIO.env); LoggerFormatInfo(LOGGER, LOG_TASK_ARB, "PWM (Front) = %d", pwm1) @@ -384,7 +381,7 @@ static _Noreturn void Mma_Thread(tMma *env) { SystemDelayMs(10); uint8_t pwm4 = env->pwms->pwmRearReservedCaptureIO.getPwm(env->pwms->pwmRearReservedCaptureIO.env); LoggerFormatInfo(LOGGER, LOG_TASK_ARB, "PWM (Rear Reserve) = %d", pwm4) - +*/ LoadDataInFromModel(env); diff --git a/MainModesArbiter_InitStage.c b/MainModesArbiter_InitStage.c index 241b235..25db5e1 100644 --- a/MainModesArbiter_InitStage.c +++ b/MainModesArbiter_InitStage.c @@ -97,7 +97,7 @@ static void Mma_InitSubSystems(tMma *env) { // Indication_Init(&env->Indication, HVAC_DEV_MODE_STARTUP); - CommandLine_Init(&env->cli, &env->serialPorts->SerialPortLog_IO, &env->serialPorts->cliVirtualPortOut_Io); + CommandLine_Init(&env->cli, &env->slog.countBufLoggerNames, &env->serialPorts->SerialPortLog_IO, &env->serialPorts->cliVirtualPortOut_Io); CommandLine_StartThread(&env->cli); Diagnostic_Init(&env->Diagnostic, &env->slog.logger); @@ -127,12 +127,12 @@ static void Mma_InitSubSystems(tMma *env) { CanSpamTransmitter_StartThread(&env->canSpamTransmitter); tLinData *linData1 = Lin1_Init(GetLin123CallbackHandler); - Lin_1_Init(&env->linTaskActuator1, linData1, &env->linPorts->lin1_Io, 9, &env->slog.logger); - Lin1_StartThread(&env->linTaskActuator1); + Lin_1_Init(&env->linTaskActuator1, linData1, &env->linPorts->lin1_Io, 8, &env->slog.logger); +// Lin1_StartThread(&env->linTaskActuator1); tLinData *linData2 = Lin2_Init(GetLin123CallbackHandler); - Lin_2_Init(&env->linTaskActuator2, linData2, &env->linPorts->lin2_Io, 9, &env->slog.logger); - Lin2_StartThread(&env->linTaskActuator2); + Lin_2_Init(&env->linTaskActuator2, linData2, &env->linPorts->lin2_Io, 6, &env->slog.logger); +// Lin2_StartThread(&env->linTaskActuator2); tLinData *linData3 = Lin3_Init(GetLin123CallbackHandler); Lin_3_Init(&env->linTaskActuator3, linData3, &env->linPorts->lin3_Io, 8, &env->slog.logger);