Revision 27:97054be1a741, committed 2018-11-22

Comitter:

mbed_official

Date:

Thu Nov 22 10:30:32 2018 +0000

Parent:

26:348eec457e58

Child:

28:232da3ce8a88

Commit message:

Changed to use NSAPI default values for pin, apn, plmn and credentials.

.
Commit copied from https://github.com/ARMmbed/mbed-os-example-cellular

Changed in this revision

--- a/main.cpp	Tue Nov 20 09:45:32 2018 +0000
+++ b/main.cpp	Thu Nov 22 10:30:32 2018 +0000
@@ -22,21 +22,6 @@
 #define UDP 0
 #define TCP 1
 
-// SIM pin code goes here
-#ifndef MBED_CONF_APP_SIM_PIN_CODE
-# define MBED_CONF_APP_SIM_PIN_CODE    "1234"
-#endif
-
-#ifndef MBED_CONF_APP_APN
-# define MBED_CONF_APP_APN         "internet"
-#endif
-#ifndef MBED_CONF_APP_USERNAME
-# define MBED_CONF_APP_USERNAME    NULL
-#endif
-#ifndef MBED_CONF_APP_PASSWORD
-# define MBED_CONF_APP_PASSWORD    NULL
-#endif
-
 // Number of retries /
 #define RETRY_COUNT 3
 
@@ -228,15 +213,11 @@
 #else
     dot_thread.start(dot_event);
 #endif // #if MBED_CONF_MBED_TRACE_ENABLE
+
+    // sim pin, apn, credentials and possible plmn are taken atuomtically from json when using get_default_instance()
     iface = CellularBase::get_default_instance();
     MBED_ASSERT(iface);
 
-    /* Set Pin code for SIM card */
-    iface->set_sim_pin(MBED_CONF_APP_SIM_PIN_CODE);
-
-    /* Set network credentials here, e.g., APN */
-    iface->set_credentials(MBED_CONF_APP_APN, MBED_CONF_APP_USERNAME, MBED_CONF_APP_PASSWORD);
-
     nsapi_error_t retcode = NSAPI_ERROR_NO_CONNECTION;
 
     /* Attempt to connect to a cellular network */

--- a/mbed_app.json	Tue Nov 20 09:45:32 2018 +0000
+++ b/mbed_app.json	Thu Nov 22 10:30:32 2018 +0000
@@ -1,22 +1,6 @@
 {
     "config": {
         "sock-type": "TCP",
-        "sim-pin-code": {
-            "help": "SIM PIN code, set to 0 if none",
-            "value": "\"1234\""
-        },
-        "apn": {
-            "help": "The APN string to use for this SIM/network, set to 0 if none",
-            "value": "\"internet\""
-        },
-        "username": {
-            "help": "The user name string to use for this APN, set to zero if none",
-            "value": 0
-        },
-        "password": {
-            "help": "The password string to use for this APN, set to 0 if none",
-            "value": 0
-        },
         "echo-server-hostname": {
             "help": "Echo server host name.",
             "value": "\"echo.mbedcloudtesting.com\""
@@ -42,7 +26,12 @@
             "platform.stdio-baud-rate": 115200,
             "platform.default-serial-baud-rate": 115200,
             "platform.stdio-buffered-serial": true,
-            "cellular.debug-at": false
+            "cellular.debug-at": false,
+            "nsapi.default-cellular-plmn": 0,
+            "nsapi.default-cellular-sim-pin": "\"1234\"",
+            "nsapi.default-cellular-apn": 0,
+            "nsapi.default-cellular-username": 0,
+            "nsapi.default-cellular-password": 0
         }
     }
 }