diff --git a/GsmWithGnss.c b/GsmWithGnss.c index c157e3b..819c2e0 100644 --- a/GsmWithGnss.c +++ b/GsmWithGnss.c @@ -211,15 +211,17 @@ AtCommandResult GsmWithGnss_NetworkReconnect(tAtCmd *env, uint8_t cuontReg) { return res; } -AtCommandResult GsmWithGnss_NetworkEnableInnaterups(tGsmWithGnss *env, uint8_t cuontReg, uint16_t timeOut) { - if (GsmWithGnss_NetworkReconnect(&env->gsmAt, cuontReg) == AT_OK) { - LoggerInfoStatic(LOGGER, LOG_SIGN, "Ждем сеть..."); - if (GsmWithGnss_WaitNetworkRegistration(env, timeOut) == true) { - LoggerTraceStatic(LOGGER, LOG_SIGN, "Сеть найдена") - return AT_OK; - } else { - LoggerTraceStatic(LOGGER, LOG_SIGN, "Попытка регистрации в сети НЕ выполнена") - return AT_ERROR; +AtCommandResult GsmWithGnss_NetworkEnableInnaterups(tGsmWithGnss *env, uint8_t cuontReg, uint32_t timeOut) { + if(GsmWithGnss_WaitNetworkRegistration(env, 4000) == false) { + if (GsmWithGnss_NetworkReconnect(&env->gsmAt, cuontReg) == AT_OK) { + LoggerInfoStatic(LOGGER, LOG_SIGN, "Ждем сеть..."); + if (GsmWithGnss_WaitNetworkRegistration(env, timeOut) == true) { + LoggerTraceStatic(LOGGER, LOG_SIGN, "Сеть найдена") + return AT_OK; + } else { + LoggerTraceStatic(LOGGER, LOG_SIGN, "Попытка регистрации в сети НЕ выполнена") + return AT_ERROR; + } } } return AT_ERROR; diff --git a/GsmWithGnss.h b/GsmWithGnss.h index f75e815..94f3f3e 100644 --- a/GsmWithGnss.h +++ b/GsmWithGnss.h @@ -156,7 +156,7 @@ void AtGsm_Gsnss_GetLastActualNavData(tGsmWithGnss *env, EraGlonassUveosNavData AtCommandResult GsmWithGnss_NetworkReconnect(tAtCmd *env, uint8_t cuontReg); -AtCommandResult GsmWithGnss_NetworkEnableInnaterups(tGsmWithGnss *env, uint8_t cuontReg, uint16_t timeOut); +AtCommandResult GsmWithGnss_NetworkEnableInnaterups(tGsmWithGnss *env, uint8_t cuontReg, uint32_t timeOut); void Gnss_GetFullNavData(tGsmWithGnss *env, tNmeaRmc *nmeaRmc);