From c28ae0fb4df458d31e963f63129ac8ba24c6c919 Mon Sep 17 00:00:00 2001 From: korolev Date: Fri, 31 Jan 2025 11:31:46 +0300 Subject: [PATCH] =?UTF-8?q?=D0=B0=D0=BB=D0=B3=D0=BE=D1=80=D0=B8=D1=82?= =?UTF-8?q?=D0=BC=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BA=D0=BB=D1=8E=D1=87=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=20=D1=81=D0=B8=D0=BC=20=D0=BF=D1=80=D0=BE=D1=84?= =?UTF-8?q?=D0=B8=D0=BB=D1=8F=20=D1=8D=D1=80=D1=8B=20=D0=BF=D0=B5=D1=80?= =?UTF-8?q?=D0=B5=D0=BF=D0=B8=D1=81=D0=B0=D0=BD,=20=D1=83=D0=B1=D1=80?= =?UTF-8?q?=D0=B0=D0=BD=D1=8B=20=D0=BF=D0=B0=D1=80=D0=B0=D0=BC=D0=B5=D1=82?= =?UTF-8?q?=D1=80=D1=8B,=20=D0=B7=D0=BD=D0=B0=D1=87=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=8F=20=D0=BA=D0=BE=D1=82=D0=BE=D1=80=D1=8B=D1=85=20=D0=B8?= =?UTF-8?q?=D0=BD=D0=B8=D1=86=D0=B8=D0=B0=D0=BB=D0=B8=D0=B7=D0=B8=D1=80?= =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BB=D0=BE=D1=81=D1=8C=20=D0=BF=D0=BE=D0=B7?= =?UTF-8?q?=D0=B4=D0=BD=D0=BE=20=D0=BE=D1=82=20=D0=BD=D0=BE=D1=81=D0=B8?= =?UTF-8?q?=D1=82=D0=B5=D0=BB=D1=8C=D0=BD=D0=BE=20=D0=B7=D0=B0=D0=BF=D1=83?= =?UTF-8?q?=D1=81=D0=BA=D0=B0=20=D0=BE=D1=81=D0=BD=D0=BE=D0=B2=D0=BD=D0=BE?= =?UTF-8?q?=D0=B9=20=D1=81=D0=B8=D1=81=D1=82=D0=B5=D0=BC=D1=8B.=20=D0=BF?= =?UTF-8?q?=D1=80=D0=B8=D1=87=D0=B8=D0=BD=D0=B0=20-=20=D0=BD=D0=B5=D0=BE?= =?UTF-8?q?=D0=B1=D1=85=D0=BE=D0=B4=D0=B8=D0=BC=D0=BE=D1=81=D1=82=D1=8C=20?= =?UTF-8?q?=D0=B8=D1=81=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0?= =?UTF-8?q?=D0=BD=D0=B8=D1=8F=20=D1=8D=D1=82=D0=BE=D0=B3=D0=BE=20=D0=B0?= =?UTF-8?q?=D0=BB=D0=B3=D0=BE=D1=80=D0=B8=D1=82=D0=BC=D0=B0=20=D0=B2=D0=BE?= =?UTF-8?q?=20=D0=B2=D1=80=D0=B5=D0=BC=D1=8F=20=D0=B8=D0=BD=D0=B8=D1=86?= =?UTF-8?q?=D0=B8=D0=B0=D0=BB=D0=B8=D0=B7=D0=B0=D1=86=D0=B8=D0=B8=20=D1=81?= =?UTF-8?q?=D0=B8=D1=81=D1=82=D0=B5=D0=BC=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- EgtsProcessing.c | 16 +++++++--------- EgtsProcessing.h | 2 +- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/EgtsProcessing.c b/EgtsProcessing.c index 090c13f..7b23a73 100644 --- a/EgtsProcessing.c +++ b/EgtsProcessing.c @@ -448,21 +448,19 @@ bool Gsm_ActivateApn(tEgtsProcessing *env) { return res == AT_OK; } -bool Gsm_SetProfileERA(tEgtsProcessing *env) { +bool Gsm_SetProfileERA(tAtCmd *env, tDeviceTeledataStorageData *deviceTeledataStorageData) { AtCommandResult res = AT_ERROR; - if (osMutexAcquire(env->gsm->gsmAt.access, 5000) == osOK) { + if (osMutexAcquire(env->access, 5000) == osOK) { #ifdef UVEOS_ADD_TELEMATICA - AtGsmTelitLe910_SimProfileSelect(&env->gsm->gsmAt, - &env->store->nvm.deviceTeledataStorageData.telematica.EGTS_PROFILE_SIM_ERA); + AtGsmTelitLe910_SimProfileSelect(env, + &deviceTeledataStorageData->telematica.EGTS_PROFILE_SIM_ERA); #endif - AtGsmTelitLe910_SIMCardNoDetect(&env->gsm->gsmAt); - AtGsmTelitLe910_SIMCardDetect(&env->gsm->gsmAt); + AtGsmTelitLe910_SIMCardNoDetect(env); + AtGsmTelitLe910_SIMCardDetect(env); - osMutexRelease(env->gsm->gsmAt.access); - } else { - LoggerInfoStatic(LOGGER, LOG_SIGN, "Ошибка доступа (Gsm_SetProfileERA)") + osMutexRelease(env->access); } return res == AT_OK; diff --git a/EgtsProcessing.h b/EgtsProcessing.h index 36b63fc..23baead 100644 --- a/EgtsProcessing.h +++ b/EgtsProcessing.h @@ -462,6 +462,6 @@ bool onOffTelematica(tEgtsProcessing *env, bool *oneOn, bool *oneOff, char *task void receivedUpdateFirmware(tEgtsProcessing *env); -bool Gsm_SetProfileERA(tEgtsProcessing *env); +bool Gsm_SetProfileERA(tAtCmd *env, tDeviceTeledataStorageData *deviceTeledataStorageData); #endif //SMART_COMPONENTS_EGTSPROCESSING_H