Okundu Omeni
this is using the mbed os version 5-13-1
Diff: source/ATCmdManager.cpp
- Revision:
- 84:7c7add00f4bf
- Parent:
- 83:9c271a50a70b
- Child:
- 85:9f896e1e041c
--- a/source/ATCmdManager.cpp Tue Mar 26 23:33:51 2019 +0000
+++ b/source/ATCmdManager.cpp Thu Mar 28 22:13:06 2019 +0000
@@ -1,7 +1,8 @@
#include "ATCmdManager.h"
#include "common_config.h"
#include "common_types.h"
-
+#include "http_request.h"
+//#include "mbed_memory_status.h"
ATCmdManager::ATCmdManager(PinName tx, PinName rx, SMDevicePeripheral *blePeripheral,
events::EventQueue &event_queue, WiFiManager *wifi,
@@ -58,7 +59,7 @@
_parser.oob("AT+UWSC=0,2", callback(this, &ATCmdManager::_oob_setWiFiSSID));
_parser.oob("AT+UWSC=0,8", callback(this, &ATCmdManager::_oob_setWiFiPWD));
_parser.oob("AT+UWSC=0,5", callback(this, &ATCmdManager::_oob_setWiFiSecurity));
- _parser.oob("AT+UWSC=0,5", callback(this, &ATCmdManager::_oob_sendHttpMessage));
+ //_parser.oob("AT+UWSC=0,5", callback(this, &ATCmdManager::_oob_sendHttpMessage));
//AT+UWSC=0,2,<SSID>
//AT+UWSC=0,8,<PWD>
@@ -89,58 +90,74 @@
break;
case AT_SCAN_RESP:
// AT_SCAN_RESP response state
- _smutex.lock();
+ //////_smutex.lock();
printf("\n [ATCMD MAN] WIFI SCAN RESPONSE RECEIVED!!\n");
_parser.send("OK\n");
- _smutex.unlock();
+ //////_smutex.unlock();
at_resp = AT_RESP_NONE;
break;
case AT_DETAILED_SCAN_RESP:
// AT_DETAILED_SCAN_RESP response state
- _smutex.lock();
+ //////_smutex.lock();
printf("\n [ATCMD MAN] WIFI DETAILED SCAN RESPONSE RECEIVED!!\n");
_parser.send("OK\n");
- _smutex.unlock();
+ //////_smutex.unlock();
at_resp = AT_RESP_NONE;
break;
case AT_CONNECT_RESP:
// AT_CONNECT_RESP response state
- _smutex.lock();
+ //////_smutex.lock();
printf("\n [ATCMD MAN] WIFI CONNECT RESPONSE RECEIVED!!\n");
_parser.send("OK\n");
- _smutex.unlock();
+ //////_smutex.unlock();
at_resp = AT_RESP_NONE;
break;
case AT_DISCONNECT_RESP:
// AT_DISCONNECT_RESP response state
- _smutex.lock();
+ //////_smutex.lock();
printf("\n [ATCMD MAN] WIFI DISCONNECT RESPONSE RECEIVED!!\n");
_parser.send("OK\n");
- _smutex.unlock();
+ //////_smutex.unlock();
at_resp = AT_RESP_NONE;
break;
case AT_CONFIG_RESP:
// AT_CONFIG_RESP response state
- _smutex.lock();
+ //////_smutex.lock();
printf("\n [ATCMD MAN] WIFI CONFIG RESPONSE RECEIVED!!\n");
_parser.send("OK\n");
- _smutex.unlock();
+ //////_smutex.unlock();
+ at_resp = AT_RESP_NONE;
+ break;
+ case AT_INTERNET_CONFIG_RESP:
+ // AT_CONFIG_RESP response state
+ //////_smutex.lock();
+ printf("\n [ATCMD MAN] WIFI INTERNET_CONFIG RESPONSE RECEIVED!!\n");
+ _parser.send("OK\n");
+ //////_smutex.unlock();
+ at_resp = AT_RESP_NONE;
+ break;
+ case AT_HTTPS_RESP:
+ // AT_HTTP_RESP response state
+ //////_smutex.lock();
+ printf("\n [ATCMD MAN] WIFI HTTPS RESPONSE RECEIVED!!\n");
+ _parser.send("OK\n");
+ //////_smutex.unlock();
at_resp = AT_RESP_NONE;
break;
case AT_HTTP_RESP:
// AT_HTTP_RESP response state
- _smutex.lock();
+ //////_smutex.lock();
printf("\n [ATCMD MAN] WIFI HTTP RESPONSE RECEIVED!!\n");
_parser.send("OK\n");
- _smutex.unlock();
+ //////_smutex.unlock();
at_resp = AT_RESP_NONE;
break;
default:
// UNKNOWN response state
- _smutex.lock();
+ //////_smutex.lock();
printf("\n [ATCMD MAN] UNKNOWN RESPONSE RECEIVED!!\n");
_parser.send("OK\n");
- _smutex.unlock();
+ //////_smutex.unlock();
at_resp = AT_RESP_NONE;
break;
}
@@ -164,17 +181,99 @@
return true;
}
+http_method ATCmdManager::str2HttpMethod(const char * methodStr)
+{
+ http_method _http_method;
+ if(strstr(methodStr, "POST")!= NULL){
+ _http_method = HTTP_POST;
+ }
+ else if(strstr(methodStr, "GET")!= NULL){
+ _http_method = HTTP_GET;
+ }
+ else{
+ _http_method = HTTP_DELETE; // unsupported method - set to HTTP_DELETE
+ }
+ return _http_method;
+}
+bool ATCmdManager::createHttpRequest()
+{
+ http_request_t http_req;
+ char s1[32];
+ char s2[32];
+ char s3[32];
+ int n = 0;
+ int pos = 0;
+ char * strPtr = (char *)&rx_buf_ptr[1];
+ char * p;
+ char * p2 = strstr(strPtr, "\r\n\r\n");
+ char * nxtPtr = strPtr;
+ char * bodyPtr = p2+4;
+ printf("\nstrPtr address= %x",strPtr);
+ printf("\np2 address= %x", p2);
+ for(int i = 0; i < 5; i++){
+ if(i == 0)// firstline scan method uri and http_ver
+ {
+ //n = sscanf(nxtPtr,"%s %s %s", &s1[0], &s2[0], &s3[0]);
+ n = sscanf(nxtPtr,"%s %s %s", s1, s2, s3);
+ printf("\nmethod = %s\nuri = %s\nhttp_ver = %s",s1, s2, s3 );
+ //http_req.method = str2HttpMethod(s1.c_str());
+ http_req.method = str2HttpMethod(s1);
+ http_req.request_URI.assign(s2);
+ http_req.http_version.assign(s3);
+ }
+ else{ // scan header pairs
+ //n = sscanf(nxtPtr,"%s %s", &s1[0], &s2[0]);
+ n = sscanf(nxtPtr,"%s %s", s1, s2);
+ p = strstr(s1,":");
+ *p = NULL;
+ //pos = s1.find(":");
+ //s1.replace(pos,1,"");
+ printf("\nname = %s value = %s",s1, s2);
+ //if(s1.find("Host")!= string::npos){
+ if(strstr(s1, "POST")!= NULL){
+ http_req.http_version.assign(s3);
+ }
+
+
+ }
+ nxtPtr = strstr(nxtPtr, "\r\n")+2; // goto next line
+ if(nxtPtr >= p2) break;
+ }
+ int bodyLen = edm_hdr.payloadLen -(p2+7-strPtr);
+ printf("\nLen = %d\n", bodyLen);
+ memcpy(http_req.body, bodyPtr, bodyLen);
+ // package and send on wifi data queue
+ wifi_data_msg_t data_msg;
+ data_msg.wifi_cmd = WIFI_CMD_SEND_HTTPS_REQ;
+ data_msg.dataLen = sizeof(http_req) + http_req.request_URI.length() +
+ http_req.http_version.length() +
+ http_req.hostName.length() +
+ http_req.AcceptVal.length() +
+ http_req.contentType.length() +
+ http_req.contentLen.length();
+ memcpy(data_msg.buffer,&http_req, data_msg.dataLen);
+ // queue next data request
+ queueWiFiDataRequest(data_msg);
+ return true;
+}
// OOB processing
void ATCmdManager::_process_oob(uint32_t timeout, bool all){
set_timeout(timeout);
static int cnt = 0;
+ int start;
if(dataMode == AT_EXT_DATA_MODE)
{
int n;
if(cnt++ % 10 == 0)printf("In EDM mode\n");
+ uint8_t edm[EDM_HDR_LEN];
+
// Poll for edm packets
do{
- n = _parser.read((char *)&edm_hdr, EDM_HDR_LEN);
+ n = _parser.read((char *)edm, EDM_HDR_LEN);
+ edm_hdr.startByte = edm[0];
+ edm_hdr.payloadLen = edm[1]*256 + edm[2];
+ edm_hdr.payloadID = edm[3]*256 + edm[4];
+ start = Kernel::get_ms_count();
if(n == -1) break; // break if it times out
printf("%d bytes read!\n", n);
if(n==5)
@@ -217,27 +316,15 @@
printf("DATA_EVENT received!\n");
break;
case DATA_COMMAND:
- char s1[100];
printf("DATA_COMMAND received!\n");
- int n = 0;
- int cnt = 0;
- int len = 0;
- char * strPtr = (char *)&rx_buf_ptr[1];
- char * p2 = strstr(strPtr, "\r\n\r\n");
- char * nxtPtr = strPtr;
- printf("\nstrPtr address= %x",strPtr);
- printf("\np2 address= %x", p2);
- while(1){
- n = sscanf(nxtPtr,"%s[^:]", s1);
- len = strlen(s1);
- if(n<=0) break;
- printf("\ns[%d] = %s len = %d, n = %d",cnt++,s1, len, n );
- if(cnt==20) break;
- nxtPtr = strstr(nxtPtr, s1)+len;
- printf("\nxtPtr address= %x p2 addr = %x",nxtPtr, p2);
- if(nxtPtr > p2) break;
+ if(createHttpRequest() == true){
+ _parser.send("OK");
}
-
+ else{
+ _parser.send("NACK");
+ }
+ int stop = Kernel::get_ms_count();
+ printf("\n Time Elapsed = %d\n", stop-start);
break;
case AT_REQUEST:
printf("AT_REQUEST received!\n");
@@ -276,9 +363,9 @@
}
void ATCmdManager::_oob_ok_hdlr(){
- _smutex.lock();
+ //_smutex.lock();
_parser.send("OK\n");
- _smutex.unlock();
+ //_smutex.unlock();
}
@@ -326,28 +413,28 @@
void ATCmdManager::_oob_echo_off()
{
- _smutex.lock();
+ //_smutex.lock();
printf("\n Received ATEO OOB command!!\n");
printf("\n turning echo OFF!!\n");
_parser.debug_on(false);
_parser.send("OK\n");
- _smutex.unlock();
+ //_smutex.unlock();
}
void ATCmdManager::_oob_echo_on()
{
- _smutex.lock();
+ //_smutex.lock();
printf("\n Received ATE1 OOB command!!\n");
printf("\n turning echo ON!!\n");
_parser.debug_on(true);
_parser.send("OK\n");
- _smutex.unlock();
+ //_smutex.unlock();
}
void ATCmdManager::_oob_data_mode(){
- _smutex.lock();
+ //_smutex.lock();
printf("\n Received EDM mode command!!\n");
if(_parser.scanf("%d", &dataMode) >0) {
printf("\nATCmdParser: Data mode=%d\n", dataMode);
@@ -373,12 +460,12 @@
printf("\nATCmdParser: Retrieving Uart Options failed\n");
}
_parser.send("OK\n");
- _smutex.unlock();
+ //_smutex.unlock();
}
void ATCmdManager::_oob_get_mac_addr(){
int bleOrWifi;
- _smutex.lock();
+ //_smutex.lock();
if(_parser.scanf("=%d", &bleOrWifi) >0) {
switch(bleOrWifi)
{
@@ -396,30 +483,30 @@
printf("\nATCmdParser: Retrieving Uart Options failed");
}
_parser.send("OK\n");
- _smutex.unlock();
+ //_smutex.unlock();
}
void ATCmdManager::_oob_get_ble_role(){
- _smutex.lock();
+ //_smutex.lock();
printf("\n Received get BLE role command!!\n");
_parser.send("OK\n");
- _smutex.unlock();
+ //_smutex.unlock();
}
void ATCmdManager::_oob_ena_ble_peri(){
- _smutex.lock();
+ //_smutex.lock();
printf("\n Received enable BLE Peripheral command!!\n");
_parser.send("OK\n");
- _smutex.unlock();
+ //_smutex.unlock();
}
void ATCmdManager::_oob_reboot(){
- _smutex.lock();
+ //_smutex.lock();
printf("\n Received reboot command!!\n");
_parser.send("OK\n");
_parser.send("System Resetting....\n");
system_reset();
- _smutex.unlock();
+ //_smutex.unlock();
}
const char * ATCmdManager::sec2str(nsapi_security_t sec)
@@ -452,10 +539,10 @@
void ATCmdManager::_oob_scanWiFiNetworks(){
- _smutex.lock();
+ //_smutex.lock();
printf("\n Received scanWiFiNetworks command!!\n");
_parser.send("OK\n");
- _smutex.unlock();
+ //_smutex.unlock();
wifi_cmd_t cmd = WIFI_CMD_SCAN;
// queue next command
queueWiFiCommand(cmd);
@@ -481,32 +568,57 @@
void ATCmdManager::_oob_setupInternetConnection()
{
- char url[200];
+ ////print_memory_info();
+ char str[200]; // = (char *) malloc(200);
+ char url[60]; // = (char *) malloc(60);
int n;
+ //internet_config_t *internet_config = (internet_config_t *) malloc(sizeof(internet_config_t));
internet_config_t internet_config;
- _smutex.lock();
- n = _parser.scanf("=%1d,%199[^,],%1d", &internet_config.peer_id,
+ printf("sizeof internet_config_t = %d\n", sizeof(internet_config_t));
+ //internet_config->url;
+ //internet_config->url;
+ //_smutex.lock();
+ n = ReadBytes((uint8_t *)str, 199);
+ str[n]=NULL;
+ printf("\n read string = %s , n = %d\n", str, n);
+ n = sscanf(str, "=%1d,%199[^,],%1d", &internet_config.peer_id,
url,
&internet_config.connectionScheme);
+ strncpy(internet_config.url, url, strlen(url)+1);
+ printf("\n read string = %s , n = %d -- strlen(url) = %d\n", internet_config.url, n, strlen(url));
if(n>0)
{
- internet_config.url = url;
+ //printf("before assign - still ok\n");
+ //internet_config.url.append(url);
+ //printf("after assign - still ok\n");
+ //print_all_thread_info();
+ //print_memory_info();
+ //internet_config->url->assign(url);
+ ////print_memory_info();
printf("peer_id = %1d, url = %s, connScheme = %1d\n", internet_config.peer_id,
- internet_config.url.c_str(),
+ internet_config.url, ///->c_str(),
internet_config.connectionScheme);
+ //print_memory_info();
// package and send on wifi data queue
- wifi_data_msg_t data_msg;
+ wifi_data_msg_t data_msg; // = (wifi_data_msg_t *) malloc(sizeof(wifi_data_msg_t));
data_msg.wifi_cmd = WIFI_CMD_INTERNET_CONFIG;
- data_msg.dataLen = sizeof(internet_config) + internet_config.url.length();
+ data_msg.dataLen = sizeof(internet_config_t); // + strlen(internet_config.url);
+ printf("\n url size = %d url str = %s\n",strlen(internet_config.url), internet_config.url );
memcpy(data_msg.buffer,&internet_config, data_msg.dataLen);
+ //print_memory_info();
+ //free(internet_config->url);
+ //free(internet_config);
+ //free(str);
+ //free(url);
// queue next data request
queueWiFiDataRequest(data_msg);
+ print_memory_info();
_parser.send("OK\n");
} else {
printf("\n[ATCMD MAN]: internet configuration failed %d fields parsed \n", n);
_parser.send("NAK\n");
}
- _smutex.unlock();
+ //_smutex.unlock();
}
wifi_config_t ATCmdManager::init_wifi_config()
@@ -553,7 +665,7 @@
{
int n;
wifi_config_t wifi_cfg = init_wifi_config();
- _smutex.lock();
+ //_smutex.lock();
n = readStringBytes((uint8_t *)wifi_cfg.ssid, 32);
printf("[ATCMD MAN]: number of bytes read = %d\n", n);
if(n>0)
@@ -570,14 +682,14 @@
printf("\n[ATCMD MAN]: wifi configuration failed \n");
_parser.send("NAK\n");
}
- _smutex.unlock();
+ //_smutex.unlock();
}
void ATCmdManager::_oob_setWiFiPWD()
{
int n;
wifi_config_t wifi_cfg = init_wifi_config();
- _smutex.lock();
+ //_smutex.lock();
//n = _parser.scanf("%31[^\r\n]", wifi_cfg.pass);
n = readStringBytes((uint8_t *)wifi_cfg.pass, 32);
if(n>0)
@@ -594,14 +706,14 @@
printf("\n[ATCMD MAN]: wifi configuration failed \n");
_parser.send("NAK\n");
}
- _smutex.unlock();
+ //_smutex.unlock();
}
void ATCmdManager::_oob_setWiFiSecurity()
{
int n;
wifi_config_t wifi_cfg = init_wifi_config();
- _smutex.lock();
+ //_smutex.lock();
n = _parser.scanf(",%d", &wifi_cfg.security);
if(n>0)
{
@@ -617,15 +729,15 @@
printf("\n[ATCMD MAN]: wifi configuration failed \n");
_parser.send("NAK\n");
}
- _smutex.unlock();
+ //_smutex.unlock();
}
void ATCmdManager::_oob_sendHttpMessage()
{
int n;
- http_post_request_t http_post_request;
- _smutex.lock();
+ http_request_t http_post_request;
+ //_smutex.lock();
/*
n = _parser.scanf(",%d", &wifi_cfg.security);
if(n>0)
@@ -643,7 +755,7 @@
_parser.send("NAK\n");
}
*/
- _smutex.unlock();
+ //_smutex.unlock();
}
@@ -672,6 +784,7 @@
memcpy(wifiData->buffer, data_req.buffer, data_req.dataLen);
_aT2WiFiDataQueue->put(wifiData);
printf("[ATCMD MAN] queued data size = %d : wifi_cmd = %d\n", data_req.dataLen, data_req.wifi_cmd);
+ //free(&data_req);
return true;
}