Merge pull request #2759 from particle-iot/fix/quectel-get-cgi-on-2g

Query 2g registration status in addition to lte with BG95m5 modem
particle-iot · Apr 4, 2024 · 1a641ce · 1a641ce
2 parents 557240e + b70467d
commit 1a641ce
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/hal/network/ncp_client/quectel/quectel_ncp_client.cpp b/hal/network/ncp_client/quectel/quectel_ncp_client.cpp
@@ -661,7 +661,7 @@ int QuectelNcpClient::getCellularGlobalIdentity(CellularGlobalIdentity* cgi) {
     // Fill in LAC and Cell ID based on current RAT, prefer PSD and EPS
     // fallback to CSD
     CHECK_PARSER_OK(parser_.execCommand("AT+CEREG?"));
-    if (isQuecCat1Device()) {
+    if (isQuecCat1Device() || ncpId() == PLATFORM_NCP_QUECTEL_BG95_M5) {
         CHECK_PARSER_OK(parser_.execCommand("AT+CGREG?"));
         CHECK_PARSER_OK(parser_.execCommand("AT+CREG?"));
     }

diff --git a/system/src/system_ble_prov.cpp b/system/src/system_ble_prov.cpp
@@ -70,7 +70,6 @@ int system_ble_prov_mode(bool enabled, void* reserved) {
 }
 
 bool system_ble_prov_get_status(void* reserved) {
-    SYSTEM_THREAD_CONTEXT_SYNC(system_ble_prov_get_status(reserved));
     return BleProvisioningModeHandler::instance()->getProvModeStatus();
 }