Add LoRaWAN and Wi-SUN drivers (Merge pull request #16 from okrasolar/master)

Author: dmohns

cicada/circularbuffer.h

@@ -186,6 +186,21 @@ template <typename T> class CircularBuffer
         return _bufferSize;
     }
 
+    /*!
+     * Rewinds the read head.
+     * Useful to re-read old data which has been pulled before.
+     * \param num number of entries to rewind the read head
+     */
+    virtual void rewindReadHead(Size num)
+    {
+        if (num <= _readHead) {
+            _readHead -= num;
+        } else {
+            _readHead = _bufferSize + _readHead - num;
+        }
+        _availableData += num;
+    }
+
   private:
     Size _writeHead;
     Size _readHead;

cicada/commdevices/cc1352p7.cpp

@@ -156,18 +156,14 @@ void CC1352P7CommDevice::run()
     }
 
     // If a modem reset is pending, handle it
-    if (_stateBooleans & RESET_PENDING) {
+    if (_stateBooleans & RESET_PENDING && _bytesToWrite == 0) {
         _serial.flushReceiveBuffers();
         _bytesToRead = 0;
         _bytesToReceive = 0;
-        _bytesToWrite = 0;
         _sendState = sendCipclose;
         _replyState = okReply;
         _waitForReply = NULL;
         _stateBooleans &= ~RESET_PENDING;
-        if (_connectState >= intermediate) {
-            connect();
-        }
     }
 
     // Buffer data from the modem
@@ -180,8 +176,7 @@ void CC1352P7CommDevice::run()
         logStates(_sendState, _replyState);
 
         // Handle error states
-        if (strncmp(_lineBuffer, "ERROR", 5) == 0
-            || (_sendState >= connected && strncmp(_lineBuffer, "SEND FAIL", 9) == 0)) {
+        if (strncmp(_lineBuffer, "ERROR", 5) == 0 ) {
             _stateBooleans |= RESET_PENDING;
             _connectState = generalError;
             _waitForReply = NULL;
@@ -230,7 +225,8 @@ void CC1352P7CommDevice::run()
             if (strncmp(_lineBuffer, "+IPD,", 4) == 0) {
                 _bytesToReceive = strtol(_lineBuffer + 5, NULL, 10);
                 _stateBooleans |= DATA_PENDING;
-            } else if (strncmp(_lineBuffer, "CLOSED", 6) == 0) {
+            } else if (strncmp(_lineBuffer, "CLOSED", 6) == 0 ||
+                       strncmp(_lineBuffer, "SEND FAIL", 9) == 0) {
                 _stateBooleans &= ~IP_CONNECTED;
             }
         }
@@ -274,6 +270,8 @@ void CC1352P7CommDevice::run()
         break;
 
     case connecting:
+        if (handleDisconnect(notConnected))
+            break;
         _connectState = IPCommDevice::intermediate;
         _stateBooleans |= LINE_READ;
         _waitForReply = _okStr;

cicada/commdevices/espressif.cpp

@@ -179,12 +179,7 @@ void EspressifDevice::run()
     // If a modem reset is pending, handle it
     if (_stateBooleans & RESET_PENDING) {
         _serial.flushReceiveBuffers();
-        if (_sendState >= connecting && _sendState <= receiving
-            && !(_stateBooleans & DISCONNECT_PENDING)) {
-            _sendState = connecting;
-        } else {
-            _sendState = notConnected;
-        }
+        _sendState = notConnected;
         _stateBooleans = LINE_READ;
         _bytesToRead = 0;
         _bytesToReceive = 0;
@@ -328,6 +323,8 @@ void EspressifDevice::run()
         break;
 
     case connecting:
+        if (handleDisconnect(notConnected))
+            break;
         setDelay(10);
         _connectState = IPCommDevice::intermediate;
         _stateBooleans |= LINE_READ;

cicada/commdevices/espressif.h

@@ -55,7 +55,8 @@ class EspressifDevice : public ATCommDevice
 
     /*!
      * Set's the wifi network SSID.
-     * \param ssid The network SSID
+     * \param ssid The network SSID Note: The ssid is *not* copied, the string
+     * needs to be valid during the lifetime of EspressifDevice object!
      */
     virtual void setSSID(const char* ssid);
 

cicada/commdevices/ipcommdevice.cpp

@@ -59,6 +59,7 @@ bool IPCommDevice::connect()
     if (_host == NULL || _port == 0)
         return false;
 
+    _stateBooleans &= ~DISCONNECT_PENDING;
     _stateBooleans |= CONNECT_PENDING;
 
     return true;
@@ -69,6 +70,7 @@ void IPCommDevice::disconnect()
     if (isIdle())
         return;
 
+    _stateBooleans &= ~CONNECT_PENDING;
     _stateBooleans |= DISCONNECT_PENDING;
 }