From db33a74d1ba22cd435e0b3f9972d157fe43404fc Mon Sep 17 00:00:00 2001
From: korolev <korolev@ficom-it.ru>
Date: Mon, 16 Dec 2024 16:45:43 +0300
Subject: [PATCH] =?UTF-8?q?=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B0=20=D0=BF=D1=80=D0=BE=D1=86=D0=B5=D0=B4=D1=83=D1=80=D0=B0?=
 =?UTF-8?q?=20=D0=BF=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=BA=D0=B0=20=D1=81?=
 =?UTF-8?q?=D0=B5=D1=82=D0=B8,=20=D1=80=D0=B5=D0=B3=D0=B8=D1=81=D1=82?=
 =?UTF-8?q?=D1=80=D0=B0=D1=86=D0=B8=D0=B8=20=D0=B2=20=D1=81=D0=BB=D1=83?=
 =?UTF-8?q?=D1=87=D0=B0=D1=8F=20=D0=BE=D1=82=D1=81=D1=83=D1=82=D1=81=D1=82?=
 =?UTF-8?q?=D0=B2=D0=B8=D1=8F=20=D1=82=D0=B0=D0=BA=D0=BE=D0=B2=D0=BE=D0=B9?=
 =?UTF-8?q?=D1=81=20=D1=86=D0=B5=D0=BB=D1=8C=D1=8E=20=D1=83=D0=B2=D0=B5?=
 =?UTF-8?q?=D0=BB=D0=B8=D1=87=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=B2=D1=80=D0=B5?=
 =?UTF-8?q?=D0=BC=D0=B5=D0=BD=D0=B8=20=D1=80=D0=B5=D0=B3=D0=B8=D1=81=D1=82?=
 =?UTF-8?q?=D1=80=D0=B0=D1=86=D0=B8=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 GsmWithGnss.c | 20 +++++++++++---------
 GsmWithGnss.h |  2 +-
 2 files changed, 12 insertions(+), 10 deletions(-)

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