From 2287b8e45b9ecc6cff0c8cbd3b775fc660dd4beb Mon Sep 17 00:00:00 2001 From: cfif Date: Thu, 12 Dec 2024 17:58:12 +0300 Subject: [PATCH] Fix --- GsmWithGnss.c | 5 ++--- GsmWithGnss.h | 7 ++++--- GsmWithGnss_GnssOps.c | 4 ++++ 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/GsmWithGnss.c b/GsmWithGnss.c index 6394ffa..c157e3b 100644 --- a/GsmWithGnss.c +++ b/GsmWithGnss.c @@ -128,11 +128,10 @@ void GsmWithGnssInit( ControllableSwitch_Init(&env->useInternalAntennaSwitch, env, GsmWithGnss_InvalidateGnssUserExternalAntenna); ControllableSwitch_Init(&env->enableNetworkSwitch, env, GsmWithGnss_InvalidateNetworkEnable); - +#ifdef UVEOS_ADD_TELEMATICA env->gnssRmcGga.rmcAccess = osMutexNew(NULL); - env->isRtcACP = false; - +#endif } diff --git a/GsmWithGnss.h b/GsmWithGnss.h index c2ccffd..f75e815 100644 --- a/GsmWithGnss.h +++ b/GsmWithGnss.h @@ -67,6 +67,8 @@ typedef struct { bool isNav; +#ifdef UVEOS_ADD_TELEMATICA + tLoggerToSerialPort *slog; struct { @@ -75,15 +77,14 @@ typedef struct { tNmeaRmc currentRmc; } gnssRmcGga; - -#ifdef UVEOS_ADD_TELEMATICA bool isDisconnect; uint8_t codeResultOpen; tSocketGsm socketGsm; -#endif bool isRtcACP; +#endif + } tGsmWithGnss; //Common diff --git a/GsmWithGnss_GnssOps.c b/GsmWithGnss_GnssOps.c index 04d171d..e03c0ef 100644 --- a/GsmWithGnss_GnssOps.c +++ b/GsmWithGnss_GnssOps.c @@ -68,6 +68,7 @@ void AtGsm_Gsnss_NavData_Processing(tGsmWithGnss *env) { } +#ifdef UVEOS_ADD_TELEMATICA void Gnss_GetFullNavData(tGsmWithGnss *env, tNmeaRmc *nmeaRmc) { if (osMutexAcquire(env->gnssRmcGga.rmcAccess, 2000) == osOK) { @@ -80,6 +81,9 @@ void Gnss_GetFullNavData(tGsmWithGnss *env, tNmeaRmc *nmeaRmc) { } } +#endif + + void GsmWithGnss_GetNevData(tGsmWithGnss *env, uint32_t timeout) {