Merge pull request #11 from ARMmbed/update_ptr

Update mbed-os pointer

Author: Hasnain Virk

Jenkinsfile

@@ -16,28 +16,26 @@ try {
 
 // Map RaaS instances to corresponding test suites
 def raas = [
-  "cellular_smoke_ublox_c027.json": "8072",
-  "cellular_smoke_mts_dragonfly.json": "8072"
+  "cellular_smoke_ublox_c027.json": "8072"
+  // Currently dragonfly is not supported by RAAS, skip it 
+  //"cellular_smoke_mts_dragonfly.json": "8072"
   ]
 
 // List of targets with supported modem families
 def target_families = [
-  "UBLOX": ["UBLOX_C027"],
-  "MTS_DRAGONFLY": ["MTS_DRAGONFLY_F411RE"]
+  "UBLOX": ["UBLOX_C027"]
   ]
 
 // Supported Modems
 def targets = [
-  "UBLOX_C027",
-  "UBLOX_C030",
-  "MTS_DRAGONFLY_F411RE"
+  "UBLOX_C027"
 ]
 
 // Map toolchains to compilers
 def toolchains = [
   ARM: "armcc",
-  GCC_ARM: "arm-none-eabi-gcc"//,
-  //IAR: "iar_arm"
+  GCC_ARM: "arm-none-eabi-gcc",
+  IAR: "iar_arm"
   ]
 
 def stepsForParallel = [:]
@@ -89,9 +87,6 @@ def buildStep(target_family, target, compilerLabel, toolchain) {
           checkout scm
           def config_file = "mbed_app.json"
 
-           // Change target type
-          execute("sed -i 's/\"platform\": .*/\"platform\": \"${target_family}\"/' ${config_file}")
-
           // Activate traces
           execute("sed -i 's/\"mbed-trace.enable\": false/\"mbed-trace.enable\": true/' ${config_file}")
 
@@ -148,9 +143,9 @@ def run_smoke(target_families, raasPort, suite_to_run, toolchains, targets) {
             }
           }     
           if ("${suiteName}" == "cellular_smoke_mts_dragonfly")  {
-            execute("python clitest.py --suitedir mbed-clitest-suites/suites/ --suite ${suite_to_run} --type hardware --reset hard --raas 193.208.80.31:${raasPort} --tcdir mbed-clitest-suites/cellular  --failure_return_value -vvv -w --log log_${raasPort}_${suiteName}")
+            execute("python clitest.py --suitedir mbed-clitest-suites/suites/ --suite ${suite_to_run} --type hardware --reset hard --raas 62.44.193.186:${raasPort} --tcdir mbed-clitest-suites/cellular  --failure_return_value -vvv -w --log log_${raasPort}_${suiteName}")
           } else {
-            execute("python clitest.py --suitedir mbed-clitest-suites/suites/ --suite ${suite_to_run} --type hardware --reset --raas 193.208.80.31:${raasPort} --tcdir mbed-clitest-suites/cellular  --failure_return_value -vvv -w --log log_${raasPort}_${suiteName}")
+            execute("python clitest.py --suitedir mbed-clitest-suites/suites/ --suite ${suite_to_run} --type hardware --reset --raas 62.44.193.186:${raasPort} --tcdir mbed-clitest-suites/cellular  --failure_return_value -vvv -w --log log_${raasPort}_${suiteName}")
           }
          archive "log_${raasPort}_${suiteName}/**/*"
         }

README.md

@@ -1,9 +1,3 @@
 # mbed-os-example-cellular
 
-For MTS Dragonfly, please change platform section in mbed_app.json as:
 
-```json
-"config": {
-        "platform": "MTS_DRAGONFLY"
-},
-```

main.cpp

@@ -2,17 +2,7 @@
 #include <inttypes.h>
 #include "mbed.h"
 #include "BufferedSerial.h"
-
-#define UBLOX           0
-#define MTS_DRAGONFLY   1
-
-#if MBED_CONF_APP_PLATFORM == UBLOX
-#include "ublox_modem_driver/UbloxCellularInterface.h"
-UbloxCellularInterface *iface;
-#elif MBED_CONF_APP_PLATFORM == MTS_DRAGONFLY
-#include "dragonfly_modem_driver/DragonFlyCellularInterface.h"
-DragonFlyCellularInterface *iface;
-#endif
+#include "ReferenceCellularInterface.h"
 #include "UDPSocket.h"
 #include "common_functions.h"
 #if defined(FEATURE_COMMON_PAL)
@@ -24,6 +14,7 @@ DragonFlyCellularInterface *iface;
 #define tr_error(...) (void(0)) //dummies if feature common pal is not added
 #endif //defined(FEATURE_COMMON_PAL)
 
+ReferenceCellularInterface iface;
 UDPSocket *socket;
 static const char *host_name = "2.pool.ntp.org";
 static const int port = 123;
@@ -58,24 +49,21 @@ static void unlock()
     mtx.unlock();
 }
 
-// main() runs in its own thread in the OS
-
-
 int do_ntp()
 {
     int ntp_values[12] = { 0 };
     time_t TIME1970 = 2208988800U;
 
     UDPSocket sock;
 
-    int ret = sock.open(iface);
+    int ret = sock.open(&iface);
     if (ret) {
         tr_error("UDPSocket.open() fails, code: %d", ret);
         return -1;
     }
 
     SocketAddress nist;
-    ret = iface->gethostbyname(host_name, &nist);
+    ret = iface.gethostbyname(host_name, &nist);
     if (ret) {
         tr_error("Couldn't resolve remote host: %s, code: %d", host_name, ret);
         return -1;
@@ -126,22 +114,16 @@ int do_ntp()
     return -1;
 }
 
-#if MBED_CONF_APP_PLATFORM == UBLOX
-UbloxCellularInterface my_iface(false);
-#elif MBED_CONF_APP_PLATFORM == MTS_DRAGONFLY
-DragonFlyCellularInterface my_iface(false);
-#endif
-
 nsapi_error_t connection()
 {
     nsapi_error_t retcode;
     bool disconnected = false;
 
-    while (!iface->isConnected()) {
+    while (!iface.isConnected()) {
 
-        retcode = iface->connect();
+        retcode = iface.connect();
         if (retcode == NSAPI_ERROR_AUTH_FAILURE) {
-            tr_error("Authentication Failure. Exiting application");
+            printf("\n\nAuthentication Failure. Exiting application\n");
             return retcode;
         } else if (retcode != NSAPI_ERROR_OK) {
             tr_error("Couldn't connect: %d", retcode);
@@ -151,15 +133,15 @@ nsapi_error_t connection()
         break;
     }
 
-    tr_info("Connection Established.");
+    printf("\n\nConnection Established.\n");
 
     return NSAPI_ERROR_OK;
 }
 
 int getTime()
 {
     int retcode = -1;
-    if (iface->isConnected()) {
+    if (iface.isConnected()) {
         retcode = do_ntp();
     } else {
         /* Determine why the network is down */
@@ -189,12 +171,11 @@ int main()
 
     nsapi_error_t retcode = NSAPI_ERROR_OK;
 
-    iface = &my_iface;
-    iface->set_SIM_pin("1234");
+    iface.set_SIM_pin("1234");
 
-    iface->set_credentials("internet");
+    iface.set_credentials("internet");
 
-    iface->connection_lost_notification_cb(ppp_connection_down_cb);
+    iface.connection_status_cb(ppp_connection_down_cb);
 
     tr_debug("Connecting...");
     retcode  = connection();
@@ -204,7 +185,7 @@ int main()
     }
 
     if (getTime() == 0) {
-        tr_info("Done.");
+        printf("\n\nDone.\n");
     }
 
     return 0;

mbed-os.lib

@@ -1 +1 @@
-https://github.com/hasnainvirk/mbed-os/#f88c23e845098216196bbbd1f3ba5f49b90bb3a8
+https://github.com/hasnainvirk/mbed-os/#351572324f4f18b5d0d20f29374f4314e7c8a084

mbed_app.json

@@ -1,7 +1,4 @@
 {
-    "config": {
-        "platform": "UBLOX"
-    },
     "macros": ["OS_MAINSTKSIZE=512"],
     "target_overrides": {
         "*": {
@@ -16,7 +13,7 @@
             "platform.default-serial-baud-rate": 115200, 
             "lwip.debug-enabled":false,
             "lwip.enable-ppp-trace": false,
-            "lwip.use-mbed-trace": true,
+            "lwip.use-mbed-trace": false,
             "mbed-trace.enable": 1
         }
     }