this is using the mbed os version 5-13-1
source/ATCmdManager.cpp@84:7c7add00f4bf, 2019-03-28 (annotated)
- Committer:
- ocomeni
- Date:
- Thu Mar 28 22:13:06 2019 +0000
- Revision:
- 84:7c7add00f4bf
- Parent:
- 83:9c271a50a70b
- Child:
- 85:9f896e1e041c
internet configuration issues fixed.
Who changed what in which revision?
| User | Revision | Line number | New contents of line |
|---|---|---|---|
| ocomeni | 74:f26e846adfe9 | 1 | #include "ATCmdManager.h" |
| ocomeni | 74:f26e846adfe9 | 2 | #include "common_config.h" |
| ocomeni | 79:a2187bbfa407 | 3 | #include "common_types.h" |
| ocomeni | 84:7c7add00f4bf | 4 | #include "http_request.h" |
| ocomeni | 84:7c7add00f4bf | 5 | //#include "mbed_memory_status.h" |
| ocomeni | 74:f26e846adfe9 | 6 | |
| ocomeni | 78:07bb86e3ce14 | 7 | ATCmdManager::ATCmdManager(PinName tx, PinName rx, SMDevicePeripheral *blePeripheral, |
| ocomeni | 79:a2187bbfa407 | 8 | events::EventQueue &event_queue, WiFiManager *wifi, |
| ocomeni | 79:a2187bbfa407 | 9 | MemoryPool<wifi_cmd_message_t, 16> *aT2WiFimPool, |
| ocomeni | 80:e8f0e92e3ac9 | 10 | Queue<wifi_cmd_message_t, 16> *aT2WiFiCmdQueue, |
| ocomeni | 81:637a87eb8170 | 11 | MemoryPool<at_resp_message_t, 16> *wiFi2ATmPool, |
| ocomeni | 81:637a87eb8170 | 12 | Queue<at_resp_message_t, 16> *wiFi2ATCmdQueue, |
| ocomeni | 80:e8f0e92e3ac9 | 13 | MemoryPool<wifi_data_msg_t, 4> *aT2WiFiDatamPool, |
| ocomeni | 80:e8f0e92e3ac9 | 14 | Queue<wifi_data_msg_t, 4> *aT2WiFiDataQueue, |
| ocomeni | 81:637a87eb8170 | 15 | MemoryPool<at_data_msg_t, 4> *wiFi2ATDatamPool, |
| ocomeni | 81:637a87eb8170 | 16 | Queue<at_data_msg_t, 4> *wiFi2ATDataQueue, |
| ocomeni | 79:a2187bbfa407 | 17 | bool debug) |
| ocomeni | 74:f26e846adfe9 | 18 | : |
| ocomeni | 74:f26e846adfe9 | 19 | _serial(tx, rx, DEFAULT_BAUD_RATE), |
| ocomeni | 78:07bb86e3ce14 | 20 | blePeripheral(blePeripheral), |
| ocomeni | 79:a2187bbfa407 | 21 | _event_queue(event_queue), |
| ocomeni | 79:a2187bbfa407 | 22 | wiFiManager(wiFiManager), |
| ocomeni | 79:a2187bbfa407 | 23 | _aT2WiFimPool(aT2WiFimPool), |
| ocomeni | 80:e8f0e92e3ac9 | 24 | _aT2WiFiCmdQueue(aT2WiFiCmdQueue), |
| ocomeni | 80:e8f0e92e3ac9 | 25 | |
| ocomeni | 80:e8f0e92e3ac9 | 26 | _wiFi2ATmPool(wiFi2ATmPool), |
| ocomeni | 80:e8f0e92e3ac9 | 27 | _wiFi2ATCmdQueue(wiFi2ATCmdQueue), |
| ocomeni | 80:e8f0e92e3ac9 | 28 | |
| ocomeni | 80:e8f0e92e3ac9 | 29 | _aT2WiFiDatamPool(aT2WiFiDatamPool), |
| ocomeni | 80:e8f0e92e3ac9 | 30 | _aT2WiFiDataQueue(aT2WiFiDataQueue), |
| ocomeni | 80:e8f0e92e3ac9 | 31 | |
| ocomeni | 80:e8f0e92e3ac9 | 32 | _wiFi2ATDatamPool(wiFi2ATDatamPool), |
| ocomeni | 80:e8f0e92e3ac9 | 33 | _wiFi2ATDataQueue(wiFi2ATDataQueue), |
| ocomeni | 80:e8f0e92e3ac9 | 34 | |
| ocomeni | 80:e8f0e92e3ac9 | 35 | _parser(&_serial) |
| ocomeni | 80:e8f0e92e3ac9 | 36 | |
| ocomeni | 74:f26e846adfe9 | 37 | |
| ocomeni | 74:f26e846adfe9 | 38 | { |
| ocomeni | 74:f26e846adfe9 | 39 | // constructor |
| ocomeni | 74:f26e846adfe9 | 40 | _serial.set_baud(DEFAULT_BAUD_RATE); |
| ocomeni | 74:f26e846adfe9 | 41 | _parser.debug_on(debug); |
| ocomeni | 74:f26e846adfe9 | 42 | _parser.set_delimiter("\r\n"); |
| ocomeni | 75:08eff6258e1b | 43 | _parser.send("+STARTUP"); |
| ocomeni | 81:637a87eb8170 | 44 | _parser.oob("AT\n", callback(this, &ATCmdManager::_oob_ok_hdlr)); |
| ocomeni | 75:08eff6258e1b | 45 | _parser.oob("ATE0", callback(this, &ATCmdManager::_oob_echo_off)); |
| ocomeni | 75:08eff6258e1b | 46 | _parser.oob("ATE1", callback(this, &ATCmdManager::_oob_echo_on)); |
| ocomeni | 75:08eff6258e1b | 47 | _parser.oob("AT+UMRS", callback(this, &ATCmdManager::_oob_uart_setup)); |
| ocomeni | 75:08eff6258e1b | 48 | |
| ocomeni | 75:08eff6258e1b | 49 | _parser.oob("ATO", callback(this, &ATCmdManager::_oob_data_mode)); |
| ocomeni | 75:08eff6258e1b | 50 | _parser.oob("AT+UMLA", callback(this, &ATCmdManager::_oob_get_mac_addr)); |
| ocomeni | 75:08eff6258e1b | 51 | _parser.oob("AT+UBTLE?", callback(this, &ATCmdManager::_oob_get_ble_role)); |
| ocomeni | 75:08eff6258e1b | 52 | _parser.oob("AT+UBTLE=2", callback(this, &ATCmdManager::_oob_ena_ble_peri)); |
| ocomeni | 75:08eff6258e1b | 53 | _parser.oob("AT+CPWROFF", callback(this, &ATCmdManager::_oob_reboot)); |
| ocomeni | 75:08eff6258e1b | 54 | _parser.oob("AT+CGMR", callback(this, &ATCmdManager::_oob_get_fw_ver)); |
| ocomeni | 82:10072c1794d3 | 55 | _parser.oob("AT+UWSCAN", callback(this, &ATCmdManager::_oob_scanWiFiNetworks)); |
| ocomeni | 79:a2187bbfa407 | 56 | _parser.oob("AT+UWSCA=", callback(this, &ATCmdManager::_oob_connect2WiFiNetwork)); |
| ocomeni | 81:637a87eb8170 | 57 | _parser.oob("AT+UWSCD=", callback(this, &ATCmdManager::_oob_disconnectWiFiNetwork)); |
| ocomeni | 81:637a87eb8170 | 58 | _parser.oob("AT+UDDRP", callback(this, &ATCmdManager::_oob_setupInternetConnection)); |
| ocomeni | 82:10072c1794d3 | 59 | _parser.oob("AT+UWSC=0,2", callback(this, &ATCmdManager::_oob_setWiFiSSID)); |
| ocomeni | 82:10072c1794d3 | 60 | _parser.oob("AT+UWSC=0,8", callback(this, &ATCmdManager::_oob_setWiFiPWD)); |
| ocomeni | 82:10072c1794d3 | 61 | _parser.oob("AT+UWSC=0,5", callback(this, &ATCmdManager::_oob_setWiFiSecurity)); |
| ocomeni | 84:7c7add00f4bf | 62 | //_parser.oob("AT+UWSC=0,5", callback(this, &ATCmdManager::_oob_sendHttpMessage)); |
| ocomeni | 81:637a87eb8170 | 63 | |
| ocomeni | 82:10072c1794d3 | 64 | //AT+UWSC=0,2,<SSID> |
| ocomeni | 82:10072c1794d3 | 65 | //AT+UWSC=0,8,<PWD> |
| ocomeni | 82:10072c1794d3 | 66 | //AT+UWSC=0,5,2 (WPA) |
| ocomeni | 75:08eff6258e1b | 67 | //_parser.oob("ATE0", callback(this, &ATCmdManager::_oob_startup_hdlr)); |
| ocomeni | 74:f26e846adfe9 | 68 | printf("\n --- ATCmdManager constructor completed ---\n"); |
| ocomeni | 81:637a87eb8170 | 69 | at_resp = AT_RESP_NONE; |
| ocomeni | 81:637a87eb8170 | 70 | dataMode = AT_CMD_DATA_MODE; |
| ocomeni | 75:08eff6258e1b | 71 | //AT+UMRS=230400,2,8,1,1,1 |
| ocomeni | 74:f26e846adfe9 | 72 | // AT+UBTLE |
| ocomeni | 74:f26e846adfe9 | 73 | } |
| ocomeni | 74:f26e846adfe9 | 74 | |
| ocomeni | 74:f26e846adfe9 | 75 | |
| ocomeni | 74:f26e846adfe9 | 76 | void ATCmdManager::runMain(){ |
| ocomeni | 74:f26e846adfe9 | 77 | while(true){ |
| ocomeni | 74:f26e846adfe9 | 78 | _process_oob(UBLOX_ODIN_W2_RECV_TIMEOUT, true); |
| ocomeni | 81:637a87eb8170 | 79 | wait_ms(MAIN_LOOP_WAIT_TIME_MS); // allow BTLE/WiFi some time |
| ocomeni | 81:637a87eb8170 | 80 | processResponses(); |
| ocomeni | 74:f26e846adfe9 | 81 | } |
| ocomeni | 74:f26e846adfe9 | 82 | |
| ocomeni | 74:f26e846adfe9 | 83 | } |
| ocomeni | 74:f26e846adfe9 | 84 | |
| ocomeni | 81:637a87eb8170 | 85 | void ATCmdManager::processResponses(){ |
| ocomeni | 81:637a87eb8170 | 86 | dequeueATresponse(); |
| ocomeni | 81:637a87eb8170 | 87 | switch(at_resp){ |
| ocomeni | 81:637a87eb8170 | 88 | case AT_RESP_NONE: |
| ocomeni | 81:637a87eb8170 | 89 | // IDLE response state |
| ocomeni | 81:637a87eb8170 | 90 | break; |
| ocomeni | 81:637a87eb8170 | 91 | case AT_SCAN_RESP: |
| ocomeni | 81:637a87eb8170 | 92 | // AT_SCAN_RESP response state |
| ocomeni | 84:7c7add00f4bf | 93 | //////_smutex.lock(); |
| ocomeni | 81:637a87eb8170 | 94 | printf("\n [ATCMD MAN] WIFI SCAN RESPONSE RECEIVED!!\n"); |
| ocomeni | 81:637a87eb8170 | 95 | _parser.send("OK\n"); |
| ocomeni | 84:7c7add00f4bf | 96 | //////_smutex.unlock(); |
| ocomeni | 81:637a87eb8170 | 97 | at_resp = AT_RESP_NONE; |
| ocomeni | 81:637a87eb8170 | 98 | break; |
| ocomeni | 81:637a87eb8170 | 99 | case AT_DETAILED_SCAN_RESP: |
| ocomeni | 81:637a87eb8170 | 100 | // AT_DETAILED_SCAN_RESP response state |
| ocomeni | 84:7c7add00f4bf | 101 | //////_smutex.lock(); |
| ocomeni | 81:637a87eb8170 | 102 | printf("\n [ATCMD MAN] WIFI DETAILED SCAN RESPONSE RECEIVED!!\n"); |
| ocomeni | 81:637a87eb8170 | 103 | _parser.send("OK\n"); |
| ocomeni | 84:7c7add00f4bf | 104 | //////_smutex.unlock(); |
| ocomeni | 81:637a87eb8170 | 105 | at_resp = AT_RESP_NONE; |
| ocomeni | 81:637a87eb8170 | 106 | break; |
| ocomeni | 81:637a87eb8170 | 107 | case AT_CONNECT_RESP: |
| ocomeni | 81:637a87eb8170 | 108 | // AT_CONNECT_RESP response state |
| ocomeni | 84:7c7add00f4bf | 109 | //////_smutex.lock(); |
| ocomeni | 81:637a87eb8170 | 110 | printf("\n [ATCMD MAN] WIFI CONNECT RESPONSE RECEIVED!!\n"); |
| ocomeni | 81:637a87eb8170 | 111 | _parser.send("OK\n"); |
| ocomeni | 84:7c7add00f4bf | 112 | //////_smutex.unlock(); |
| ocomeni | 81:637a87eb8170 | 113 | at_resp = AT_RESP_NONE; |
| ocomeni | 81:637a87eb8170 | 114 | break; |
| ocomeni | 81:637a87eb8170 | 115 | case AT_DISCONNECT_RESP: |
| ocomeni | 81:637a87eb8170 | 116 | // AT_DISCONNECT_RESP response state |
| ocomeni | 84:7c7add00f4bf | 117 | //////_smutex.lock(); |
| ocomeni | 81:637a87eb8170 | 118 | printf("\n [ATCMD MAN] WIFI DISCONNECT RESPONSE RECEIVED!!\n"); |
| ocomeni | 81:637a87eb8170 | 119 | _parser.send("OK\n"); |
| ocomeni | 84:7c7add00f4bf | 120 | //////_smutex.unlock(); |
| ocomeni | 81:637a87eb8170 | 121 | at_resp = AT_RESP_NONE; |
| ocomeni | 81:637a87eb8170 | 122 | break; |
| ocomeni | 82:10072c1794d3 | 123 | case AT_CONFIG_RESP: |
| ocomeni | 82:10072c1794d3 | 124 | // AT_CONFIG_RESP response state |
| ocomeni | 84:7c7add00f4bf | 125 | //////_smutex.lock(); |
| ocomeni | 82:10072c1794d3 | 126 | printf("\n [ATCMD MAN] WIFI CONFIG RESPONSE RECEIVED!!\n"); |
| ocomeni | 81:637a87eb8170 | 127 | _parser.send("OK\n"); |
| ocomeni | 84:7c7add00f4bf | 128 | //////_smutex.unlock(); |
| ocomeni | 84:7c7add00f4bf | 129 | at_resp = AT_RESP_NONE; |
| ocomeni | 84:7c7add00f4bf | 130 | break; |
| ocomeni | 84:7c7add00f4bf | 131 | case AT_INTERNET_CONFIG_RESP: |
| ocomeni | 84:7c7add00f4bf | 132 | // AT_CONFIG_RESP response state |
| ocomeni | 84:7c7add00f4bf | 133 | //////_smutex.lock(); |
| ocomeni | 84:7c7add00f4bf | 134 | printf("\n [ATCMD MAN] WIFI INTERNET_CONFIG RESPONSE RECEIVED!!\n"); |
| ocomeni | 84:7c7add00f4bf | 135 | _parser.send("OK\n"); |
| ocomeni | 84:7c7add00f4bf | 136 | //////_smutex.unlock(); |
| ocomeni | 84:7c7add00f4bf | 137 | at_resp = AT_RESP_NONE; |
| ocomeni | 84:7c7add00f4bf | 138 | break; |
| ocomeni | 84:7c7add00f4bf | 139 | case AT_HTTPS_RESP: |
| ocomeni | 84:7c7add00f4bf | 140 | // AT_HTTP_RESP response state |
| ocomeni | 84:7c7add00f4bf | 141 | //////_smutex.lock(); |
| ocomeni | 84:7c7add00f4bf | 142 | printf("\n [ATCMD MAN] WIFI HTTPS RESPONSE RECEIVED!!\n"); |
| ocomeni | 84:7c7add00f4bf | 143 | _parser.send("OK\n"); |
| ocomeni | 84:7c7add00f4bf | 144 | //////_smutex.unlock(); |
| ocomeni | 81:637a87eb8170 | 145 | at_resp = AT_RESP_NONE; |
| ocomeni | 81:637a87eb8170 | 146 | break; |
| ocomeni | 81:637a87eb8170 | 147 | case AT_HTTP_RESP: |
| ocomeni | 81:637a87eb8170 | 148 | // AT_HTTP_RESP response state |
| ocomeni | 84:7c7add00f4bf | 149 | //////_smutex.lock(); |
| ocomeni | 81:637a87eb8170 | 150 | printf("\n [ATCMD MAN] WIFI HTTP RESPONSE RECEIVED!!\n"); |
| ocomeni | 81:637a87eb8170 | 151 | _parser.send("OK\n"); |
| ocomeni | 84:7c7add00f4bf | 152 | //////_smutex.unlock(); |
| ocomeni | 81:637a87eb8170 | 153 | at_resp = AT_RESP_NONE; |
| ocomeni | 81:637a87eb8170 | 154 | break; |
| ocomeni | 81:637a87eb8170 | 155 | default: |
| ocomeni | 81:637a87eb8170 | 156 | // UNKNOWN response state |
| ocomeni | 84:7c7add00f4bf | 157 | //////_smutex.lock(); |
| ocomeni | 82:10072c1794d3 | 158 | printf("\n [ATCMD MAN] UNKNOWN RESPONSE RECEIVED!!\n"); |
| ocomeni | 82:10072c1794d3 | 159 | _parser.send("OK\n"); |
| ocomeni | 84:7c7add00f4bf | 160 | //////_smutex.unlock(); |
| ocomeni | 81:637a87eb8170 | 161 | at_resp = AT_RESP_NONE; |
| ocomeni | 81:637a87eb8170 | 162 | break; |
| ocomeni | 81:637a87eb8170 | 163 | } |
| ocomeni | 81:637a87eb8170 | 164 | } |
| ocomeni | 81:637a87eb8170 | 165 | |
| ocomeni | 81:637a87eb8170 | 166 | |
| ocomeni | 83:9c271a50a70b | 167 | bool ATCmdManager::validate(edm_header_t edm_header) |
| ocomeni | 83:9c271a50a70b | 168 | { |
| ocomeni | 83:9c271a50a70b | 169 | if(edm_header.startByte != EDM_START_BYTE)return false; // unexpected start byte found! |
| ocomeni | 83:9c271a50a70b | 170 | if(edm_header.payloadID != CONNECT_EVENT && |
| ocomeni | 83:9c271a50a70b | 171 | edm_header.payloadID != DISCONNECT_EVENT && |
| ocomeni | 83:9c271a50a70b | 172 | edm_header.payloadID != DATA_EVENT && |
| ocomeni | 83:9c271a50a70b | 173 | edm_header.payloadID != DATA_COMMAND && |
| ocomeni | 83:9c271a50a70b | 174 | edm_header.payloadID != AT_REQUEST && |
| ocomeni | 83:9c271a50a70b | 175 | edm_header.payloadID != AT_CONFIRMATION && |
| ocomeni | 83:9c271a50a70b | 176 | edm_header.payloadID != AT_EVENT |
| ocomeni | 83:9c271a50a70b | 177 | )return false; // unexpected payload ID found! |
| ocomeni | 83:9c271a50a70b | 178 | if(edm_header.payloadLen > MAX_EDM_PAYLOAD_LEN || |
| ocomeni | 83:9c271a50a70b | 179 | edm_header.payloadLen < MIN_EDM_PAYLOAD_LEN |
| ocomeni | 83:9c271a50a70b | 180 | ) return false; // unexpected length received! |
| ocomeni | 83:9c271a50a70b | 181 | return true; |
| ocomeni | 83:9c271a50a70b | 182 | } |
| ocomeni | 74:f26e846adfe9 | 183 | |
| ocomeni | 84:7c7add00f4bf | 184 | http_method ATCmdManager::str2HttpMethod(const char * methodStr) |
| ocomeni | 84:7c7add00f4bf | 185 | { |
| ocomeni | 84:7c7add00f4bf | 186 | http_method _http_method; |
| ocomeni | 84:7c7add00f4bf | 187 | if(strstr(methodStr, "POST")!= NULL){ |
| ocomeni | 84:7c7add00f4bf | 188 | _http_method = HTTP_POST; |
| ocomeni | 84:7c7add00f4bf | 189 | } |
| ocomeni | 84:7c7add00f4bf | 190 | else if(strstr(methodStr, "GET")!= NULL){ |
| ocomeni | 84:7c7add00f4bf | 191 | _http_method = HTTP_GET; |
| ocomeni | 84:7c7add00f4bf | 192 | } |
| ocomeni | 84:7c7add00f4bf | 193 | else{ |
| ocomeni | 84:7c7add00f4bf | 194 | _http_method = HTTP_DELETE; // unsupported method - set to HTTP_DELETE |
| ocomeni | 84:7c7add00f4bf | 195 | } |
| ocomeni | 84:7c7add00f4bf | 196 | return _http_method; |
| ocomeni | 84:7c7add00f4bf | 197 | } |
| ocomeni | 84:7c7add00f4bf | 198 | bool ATCmdManager::createHttpRequest() |
| ocomeni | 84:7c7add00f4bf | 199 | { |
| ocomeni | 84:7c7add00f4bf | 200 | http_request_t http_req; |
| ocomeni | 84:7c7add00f4bf | 201 | char s1[32]; |
| ocomeni | 84:7c7add00f4bf | 202 | char s2[32]; |
| ocomeni | 84:7c7add00f4bf | 203 | char s3[32]; |
| ocomeni | 84:7c7add00f4bf | 204 | int n = 0; |
| ocomeni | 84:7c7add00f4bf | 205 | int pos = 0; |
| ocomeni | 84:7c7add00f4bf | 206 | char * strPtr = (char *)&rx_buf_ptr[1]; |
| ocomeni | 84:7c7add00f4bf | 207 | char * p; |
| ocomeni | 84:7c7add00f4bf | 208 | char * p2 = strstr(strPtr, "\r\n\r\n"); |
| ocomeni | 84:7c7add00f4bf | 209 | char * nxtPtr = strPtr; |
| ocomeni | 84:7c7add00f4bf | 210 | char * bodyPtr = p2+4; |
| ocomeni | 84:7c7add00f4bf | 211 | printf("\nstrPtr address= %x",strPtr); |
| ocomeni | 84:7c7add00f4bf | 212 | printf("\np2 address= %x", p2); |
| ocomeni | 84:7c7add00f4bf | 213 | for(int i = 0; i < 5; i++){ |
| ocomeni | 84:7c7add00f4bf | 214 | if(i == 0)// firstline scan method uri and http_ver |
| ocomeni | 84:7c7add00f4bf | 215 | { |
| ocomeni | 84:7c7add00f4bf | 216 | //n = sscanf(nxtPtr,"%s %s %s", &s1[0], &s2[0], &s3[0]); |
| ocomeni | 84:7c7add00f4bf | 217 | n = sscanf(nxtPtr,"%s %s %s", s1, s2, s3); |
| ocomeni | 84:7c7add00f4bf | 218 | printf("\nmethod = %s\nuri = %s\nhttp_ver = %s",s1, s2, s3 ); |
| ocomeni | 84:7c7add00f4bf | 219 | //http_req.method = str2HttpMethod(s1.c_str()); |
| ocomeni | 84:7c7add00f4bf | 220 | http_req.method = str2HttpMethod(s1); |
| ocomeni | 84:7c7add00f4bf | 221 | http_req.request_URI.assign(s2); |
| ocomeni | 84:7c7add00f4bf | 222 | http_req.http_version.assign(s3); |
| ocomeni | 84:7c7add00f4bf | 223 | } |
| ocomeni | 84:7c7add00f4bf | 224 | else{ // scan header pairs |
| ocomeni | 84:7c7add00f4bf | 225 | //n = sscanf(nxtPtr,"%s %s", &s1[0], &s2[0]); |
| ocomeni | 84:7c7add00f4bf | 226 | n = sscanf(nxtPtr,"%s %s", s1, s2); |
| ocomeni | 84:7c7add00f4bf | 227 | p = strstr(s1,":"); |
| ocomeni | 84:7c7add00f4bf | 228 | *p = NULL; |
| ocomeni | 84:7c7add00f4bf | 229 | //pos = s1.find(":"); |
| ocomeni | 84:7c7add00f4bf | 230 | //s1.replace(pos,1,""); |
| ocomeni | 84:7c7add00f4bf | 231 | printf("\nname = %s value = %s",s1, s2); |
| ocomeni | 84:7c7add00f4bf | 232 | //if(s1.find("Host")!= string::npos){ |
| ocomeni | 84:7c7add00f4bf | 233 | if(strstr(s1, "POST")!= NULL){ |
| ocomeni | 84:7c7add00f4bf | 234 | http_req.http_version.assign(s3); |
| ocomeni | 84:7c7add00f4bf | 235 | } |
| ocomeni | 84:7c7add00f4bf | 236 | |
| ocomeni | 84:7c7add00f4bf | 237 | |
| ocomeni | 84:7c7add00f4bf | 238 | } |
| ocomeni | 84:7c7add00f4bf | 239 | nxtPtr = strstr(nxtPtr, "\r\n")+2; // goto next line |
| ocomeni | 84:7c7add00f4bf | 240 | if(nxtPtr >= p2) break; |
| ocomeni | 84:7c7add00f4bf | 241 | } |
| ocomeni | 84:7c7add00f4bf | 242 | int bodyLen = edm_hdr.payloadLen -(p2+7-strPtr); |
| ocomeni | 84:7c7add00f4bf | 243 | printf("\nLen = %d\n", bodyLen); |
| ocomeni | 84:7c7add00f4bf | 244 | memcpy(http_req.body, bodyPtr, bodyLen); |
| ocomeni | 84:7c7add00f4bf | 245 | // package and send on wifi data queue |
| ocomeni | 84:7c7add00f4bf | 246 | wifi_data_msg_t data_msg; |
| ocomeni | 84:7c7add00f4bf | 247 | data_msg.wifi_cmd = WIFI_CMD_SEND_HTTPS_REQ; |
| ocomeni | 84:7c7add00f4bf | 248 | data_msg.dataLen = sizeof(http_req) + http_req.request_URI.length() + |
| ocomeni | 84:7c7add00f4bf | 249 | http_req.http_version.length() + |
| ocomeni | 84:7c7add00f4bf | 250 | http_req.hostName.length() + |
| ocomeni | 84:7c7add00f4bf | 251 | http_req.AcceptVal.length() + |
| ocomeni | 84:7c7add00f4bf | 252 | http_req.contentType.length() + |
| ocomeni | 84:7c7add00f4bf | 253 | http_req.contentLen.length(); |
| ocomeni | 84:7c7add00f4bf | 254 | memcpy(data_msg.buffer,&http_req, data_msg.dataLen); |
| ocomeni | 84:7c7add00f4bf | 255 | // queue next data request |
| ocomeni | 84:7c7add00f4bf | 256 | queueWiFiDataRequest(data_msg); |
| ocomeni | 84:7c7add00f4bf | 257 | return true; |
| ocomeni | 84:7c7add00f4bf | 258 | } |
| ocomeni | 74:f26e846adfe9 | 259 | // OOB processing |
| ocomeni | 74:f26e846adfe9 | 260 | void ATCmdManager::_process_oob(uint32_t timeout, bool all){ |
| ocomeni | 74:f26e846adfe9 | 261 | set_timeout(timeout); |
| ocomeni | 83:9c271a50a70b | 262 | static int cnt = 0; |
| ocomeni | 84:7c7add00f4bf | 263 | int start; |
| ocomeni | 83:9c271a50a70b | 264 | if(dataMode == AT_EXT_DATA_MODE) |
| ocomeni | 83:9c271a50a70b | 265 | { |
| ocomeni | 83:9c271a50a70b | 266 | int n; |
| ocomeni | 83:9c271a50a70b | 267 | if(cnt++ % 10 == 0)printf("In EDM mode\n"); |
| ocomeni | 84:7c7add00f4bf | 268 | uint8_t edm[EDM_HDR_LEN]; |
| ocomeni | 84:7c7add00f4bf | 269 | |
| ocomeni | 83:9c271a50a70b | 270 | // Poll for edm packets |
| ocomeni | 83:9c271a50a70b | 271 | do{ |
| ocomeni | 84:7c7add00f4bf | 272 | n = _parser.read((char *)edm, EDM_HDR_LEN); |
| ocomeni | 84:7c7add00f4bf | 273 | edm_hdr.startByte = edm[0]; |
| ocomeni | 84:7c7add00f4bf | 274 | edm_hdr.payloadLen = edm[1]*256 + edm[2]; |
| ocomeni | 84:7c7add00f4bf | 275 | edm_hdr.payloadID = edm[3]*256 + edm[4]; |
| ocomeni | 84:7c7add00f4bf | 276 | start = Kernel::get_ms_count(); |
| ocomeni | 83:9c271a50a70b | 277 | if(n == -1) break; // break if it times out |
| ocomeni | 83:9c271a50a70b | 278 | printf("%d bytes read!\n", n); |
| ocomeni | 83:9c271a50a70b | 279 | if(n==5) |
| ocomeni | 83:9c271a50a70b | 280 | printf("Start = %d, payloadID = %d len = %d\n", edm_hdr.startByte, |
| ocomeni | 83:9c271a50a70b | 281 | edm_hdr.payloadID, |
| ocomeni | 83:9c271a50a70b | 282 | edm_hdr.payloadLen); |
| ocomeni | 83:9c271a50a70b | 283 | if(n == EDM_HDR_LEN && validate(edm_hdr)) // if AT command use process oob to decode |
| ocomeni | 83:9c271a50a70b | 284 | { |
| ocomeni | 83:9c271a50a70b | 285 | if(edm_hdr.payloadID == AT_REQUEST) |
| ocomeni | 83:9c271a50a70b | 286 | { |
| ocomeni | 83:9c271a50a70b | 287 | _parser.process_oob(); |
| ocomeni | 83:9c271a50a70b | 288 | break; |
| ocomeni | 83:9c271a50a70b | 289 | } |
| ocomeni | 83:9c271a50a70b | 290 | else |
| ocomeni | 83:9c271a50a70b | 291 | { |
| ocomeni | 83:9c271a50a70b | 292 | int pLen = edm_hdr.payloadLen-1; |
| ocomeni | 83:9c271a50a70b | 293 | rx_buf_ptr = (uint8_t *) malloc (pLen); // we already read 2 bytes from payload but expect 1 stop byte |
| ocomeni | 83:9c271a50a70b | 294 | rx_buf_ptr[pLen-1] = 0x00; // clear last byte so the readback value is as expected |
| ocomeni | 83:9c271a50a70b | 295 | n = _parser.read((char *)rx_buf_ptr, pLen); |
| ocomeni | 83:9c271a50a70b | 296 | if(n == -1) break; // timeout! |
| ocomeni | 83:9c271a50a70b | 297 | printf("%d bytes read - expected %d!\n", n, pLen); |
| ocomeni | 83:9c271a50a70b | 298 | for(int i =0;i<pLen;i++){ |
| ocomeni | 83:9c271a50a70b | 299 | if(i%8==0) printf("\n[%3d]",i/8); |
| ocomeni | 83:9c271a50a70b | 300 | printf("%2x ", rx_buf_ptr[i]); |
| ocomeni | 83:9c271a50a70b | 301 | } |
| ocomeni | 83:9c271a50a70b | 302 | printf("\n"); |
| ocomeni | 83:9c271a50a70b | 303 | printf("rx_buf_ptr[pLen-1] = %0x\n",rx_buf_ptr[pLen-1]); |
| ocomeni | 83:9c271a50a70b | 304 | if(rx_buf_ptr[pLen-1] != EDM_STOP_BYTE) { |
| ocomeni | 83:9c271a50a70b | 305 | break; // exit if stop byte now found - possible data corruption! |
| ocomeni | 83:9c271a50a70b | 306 | } |
| ocomeni | 83:9c271a50a70b | 307 | switch(edm_hdr.payloadID) |
| ocomeni | 83:9c271a50a70b | 308 | { |
| ocomeni | 83:9c271a50a70b | 309 | case CONNECT_EVENT: |
| ocomeni | 83:9c271a50a70b | 310 | printf("Connection Event received!\n"); |
| ocomeni | 83:9c271a50a70b | 311 | break; |
| ocomeni | 83:9c271a50a70b | 312 | case DISCONNECT_EVENT: |
| ocomeni | 83:9c271a50a70b | 313 | printf("DISCONNECT_EVENT received!\n"); |
| ocomeni | 83:9c271a50a70b | 314 | break; |
| ocomeni | 83:9c271a50a70b | 315 | case DATA_EVENT: |
| ocomeni | 83:9c271a50a70b | 316 | printf("DATA_EVENT received!\n"); |
| ocomeni | 83:9c271a50a70b | 317 | break; |
| ocomeni | 83:9c271a50a70b | 318 | case DATA_COMMAND: |
| ocomeni | 83:9c271a50a70b | 319 | printf("DATA_COMMAND received!\n"); |
| ocomeni | 84:7c7add00f4bf | 320 | if(createHttpRequest() == true){ |
| ocomeni | 84:7c7add00f4bf | 321 | _parser.send("OK"); |
| ocomeni | 83:9c271a50a70b | 322 | } |
| ocomeni | 84:7c7add00f4bf | 323 | else{ |
| ocomeni | 84:7c7add00f4bf | 324 | _parser.send("NACK"); |
| ocomeni | 84:7c7add00f4bf | 325 | } |
| ocomeni | 84:7c7add00f4bf | 326 | int stop = Kernel::get_ms_count(); |
| ocomeni | 84:7c7add00f4bf | 327 | printf("\n Time Elapsed = %d\n", stop-start); |
| ocomeni | 83:9c271a50a70b | 328 | break; |
| ocomeni | 83:9c271a50a70b | 329 | case AT_REQUEST: |
| ocomeni | 83:9c271a50a70b | 330 | printf("AT_REQUEST received!\n"); |
| ocomeni | 83:9c271a50a70b | 331 | break; |
| ocomeni | 83:9c271a50a70b | 332 | case AT_CONFIRMATION: |
| ocomeni | 83:9c271a50a70b | 333 | printf("AT_CONFIRMATION received!\n"); |
| ocomeni | 83:9c271a50a70b | 334 | break; |
| ocomeni | 83:9c271a50a70b | 335 | case AT_EVENT: |
| ocomeni | 83:9c271a50a70b | 336 | printf("AT_EVENT received!\n"); |
| ocomeni | 83:9c271a50a70b | 337 | break; |
| ocomeni | 83:9c271a50a70b | 338 | default: |
| ocomeni | 83:9c271a50a70b | 339 | printf("UNKNOWN MESSAGE received!\n"); |
| ocomeni | 83:9c271a50a70b | 340 | break; |
| ocomeni | 83:9c271a50a70b | 341 | } |
| ocomeni | 83:9c271a50a70b | 342 | } |
| ocomeni | 83:9c271a50a70b | 343 | //_parser.process_oob(); |
| ocomeni | 83:9c271a50a70b | 344 | } |
| ocomeni | 83:9c271a50a70b | 345 | else // incorrect # of bytes received abort!! |
| ocomeni | 83:9c271a50a70b | 346 | { |
| ocomeni | 83:9c271a50a70b | 347 | break; |
| ocomeni | 83:9c271a50a70b | 348 | } |
| ocomeni | 83:9c271a50a70b | 349 | }while (all); // continue to process until timeout |
| ocomeni | 74:f26e846adfe9 | 350 | } |
| ocomeni | 83:9c271a50a70b | 351 | else |
| ocomeni | 83:9c271a50a70b | 352 | { |
| ocomeni | 83:9c271a50a70b | 353 | // Poll for inbound packets |
| ocomeni | 83:9c271a50a70b | 354 | while (_parser.process_oob() && all) { |
| ocomeni | 83:9c271a50a70b | 355 | } |
| ocomeni | 83:9c271a50a70b | 356 | } |
| ocomeni | 74:f26e846adfe9 | 357 | set_timeout(); |
| ocomeni | 74:f26e846adfe9 | 358 | } |
| ocomeni | 74:f26e846adfe9 | 359 | |
| ocomeni | 74:f26e846adfe9 | 360 | |
| ocomeni | 74:f26e846adfe9 | 361 | // OOB message handlers |
| ocomeni | 74:f26e846adfe9 | 362 | void ATCmdManager::_oob_startup_hdlr(){ |
| ocomeni | 74:f26e846adfe9 | 363 | } |
| ocomeni | 74:f26e846adfe9 | 364 | |
| ocomeni | 81:637a87eb8170 | 365 | void ATCmdManager::_oob_ok_hdlr(){ |
| ocomeni | 84:7c7add00f4bf | 366 | //_smutex.lock(); |
| ocomeni | 81:637a87eb8170 | 367 | _parser.send("OK\n"); |
| ocomeni | 84:7c7add00f4bf | 368 | //_smutex.unlock(); |
| ocomeni | 81:637a87eb8170 | 369 | } |
| ocomeni | 81:637a87eb8170 | 370 | |
| ocomeni | 74:f26e846adfe9 | 371 | |
| ocomeni | 74:f26e846adfe9 | 372 | void ATCmdManager::_oob_bleRole_hdlr(){ |
| ocomeni | 74:f26e846adfe9 | 373 | } |
| ocomeni | 74:f26e846adfe9 | 374 | |
| ocomeni | 74:f26e846adfe9 | 375 | |
| ocomeni | 74:f26e846adfe9 | 376 | void ATCmdManager::_oob_wifiMode_err(){ |
| ocomeni | 74:f26e846adfe9 | 377 | } |
| ocomeni | 74:f26e846adfe9 | 378 | |
| ocomeni | 74:f26e846adfe9 | 379 | |
| ocomeni | 74:f26e846adfe9 | 380 | void ATCmdManager::_oob_conn_already(){ |
| ocomeni | 74:f26e846adfe9 | 381 | } |
| ocomeni | 74:f26e846adfe9 | 382 | |
| ocomeni | 74:f26e846adfe9 | 383 | |
| ocomeni | 74:f26e846adfe9 | 384 | void ATCmdManager::_oob_err(){ |
| ocomeni | 74:f26e846adfe9 | 385 | } |
| ocomeni | 74:f26e846adfe9 | 386 | |
| ocomeni | 79:a2187bbfa407 | 387 | void ATCmdManager::_oob_get_fw_ver() |
| ocomeni | 79:a2187bbfa407 | 388 | { |
| ocomeni | 79:a2187bbfa407 | 389 | } |
| ocomeni | 79:a2187bbfa407 | 390 | |
| ocomeni | 79:a2187bbfa407 | 391 | |
| ocomeni | 75:08eff6258e1b | 392 | void ATCmdManager::_oob_uart_setup(){ |
| ocomeni | 75:08eff6258e1b | 393 | int uOpts[NUM_UART_OPTIONS]; |
| ocomeni | 75:08eff6258e1b | 394 | //if(_parser.recv("=%d,%d,%d,%d,%d,%d", &uOpts[0], &uOpts[1], &uOpts[2], &uOpts[3], &uOpts[4], &uOpts[5])) { |
| ocomeni | 75:08eff6258e1b | 395 | if(_parser.scanf("=%d,%d,%d,%d,%d,%d", &uOpts[0], &uOpts[1], &uOpts[2], &uOpts[3], &uOpts[4], &uOpts[5]) >0) { |
| ocomeni | 75:08eff6258e1b | 396 | printf("\nATCmdParser: Uart Options=%d,%d,%d,%d,%d,%d\n", uOpts[0], uOpts[1], uOpts[2], uOpts[3], uOpts[4], uOpts[5]); |
| ocomeni | 81:637a87eb8170 | 397 | //AT+UMRS=230400,2,8,1,1,1 |
| ocomeni | 81:637a87eb8170 | 398 | printf("\n Changing Baud Rate to %d\n", uOpts[0]); |
| ocomeni | 81:637a87eb8170 | 399 | |
| ocomeni | 81:637a87eb8170 | 400 | _serial.set_baud(uOpts[0]); |
| ocomeni | 81:637a87eb8170 | 401 | printf("\n Baud Rate now %d\n", uOpts[0]); |
| ocomeni | 81:637a87eb8170 | 402 | |
| ocomeni | 75:08eff6258e1b | 403 | } else { |
| ocomeni | 75:08eff6258e1b | 404 | printf("\nATCmdParser: Retrieving Uart Options failed"); |
| ocomeni | 75:08eff6258e1b | 405 | } |
| ocomeni | 75:08eff6258e1b | 406 | } |
| ocomeni | 75:08eff6258e1b | 407 | |
| ocomeni | 74:f26e846adfe9 | 408 | void ATCmdManager::set_timeout(uint32_t timeout_ms) |
| ocomeni | 74:f26e846adfe9 | 409 | { |
| ocomeni | 74:f26e846adfe9 | 410 | _parser.set_timeout(timeout_ms); |
| ocomeni | 74:f26e846adfe9 | 411 | } |
| ocomeni | 74:f26e846adfe9 | 412 | |
| ocomeni | 75:08eff6258e1b | 413 | |
| ocomeni | 75:08eff6258e1b | 414 | void ATCmdManager::_oob_echo_off() |
| ocomeni | 75:08eff6258e1b | 415 | { |
| ocomeni | 84:7c7add00f4bf | 416 | //_smutex.lock(); |
| ocomeni | 75:08eff6258e1b | 417 | printf("\n Received ATEO OOB command!!\n"); |
| ocomeni | 75:08eff6258e1b | 418 | printf("\n turning echo OFF!!\n"); |
| ocomeni | 75:08eff6258e1b | 419 | _parser.debug_on(false); |
| ocomeni | 75:08eff6258e1b | 420 | _parser.send("OK\n"); |
| ocomeni | 84:7c7add00f4bf | 421 | //_smutex.unlock(); |
| ocomeni | 75:08eff6258e1b | 422 | } |
| ocomeni | 75:08eff6258e1b | 423 | |
| ocomeni | 75:08eff6258e1b | 424 | |
| ocomeni | 75:08eff6258e1b | 425 | void ATCmdManager::_oob_echo_on() |
| ocomeni | 75:08eff6258e1b | 426 | { |
| ocomeni | 84:7c7add00f4bf | 427 | //_smutex.lock(); |
| ocomeni | 75:08eff6258e1b | 428 | printf("\n Received ATE1 OOB command!!\n"); |
| ocomeni | 75:08eff6258e1b | 429 | printf("\n turning echo ON!!\n"); |
| ocomeni | 75:08eff6258e1b | 430 | _parser.debug_on(true); |
| ocomeni | 75:08eff6258e1b | 431 | _parser.send("OK\n"); |
| ocomeni | 84:7c7add00f4bf | 432 | //_smutex.unlock(); |
| ocomeni | 75:08eff6258e1b | 433 | } |
| ocomeni | 75:08eff6258e1b | 434 | |
| ocomeni | 75:08eff6258e1b | 435 | |
| ocomeni | 75:08eff6258e1b | 436 | void ATCmdManager::_oob_data_mode(){ |
| ocomeni | 84:7c7add00f4bf | 437 | //_smutex.lock(); |
| ocomeni | 75:08eff6258e1b | 438 | printf("\n Received EDM mode command!!\n"); |
| ocomeni | 75:08eff6258e1b | 439 | if(_parser.scanf("%d", &dataMode) >0) { |
| ocomeni | 75:08eff6258e1b | 440 | printf("\nATCmdParser: Data mode=%d\n", dataMode); |
| ocomeni | 75:08eff6258e1b | 441 | switch(dataMode) |
| ocomeni | 75:08eff6258e1b | 442 | { |
| ocomeni | 75:08eff6258e1b | 443 | case 0: |
| ocomeni | 83:9c271a50a70b | 444 | printf("\nATCmdParser: Command Mode request received\n"); |
| ocomeni | 81:637a87eb8170 | 445 | dataMode = AT_CMD_DATA_MODE; |
| ocomeni | 75:08eff6258e1b | 446 | break; |
| ocomeni | 75:08eff6258e1b | 447 | case 1: |
| ocomeni | 83:9c271a50a70b | 448 | printf("\nATCmdParser: Data Mode request received\n"); |
| ocomeni | 81:637a87eb8170 | 449 | dataMode = AT_STD_DATA_MODE; |
| ocomeni | 75:08eff6258e1b | 450 | break; |
| ocomeni | 75:08eff6258e1b | 451 | case 2: |
| ocomeni | 83:9c271a50a70b | 452 | printf("\nATCmdParser: Extended data Mode request received\n"); |
| ocomeni | 81:637a87eb8170 | 453 | dataMode = AT_EXT_DATA_MODE; |
| ocomeni | 75:08eff6258e1b | 454 | break; |
| ocomeni | 75:08eff6258e1b | 455 | default: |
| ocomeni | 75:08eff6258e1b | 456 | printf("\nATCmdParser: ERROR - UNKNOWN DATA MODE RECEIVED!!! \n"); |
| ocomeni | 75:08eff6258e1b | 457 | break; |
| ocomeni | 75:08eff6258e1b | 458 | } |
| ocomeni | 75:08eff6258e1b | 459 | } else { |
| ocomeni | 83:9c271a50a70b | 460 | printf("\nATCmdParser: Retrieving Uart Options failed\n"); |
| ocomeni | 75:08eff6258e1b | 461 | } |
| ocomeni | 75:08eff6258e1b | 462 | _parser.send("OK\n"); |
| ocomeni | 84:7c7add00f4bf | 463 | //_smutex.unlock(); |
| ocomeni | 75:08eff6258e1b | 464 | } |
| ocomeni | 75:08eff6258e1b | 465 | |
| ocomeni | 75:08eff6258e1b | 466 | void ATCmdManager::_oob_get_mac_addr(){ |
| ocomeni | 75:08eff6258e1b | 467 | int bleOrWifi; |
| ocomeni | 84:7c7add00f4bf | 468 | //_smutex.lock(); |
| ocomeni | 75:08eff6258e1b | 469 | if(_parser.scanf("=%d", &bleOrWifi) >0) { |
| ocomeni | 75:08eff6258e1b | 470 | switch(bleOrWifi) |
| ocomeni | 75:08eff6258e1b | 471 | { |
| ocomeni | 75:08eff6258e1b | 472 | case 1: |
| ocomeni | 75:08eff6258e1b | 473 | printf("\nATCmdParser: BLE MAC Address request received"); |
| ocomeni | 75:08eff6258e1b | 474 | break; |
| ocomeni | 75:08eff6258e1b | 475 | case 2: |
| ocomeni | 75:08eff6258e1b | 476 | printf("\nATCmdParser: WiFi MAC Address request received"); |
| ocomeni | 75:08eff6258e1b | 477 | break; |
| ocomeni | 75:08eff6258e1b | 478 | default: |
| ocomeni | 75:08eff6258e1b | 479 | printf("\nATCmdParser: ERROR - UNKNOWN MAC ADDRESS REQUEST RECEIVED!!! \n"); |
| ocomeni | 75:08eff6258e1b | 480 | break; |
| ocomeni | 75:08eff6258e1b | 481 | } |
| ocomeni | 75:08eff6258e1b | 482 | } else { |
| ocomeni | 75:08eff6258e1b | 483 | printf("\nATCmdParser: Retrieving Uart Options failed"); |
| ocomeni | 75:08eff6258e1b | 484 | } |
| ocomeni | 75:08eff6258e1b | 485 | _parser.send("OK\n"); |
| ocomeni | 84:7c7add00f4bf | 486 | //_smutex.unlock(); |
| ocomeni | 75:08eff6258e1b | 487 | } |
| ocomeni | 75:08eff6258e1b | 488 | |
| ocomeni | 75:08eff6258e1b | 489 | void ATCmdManager::_oob_get_ble_role(){ |
| ocomeni | 84:7c7add00f4bf | 490 | //_smutex.lock(); |
| ocomeni | 75:08eff6258e1b | 491 | printf("\n Received get BLE role command!!\n"); |
| ocomeni | 75:08eff6258e1b | 492 | _parser.send("OK\n"); |
| ocomeni | 84:7c7add00f4bf | 493 | //_smutex.unlock(); |
| ocomeni | 75:08eff6258e1b | 494 | } |
| ocomeni | 75:08eff6258e1b | 495 | |
| ocomeni | 75:08eff6258e1b | 496 | void ATCmdManager::_oob_ena_ble_peri(){ |
| ocomeni | 84:7c7add00f4bf | 497 | //_smutex.lock(); |
| ocomeni | 75:08eff6258e1b | 498 | printf("\n Received enable BLE Peripheral command!!\n"); |
| ocomeni | 75:08eff6258e1b | 499 | _parser.send("OK\n"); |
| ocomeni | 84:7c7add00f4bf | 500 | //_smutex.unlock(); |
| ocomeni | 75:08eff6258e1b | 501 | } |
| ocomeni | 75:08eff6258e1b | 502 | |
| ocomeni | 75:08eff6258e1b | 503 | void ATCmdManager::_oob_reboot(){ |
| ocomeni | 84:7c7add00f4bf | 504 | //_smutex.lock(); |
| ocomeni | 75:08eff6258e1b | 505 | printf("\n Received reboot command!!\n"); |
| ocomeni | 75:08eff6258e1b | 506 | _parser.send("OK\n"); |
| ocomeni | 75:08eff6258e1b | 507 | _parser.send("System Resetting....\n"); |
| ocomeni | 75:08eff6258e1b | 508 | system_reset(); |
| ocomeni | 84:7c7add00f4bf | 509 | //_smutex.unlock(); |
| ocomeni | 75:08eff6258e1b | 510 | } |
| ocomeni | 75:08eff6258e1b | 511 | |
| ocomeni | 79:a2187bbfa407 | 512 | const char * ATCmdManager::sec2str(nsapi_security_t sec) |
| ocomeni | 79:a2187bbfa407 | 513 | { |
| ocomeni | 79:a2187bbfa407 | 514 | switch (sec) { |
| ocomeni | 79:a2187bbfa407 | 515 | case NSAPI_SECURITY_NONE: |
| ocomeni | 79:a2187bbfa407 | 516 | return "None"; |
| ocomeni | 79:a2187bbfa407 | 517 | case NSAPI_SECURITY_WEP: |
| ocomeni | 79:a2187bbfa407 | 518 | return "WEP"; |
| ocomeni | 79:a2187bbfa407 | 519 | case NSAPI_SECURITY_WPA: |
| ocomeni | 79:a2187bbfa407 | 520 | return "WPA"; |
| ocomeni | 79:a2187bbfa407 | 521 | case NSAPI_SECURITY_WPA2: |
| ocomeni | 79:a2187bbfa407 | 522 | return "WPA2"; |
| ocomeni | 79:a2187bbfa407 | 523 | case NSAPI_SECURITY_WPA_WPA2: |
| ocomeni | 79:a2187bbfa407 | 524 | return "WPA/WPA2"; |
| ocomeni | 79:a2187bbfa407 | 525 | case NSAPI_SECURITY_UNKNOWN: |
| ocomeni | 79:a2187bbfa407 | 526 | default: |
| ocomeni | 79:a2187bbfa407 | 527 | return "Unknown"; |
| ocomeni | 79:a2187bbfa407 | 528 | } |
| ocomeni | 79:a2187bbfa407 | 529 | } |
| ocomeni | 81:637a87eb8170 | 530 | |
| ocomeni | 81:637a87eb8170 | 531 | bool ATCmdManager::setNextResponse(at_cmd_resp_t resp) |
| ocomeni | 81:637a87eb8170 | 532 | { |
| ocomeni | 81:637a87eb8170 | 533 | if(at_resp == AT_RESP_NONE){ |
| ocomeni | 81:637a87eb8170 | 534 | at_resp = resp; |
| ocomeni | 81:637a87eb8170 | 535 | return true; // success |
| ocomeni | 81:637a87eb8170 | 536 | } |
| ocomeni | 81:637a87eb8170 | 537 | return false; // wiFiManager busy |
| ocomeni | 79:a2187bbfa407 | 538 | } |
| ocomeni | 79:a2187bbfa407 | 539 | |
| ocomeni | 81:637a87eb8170 | 540 | |
| ocomeni | 79:a2187bbfa407 | 541 | void ATCmdManager::_oob_scanWiFiNetworks(){ |
| ocomeni | 84:7c7add00f4bf | 542 | //_smutex.lock(); |
| ocomeni | 79:a2187bbfa407 | 543 | printf("\n Received scanWiFiNetworks command!!\n"); |
| ocomeni | 75:08eff6258e1b | 544 | _parser.send("OK\n"); |
| ocomeni | 84:7c7add00f4bf | 545 | //_smutex.unlock(); |
| ocomeni | 79:a2187bbfa407 | 546 | wifi_cmd_t cmd = WIFI_CMD_SCAN; |
| ocomeni | 79:a2187bbfa407 | 547 | // queue next command |
| ocomeni | 79:a2187bbfa407 | 548 | queueWiFiCommand(cmd); |
| ocomeni | 81:637a87eb8170 | 549 | return; |
| ocomeni | 75:08eff6258e1b | 550 | } |
| ocomeni | 75:08eff6258e1b | 551 | |
| ocomeni | 79:a2187bbfa407 | 552 | void ATCmdManager::_oob_connect2WiFiNetwork() |
| ocomeni | 79:a2187bbfa407 | 553 | { |
| ocomeni | 81:637a87eb8170 | 554 | wifi_cmd_t cmd = WIFI_CMD_CONNECT; |
| ocomeni | 81:637a87eb8170 | 555 | // queue next command |
| ocomeni | 81:637a87eb8170 | 556 | queueWiFiCommand(cmd); |
| ocomeni | 81:637a87eb8170 | 557 | return; |
| ocomeni | 79:a2187bbfa407 | 558 | } |
| ocomeni | 79:a2187bbfa407 | 559 | |
| ocomeni | 79:a2187bbfa407 | 560 | |
| ocomeni | 79:a2187bbfa407 | 561 | void ATCmdManager::_oob_disconnectWiFiNetwork() |
| ocomeni | 79:a2187bbfa407 | 562 | { |
| ocomeni | 81:637a87eb8170 | 563 | wifi_cmd_t cmd = WIFI_CMD_DISCONNECT; |
| ocomeni | 81:637a87eb8170 | 564 | // queue next command |
| ocomeni | 81:637a87eb8170 | 565 | queueWiFiCommand(cmd); |
| ocomeni | 81:637a87eb8170 | 566 | return; |
| ocomeni | 81:637a87eb8170 | 567 | } |
| ocomeni | 81:637a87eb8170 | 568 | |
| ocomeni | 81:637a87eb8170 | 569 | void ATCmdManager::_oob_setupInternetConnection() |
| ocomeni | 81:637a87eb8170 | 570 | { |
| ocomeni | 84:7c7add00f4bf | 571 | ////print_memory_info(); |
| ocomeni | 84:7c7add00f4bf | 572 | char str[200]; // = (char *) malloc(200); |
| ocomeni | 84:7c7add00f4bf | 573 | char url[60]; // = (char *) malloc(60); |
| ocomeni | 81:637a87eb8170 | 574 | int n; |
| ocomeni | 84:7c7add00f4bf | 575 | //internet_config_t *internet_config = (internet_config_t *) malloc(sizeof(internet_config_t)); |
| ocomeni | 81:637a87eb8170 | 576 | internet_config_t internet_config; |
| ocomeni | 84:7c7add00f4bf | 577 | printf("sizeof internet_config_t = %d\n", sizeof(internet_config_t)); |
| ocomeni | 84:7c7add00f4bf | 578 | //internet_config->url; |
| ocomeni | 84:7c7add00f4bf | 579 | //internet_config->url; |
| ocomeni | 84:7c7add00f4bf | 580 | //_smutex.lock(); |
| ocomeni | 84:7c7add00f4bf | 581 | n = ReadBytes((uint8_t *)str, 199); |
| ocomeni | 84:7c7add00f4bf | 582 | str[n]=NULL; |
| ocomeni | 84:7c7add00f4bf | 583 | printf("\n read string = %s , n = %d\n", str, n); |
| ocomeni | 84:7c7add00f4bf | 584 | n = sscanf(str, "=%1d,%199[^,],%1d", &internet_config.peer_id, |
| ocomeni | 81:637a87eb8170 | 585 | url, |
| ocomeni | 81:637a87eb8170 | 586 | &internet_config.connectionScheme); |
| ocomeni | 84:7c7add00f4bf | 587 | strncpy(internet_config.url, url, strlen(url)+1); |
| ocomeni | 84:7c7add00f4bf | 588 | printf("\n read string = %s , n = %d -- strlen(url) = %d\n", internet_config.url, n, strlen(url)); |
| ocomeni | 81:637a87eb8170 | 589 | if(n>0) |
| ocomeni | 81:637a87eb8170 | 590 | { |
| ocomeni | 84:7c7add00f4bf | 591 | //printf("before assign - still ok\n"); |
| ocomeni | 84:7c7add00f4bf | 592 | //internet_config.url.append(url); |
| ocomeni | 84:7c7add00f4bf | 593 | //printf("after assign - still ok\n"); |
| ocomeni | 84:7c7add00f4bf | 594 | //print_all_thread_info(); |
| ocomeni | 84:7c7add00f4bf | 595 | //print_memory_info(); |
| ocomeni | 84:7c7add00f4bf | 596 | //internet_config->url->assign(url); |
| ocomeni | 84:7c7add00f4bf | 597 | ////print_memory_info(); |
| ocomeni | 81:637a87eb8170 | 598 | printf("peer_id = %1d, url = %s, connScheme = %1d\n", internet_config.peer_id, |
| ocomeni | 84:7c7add00f4bf | 599 | internet_config.url, ///->c_str(), |
| ocomeni | 81:637a87eb8170 | 600 | internet_config.connectionScheme); |
| ocomeni | 84:7c7add00f4bf | 601 | //print_memory_info(); |
| ocomeni | 81:637a87eb8170 | 602 | // package and send on wifi data queue |
| ocomeni | 84:7c7add00f4bf | 603 | wifi_data_msg_t data_msg; // = (wifi_data_msg_t *) malloc(sizeof(wifi_data_msg_t)); |
| ocomeni | 81:637a87eb8170 | 604 | data_msg.wifi_cmd = WIFI_CMD_INTERNET_CONFIG; |
| ocomeni | 84:7c7add00f4bf | 605 | data_msg.dataLen = sizeof(internet_config_t); // + strlen(internet_config.url); |
| ocomeni | 84:7c7add00f4bf | 606 | printf("\n url size = %d url str = %s\n",strlen(internet_config.url), internet_config.url ); |
| ocomeni | 81:637a87eb8170 | 607 | memcpy(data_msg.buffer,&internet_config, data_msg.dataLen); |
| ocomeni | 84:7c7add00f4bf | 608 | //print_memory_info(); |
| ocomeni | 84:7c7add00f4bf | 609 | //free(internet_config->url); |
| ocomeni | 84:7c7add00f4bf | 610 | //free(internet_config); |
| ocomeni | 84:7c7add00f4bf | 611 | //free(str); |
| ocomeni | 84:7c7add00f4bf | 612 | //free(url); |
| ocomeni | 82:10072c1794d3 | 613 | // queue next data request |
| ocomeni | 81:637a87eb8170 | 614 | queueWiFiDataRequest(data_msg); |
| ocomeni | 84:7c7add00f4bf | 615 | print_memory_info(); |
| ocomeni | 82:10072c1794d3 | 616 | _parser.send("OK\n"); |
| ocomeni | 81:637a87eb8170 | 617 | } else { |
| ocomeni | 81:637a87eb8170 | 618 | printf("\n[ATCMD MAN]: internet configuration failed %d fields parsed \n", n); |
| ocomeni | 82:10072c1794d3 | 619 | _parser.send("NAK\n"); |
| ocomeni | 82:10072c1794d3 | 620 | } |
| ocomeni | 84:7c7add00f4bf | 621 | //_smutex.unlock(); |
| ocomeni | 82:10072c1794d3 | 622 | } |
| ocomeni | 82:10072c1794d3 | 623 | |
| ocomeni | 82:10072c1794d3 | 624 | wifi_config_t ATCmdManager::init_wifi_config() |
| ocomeni | 82:10072c1794d3 | 625 | { |
| ocomeni | 82:10072c1794d3 | 626 | wifi_config_t wifi_cfg; |
| ocomeni | 82:10072c1794d3 | 627 | wifi_cfg.ssid[0] = NULL; |
| ocomeni | 82:10072c1794d3 | 628 | wifi_cfg.pass[0] = NULL; |
| ocomeni | 82:10072c1794d3 | 629 | wifi_cfg.security = NSAPI_SECURITY_UNKNOWN; |
| ocomeni | 82:10072c1794d3 | 630 | return wifi_cfg; |
| ocomeni | 82:10072c1794d3 | 631 | } |
| ocomeni | 83:9c271a50a70b | 632 | /* read ASCII characters into buffer and null terminate */ |
| ocomeni | 83:9c271a50a70b | 633 | int ATCmdManager::readStringBytes(uint8_t *buf, int maxBytes) |
| ocomeni | 82:10072c1794d3 | 634 | { |
| ocomeni | 82:10072c1794d3 | 635 | int c; |
| ocomeni | 82:10072c1794d3 | 636 | int sptr = 0; |
| ocomeni | 82:10072c1794d3 | 637 | for(int i=0;i<maxBytes;i++){ |
| ocomeni | 82:10072c1794d3 | 638 | c = _parser.getc(); |
| ocomeni | 82:10072c1794d3 | 639 | if(c==-1){ |
| ocomeni | 83:9c271a50a70b | 640 | buf[sptr] = NULL; // null terminate if string |
| ocomeni | 82:10072c1794d3 | 641 | return i; |
| ocomeni | 82:10072c1794d3 | 642 | } |
| ocomeni | 82:10072c1794d3 | 643 | if(c != ',' && c!= '"'){ |
| ocomeni | 82:10072c1794d3 | 644 | buf[sptr++] = (uint8_t) c; |
| ocomeni | 82:10072c1794d3 | 645 | } |
| ocomeni | 81:637a87eb8170 | 646 | } |
| ocomeni | 83:9c271a50a70b | 647 | return maxBytes; |
| ocomeni | 83:9c271a50a70b | 648 | } |
| ocomeni | 83:9c271a50a70b | 649 | |
| ocomeni | 83:9c271a50a70b | 650 | int ATCmdManager::ReadBytes(uint8_t *buf, int maxBytes) |
| ocomeni | 83:9c271a50a70b | 651 | { |
| ocomeni | 83:9c271a50a70b | 652 | int c; |
| ocomeni | 83:9c271a50a70b | 653 | int sptr = 0; |
| ocomeni | 83:9c271a50a70b | 654 | for(int i=0;i<maxBytes;i++){ |
| ocomeni | 83:9c271a50a70b | 655 | c = _parser.getc(); |
| ocomeni | 83:9c271a50a70b | 656 | if(c==-1){ |
| ocomeni | 83:9c271a50a70b | 657 | return i; |
| ocomeni | 83:9c271a50a70b | 658 | } |
| ocomeni | 83:9c271a50a70b | 659 | buf[sptr++] = (uint8_t) c; |
| ocomeni | 83:9c271a50a70b | 660 | } |
| ocomeni | 83:9c271a50a70b | 661 | return maxBytes; |
| ocomeni | 82:10072c1794d3 | 662 | } |
| ocomeni | 82:10072c1794d3 | 663 | |
| ocomeni | 82:10072c1794d3 | 664 | void ATCmdManager::_oob_setWiFiSSID() |
| ocomeni | 82:10072c1794d3 | 665 | { |
| ocomeni | 82:10072c1794d3 | 666 | int n; |
| ocomeni | 82:10072c1794d3 | 667 | wifi_config_t wifi_cfg = init_wifi_config(); |
| ocomeni | 84:7c7add00f4bf | 668 | //_smutex.lock(); |
| ocomeni | 83:9c271a50a70b | 669 | n = readStringBytes((uint8_t *)wifi_cfg.ssid, 32); |
| ocomeni | 82:10072c1794d3 | 670 | printf("[ATCMD MAN]: number of bytes read = %d\n", n); |
| ocomeni | 82:10072c1794d3 | 671 | if(n>0) |
| ocomeni | 82:10072c1794d3 | 672 | { |
| ocomeni | 82:10072c1794d3 | 673 | printf("[ATCMD MAN]: wifi_cfg.ssid = %s\n", wifi_cfg.ssid); |
| ocomeni | 82:10072c1794d3 | 674 | // package and send on wifi data queue |
| ocomeni | 82:10072c1794d3 | 675 | wifi_data_msg_t data_msg; |
| ocomeni | 82:10072c1794d3 | 676 | data_msg.wifi_cmd = WIFI_CMD_CONFIG; |
| ocomeni | 82:10072c1794d3 | 677 | data_msg.dataLen = sizeof(wifi_config_t); |
| ocomeni | 82:10072c1794d3 | 678 | memcpy(data_msg.buffer,&wifi_cfg, data_msg.dataLen); |
| ocomeni | 82:10072c1794d3 | 679 | queueWiFiDataRequest(data_msg); |
| ocomeni | 82:10072c1794d3 | 680 | _parser.send("OK\n"); |
| ocomeni | 82:10072c1794d3 | 681 | } else { |
| ocomeni | 82:10072c1794d3 | 682 | printf("\n[ATCMD MAN]: wifi configuration failed \n"); |
| ocomeni | 82:10072c1794d3 | 683 | _parser.send("NAK\n"); |
| ocomeni | 82:10072c1794d3 | 684 | } |
| ocomeni | 84:7c7add00f4bf | 685 | //_smutex.unlock(); |
| ocomeni | 82:10072c1794d3 | 686 | } |
| ocomeni | 82:10072c1794d3 | 687 | |
| ocomeni | 82:10072c1794d3 | 688 | void ATCmdManager::_oob_setWiFiPWD() |
| ocomeni | 82:10072c1794d3 | 689 | { |
| ocomeni | 82:10072c1794d3 | 690 | int n; |
| ocomeni | 82:10072c1794d3 | 691 | wifi_config_t wifi_cfg = init_wifi_config(); |
| ocomeni | 84:7c7add00f4bf | 692 | //_smutex.lock(); |
| ocomeni | 82:10072c1794d3 | 693 | //n = _parser.scanf("%31[^\r\n]", wifi_cfg.pass); |
| ocomeni | 83:9c271a50a70b | 694 | n = readStringBytes((uint8_t *)wifi_cfg.pass, 32); |
| ocomeni | 82:10072c1794d3 | 695 | if(n>0) |
| ocomeni | 82:10072c1794d3 | 696 | { |
| ocomeni | 82:10072c1794d3 | 697 | printf("ATCMD MAN]: wifi_cfg.pass = %s\n", wifi_cfg.pass); |
| ocomeni | 82:10072c1794d3 | 698 | // package and send on wifi data queue |
| ocomeni | 82:10072c1794d3 | 699 | wifi_data_msg_t data_msg; |
| ocomeni | 82:10072c1794d3 | 700 | data_msg.wifi_cmd = WIFI_CMD_CONFIG; |
| ocomeni | 82:10072c1794d3 | 701 | data_msg.dataLen = sizeof(wifi_config_t); |
| ocomeni | 82:10072c1794d3 | 702 | memcpy(data_msg.buffer,&wifi_cfg, data_msg.dataLen); |
| ocomeni | 82:10072c1794d3 | 703 | queueWiFiDataRequest(data_msg); |
| ocomeni | 82:10072c1794d3 | 704 | _parser.send("OK\n"); |
| ocomeni | 82:10072c1794d3 | 705 | } else { |
| ocomeni | 82:10072c1794d3 | 706 | printf("\n[ATCMD MAN]: wifi configuration failed \n"); |
| ocomeni | 82:10072c1794d3 | 707 | _parser.send("NAK\n"); |
| ocomeni | 82:10072c1794d3 | 708 | } |
| ocomeni | 84:7c7add00f4bf | 709 | //_smutex.unlock(); |
| ocomeni | 82:10072c1794d3 | 710 | } |
| ocomeni | 82:10072c1794d3 | 711 | |
| ocomeni | 82:10072c1794d3 | 712 | void ATCmdManager::_oob_setWiFiSecurity() |
| ocomeni | 82:10072c1794d3 | 713 | { |
| ocomeni | 82:10072c1794d3 | 714 | int n; |
| ocomeni | 82:10072c1794d3 | 715 | wifi_config_t wifi_cfg = init_wifi_config(); |
| ocomeni | 84:7c7add00f4bf | 716 | //_smutex.lock(); |
| ocomeni | 82:10072c1794d3 | 717 | n = _parser.scanf(",%d", &wifi_cfg.security); |
| ocomeni | 82:10072c1794d3 | 718 | if(n>0) |
| ocomeni | 82:10072c1794d3 | 719 | { |
| ocomeni | 82:10072c1794d3 | 720 | printf("ATCMD MAN]: wifi_cfg.security = %s\n", sec2str(wifi_cfg.security)); |
| ocomeni | 82:10072c1794d3 | 721 | // package and send on wifi data queue |
| ocomeni | 82:10072c1794d3 | 722 | wifi_data_msg_t data_msg; |
| ocomeni | 82:10072c1794d3 | 723 | data_msg.wifi_cmd = WIFI_CMD_CONFIG; |
| ocomeni | 82:10072c1794d3 | 724 | data_msg.dataLen = sizeof(wifi_config_t); |
| ocomeni | 82:10072c1794d3 | 725 | memcpy(data_msg.buffer,&wifi_cfg, data_msg.dataLen); |
| ocomeni | 82:10072c1794d3 | 726 | queueWiFiDataRequest(data_msg); |
| ocomeni | 82:10072c1794d3 | 727 | _parser.send("OK\n"); |
| ocomeni | 82:10072c1794d3 | 728 | } else { |
| ocomeni | 82:10072c1794d3 | 729 | printf("\n[ATCMD MAN]: wifi configuration failed \n"); |
| ocomeni | 82:10072c1794d3 | 730 | _parser.send("NAK\n"); |
| ocomeni | 82:10072c1794d3 | 731 | } |
| ocomeni | 84:7c7add00f4bf | 732 | //_smutex.unlock(); |
| ocomeni | 79:a2187bbfa407 | 733 | } |
| ocomeni | 81:637a87eb8170 | 734 | |
| ocomeni | 83:9c271a50a70b | 735 | |
| ocomeni | 83:9c271a50a70b | 736 | void ATCmdManager::_oob_sendHttpMessage() |
| ocomeni | 83:9c271a50a70b | 737 | { |
| ocomeni | 83:9c271a50a70b | 738 | int n; |
| ocomeni | 84:7c7add00f4bf | 739 | http_request_t http_post_request; |
| ocomeni | 84:7c7add00f4bf | 740 | //_smutex.lock(); |
| ocomeni | 83:9c271a50a70b | 741 | /* |
| ocomeni | 83:9c271a50a70b | 742 | n = _parser.scanf(",%d", &wifi_cfg.security); |
| ocomeni | 83:9c271a50a70b | 743 | if(n>0) |
| ocomeni | 83:9c271a50a70b | 744 | { |
| ocomeni | 83:9c271a50a70b | 745 | printf("ATCMD MAN]: wifi_cfg.security = %s\n", sec2str(wifi_cfg.security)); |
| ocomeni | 83:9c271a50a70b | 746 | // package and send on wifi data queue |
| ocomeni | 83:9c271a50a70b | 747 | wifi_data_msg_t data_msg; |
| ocomeni | 83:9c271a50a70b | 748 | data_msg.wifi_cmd = WIFI_CMD_CONFIG; |
| ocomeni | 83:9c271a50a70b | 749 | data_msg.dataLen = sizeof(wifi_config_t); |
| ocomeni | 83:9c271a50a70b | 750 | memcpy(data_msg.buffer,&wifi_cfg, data_msg.dataLen); |
| ocomeni | 83:9c271a50a70b | 751 | queueWiFiDataRequest(data_msg); |
| ocomeni | 83:9c271a50a70b | 752 | _parser.send("OK\n"); |
| ocomeni | 83:9c271a50a70b | 753 | } else { |
| ocomeni | 83:9c271a50a70b | 754 | printf("\n[ATCMD MAN]: wifi configuration failed \n"); |
| ocomeni | 83:9c271a50a70b | 755 | _parser.send("NAK\n"); |
| ocomeni | 83:9c271a50a70b | 756 | } |
| ocomeni | 83:9c271a50a70b | 757 | */ |
| ocomeni | 84:7c7add00f4bf | 758 | //_smutex.unlock(); |
| ocomeni | 83:9c271a50a70b | 759 | |
| ocomeni | 83:9c271a50a70b | 760 | } |
| ocomeni | 83:9c271a50a70b | 761 | |
| ocomeni | 81:637a87eb8170 | 762 | bool ATCmdManager::queueWiFiCommand(wifi_cmd_t cmd){ |
| ocomeni | 81:637a87eb8170 | 763 | wifi_cmd_message_t *wifiCmd = _aT2WiFimPool->alloc(); |
| ocomeni | 81:637a87eb8170 | 764 | wifiCmd->wifi_cmd = cmd; |
| ocomeni | 81:637a87eb8170 | 765 | _aT2WiFiCmdQueue->put(wifiCmd); |
| ocomeni | 81:637a87eb8170 | 766 | return true; |
| ocomeni | 81:637a87eb8170 | 767 | } |
| ocomeni | 81:637a87eb8170 | 768 | |
| ocomeni | 81:637a87eb8170 | 769 | bool ATCmdManager::dequeueATresponse(){ |
| ocomeni | 81:637a87eb8170 | 770 | if(at_resp != AT_RESP_NONE) return false; // busy |
| ocomeni | 81:637a87eb8170 | 771 | osEvent evt = _wiFi2ATCmdQueue->get(0); |
| ocomeni | 81:637a87eb8170 | 772 | if(evt.status == osEventMessage){ |
| ocomeni | 81:637a87eb8170 | 773 | at_resp_message_t *resp = (at_resp_message_t*)evt.value.p; |
| ocomeni | 81:637a87eb8170 | 774 | setNextResponse(resp->at_resp); |
| ocomeni | 81:637a87eb8170 | 775 | _wiFi2ATmPool->free(resp); |
| ocomeni | 81:637a87eb8170 | 776 | } |
| ocomeni | 81:637a87eb8170 | 777 | return true; |
| ocomeni | 81:637a87eb8170 | 778 | } |
| ocomeni | 81:637a87eb8170 | 779 | |
| ocomeni | 81:637a87eb8170 | 780 | bool ATCmdManager::queueWiFiDataRequest(wifi_data_msg_t data_req){ |
| ocomeni | 81:637a87eb8170 | 781 | wifi_data_msg_t *wifiData = _aT2WiFiDatamPool->alloc(); |
| ocomeni | 81:637a87eb8170 | 782 | wifiData->wifi_cmd = data_req.wifi_cmd; |
| ocomeni | 81:637a87eb8170 | 783 | wifiData->dataLen = data_req.dataLen; |
| ocomeni | 81:637a87eb8170 | 784 | memcpy(wifiData->buffer, data_req.buffer, data_req.dataLen); |
| ocomeni | 81:637a87eb8170 | 785 | _aT2WiFiDataQueue->put(wifiData); |
| ocomeni | 81:637a87eb8170 | 786 | printf("[ATCMD MAN] queued data size = %d : wifi_cmd = %d\n", data_req.dataLen, data_req.wifi_cmd); |
| ocomeni | 84:7c7add00f4bf | 787 | //free(&data_req); |
| ocomeni | 81:637a87eb8170 | 788 | return true; |
| ocomeni | 81:637a87eb8170 | 789 | } |
| ocomeni | 81:637a87eb8170 | 790 | |
| ocomeni | 81:637a87eb8170 | 791 | bool ATCmdManager::dequeueATdataResponse(){ |
| ocomeni | 81:637a87eb8170 | 792 | if(at_resp != AT_RESP_NONE) return false; // busy |
| ocomeni | 81:637a87eb8170 | 793 | osEvent evt = _wiFi2ATDataQueue->get(0); |
| ocomeni | 81:637a87eb8170 | 794 | if(evt.status == osEventMessage){ |
| ocomeni | 81:637a87eb8170 | 795 | resp_data = (at_data_msg_t*)evt.value.p; |
| ocomeni | 81:637a87eb8170 | 796 | setNextResponse(resp_data->at_resp); |
| ocomeni | 81:637a87eb8170 | 797 | //_wiFi2ATDatamPool->free(resp_data); |
| ocomeni | 81:637a87eb8170 | 798 | } |
| ocomeni | 81:637a87eb8170 | 799 | return true; |
| ocomeni | 81:637a87eb8170 | 800 | } |
| ocomeni | 81:637a87eb8170 | 801 | |
| ocomeni | 81:637a87eb8170 | 802 | |
| ocomeni | 81:637a87eb8170 | 803 |