ublox cellular context activation updated for C030_R412M

Author: mudassar-ublox

features/cellular/framework/targets/UBLOX/AT/UBLOX_AT_CellularContext.cpp

@@ -51,7 +51,7 @@ void UBLOX_AT_CellularContext::do_connect()
     _cb_data.error = NSAPI_ERROR_NO_CONNECTION;
 
     // Attempt to establish a connection
-#ifdef TARGET_UBLOX_C030_R41XM
+#ifdef TARGET_UBLOX_C030_R410M
     _cb_data.error = NSAPI_ERROR_OK;
 #else
     _cb_data.error = open_data_channel();
@@ -72,6 +72,78 @@ void UBLOX_AT_CellularContext::do_connect()
     }
 }
 
+#ifdef TARGET_UBLOX_C030_R412M
+nsapi_error_t UBLOX_AT_CellularContext::open_data_channel()
+{
+    bool success = false;
+    char *config = NULL;
+    nsapi_error_t err = NSAPI_ERROR_NO_CONNECTION;
+    char imsi[MAX_IMSI_LENGTH + 1];
+
+    // do check for stack to validate that we have support for stack
+    _stack = get_stack();
+    if (!_stack) {
+        return err;
+    }
+
+    _at.set_at_timeout(3*60*1000);
+    _at.cmd_start("AT+CGATT=0");
+    _at.cmd_stop();
+    _at.resp_start();
+    _at.resp_stop();
+    _at.restore_at_timeout();
+
+    if (_at.get_last_error() == NSAPI_ERROR_OK) {
+        _at.set_at_timeout(40*1000);
+        _at.cmd_start("AT+CGACT=0");
+        _at.cmd_stop();
+        _at.resp_start();
+        _at.resp_stop();
+        _at.restore_at_timeout();
+
+        if (_at.get_last_error() == NSAPI_ERROR_OK) {
+            if (_apn == NULL) {
+                err = get_imsi(imsi);
+                if (err == NSAPI_ERROR_OK) {
+                    config = (char *)apnconfig(imsi);
+                }
+            }
+
+            // Attempt to connect
+            do {
+                // Set up APN and IP protocol for PDP context
+                get_next_credentials(&config);
+                _auth = (*_uname && *_pwd) ? _auth : NSAPI_SECURITY_NONE;
+                if (activate_profile(_apn, _uname, _pwd, _authentication_type)) {
+                    success = true;
+                }
+            } while (!success && config && *config);
+
+            if(success) {
+               _at.set_at_timeout(3*60*1000);
+               _at.cmd_start("AT+CGATT=1");
+               _at.cmd_stop();
+               _at.resp_start();
+               _at.resp_stop();
+               _at.restore_at_timeout();
+
+               if (_at.get_last_error() == NSAPI_ERROR_OK) {
+                   _at.set_at_timeout(150*1000);
+                   _at.cmd_start("AT+CGACT=1,1");
+                   _at.cmd_stop();
+                   _at.resp_start();
+                   _at.resp_stop();
+                   _at.restore_at_timeout();
+               }
+            }
+        }
+     }
+
+    err = (_at.get_last_error() == NSAPI_ERROR_OK) ? NSAPI_ERROR_OK : NSAPI_ERROR_NO_CONNECTION;
+
+    return err;
+}
+#else
 nsapi_error_t UBLOX_AT_CellularContext::open_data_channel()
 {
     bool success = false;
@@ -121,7 +193,60 @@ nsapi_error_t UBLOX_AT_CellularContext::open_data_channel()
 
     return err;
 }
+#endif
 
+#ifdef TARGET_UBLOX_C030_R412M
+bool UBLOX_AT_CellularContext::activate_profile(const char *apn,
+                                                const char *username,
+                                                const char *password,
+                                                CellularContext::AuthenticationType auth)
+{
+    bool success = false;
+    int modem_security = nsapi_security_to_modem_security((nsapi_security_t)auth);
+
+    _at.cmd_start("AT+CGDCONT=1,");
+    _at.write_string("IP");
+    _at.write_string(apn);
+    _at.cmd_stop();
+    _at.resp_start();
+    _at.resp_stop();
+
+
+    if (_at.get_last_error() == NSAPI_ERROR_OK) {
+        if (modem_security == NSAPI_SECURITY_CHAP) {
+            _at.cmd_start("AT+UAUTHREQ=1,");
+            _at.write_int(modem_security);
+            _at.write_string(password);
+            _at.write_string(username);
+            _at.cmd_stop();
+            _at.resp_start();
+            _at.resp_stop();
+
+        } else if (modem_security == NSAPI_SECURITY_NONE) {
+            _at.cmd_start("AT+UAUTHREQ=1,");
+            _at.write_int(modem_security);
+            _at.cmd_stop();
+            _at.resp_start();
+            _at.resp_stop();
+
+        } else {
+            _at.cmd_start("AT+UAUTHREQ=1,");
+            _at.write_int(modem_security);
+            _at.write_string(username);
+            _at.write_string(password);
+            _at.cmd_stop();
+            _at.resp_start();
+            _at.resp_stop();
+        }
+
+        if (_at.get_last_error() == NSAPI_ERROR_OK) {
+            success = true;
+        }
+    }
+
+    return success;
+}
+#else
 bool UBLOX_AT_CellularContext::activate_profile(const char *apn,
                                                 const char *username,
                                                 const char *password)
@@ -222,6 +347,7 @@ bool UBLOX_AT_CellularContext::activate_profile(const char *apn,
 
     return activated;
 }
+#endif
 
 // Convert nsapi_security_t to the modem security numbers
 int UBLOX_AT_CellularContext::nsapi_security_to_modem_security(nsapi_security_t nsapi_security)
@@ -238,12 +364,18 @@ int UBLOX_AT_CellularContext::nsapi_security_to_modem_security(nsapi_security_t
         case NSAPI_SECURITY_CHAP:
             modem_security = 2;
             break;
+#ifndef TARGET_UBLOX_C030_R41XM
         case NSAPI_SECURITY_UNKNOWN:
             modem_security = 3;
             break;
         default:
             modem_security = 3;
             break;
+#else
+        default:
+            modem_security = 0;
+            break;
+#endif
     }
 
     return modem_security;

features/cellular/framework/targets/UBLOX/AT/UBLOX_AT_CellularContext.h

@@ -58,7 +58,11 @@ class UBLOX_AT_CellularContext: public AT_CellularContext {
      *                 NSAPI_SECURITY_CHAP or NSAPI_SECURITY_UNKNOWN).
      * @return         True if successful, otherwise false.
      */
+#ifdef TARGET_UBLOX_C030_R412M
+    bool activate_profile(const char *apn, const char *username, const char *password, CellularContext::AuthenticationType auth);
+#else
     bool activate_profile(const char *apn, const char *username, const char *password);
+#endif
 
     /** Convert nsapi_security_t to the modem security numbers.
      *