From 7c8a9c887bddb43a69a98567d8c4dac67ccf1158 Mon Sep 17 00:00:00 2001 From: cfif Date: Mon, 25 May 2026 12:46:59 +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=20=D0=BF=D0=BB=D0=B0=D1=82=D1=8B=20=D0=BD?= =?UTF-8?q?=D0=B0=20V2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- MainModesArbiter.c | 12 ------------ MainModesArbiter.h | 2 -- MainModesArbiter_InitStage.c | 12 +++++++++++- 3 files changed, 11 insertions(+), 15 deletions(-) diff --git a/MainModesArbiter.c b/MainModesArbiter.c index aaa7cdf..da50168 100644 --- a/MainModesArbiter.c +++ b/MainModesArbiter.c @@ -71,18 +71,6 @@ static _Noreturn void Mma_Thread(tMma *env) { // Запуск устройства Mma_InitStage(env); - if (RGM_SRS_WAKEUP_MASK == (RGM->SRS & RGM_SRS_WAKEUP_MASK)) { - LoggerInfoStatic(LOGGER, LOG_TASK_ARB, "Wake up from standby") - } - - -// if (RGM_SRS_WAKEUP_MASK == (RGM->SRS & RGM_SRS_WAKEUP_MASK)) { -// asm("nop"); -// } else { -// SystemDelayMs(1000); -// SMC_SetSystemMode(SMC_MODE_STANBY_3); -// } - env->pwms->pwmFrontIo.run(env->pwms->pwmFrontIo.env); ModelTask_StartThread(&env->ModelTask); diff --git a/MainModesArbiter.h b/MainModesArbiter.h index 3200bad..8d2ec0f 100644 --- a/MainModesArbiter.h +++ b/MainModesArbiter.h @@ -76,8 +76,6 @@ typedef struct { tAdc0Task adcTask0; tAdc1Task adcTask1; - tStandBy standBy; - tModelTask ModelTask; tDiagnostic Diagnostic; diff --git a/MainModesArbiter_InitStage.c b/MainModesArbiter_InitStage.c index 0c099c4..ab0349f 100644 --- a/MainModesArbiter_InitStage.c +++ b/MainModesArbiter_InitStage.c @@ -35,6 +35,7 @@ const DMA_InitType dmaInitCfg = }; static void Mma_InitSubSystems(tMma *env) { + DMA_Init(DMA_INSTANCE_0, &dmaInitCfg); // Настройка таймера реального времени @@ -48,6 +49,16 @@ static void Mma_InitSubSystems(tMma *env) { env->flash->nf_storage_param.logger = &env->slog.logger; env->flash->nf_storage_calib.logger = &env->slog.logger; + if (RGM_SRS_WAKEUP_MASK == (RGM->SRS & RGM_SRS_WAKEUP_MASK)) { + LoggerInfoStatic(&env->slog.logger, LOG_TASK_MAIN, "Wake up from standby") + + tGpioPin Ign_Wakeup = vInitGpioPinPull(GPIO_E, PORT_PIN_16, GPIO_IN, GPIO_PIN_NOREVERSE, GPIO_HIGH, GPIO_PUSH_PULL, + PORT_PULL_UP); + + + } + + LoggerInfoStatic(&env->slog.logger, LOG_TASK_MAIN, "Initialization of subsystems") // Инициализация периферийных интерфейсов @@ -211,7 +222,6 @@ static void Mma_InitSubSystems(tMma *env) { CanSerialPortCanUds_Start(&env->canUds); - StandBy_Init(&env->standBy); LoggerInfoStatic(&env->slog.logger, LOG_TASK_MAIN, "End of subsystem initialization")