Diff: source/ATCmdManager.h

Branch:

PassingRegression

Revision:

119:8d939a902333

Parent:

118:8df0e9c2ee3f

Child:

120:779b74689747

--- a/source/ATCmdManager.h	Sat May 25 16:25:42 2019 +0000
+++ b/source/ATCmdManager.h	Mon May 27 12:34:58 2019 +0000
@@ -16,6 +16,7 @@
 #define OK_RESP    "\r\nOK\r\n"
 #define ERROR_RESP "\r\nERROR\r\n"
 #define WIFI_BUSY_RESP "\r\nWIFI BUSY\r\n"
+#define UART_TIMEOUT_ERROR "\r\nUART TIMEOUT ERROR\r\n"
 #define BOX_UBLOX_DEMO_TESTING
 //extern void print_memory_info();
 //extern void blinkLEDs();
@@ -43,14 +44,13 @@
 
 private:
 // UART settings
+    UARTSerial _serial;
     uart_config_t *uart_config;
-    UARTSerial _serial;
     Mutex _smutex; // Protect serial port access
     Mutex _rmutex; // Reset protection
     // define event queue
     events::EventQueue &_event_queue;
     // AT Command Parser
-    ATCmdParser _parser;
     SMDevicePeripheral *blePeripheral;
     WiFiManager *wiFiManager;
     at_cmd_resp_t at_resp;
@@ -82,10 +82,13 @@
     /*  Queue and memory pool for BLE to AT data */
     MemoryPool<ble_at_msg_t, PQDSZ_BLE> *_ble2ATDatamPool;
     Queue<ble_at_msg_t, PQDSZ_BLE> *_ble2ATDataQueue;
+    ATCmdParser _parser;
 
     
-    //pointer to response data - should be deleted after processing
+    //pointer to wifi response data - should be deleted after processing
     at_data_msg_t *resp_data;
+    //pointer to ble response data - should be deleted after processing
+    ble_at_msg_t *ble_resp_data;
     edm_header_t   edm_hdr;
     uint8_t        *rx_buf_ptr;
     int            debug_flag;
@@ -152,6 +155,8 @@
     int         readAtCommandString(char *strbuf, size_t bufLen);
     void        updateWiFiMgrStatus();
     void        sendBleDataEvent(const char *buf, int len);
+    void        sendBleAtEvent(const char *buf, int len);
+    void        sendBleConnectEvent(const char *buf, int len);
     
     /**
     * Allows timeout to be changed between commands