Cellular: Update modem drivers with get_default and other new APIs

Author: Ari Parkkila

UNITTESTS/features/cellular/framework/AT/at_cellularcontext/at_cellularcontexttest.cpp

@@ -142,10 +142,6 @@ class my_AT_CTXIPV6 : public AT_CellularContext {
     my_AT_CTXIPV6(ATHandler &at, CellularDevice *device, const char *apn = MBED_CONF_NSAPI_DEFAULT_CELLULAR_APN) :
         AT_CellularContext(at, device, apn), _st(at) {}
     virtual ~my_AT_CTXIPV6() {}
-    virtual bool stack_type_supported(nsapi_ip_stack_t stack_type)
-    {
-        return true;
-    }
     virtual NetworkStack *get_stack()
     {
         return &_st;

features/cellular/TESTS/socket/udp/main.cpp

@@ -22,10 +22,6 @@
 #include "CellularUtil.h" // for CELLULAR_ helper macros
 #include "CellularTargets.h"
 
-#ifndef CELLULAR_DEVICE
-#error [NOT_SUPPORTED] CELLULAR_DEVICE must be defined
-#endif
-
 #ifndef MBED_CONF_APP_CELLULAR_SIM_PIN
 #error [NOT_SUPPORTED] SIM pin code is needed. Skipping this build.
 #endif

features/cellular/framework/targets/QUECTEL/M26/QUECTEL_M26.cpp

@@ -1,4 +1,5 @@
 /*
+#include <M26/QUECTEL_M26_CellularInformation.h>
  * Copyright (c) 2018, Arm Limited and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -15,53 +16,89 @@
  * limitations under the License.
  */
 
-#include "QUECTEL_M26_CellularNetwork.h"
-#include "QUECTEL_M26_CellularPower.h"
-#include "QUECTEL_M26_CellularSIM.h"
+#include "AT_CellularNetwork.h"
 #include "QUECTEL_M26_CellularContext.h"
 #include "QUECTEL_M26.h"
 
-using namespace events;
-using namespace mbed;
-
-#define CONNECT_DELIM         "\r\n"
-#define CONNECT_BUFFER_SIZE   (1280 + 80 + 80) // AT response + sscanf format
-#define CONNECT_TIMEOUT       8000
+#include "CellularLog.h"
 
-#define MAX_STARTUP_TRIALS 5
-#define MAX_RESET_TRIALS 5
+using namespace mbed;
 
-static const AT_CellularBase::SupportedFeature unsupported_features[] =  {
-    AT_CellularBase::AT_CGSN_WITH_TYPE,
-    AT_CellularBase::AT_CGAUTH,
-    AT_CellularBase::SUPPORTED_FEATURE_END_MARK
+static const intptr_t cellular_properties[AT_CellularBase::PROPERTY_MAX] = {
+    AT_CellularNetwork::RegistrationModeDisable,// C_EREG
+    AT_CellularNetwork::RegistrationModeLAC,    // C_GREG
+    AT_CellularNetwork::RegistrationModeDisable,// C_REG
+    0,  // AT_CGSN_WITH_TYPE
+    1,  // AT_CGDATA
+    0,  // AT_CGAUTH
+    1,  // PROPERTY_IPV4_STACK
+    0,  // PROPERTY_IPV6_STACK
+    0,  // PROPERTY_IPV4V6_STACK
 };
 
 QUECTEL_M26::QUECTEL_M26(FileHandle *fh) : AT_CellularDevice(fh)
 {
-    AT_CellularBase::set_unsupported_features(unsupported_features);
+    AT_CellularBase::set_cellular_properties(cellular_properties);
 }
 
-QUECTEL_M26::~QUECTEL_M26()
+nsapi_error_t QUECTEL_M26::get_sim_state(SimState &state)
 {
-}
+    char buf[13];
 
-AT_CellularNetwork *QUECTEL_M26::open_network_impl(ATHandler &at)
-{
-    return new QUECTEL_M26_CellularNetwork(at);
+    _at->lock();
+    _at->cmd_start("AT+CPIN?");
+    _at->cmd_stop();
+    _at->resp_start("+CPIN:");
+    if (_at->info_resp()) {
+        _at->read_string(buf, 13);
+        tr_debug("CPIN: %s", buf);
+
+        if (memcmp(buf, "READY", 5) == 0) {
+            state = SimStateReady;
+        } else if (memcmp(buf, "SIM PIN", 7) == 0) {
+            state = SimStatePinNeeded;
+        } else if (memcmp(buf, "SIM PUK", 7) == 0) {
+            state = SimStatePukNeeded;
+        } else if (memcmp(buf, "PH_SIM PIN", 10) == 0) {
+            state = SimStatePinNeeded;
+        } else if (memcmp(buf, "PH_SIM PUK", 10) == 0) {
+            state = SimStatePukNeeded;
+        } else if (memcmp(buf, "SIM PIN2", 8) == 0) {
+            state = SimStatePinNeeded;
+        } else if (memcmp(buf, "SIM PUK2", 8) == 0) {
+            state = SimStatePukNeeded;
+        } else {
+            state = SimStateUnknown; // SIM may not be ready yet
+        }
+
+    }
+    _at->resp_stop();
+    return _at->unlock_return_error();
 }
 
-AT_CellularPower *QUECTEL_M26::open_power_impl(ATHandler &at)
+AT_CellularContext *QUECTEL_M26::create_context_impl(ATHandler &at, const char *apn, bool cp_req, bool nonip_req)
 {
-    return new QUECTEL_M26_CellularPower(at);
+    return new QUECTEL_M26_CellularContext(at, this, apn, cp_req, nonip_req);
 }
 
-AT_CellularSIM *QUECTEL_M26::open_sim_impl(ATHandler &at)
+nsapi_error_t QUECTEL_M26::init()
 {
-    return new QUECTEL_M26_CellularSIM(at);
+    _at->lock();
+    _at->cmd_start("AT");
+    _at->cmd_stop_read_resp();
+    _at->cmd_start("AT+CMEE="); // verbose responses
+    _at->write_int(1);
+    _at->cmd_stop_read_resp();
+    return _at->unlock_return_error();
 }
 
-AT_CellularContext *QUECTEL_M26::create_context_impl(ATHandler &at, const char *apn)
+nsapi_error_t QUECTEL_M26::shutdown()
 {
-    return new QUECTEL_M26_CellularContext(at, this, apn);
+    _at->lock();
+    _at->cmd_start("AT+QPOWD=0");
+    _at->cmd_stop();
+    _at->resp_start();
+    _at->resp_stop();
+
+    return _at->unlock_return_error();;
 }

features/cellular/framework/targets/QUECTEL/M26/QUECTEL_M26.h

@@ -18,20 +18,28 @@
 #ifndef QUECTEL_M26_H_
 #define QUECTEL_M26_H_
 
+#ifdef TARGET_FF_ARDUINO
+#ifndef MBED_CONF_QUECTEL_M26_TX
+#define MBED_CONF_QUECTEL_M26_TX D1
+#endif
+#ifndef MBED_CONF_QUECTEL_M26_RX
+#define MBED_CONF_QUECTEL_M26_RX D0
+#endif
+#endif /* TARGET_FF_ARDUINO */
+
 #include "AT_CellularDevice.h"
 
 namespace mbed {
 
 class QUECTEL_M26 : public AT_CellularDevice {
 public:
     QUECTEL_M26(FileHandle *fh);
-    virtual ~QUECTEL_M26();
 
 protected: // AT_CellularDevice
-    virtual AT_CellularNetwork *open_network_impl(ATHandler &at);
-    virtual AT_CellularPower *open_power_impl(ATHandler &at);
-    virtual AT_CellularSIM *open_sim_impl(ATHandler &at);
-    virtual AT_CellularContext *create_context_impl(ATHandler &at, const char *apn);
+    virtual nsapi_error_t get_sim_state(SimState &state);
+    virtual AT_CellularContext *create_context_impl(ATHandler &at, const char *apn, bool cp_req = false, bool nonip_req = false);
+    virtual nsapi_error_t init();
+    virtual nsapi_error_t shutdown();
 
 public: // NetworkInterface
     void handle_urc(FileHandle *fh);

features/cellular/framework/targets/QUECTEL/M26/QUECTEL_M26_CellularContext.cpp

@@ -19,25 +19,16 @@
 
 namespace mbed {
 
-QUECTEL_M26_CellularContext::QUECTEL_M26_CellularContext(ATHandler &at, CellularDevice *device, const char *apn) :
-    AT_CellularContext(at, device, apn)
+QUECTEL_M26_CellularContext::QUECTEL_M26_CellularContext(ATHandler &at, CellularDevice *device, const char *apn, bool cp_req, bool nonip_req) :
+    AT_CellularContext(at, device, apn, cp_req, nonip_req)
 {
 }
 
-QUECTEL_M26_CellularContext::~QUECTEL_M26_CellularContext()
-{
-}
-
-bool QUECTEL_M26_CellularContext::stack_type_supported(nsapi_ip_stack_t stack_type)
-{
-    return stack_type == IPV4_STACK ? true : false;
-}
-
 #if !NSAPI_PPP_AVAILABLE
 NetworkStack *QUECTEL_M26_CellularContext::get_stack()
 {
     if (!_stack) {
-        _stack = new QUECTEL_M26_CellularStack(_at, _cid, _ip_stack_type);
+        _stack = new QUECTEL_M26_CellularStack(_at, _cid, (nsapi_ip_stack_t)_pdp_type);
     }
     return _stack;
 }

features/cellular/framework/targets/QUECTEL/M26/QUECTEL_M26_CellularContext.h

@@ -23,11 +23,9 @@ namespace mbed {
 
 class QUECTEL_M26_CellularContext: public AT_CellularContext {
 public:
-    QUECTEL_M26_CellularContext(ATHandler &at, CellularDevice *device, const char *apn);
-    virtual ~QUECTEL_M26_CellularContext();
+    QUECTEL_M26_CellularContext(ATHandler &at, CellularDevice *device, const char *apn, bool cp_req = false, bool nonip_req = false);
 
 protected:
-    virtual bool stack_type_supported(nsapi_ip_stack_t stack_type);
 #if !NSAPI_PPP_AVAILABLE
     virtual NetworkStack *get_stack();
 #endif // #if !NSAPI_PPP_AVAILABLE

features/cellular/framework/targets/QUECTEL/M26/QUECTEL_M26_CellularNetwork.h renamed to features/cellular/framework/targets/QUECTEL/M26/QUECTEL_M26_CellularInformation.cpp

@@ -15,21 +15,23 @@
  * limitations under the License.
  */
 
-#ifndef QUECTEL_M26_CELLULAR_NETWORK_H_
-#define QUECTEL_M26_CELLULAR_NETWORK_H_
+#include "QUECTEL_M26_CellularInformation.h"
 
-#include "AT_CellularNetwork.h"
+using namespace mbed;
 
-namespace mbed {
+QUECTEL_M26_CellularInformation::QUECTEL_M26_CellularInformation(ATHandler &atHandler) : AT_CellularInformation(atHandler)
+{
 
-class QUECTEL_M26_CellularNetwork : public AT_CellularNetwork {
-public:
-    QUECTEL_M26_CellularNetwork(ATHandler &atHandler);
-    virtual ~QUECTEL_M26_CellularNetwork();
+}
 
-protected:
-    virtual nsapi_error_t set_access_technology_impl(RadioAccessTechnology opRat);
-    virtual RegistrationMode has_registration(RegistrationType reg_type);
-};
-} // namespace mbed
-#endif // QUECTEL_M26_CELLULAR_NETWORK_H_
+// According to M26_AT_Commands_Manual_V1.9
+nsapi_error_t QUECTEL_M26_CellularInformation::get_iccid(char *buf, size_t buf_size)
+{
+    _at.lock();
+    _at.cmd_start("AT+CCID");
+    _at.cmd_stop();
+    _at.resp_start("+CCID:");
+    _at.read_string(buf, buf_size);
+    _at.resp_stop();
+    return _at.unlock_return_error();
+}

features/cellular/framework/targets/QUECTEL/M26/QUECTEL_M26_CellularPower.h renamed to features/cellular/framework/targets/QUECTEL/M26/QUECTEL_M26_CellularInformation.h

@@ -15,26 +15,21 @@
  * limitations under the License.
  */
 
-#ifndef QUECTEL_M26_CELLULAR_POWER_H_
-#define QUECTEL_M26_CELLULAR_POWER_H_
+#ifndef QUECTEL_M26_CELLULAR_INFORMATION_H_
+#define QUECTEL_M26_CELLULAR_INFORMATION_H_
 
-#include "AT_CellularPower.h"
+#include "AT_CellularInformation.h"
 
 namespace mbed {
 
-class QUECTEL_M26_CellularPower : public AT_CellularPower {
+class QUECTEL_M26_CellularInformation : public AT_CellularInformation {
 public:
-    QUECTEL_M26_CellularPower(ATHandler &atHandler);
-    virtual ~QUECTEL_M26_CellularPower();
+    QUECTEL_M26_CellularInformation(ATHandler &atHandler);
 
-public: //from CellularPower
-    virtual nsapi_error_t set_at_mode();
-
-    virtual nsapi_error_t on();
-
-    virtual nsapi_error_t off();
+public: //from CellularInformation
+    virtual nsapi_error_t get_iccid(char *buf, size_t buf_size);
 };
 
 } // namespace mbed
 
-#endif // QUECTEL_M26_CELLULAR_POWER_H_
+#endif // QUECTEL_M26_CELLULAR_INFORMATION_H_