Merge pull request #83 from AriParkkila/mbed-os-5.9.0-oob

Changed OnboardCellularInterface to CellularBase::get_default_instance

Author: Ari Parkkila

main.cpp

@@ -17,7 +17,6 @@
 #include "mbed.h"
 #include "common_functions.h"
 #include "UDPSocket.h"
-#include "OnboardCellularInterface.h"
 #include "CellularLog.h"
 
 #define UDP 0
@@ -41,10 +40,7 @@
 // Number of retries /
 #define RETRY_COUNT 3
 
-
-
-// CellularInterface object
-OnboardCellularInterface iface;
+CellularBase *iface;
 
 // Echo server hostname
 const char *host_name = MBED_CONF_APP_ECHO_SERVER_HOSTNAME;
@@ -110,7 +106,7 @@ void dot_event()
 {
     while (true) {
         Thread::wait(4000);
-        if (!iface.is_connected()) {
+        if (!iface->is_connected()) {
             trace_mutex.lock();
             printf(".");
             fflush(stdout);
@@ -129,8 +125,8 @@ nsapi_error_t do_connect()
     nsapi_error_t retcode = NSAPI_ERROR_OK;
     uint8_t retry_counter = 0;
 
-    while (!iface.is_connected()) {
-        retcode = iface.connect();
+    while (!iface->is_connected()) {
+        retcode = iface->connect();
         if (retcode == NSAPI_ERROR_AUTH_FAILURE) {
             print_function("\n\nAuthentication Failure. Exiting application\n");
         } else if (retcode == NSAPI_ERROR_OK) {
@@ -160,14 +156,14 @@ nsapi_error_t test_send_recv()
     UDPSocket sock;
 #endif
 
-    retcode = sock.open(&iface);
+    retcode = sock.open(iface);
     if (retcode != NSAPI_ERROR_OK) {
         print_function("UDPSocket.open() fails, code: %d\n", retcode);
         return -1;
     }
 
     SocketAddress sock_addr;
-    retcode = iface.gethostbyname(host_name, &sock_addr);
+    retcode = iface->gethostbyname(host_name, &sock_addr);
     if (retcode != NSAPI_ERROR_OK) {
         print_function("Couldn't resolve remote host: %s, code: %d\n", host_name, retcode);
         return -1;
@@ -228,11 +224,14 @@ int main()
 #else
     dot_thread.start(dot_event);
 #endif // #if MBED_CONF_MBED_TRACE_ENABLE
+    iface = CellularBase::get_default_instance();
+    MBED_ASSERT(iface);
+
     /* Set Pin code for SIM card */
-    iface.set_sim_pin(MBED_CONF_APP_SIM_PIN_CODE);
+    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);
+    iface->set_credentials(MBED_CONF_APP_APN, MBED_CONF_APP_USERNAME, MBED_CONF_APP_PASSWORD);
 
     nsapi_error_t retcode = NSAPI_ERROR_NO_CONNECTION;