GONEC_NEW
/
GONEC_ARTERY_Modem_GSM
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Изменения на новый

This commit is contained in:
cfif 2025-06-18 13:56:44 +03:00
parent 7e3b9602e8
commit 6dd29bb253
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ModemGsm.c
View File

@ -7,7 +7,9 @@
// начало-------------------------- Служебные ---------------------------------------------------------------------- // начало-------------------------- Служебные ----------------------------------------------------------------------
// начало-------------------------- Служебные ---------------------------------------------------------------------- // начало-------------------------- Служебные ----------------------------------------------------------------------
bool Gsm_GET_CGSN(tAtCmd *env, char *acpString, size_t *acpStringLen) { bool Gsm_GET_CGSN(tAtCmd *env, char *acpString, size_t *acpStringLen) {
AtCommandResult result = AtGsm_Simcom_A76xx_GET_CGSN(env, acpString, acpStringLen); AtCommandResult result = AtGsm_Simcom_A76xx_GET_CGSN(env, acpString, acpStringLen);
osMutexRelease(env->access);
if (result != AT_OK) if (result != AT_OK)
return false; return false;
@ -16,6 +18,7 @@ bool Gsm_GET_CGSN(tAtCmd *env, char *acpString, size_t *acpStringLen) {
} }
bool Gsm_CCID(tAtCmd *env, char *acpString, size_t *acpStringLen) { bool Gsm_CCID(tAtCmd *env, char *acpString, size_t *acpStringLen) {
AtCommandResult result = AtGsm_Simcom_A76xx_CCID(env, acpString, acpStringLen); AtCommandResult result = AtGsm_Simcom_A76xx_CCID(env, acpString, acpStringLen);
if (result != AT_OK) if (result != AT_OK)

21
ModemGsmFunc.c
View File

@ -21,7 +21,15 @@
// начало-------------------------- Служебные ---------------------------------------------------------------------- // начало-------------------------- Служебные ----------------------------------------------------------------------
bool GsmGET_CGSN(tModemMain *env, char *acpString, size_t *acpStringLen) { bool GsmGET_CGSN(tModemMain *env, char *acpString, size_t *acpStringLen) {
bool result = Gsm_GET_CGSN(&env->modemAtGsm, acpString, acpStringLen); bool result = AT_ERROR;
if (osMutexAcquire(env->modemAtGsm.access, 1000) == osOK) {
result = Gsm_GET_CGSN(&env->modemAtGsm, acpString, acpStringLen);
osMutexRelease(env->modemAtGsm.access);
} else {
LoggerInfoStatic(LOGGER, LOG_SIGN,
"Ошибка выполнения команды записи в модем (GSM): Получение IMEI (AT+CGSN) Ошибка захвата");
}
if (!result) { if (!result) {
LoggerInfoStatic(LOGGER, LOG_SIGN, LoggerInfoStatic(LOGGER, LOG_SIGN,
@ -32,7 +40,16 @@ bool GsmGET_CGSN(tModemMain *env, char *acpString, size_t *acpStringLen) {
} }
bool GsmCCID(tModemMain *env, char *acpString, size_t *acpStringLen) { bool GsmCCID(tModemMain *env, char *acpString, size_t *acpStringLen) {
AtCommandResult result = Gsm_CCID(&env->modemAtGsm, acpString, acpStringLen);
bool result = AT_ERROR;
if (osMutexAcquire(env->modemAtGsm.access, 1000) == osOK) {
result = Gsm_CCID(&env->modemAtGsm, acpString, acpStringLen);
osMutexRelease(env->modemAtGsm.access);
} else {
LoggerInfoStatic(LOGGER, LOG_SIGN,
"Ошибка выполнения команды записи в модем (GSM): Получение Msisdn (AT+CCID) Ошибка захвата");
}
if (!result) { if (!result) {
LoggerInfoStatic(LOGGER, LOG_SIGN, LoggerInfoStatic(LOGGER, LOG_SIGN,