Merge pull request #2842 from particle-iot/fix/bg95s5-init

Allow Device OS to initialize BG95-S5 modems

Author: scott-brust

hal/network/ncp_client/quectel/quectel_ncp_client.cpp

@@ -1135,8 +1135,12 @@ int QuectelNcpClient::initReady(ModemState state) {
         skipAll(serial_.get(), 1000);
         CHECK(waitAtResponse(10000));
 
-        // Select either internal or external SIM card slot depending on the configuration
-        CHECK(selectSimCard());
+        // Cannot use ncpId() as this is not programmed on first boot during manufacturing
+        // Read NCP ID from OTP when initializing the modem after provisioning
+        if (platform_primary_ncp_identifier() != PLATFORM_NCP_QUECTEL_BG95_S5) {
+            // Select either internal or external SIM card slot depending on the configuration
+            CHECK(selectSimCard());
+        }
 
         // Just in case disconnect
         // int r = CHECK_PARSER(parser_.execCommand("AT+COPS=2"));

hal/shared/cellular_enums_hal.h

@@ -49,7 +49,7 @@ typedef enum {
     DEV_QUECTEL_BG95_MF = 17,
     DEV_QUECTEL_BG95_M6 = 18,
     DEV_QUECTEL_BG95_M5 = 19,
-
+    DEV_QUECTEL_BG95_S5 = 22
 } Dev;
 //! SIM Status
 typedef enum {

hal/shared/cellular_ncp_dev_mapping.h

@@ -65,6 +65,9 @@ inline Dev cellular_dev_from_ncp(PlatformNCPIdentifier identifer) {
     case PLATFORM_NCP_QUECTEL_BG95_M5:
         device = DEV_QUECTEL_BG95_M5;
         break;
+    case PLATFORM_NCP_QUECTEL_BG95_S5:
+        device = DEV_QUECTEL_BG95_S5;
+        break;
     default:
         device = DEV_UNKNOWN;
         break;

hal/shared/platform_ncp.h

@@ -53,16 +53,17 @@ typedef enum PlatformNCPIdentifier {
     PLATFORM_NCP_SARA_R510 = PLATFORM_NCP_IDENTIFIER(PLATFORM_NCP_MANUFACTURER_UBLOX, 7),
 
     // 0x6x
-    PLATFORM_NCP_QUECTEL_BG96     = PLATFORM_NCP_IDENTIFIER(PLATFORM_NCP_MANUFACTURER_QUECTEL, 1),
-    PLATFORM_NCP_QUECTEL_EG91_E   = PLATFORM_NCP_IDENTIFIER(PLATFORM_NCP_MANUFACTURER_QUECTEL, 2),
-    PLATFORM_NCP_QUECTEL_EG91_NA  = PLATFORM_NCP_IDENTIFIER(PLATFORM_NCP_MANUFACTURER_QUECTEL, 3),
-    PLATFORM_NCP_QUECTEL_EG91_EX  = PLATFORM_NCP_IDENTIFIER(PLATFORM_NCP_MANUFACTURER_QUECTEL, 4),
-    PLATFORM_NCP_QUECTEL_BG95_M1  = PLATFORM_NCP_IDENTIFIER(PLATFORM_NCP_MANUFACTURER_QUECTEL, 5),
-    PLATFORM_NCP_QUECTEL_EG91_NAX = PLATFORM_NCP_IDENTIFIER(PLATFORM_NCP_MANUFACTURER_QUECTEL, 6),
-    PLATFORM_NCP_QUECTEL_BG77     = PLATFORM_NCP_IDENTIFIER(PLATFORM_NCP_MANUFACTURER_QUECTEL, 7),
-    PLATFORM_NCP_QUECTEL_BG95_MF  = PLATFORM_NCP_IDENTIFIER(PLATFORM_NCP_MANUFACTURER_QUECTEL, 8),
-    PLATFORM_NCP_QUECTEL_BG95_M6  = PLATFORM_NCP_IDENTIFIER(PLATFORM_NCP_MANUFACTURER_QUECTEL, 9),
-    PLATFORM_NCP_QUECTEL_BG95_M5  = PLATFORM_NCP_IDENTIFIER(PLATFORM_NCP_MANUFACTURER_QUECTEL, 10),
+    PLATFORM_NCP_QUECTEL_BG96      = PLATFORM_NCP_IDENTIFIER(PLATFORM_NCP_MANUFACTURER_QUECTEL, 1),
+    PLATFORM_NCP_QUECTEL_EG91_E    = PLATFORM_NCP_IDENTIFIER(PLATFORM_NCP_MANUFACTURER_QUECTEL, 2),
+    PLATFORM_NCP_QUECTEL_EG91_NA   = PLATFORM_NCP_IDENTIFIER(PLATFORM_NCP_MANUFACTURER_QUECTEL, 3),
+    PLATFORM_NCP_QUECTEL_EG91_EX   = PLATFORM_NCP_IDENTIFIER(PLATFORM_NCP_MANUFACTURER_QUECTEL, 4),
+    PLATFORM_NCP_QUECTEL_BG95_M1   = PLATFORM_NCP_IDENTIFIER(PLATFORM_NCP_MANUFACTURER_QUECTEL, 5),
+    PLATFORM_NCP_QUECTEL_EG91_NAX  = PLATFORM_NCP_IDENTIFIER(PLATFORM_NCP_MANUFACTURER_QUECTEL, 6),
+    PLATFORM_NCP_QUECTEL_BG77      = PLATFORM_NCP_IDENTIFIER(PLATFORM_NCP_MANUFACTURER_QUECTEL, 7),
+    PLATFORM_NCP_QUECTEL_BG95_MF   = PLATFORM_NCP_IDENTIFIER(PLATFORM_NCP_MANUFACTURER_QUECTEL, 8),
+    PLATFORM_NCP_QUECTEL_BG95_M6   = PLATFORM_NCP_IDENTIFIER(PLATFORM_NCP_MANUFACTURER_QUECTEL, 9),
+    PLATFORM_NCP_QUECTEL_BG95_M5   = PLATFORM_NCP_IDENTIFIER(PLATFORM_NCP_MANUFACTURER_QUECTEL, 10),
+    PLATFORM_NCP_QUECTEL_BG95_S5   = PLATFORM_NCP_IDENTIFIER(PLATFORM_NCP_MANUFACTURER_QUECTEL, 13),
 
     // 0x8x
     PLATFORM_NCP_BROADCOM_BCM9WCDUSI09 = PLATFORM_NCP_IDENTIFIER(PLATFORM_NCP_MANUFACTURER_BROADCOM, 1),

hal/src/msom/platform_ncp_quectel.cpp

@@ -40,6 +40,7 @@ bool isValidNcpId(uint8_t id) {
     case PlatformNCPIdentifier::PLATFORM_NCP_QUECTEL_BG77:
     case PlatformNCPIdentifier::PLATFORM_NCP_QUECTEL_BG95_M6:
     case PlatformNCPIdentifier::PLATFORM_NCP_QUECTEL_BG95_M5:
+    case PlatformNCPIdentifier::PLATFORM_NCP_QUECTEL_BG95_S5:
         return true;
     default:
         return false;