HVAC_M7
/
HVAC_M7_DebugTesting
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Обновление

This commit is contained in:
cfif 2026-04-06 17:16:34 +03:00
parent 26996a9fa3
commit dbcb7145d9
2 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
MainModesArbiter.c
View File

@ -247,15 +247,12 @@ void LoadDataInFromModel(tMma *env) {
env->pwms->pwmRearIo.setActivePercent(env->pwms->pwmRearIo.env, rtDW.PWM_Set_Model.pwmPercentRear); 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->pwmFrontReservedIo.setActivePercent(env->pwms->pwmFrontReservedIo.env, rtDW.PWM_Set_Model.pwmPercentFrontReserved);
env->pwms->pwmRearReservedIo.setActivePercent(env->pwms->pwmRearReservedIo.env, rtDW.PWM_Set_Model.pwmPercentRearReserved); env->pwms->pwmRearReservedIo.setActivePercent(env->pwms->pwmRearReservedIo.env, rtDW.PWM_Set_Model.pwmPercentRearReserved);
*/
PWM_Get.pwmPercentFront = env->pwms->pwmFrontCaptureIO.getPwm(env->pwms->pwmFrontCaptureIO.env);
/* PWM_Get.pwmPercentRear = env->pwms->pwmRearCaptureIO.getPwm(env->pwms->pwmRearCaptureIO.env);
rtDW.PWM_Set_Model.pwmPercentFront = env->pwms->pwmFrontCaptureIO.getPwm(env->pwms->pwmFrontCaptureIO.env); PWM_Get.pwmPercentFrontReserved = env->pwms->pwmFrontCaptureIO.getPwm(
rtDW.PWM_Set_Model.pwmPercentRear = env->pwms->pwmRearCaptureIO.getPwm(env->pwms->pwmRearCaptureIO.env);
rtDW.PWM_Set_Model.pwmPercentFrontReserved = env->pwms->pwmFrontCaptureIO.getPwm(
env->pwms->pwmFrontReservedCaptureIO.env); env->pwms->pwmFrontReservedCaptureIO.env);
rtDW.PWM_Set_Model.pwmPercentRearReserved = env->pwms->pwmRearCaptureIO.getPwm( PWM_Get.pwmPercentRearReserved = env->pwms->pwmRearCaptureIO.getPwm(
env->pwms->pwmRearReservedCaptureIO.env); 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->pwmFrontIo.setActivePercent(env->pwms->pwmFrontIo.env, 95);
env->pwms->pwmRearIo.setActivePercent(env->pwms->pwmRearIo.env, 10); env->pwms->pwmRearIo.setActivePercent(env->pwms->pwmRearIo.env, 95);
env->pwms->pwmFrontReservedIo.setActivePercent(env->pwms->pwmFrontReservedIo.env, 10); env->pwms->pwmFrontReservedIo.setActivePercent(env->pwms->pwmFrontReservedIo.env, 10);
env->pwms->pwmRearReservedIo.setActivePercent(env->pwms->pwmRearReservedIo.env, 20); env->pwms->pwmRearReservedIo.setActivePercent(env->pwms->pwmRearReservedIo.env, 20);
/*
SystemDelayMs(10); SystemDelayMs(10);
uint8_t pwm1 = env->pwms->pwmFrontCaptureIO.getPwm(env->pwms->pwmFrontCaptureIO.env); uint8_t pwm1 = env->pwms->pwmFrontCaptureIO.getPwm(env->pwms->pwmFrontCaptureIO.env);
LoggerFormatInfo(LOGGER, LOG_TASK_ARB, "PWM (Front) = %d", pwm1) LoggerFormatInfo(LOGGER, LOG_TASK_ARB, "PWM (Front) = %d", pwm1)
@ -384,7 +381,7 @@ static _Noreturn void Mma_Thread(tMma *env) {
SystemDelayMs(10); SystemDelayMs(10);
uint8_t pwm4 = env->pwms->pwmRearReservedCaptureIO.getPwm(env->pwms->pwmRearReservedCaptureIO.env); uint8_t pwm4 = env->pwms->pwmRearReservedCaptureIO.getPwm(env->pwms->pwmRearReservedCaptureIO.env);
LoggerFormatInfo(LOGGER, LOG_TASK_ARB, "PWM (Rear Reserve) = %d", pwm4) LoggerFormatInfo(LOGGER, LOG_TASK_ARB, "PWM (Rear Reserve) = %d", pwm4)
*/
LoadDataInFromModel(env); LoadDataInFromModel(env);

10
MainModesArbiter_InitStage.c
View File

@ -97,7 +97,7 @@ static void Mma_InitSubSystems(tMma *env) {
// Indication_Init(&env->Indication, HVAC_DEV_MODE_STARTUP); // 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); CommandLine_StartThread(&env->cli);
Diagnostic_Init(&env->Diagnostic, &env->slog.logger); Diagnostic_Init(&env->Diagnostic, &env->slog.logger);
@ -127,12 +127,12 @@ static void Mma_InitSubSystems(tMma *env) {
CanSpamTransmitter_StartThread(&env->canSpamTransmitter); CanSpamTransmitter_StartThread(&env->canSpamTransmitter);
tLinData *linData1 = Lin1_Init(GetLin123CallbackHandler); tLinData *linData1 = Lin1_Init(GetLin123CallbackHandler);
Lin_1_Init(&env->linTaskActuator1, linData1, &env->linPorts->lin1_Io, 9, &env->slog.logger); Lin_1_Init(&env->linTaskActuator1, linData1, &env->linPorts->lin1_Io, 8, &env->slog.logger);
Lin1_StartThread(&env->linTaskActuator1); // Lin1_StartThread(&env->linTaskActuator1);
tLinData *linData2 = Lin2_Init(GetLin123CallbackHandler); tLinData *linData2 = Lin2_Init(GetLin123CallbackHandler);
Lin_2_Init(&env->linTaskActuator2, linData2, &env->linPorts->lin2_Io, 9, &env->slog.logger); Lin_2_Init(&env->linTaskActuator2, linData2, &env->linPorts->lin2_Io, 6, &env->slog.logger);
Lin2_StartThread(&env->linTaskActuator2); // Lin2_StartThread(&env->linTaskActuator2);
tLinData *linData3 = Lin3_Init(GetLin123CallbackHandler); tLinData *linData3 = Lin3_Init(GetLin123CallbackHandler);
Lin_3_Init(&env->linTaskActuator3, linData3, &env->linPorts->lin3_Io, 8, &env->slog.logger); Lin_3_Init(&env->linTaskActuator3, linData3, &env->linPorts->lin3_Io, 8, &env->slog.logger);