Diff: source/ATCmdManager.cpp

Branch:

PassingRegression

Revision:

123:a49e9ffbaca6

Parent:

122:62166886db5f

Child:

124:eae4512b131b

--- a/source/ATCmdManager.cpp	Tue Jun 11 20:23:43 2019 +0000
+++ b/source/ATCmdManager.cpp	Fri Jun 14 21:13:46 2019 +0000
@@ -70,8 +70,8 @@
     _parser.oob("AT+UWSCAN", callback(this, &ATCmdManager::_oob_scanWiFiNetworks));
     _parser.oob("AT+UWSCA=", callback(this, &ATCmdManager::_oob_WiFiStationConfigAction));
     
-    _parser.oob("AT+UMLA=", callback(this, &ATCmdManager::_oob_ok_hdlr));
-    _parser.oob("AT+UBTLN", callback(this, &ATCmdManager::_oob_ok_hdlr));
+    _parser.oob("AAT+UBTLN?", callback(this, &ATCmdManager::_oob_get_ble_name));
+    _parser.oob("AT+UBTLN=", callback(this, &ATCmdManager::_oob_ok_hdlr));
     _parser.oob("AT+UBTSM?", callback(this, &ATCmdManager::_oob_ok_hdlr));
     _parser.oob("AT+UBTPM", callback(this, &ATCmdManager::_oob_ok_hdlr));
     
@@ -301,12 +301,37 @@
             }
             case BLE_DISCONNECT_EVENT:  
             {
-                // AT Event state 
+                // BLE_DISCONNECT_EVENT state 
                 dbg_printf(LOG, "\n [ATCMD MAN] BLE_DISCONNECT_EVENT RECEIVED!!\r\n");
                 sendBleDisconnectEvent();
                 at_resp = AT_RESP_NONE;
                 break;
             }
+            case AT_WIFI_MAC_RESP:  
+                // AT_WIFI_MAC_RESP response state 
+                dbg_printf(LOG, "\n [ATCMD MAN] AT_WIFI_MAC_RESP RESPONSE RECEIVED!!\r\n");
+                respStr = (char *) resp_data->buffer;
+                sendAtConfirmationFreeMpool(respStr);
+                at_resp = AT_RESP_NONE;
+                break;
+            case AT_BLE_MAC_RESP:  
+                // AT_BLE_MAC_RESP response state 
+                dbg_printf(LOG, "\n [ATCMD MAN] AT_BLE_MAC_RESP RESPONSE RECEIVED!!\r\n");
+                respStr = (char *) ble_resp_data->buffer;
+                sendAtConfirmation(respStr);
+                _ble2ATDatamPool->free(ble_resp_data);
+                ble_resp_data = NULL;                
+                at_resp = AT_RESP_NONE;
+                break;
+            case AT_BLE_NAME_RESP:  
+                // AT_BLE_MAC_RESP response state 
+                dbg_printf(LOG, "\n [ATCMD MAN] AT_BLE_NAME_RESP RESPONSE RECEIVED!!\r\n");
+                respStr = (char *) ble_resp_data->buffer;
+                sendAtConfirmation(respStr);
+                _ble2ATDatamPool->free(ble_resp_data);
+                ble_resp_data = NULL;                
+                at_resp = AT_RESP_NONE;
+                break;
             default:
                  //UNKNOWN response state
                 dbg_printf(LOG, "\n [ATCMD MAN] UNKNOWN RESPONSE RECEIVED!!\r\n");
@@ -750,8 +775,13 @@
 void ATCmdManager::_oob_get_fw_ver()
 {
 #ifdef MBED_MAJOR_VERSION
-    char * fw_ver_str = new char[20];
-    sprintf(fw_ver_str, "Mbed OS version %d.%d.%d.0\n\n", MBED_MAJOR_VERSION, MBED_MINOR_VERSION, MBED_PATCH_VERSION);
+    char * fw_ver_str = new char[40];
+    sprintf(fw_ver_str, "API version:%d.%d.%d.%d.%d.%d\n\n", MBED_MAJOR_VERSION 
+                                                           , MBED_MINOR_VERSION 
+                                                           , MBED_PATCH_VERSION
+                                                           , API_MAJOR_VERSION
+                                                           , API_MINOR_VERSION
+                                                           , API_BUILD_NUMBER);
     sendAtConfirmation(fw_ver_str);
     delete fw_ver_str;
 #endif
@@ -861,9 +891,16 @@
         {
             case 1:
                 dbg_printf(LOG, "\nATCmdParser: BLE MAC Address request received");
+                at_ble_msg_t data_req;
+                data_req.ble_cmd = BLE_CMD_MAC_ADDR;
+                // queue next BLE command
+                queueBleDataRequest(data_req);
                 break;
             case 2:
-                dbg_printf(LOG, "\nATCmdParser: WiFi MAC Address request received");
+                dbg_printf(LOG, "\nATCmdParser: WiFi MAC Address request received");                
+                wifi_cmd_t cmd = WIFI_CMD_WIFI_MAC_ADDR;
+                // queue next command
+                queueWiFiCommand(cmd);
                 break;
             default:
                 dbg_printf(LOG, "\nATCmdParser: ERROR - UNKNOWN MAC ADDRESS REQUEST RECEIVED!!! \n");
@@ -875,6 +912,16 @@
     sendAtConfirmation(OK_RESP);   //_parser.send(OK_RESP);
 }
 
+
+void ATCmdManager::_oob_get_ble_name()
+{
+    dbg_printf(LOG, "\nATCmdParser: BLE CMD DEVICE_NAME request received");
+    at_ble_msg_t data_req;
+    data_req.ble_cmd = BLE_CMD_DEVICE_NAME;
+    // queue next BLE command
+    queueBleDataRequest(data_req);
+}
+
 void ATCmdManager::_oob_get_ble_role(){
     trigger_start_BLE();
     dbg_printf(LOG, "\n Received get BLE role command!!\n");
@@ -1292,7 +1339,7 @@
     bleData->dataLen        = data_req.dataLen;
     memcpy(bleData->buffer, data_req.buffer, data_req.dataLen);
     _aT2BleDataQueue->put(bleData);
-    dbg_printf(LOG, "[ATCMD MAN] queued BLE data size = %d : wifi_cmd = %d\n", data_req.dataLen, data_req.ble_cmd);
+    dbg_printf(LOG, "[ATCMD MAN] queued BLE data size = %d : ble_cmd = %d\n", data_req.dataLen, data_req.ble_cmd);
     return true;
 }