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)) {