From d4b91a372c8b82e290150bf8851704c0574143b6 Mon Sep 17 00:00:00 2001 From: cfif Date: Mon, 6 Apr 2026 12:59:38 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- MainModesArbiter.c | 16 ++++++++-------- MainModesArbiter_InitStage.c | 3 +-- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/MainModesArbiter.c b/MainModesArbiter.c index f04c0cf..e8cce7b 100644 --- a/MainModesArbiter.c +++ b/MainModesArbiter.c @@ -288,9 +288,9 @@ static _Noreturn void Mma_Thread(tMma *env) { Mma_InitStage(env); // Инициализируем обе таблицы одновременно с разными значениями R1 - init_both_tables(20000.0f, // R1 для KST45 - 20000.0f, // R1 для INCAR - ALG_STEINHART); +// init_both_tables(20000.0f, // R1 для KST45 +// 20000.0f, // R1 для INCAR +// ALG_STEINHART); can_rx_message_type frame_data; @@ -393,24 +393,24 @@ static _Noreturn void Mma_Thread(tMma *env) { &env->ModelTask.triggerActuatorCmdBus_1, &env->actuator_Ch0_Input_Model_local_1, &rtDW.Actuator_Ch0_Status_Model, &env->ModelTask.triggerCommand1, "Ln1 "); -/* + LinActuatorWork(env, &env->linTaskActuator2, &env->actuator_Ch1_Command_Model_local_2, &env->ModelTask.triggerActuatorCmdBus_2, &env->actuator_Ch1_Input_Model_local_2, &rtDW.Actuator_Ch1_Status_Model, &env->ModelTask.triggerCommand2, "Ln2 "); -*/ + LinActuatorWork(env, &env->linTaskActuator3, &env->actuator_Ch2_Command_Model_local_3, &env->ModelTask.triggerActuatorCmdBus_3, &env->actuator_Ch2_Input_Model_local_3, &rtDW.Actuator_Ch2_Status_Model, &env->ModelTask.triggerCommand3, "Ln3 "); - SystemDelayMs(200); + + SystemDelayMs(50); GpioPinToggle(&env->gpios->led.LED_G); - - SystemDelayMs(200); + SystemDelayMs(50); /* if (RGM_SRS_WAKEUP_MASK == (RGM->SRS & RGM_SRS_WAKEUP_MASK)) { } else { diff --git a/MainModesArbiter_InitStage.c b/MainModesArbiter_InitStage.c index 98fcfc6..241b235 100644 --- a/MainModesArbiter_InitStage.c +++ b/MainModesArbiter_InitStage.c @@ -98,7 +98,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_StartThread(&env->cli); + CommandLine_StartThread(&env->cli); 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); Lin3_StartThread(&env->linTaskActuator3); - tLinData *linData4 = Lin4_Init(GetLin123CallbackHandler); Lin_4_Init(&env->linTaskSensor4, linData4, &env->linPorts->lin4_Io, &env->slog.logger); // Lin4_StartThread(&env->linTaskSensor4);