From 595207de4b29fb0c3a06a040db1c9ee6244ce1f4 Mon Sep 17 00:00:00 2001 From: korolev Date: Mon, 16 Dec 2024 16:46:25 +0300 Subject: [PATCH] =?UTF-8?q?=D0=B0=D0=B2=D1=82=D0=BE=D0=BC=D0=B0=D1=82?= =?UTF-8?q?=D0=B8=D1=87=D0=B5=D1=81=D0=BA=D0=B8=D0=B9=20=D0=B2=D1=8B=D0=B7?= =?UTF-8?q?=D0=BE=D0=B2=20=D0=B8=D0=B7=20=D1=82=D0=B5=D1=81=D1=82=D0=BE?= =?UTF-8?q?=D0=B2=D0=BE=D0=B3=D0=BE=20=D0=B4=D0=BB=D1=8F=20=D0=B2=D1=80?= =?UTF-8?q?=D0=B5=D0=BC=D0=B5=D0=BD=D0=BD=D1=8B=D1=85=20=D0=B8=D1=81=D0=BF?= =?UTF-8?q?=D1=8B=D1=82=D0=B0=D0=BD=D0=B8=D0=B9=20=D0=B2=20=D0=9A=D0=B0?= =?UTF-8?q?=D0=B7=D0=B0=D1=85=D1=81=D1=82=D0=B0=D0=BD=D0=B5=20=D0=BF=D0=B5?= =?UTF-8?q?=D1=80=D0=B5=D0=BF=D0=B8=D1=81=D0=B0=D0=BD=20=D0=B2=20=D1=88?= =?UTF-8?q?=D1=82=D0=B0=D1=82=D0=BD=D1=8B=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- MainModesArbiter.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/MainModesArbiter.c b/MainModesArbiter.c index 01cbbef..0b25a49 100644 --- a/MainModesArbiter.c +++ b/MainModesArbiter.c @@ -302,12 +302,12 @@ void Mma_gnssUpdate(tMma *env, eDeviceModes *deviceModes) { } void Mma_EcallAutomatic(tMma *env, tUveosEmergencyEvent emergencyEvent) { - EraGlonassUveos_SetTimings(&env->uveos); Pwm_AudioEnable(&env->power); Mma_SetMode(env, DEVICE_MODE_UVEOS_CALL_INITIATE); - Mma_NetworkAndAudioRequire(env); + GsmWithGnss_NetworkEnableInnaterups(&env->gsmWithGnss, 5,120000); + Mma_NetworkAndAudioRequireKz(env); GpioPinEnable(&env->power.pins->main.ecall); Mma_AudioSignal(env, 1, 500); @@ -613,24 +613,15 @@ static _Noreturn void Mma_Thread(tMma *env) { checkLastInMemTransmit(env); #endif -// LoggerTraceStatic(LOGGER, LOG_SIGN, "Проверяем экстренное событие") -// if (UveosEmergencyEvent_GetNext(&env->crashDetect.emergencyEvents, &emergencyEvent, 0)) { -// if(env->storage.nvm.gost.CRASH_SIGNAL_INTERNAL == 1) { -// LoggerInfoStatic(LOGGER, LOG_SIGN, "Экстренное событие получено"); -// Mma_EcallAutomatic(env, emergencyEvent); -// } -// } - LoggerTraceStatic(LOGGER, LOG_SIGN, "Проверяем экстренное событие") if (UveosEmergencyEvent_GetNext(&env->crashDetect.emergencyEvents, &emergencyEvent, 0)) { - if (env->storage.nvm.gost.CRASH_SIGNAL_INTERNAL == 1) { - Mma_EcallManualKZ(env); -// DeviceTesting_EcallKZ1(&env->testing); + if(env->storage.nvm.gost.CRASH_SIGNAL_INTERNAL == 1) { LoggerInfoStatic(LOGGER, LOG_SIGN, "Экстренное событие получено"); -// Mma_EcallAutomatic(env, emergencyEvent); + Mma_EcallAutomatic(env, emergencyEvent); } } + LoggerTraceStatic(LOGGER, LOG_SIGN, "Проверяем нажатия кнопок") if (UserButtons_GetNext(&env->userInput.buttonsInterface, &buttonEvent, 10)) {