From 10d3357ecddb03c86c1173c28a7d3d77975e3c17 Mon Sep 17 00:00:00 2001
From: korolev <korolev@ficom-it.ru>
Date: Fri, 20 Dec 2024 15:57:48 +0300
Subject: [PATCH] =?UTF-8?q?=D0=90=D0=A2=20=D0=B8=D0=BD=D1=82=D0=B5=D1=80?=
 =?UTF-8?q?=D1=84=D0=B5=D0=B9=D1=81=20=D0=B1=D0=BB=D0=BE=D0=BA=D0=B8=D1=80?=
 =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BD=20=D0=BF=D0=BE=20=D0=BC=D1=8C=D1=8E?=
 =?UTF-8?q?=D1=82=D1=8D=D0=BA=D1=81=D0=B0=20=D0=B2=D0=BE=20=D0=B2=D1=80?=
 =?UTF-8?q?=D0=B5=D0=BC=D1=8F=20=D0=BF=D0=B5=D1=80=D0=B2=D0=B8=D1=87=D0=BD?=
 =?UTF-8?q?=D0=BE=D0=B9=20=D0=BD=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B9=D0=BA?=
 =?UTF-8?q?=D0=B8=20=D0=BC=D0=BE=D0=B4=D0=B5=D0=BC=D0=B0,=20=D0=B4=D0=BE?=
 =?UTF-8?q?=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B0=20=D0=BD=D0=B0=D1=81?=
 =?UTF-8?q?=D1=82=D1=80=D0=BE=D0=B9=D0=BA=D0=B0=20=D1=81=D1=82=D0=B0=D0=BD?=
 =?UTF-8?q?=D0=B4=D0=B0=D1=80=D1=82=D0=B0=20=D0=BF=D0=BE=D1=82=D0=B4=D0=B5?=
 =?UTF-8?q?=D1=80=D0=B6=D0=B8=D0=B2=D0=B0=D0=B5=D0=BC=D1=8B=D1=85=20=D1=81?=
 =?UTF-8?q?=D1=82=D0=B0=D0=BD=D0=B4=D0=B0=D1=80=D1=82=D0=BE=D0=B2=20=D1=81?=
 =?UTF-8?q?=D0=B2=D1=8F=D0=B7=D0=B8=20=D1=81=D1=80=D0=B0=D0=B7=D1=83=20?=
 =?UTF-8?q?=D0=BF=D0=BE=D1=81=D0=BB=D0=B5=20=D0=B1=D0=B0=D0=B7=D0=BE=D0=B2?=
 =?UTF-8?q?=D1=8B=D1=85=20=D0=BD=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B5=D0=BA?=
 =?UTF-8?q?=20=D0=BC=D0=BE=D0=B4=D0=B5=D0=BC=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 GsmWithGnss.c         |  1 +
 GsmWithGnss_GnssOps.c | 28 +++++++++++++++-------------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/GsmWithGnss.c b/GsmWithGnss.c
index 2db08b5..8a92e81 100644
--- a/GsmWithGnss.c
+++ b/GsmWithGnss.c
@@ -199,6 +199,7 @@ void Gsm_WaitGsmBoot(tGsmWithGnss *env) {
             break;
         }
     }
+
     GsmWithGnss_InitAudio(env);
 }
 
diff --git a/GsmWithGnss_GnssOps.c b/GsmWithGnss_GnssOps.c
index 70c26f2..d75d5f3 100644
--- a/GsmWithGnss_GnssOps.c
+++ b/GsmWithGnss_GnssOps.c
@@ -14,6 +14,7 @@
 #include "AtGsmSms_DeleteAll.h"
 #include "Nmea0183Parser.h"
 #include "Rtc.h"
+#include "AtGsmTelitLe910_DefinePdpContext.h"
 
 #define LOGGER env->logger
 #define LOG_SIGN "GSM&GNSSOPS"
@@ -24,19 +25,20 @@ bool fl_rtcIsUsed = false;
 
 
 AtCommandResult GsmWithGnssInitGnss(tGsmWithGnss *env) {
-    AT_INOKR(AtGsmTelitLe910_GnssSwitchOnRestoreParam(&env->gsmAt))
-    SystemDelayMs(200);
-    AT_INOKR(AtGsmTelitLe910_Gnss_ClearNvramGnssBuf(&env->gsmAt));
-    SystemDelayMs(200);
-    AT_INOKR(AtGsmTelitLe910_Gnss_ClearStaticBufFix(&env->gsmAt));
-    SystemDelayMs(200);
-//    AT_INOKR(AtGsmTelitLe910_Gnss_AGPSup(&env->gsmAt,2));
-//    SystemDelayMs(1000);
-    AT_INOKR(AtGsmTelitLe910_Gnss_ReStartReceiver(&env->gsmAt, 1));
-    SystemDelayMs(200);
-    AT_INOKR(AtGsmTelitLe910_SIMCardDetect(&env->gsmAt));
-    SystemDelayMs(200);
-    return AT_OK;
+    if (osMutexAcquire(&env->gsmAt.access, 5000) == osOK) {
+        AT_INOKR(AtGsmTelitLe910_GnssSwitchOnRestoreParam(&env->gsmAt))
+        SystemDelayMs(200);
+        AT_INOKR(AtGsmTelitLe910_Gnss_ClearNvramGnssBuf(&env->gsmAt));
+        SystemDelayMs(200);
+        AT_INOKR(AtGsmTelitLe910_Gnss_ClearStaticBufFix(&env->gsmAt));
+        SystemDelayMs(200);
+        AT_INOKR(AtGsmTelitLe910_Gnss_ReStartReceiver(&env->gsmAt, 1));
+        osMutexRelease(&env->gsmAt.access);
+        return AT_OK;
+    } else {
+        LoggerInfoStatic(LOGGER, LOG_SIGN, "Ошибка доступа AtGsmTelitLe910_SimProfileSelect")
+    }
+
 }
 
 void AtGsm_Gsnss_NavData_Incorrect(tGsmWithGnss *env) {