New ATHandler functions taken into use

Author: Antti Kauppila

features/cellular/framework/AT/ATHandler.cpp

@@ -1292,10 +1292,14 @@ nsapi_error_t ATHandler::at_cmd_str(const char *cmd, const char *cmd_chr, char *
 
     cmd_stop();
 
-    memcpy(_cmd_buffer, cmd, strlen(cmd));
-    _cmd_buffer[strlen(cmd)] = ':';
-    _cmd_buffer[strlen(cmd) + 1] = '\0';
-    resp_start(_cmd_buffer);
+    if (cmd && strlen(cmd) > 0) {
+        memcpy(_cmd_buffer, cmd, strlen(cmd));
+        _cmd_buffer[strlen(cmd)] = ':';
+        _cmd_buffer[strlen(cmd) + 1] = '\0';
+        resp_start(_cmd_buffer);
+    } else {
+        resp_start();
+    }
 
     resp_buf[0] = '\0';
     read_string(resp_buf, buf_size);

features/cellular/framework/AT/AT_CellularInformation.cpp

@@ -83,8 +83,7 @@ nsapi_error_t AT_CellularInformation::get_imsi(char *imsi, size_t buf_size)
         return NSAPI_ERROR_PARAMETER;
     }
     _at.lock();
-    _at.cmd_start("AT+CIMI");
-    _at.cmd_stop();
+    _at.cmd_start_stop("+CIMI", "");
     _at.resp_start();
     _at.read_string(imsi, MAX_IMSI_LENGTH + 1);
     _at.resp_stop();

features/cellular/framework/targets/QUECTEL/BC95/QUECTEL_BC95.cpp

@@ -55,17 +55,16 @@ nsapi_error_t QUECTEL_BC95::get_sim_state(SimState &state)
 {
     _at->lock();
     _at->flush();
-    _at->cmd_start("AT+NCCID?");
-    _at->cmd_stop();
-    _at->resp_start("+NCCID:");
-    if (_at->info_resp()) {
-        state = SimStateReady;
-    } else {
+    nsapi_error_t err = _at->at_cmd_discard("+NCCID", "?");
+    _at->unlock();
+
+    state = SimStateReady;
+    if (err != NSAPI_ERROR_OK) {
         tr_warn("SIM not readable.");
-        state = SimStateUnknown; // SIM may not be ready yet
+        state = SimStateUnknown;
     }
-    _at->resp_stop();
-    return _at->unlock_return_error();
+
+    return err;
 }
 
 AT_CellularNetwork *QUECTEL_BC95::open_network_impl(ATHandler &at)
@@ -87,12 +86,9 @@ nsapi_error_t QUECTEL_BC95::init()
 {
     _at->lock();
     _at->flush();
-    _at->cmd_start("AT");
-    _at->cmd_stop_read_resp();
+    _at->at_cmd_discard("", "");  //Send AT
 
-    _at->cmd_start("AT+CMEE="); // verbose responses
-    _at->write_int(1);
-    _at->cmd_stop_read_resp();
+    _at->at_cmd_discard("+CMEE", "=1"); // verbose responses
 
     return _at->unlock_return_error();
 }

features/cellular/framework/targets/QUECTEL/BC95/QUECTEL_BC95_CellularStack.cpp

@@ -227,7 +227,8 @@ nsapi_size_or_error_t QUECTEL_BC95_CellularStack::socket_recvfrom_impl(CellularS
     int port;
     char ip_address[NSAPI_IP_SIZE];
 
-    _at.cmd_start_stop("AT+NSORF", "=", "%d%d", socket->id, size < PACKET_SIZE_MAX ? size : PACKET_SIZE_MAX);
+    _at.cmd_start_stop("+NSORF", "=", "%d%d", socket->id, size < PACKET_SIZE_MAX ? size : PACKET_SIZE_MAX);
+
     _at.resp_start();
     // receiving socket id
     _at.skip_param();

features/cellular/framework/targets/QUECTEL/BG96/QUECTEL_BG96.cpp

@@ -136,8 +136,7 @@ nsapi_error_t QUECTEL_BG96::soft_power_on()
         // check if modem was silently powered on
         _at->clear_error();
         _at->set_at_timeout(100);
-        _at->cmd_start("AT");
-        _at->cmd_stop_read_resp();
+        _at->at_cmd_discard("", ""); //Send AT
         _at->restore_at_timeout();
     }
     return _at->unlock_return_error();
@@ -161,20 +160,17 @@ nsapi_error_t QUECTEL_BG96::init()
 
     _at->lock();
     _at->flush();
-    _at->cmd_start("ATE0"); // echo off
-    _at->cmd_stop_read_resp();
+    _at->at_cmd_discard("E0", ""); // echo off
 
-    _at->cmd_start("AT+CMEE=1"); // verbose responses
-    _at->cmd_stop_read_resp();
+    _at->at_cmd_discard("+CMEE", "=1"); // verbose responses
 
     if (_at->get_last_error() != NSAPI_ERROR_OK) {
         return _at->unlock_return_error();
     }
 
     do {
         _at->clear_error();
-        _at->cmd_start("AT+CFUN=1"); // set full functionality
-        _at->cmd_stop_read_resp();
+        _at->at_cmd_discard("+CFUN", "=1"); // set full functionality
         if (_at->get_last_error() == NSAPI_ERROR_OK) {
             break;
         }

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

@@ -52,34 +52,28 @@ nsapi_error_t QUECTEL_M26::get_sim_state(SimState &state)
     char buf[13];
 
     _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
-        }
+    nsapi_error_t err = _at->at_cmd_str("+CPIN", "?", 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();
+
+    return err;
 }
 
 AT_CellularContext *QUECTEL_M26::create_context_impl(ATHandler &at, const char *apn, bool cp_req, bool nonip_req)
@@ -89,13 +83,7 @@ AT_CellularContext *QUECTEL_M26::create_context_impl(ATHandler &at, const char *
 
 nsapi_error_t QUECTEL_M26::shutdown()
 {
-    _at->lock();
-    _at->cmd_start("AT+QPOWD=0");
-    _at->cmd_stop();
-    _at->resp_start();
-    _at->resp_stop();
-
-    return _at->unlock_return_error();;
+    return _at->at_cmd_discard("+QPOWD", "=0");
 }
 
 

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

@@ -159,7 +159,7 @@ nsapi_error_t QUECTEL_M26_CellularStack::socket_stack_init()
     }
 
     /*AT+QIMODE=0 Set transparent mode*/
-    _at.cmd_start_stop("AT+QIMODE", "?");
+    _at.cmd_start_stop("+QIMODE", "?");
 
     _at.resp_start("+QIMODE:");
     if (_at.info_resp()) {
@@ -176,7 +176,7 @@ nsapi_error_t QUECTEL_M26_CellularStack::socket_stack_init()
     }
 
     /*AT+QIMUX=1*/
-    _at.cmd_start_stop("AT+QIMUX", "?");
+    _at.cmd_start_stop("+QIMUX", "?");
 
     _at.resp_start("+QIMUX:");
     if (_at.info_resp()) {

features/cellular/framework/targets/RiotMicro/AT/RM1000_AT.cpp

@@ -71,18 +71,14 @@ nsapi_error_t RM1000_AT::init()
 
     _at->lock();
     _at->flush();
-    _at->cmd_start("ATE0"); // echo off
-    _at->cmd_stop_read_resp();
+    _at->at_cmd_discard("E0", ""); // echo off
 
-    _at->cmd_start("AT+SIM=physical");
-    _at->cmd_stop_read_resp();
+    _at->at_cmd_discard("+SIM", "=physical");
 
     _at->set_at_timeout(5000);
-    _at->cmd_start("AT+CFUN=1"); // set full functionality
-    _at->cmd_stop_read_resp();
+    _at->at_cmd_discard("+CFUN", "=1"); // set full functionality
 
-    _at->cmd_start("AT+VERBOSE=0"); // verbose responses
-    _at->cmd_stop_read_resp();
+    _at->at_cmd_discard("+VERBOSE", "=0"); // verbose responses
 
     return _at->unlock_return_error();
 }

features/cellular/framework/targets/RiotMicro/AT/RM1000_AT_CellularStack.cpp

@@ -246,7 +246,7 @@ nsapi_size_or_error_t RM1000_AT_CellularStack::socket_recvfrom_impl(CellularSock
             read_blk = size;
         }
         if (socket->pending_bytes > 0) {
-            _at.cmd_start_stop("AT+RSORCV", "=", "%d%d", socket->id, read_blk);
+            _at.cmd_start_stop("+RSORCV", "=", "%d%d", socket->id, read_blk);
 
             _at.resp_start("+RSORCV:");
             _at.skip_param(); // receiving socket id

features/cellular/framework/targets/TELIT/HE910/TELIT_HE910.cpp

@@ -55,11 +55,7 @@ nsapi_error_t TELIT_HE910::init()
     if (err != NSAPI_ERROR_OK) {
         return err;
     }
-    _at->lock();
-    _at->cmd_start("AT&K0;&C1;&D0");
-    _at->cmd_stop_read_resp();
-
-    return _at->unlock_return_error();
+    return _at->at_cmd_discard("&K0;&C1;&D0", "");
 }
 
 #if MBED_CONF_TELIT_HE910_PROVIDE_DEFAULT

features/cellular/framework/targets/TELIT/ME910/TELIT_ME910.cpp

@@ -89,11 +89,10 @@ nsapi_error_t TELIT_ME910::init()
     }
     _at->lock();
 #if defined (MBED_CONF_TELIT_ME910_RTS) && defined (MBED_CONF_TELIT_ME910_CTS)
-    _at->cmd_start("AT&K3;&C1;&D0");
+    _at->at_cmd_discard("&K3;&C1;&D0", "");
 #else
-    _at->cmd_start("AT&K0;&C1;&D0");
+    _at->at_cmd_discard("&K0;&C1;&D0", "");
 #endif
-    _at->cmd_stop_read_resp();
 
     // AT#QSS=1
     // Enable the Query SIM Status unsolicited indication in the ME. The format of the
@@ -104,8 +103,7 @@ nsapi_error_t TELIT_ME910::init()
     // <status> values:
     // - 0: SIM not inserted
     // - 1: SIM inserted
-    _at->cmd_start("AT#QSS=1");
-    _at->cmd_stop_read_resp();
+    _at->at_cmd_discard("#QSS", "=1");
 
     // AT#PSNT=1
     // Set command enables unsolicited result code for packet service network type (PSNT)
@@ -115,34 +113,30 @@ nsapi_error_t TELIT_ME910::init()
     // - 0: GPRS network
     // - 4: LTE network
     // - 5: unknown or not registered
-    _at->cmd_start("AT#PSNT=1");
-    _at->cmd_stop_read_resp();
+    _at->at_cmd_discard("#PSNT", "=1");
 
     // AT+CMER=2
     // Set command enables sending of unsolicited result codes from TA to TE in the case of
     // indicator state changes.
     // Current setting: buffer +CIEV Unsolicited Result Codes in the TA when TA-TE link is
     // reserved (e.g. on-line data mode) and flush them to the TE after
     // reservation; otherwise forward them directly to the TE
-    _at->cmd_start("AT+CMER=2");
-    _at->cmd_stop_read_resp();
+    _at->at_cmd_discard("+CMER", "=2");
 
     // AT+CMEE=2
     // Set command disables the use of result code +CME ERROR: <err> as an indication of an
     // error relating to the +Cxxx command issued. When enabled, device related errors cause the +CME
     // ERROR: <err> final result code instead of the default ERROR final result code. ERROR is returned
     // normally when the error message is related to syntax, invalid parameters or DTE functionality.
     // Current setting: enable and use verbose <err> values
-    _at->cmd_start("AT+CMEE=2");
-    _at->cmd_stop_read_resp();
+    _at->at_cmd_discard("+CMEE", "=2");
 
     // AT&W&P
     // - AT&W: Execution command stores on profile <n> the complete configuration of the device. If
     //         parameter is omitted, the command has the same behavior of AT&W0.
     // - AT&P: Execution command defines which full profile will be loaded at startup. If parameter
     //         is omitted, the command has the same behavior as AT&P0
-    _at->cmd_start("AT&W&P");
-    _at->cmd_stop_read_resp();
+    _at->at_cmd_discard("&W&P", "");
 
     return _at->unlock_return_error();
 }

features/cellular/framework/targets/TELIT/ME910/TELIT_ME910_CellularContext.cpp

@@ -37,7 +37,7 @@ bool TELIT_ME910_CellularContext::get_context()
     bool modem_supports_ipv6 = get_property(PROPERTY_IPV6_PDP_TYPE);
     bool modem_supports_ipv4 = get_property(PROPERTY_IPV4_PDP_TYPE);
 
-    _at.cmd_start_stop("AT+CGDCONT", "?");
+    _at.cmd_start_stop("+CGDCONT", "?");
     _at.resp_start("+CGDCONT:");
     _cid = -1;
     int cid_max = 0; // needed when creating new context