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 12:59:38 +03:00
parent 99a70518a7
commit d4b91a372c
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
MainModesArbiter.c
View File

@ -288,9 +288,9 @@ static _Noreturn void Mma_Thread(tMma *env) {
Mma_InitStage(env); Mma_InitStage(env);
// Инициализируем обе таблицы одновременно с разными значениями R1 // Инициализируем обе таблицы одновременно с разными значениями R1
init_both_tables(20000.0f, // R1 для KST45 // init_both_tables(20000.0f, // R1 для KST45
20000.0f, // R1 для INCAR // 20000.0f, // R1 для INCAR
ALG_STEINHART); // ALG_STEINHART);
can_rx_message_type frame_data; can_rx_message_type frame_data;
@ -393,24 +393,24 @@ static _Noreturn void Mma_Thread(tMma *env) {
&env->ModelTask.triggerActuatorCmdBus_1, &env->ModelTask.triggerActuatorCmdBus_1,
&env->actuator_Ch0_Input_Model_local_1, &env->actuator_Ch0_Input_Model_local_1,
&rtDW.Actuator_Ch0_Status_Model, &env->ModelTask.triggerCommand1, "Ln1 "); &rtDW.Actuator_Ch0_Status_Model, &env->ModelTask.triggerCommand1, "Ln1 ");
/*
LinActuatorWork(env, &env->linTaskActuator2, LinActuatorWork(env, &env->linTaskActuator2,
&env->actuator_Ch1_Command_Model_local_2, &env->actuator_Ch1_Command_Model_local_2,
&env->ModelTask.triggerActuatorCmdBus_2, &env->ModelTask.triggerActuatorCmdBus_2,
&env->actuator_Ch1_Input_Model_local_2, &env->actuator_Ch1_Input_Model_local_2,
&rtDW.Actuator_Ch1_Status_Model, &env->ModelTask.triggerCommand2, "Ln2 "); &rtDW.Actuator_Ch1_Status_Model, &env->ModelTask.triggerCommand2, "Ln2 ");
*/
LinActuatorWork(env, &env->linTaskActuator3, LinActuatorWork(env, &env->linTaskActuator3,
&env->actuator_Ch2_Command_Model_local_3, &env->actuator_Ch2_Command_Model_local_3,
&env->ModelTask.triggerActuatorCmdBus_3, &env->ModelTask.triggerActuatorCmdBus_3,
&env->actuator_Ch2_Input_Model_local_3, &env->actuator_Ch2_Input_Model_local_3,
&rtDW.Actuator_Ch2_Status_Model, &env->ModelTask.triggerCommand3, "Ln3 "); &rtDW.Actuator_Ch2_Status_Model, &env->ModelTask.triggerCommand3, "Ln3 ");
SystemDelayMs(200);
SystemDelayMs(50);
GpioPinToggle(&env->gpios->led.LED_G); GpioPinToggle(&env->gpios->led.LED_G);
SystemDelayMs(50);
SystemDelayMs(200);
/* /*
if (RGM_SRS_WAKEUP_MASK == (RGM->SRS & RGM_SRS_WAKEUP_MASK)) { if (RGM_SRS_WAKEUP_MASK == (RGM->SRS & RGM_SRS_WAKEUP_MASK)) {
} else { } else {

3
MainModesArbiter_InitStage.c
View File

@ -98,7 +98,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->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);
@ -138,7 +138,6 @@ static void Mma_InitSubSystems(tMma *env) {
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);
Lin3_StartThread(&env->linTaskActuator3); Lin3_StartThread(&env->linTaskActuator3);
tLinData *linData4 = Lin4_Init(GetLin123CallbackHandler); tLinData *linData4 = Lin4_Init(GetLin123CallbackHandler);
Lin_4_Init(&env->linTaskSensor4, linData4, &env->linPorts->lin4_Io, &env->slog.logger); Lin_4_Init(&env->linTaskSensor4, linData4, &env->linPorts->lin4_Io, &env->slog.logger);
// Lin4_StartThread(&env->linTaskSensor4); // Lin4_StartThread(&env->linTaskSensor4);