diff --git a/MainModesArbiter.c b/MainModesArbiter.c index 83151d5..0365e61 100644 --- a/MainModesArbiter.c +++ b/MainModesArbiter.c @@ -90,6 +90,20 @@ void Mma_Shutdown(tMma *env) { LoggerErrorStatic(LOGGER, LOG_SIGN, "Этой строчки не должно быть! Критическая ошибка!") } +void Mma_EcallPrepare(tMma *env) { + AtGsm_OperatorSelectionDeregister(&env->gsmWithGnss.gsmAt); + SystemDelayMs(1000); + GsmWithGnss_SelectStandartNetwork(&env->gsmWithGnss.gsmAt, 12); + SystemDelayMs(3000); + GsmWithGnss_SelectStandartNetwork(&env->gsmWithGnss.gsmAt, 22); + SystemDelayMs(3000); + GsmWithGnss_SelectStandartNetwork(&env->gsmWithGnss.gsmAt, 25); + SystemDelayMs(3000); + AtGsm_OperatorSelectionDeregister(&env->gsmWithGnss.gsmAt); + AtGsmTelitLe910_GnssEcallOnlyMode(&env->gsmWithGnss.gsmAt, 0); +} + + void Mma_CheckShutdownIsBattary(tMma *env) { bool statShutdown = Pwm_IsShutdownRequired(&env->power); if ((env->indication.mode != DEVICE_MODE_TESTING) && (env->indication.mode != DEVICE_MODE_UVEOS_GARAG)) { @@ -231,15 +245,8 @@ void Mma_NetworkAndAudioRequire(tMma *env) { Pwm_SetMute(&env->power, true); LoggerInfoStatic(LOGGER, LOG_SIGN, "Включаем регистрацию в сети"); - - Mma_SetNetworkRegistration(env, true); - LoggerInfoStatic(LOGGER, LOG_SIGN, "Ждем сеть..."); - - if (Mma_WaitNetworkRegistration(env)) { - LoggerInfoStatic(LOGGER, LOG_SIGN, "зарегестрировались"); - } else { - LoggerErrorStatic(LOGGER, LOG_SIGN, "нет сети"); - }; + Mma_EcallPrepare(env); + GsmWithGnss_NetworkEnableInnaterups(&env->gsmWithGnss, 5, 250000); } static void Mma_NetworkAndAudioRelease(tMma *env) { @@ -249,18 +256,6 @@ static void Mma_NetworkAndAudioRelease(tMma *env) { while (t > SystemGetMs()) {} } -void Mma_EcallPrepare(tMma *env) { - AtGsm_OperatorSelectionDeregister(&env->gsmWithGnss.gsmAt); - SystemDelayMs(1000); - GsmWithGnss_SelectStandartNetwork(&env->gsmWithGnss.gsmAt, 12); - SystemDelayMs(3000); - GsmWithGnss_SelectStandartNetwork(&env->gsmWithGnss.gsmAt, 22); - SystemDelayMs(3000); - GsmWithGnss_SelectStandartNetwork(&env->gsmWithGnss.gsmAt, 25); - SystemDelayMs(3000); - AtGsm_OperatorSelectionDeregister(&env->gsmWithGnss.gsmAt); - AtGsmTelitLe910_GnssEcallOnlyMode(&env->gsmWithGnss.gsmAt, 0); -} void Mma_EcallManual(tMma *env) { EraGlonassUveos_SetTimings(&env->uveos); @@ -335,7 +330,7 @@ void Mma_EcallAutomatic(tMma *env, tUveosEmergencyEvent emergencyEvent) { Mma_SetMode(env, DEVICE_MODE_UVEOS_CALL_INITIATE); Mma_EcallPrepare(env); GsmWithGnss_NetworkEnableInnaterups(&env->gsmWithGnss, 5, 250000); - Mma_NetworkAndAudioRequireKz(env); + Mma_NetworkAndAudioRequire(env); GpioPinEnable(&env->power.pins->main.ecall); Mma_AudioSignal(env, 1, 500); @@ -683,7 +678,7 @@ static _Noreturn void Mma_Thread(tMma *env) { #ifdef UVEOS_ADD_TELEMATICA TELEMATICA_STOP(env); #endif - Mma_EcallManualKZ(env); + Mma_EcallManual(env); } else if (UserInputButtonEventIsBetween(buttonEvent, UI_BUTTON_ADDITIONAL, RAISE, 3000, 10000)) { #ifdef UVEOS_ADD_TELEMATICA