added selectable debug to modem

Former-commit-id: d2b190a

Author: maidnl

libraries/WiFiS3/examples/WiFiWebClient/WiFiWebClient.ino

@@ -18,9 +18,8 @@
  */
 
 
-#include "WiFi.h"
-#include "WiFiClient.h"
-#include "IPAddress.h"
+#include "WiFiS3.h"
+
 
 #include "arduino_secrets.h" 
 
@@ -44,7 +43,7 @@ WiFiClient client;
 void setup() {
 /* -------------------------------------------------------------------------- */  
   //Initialize serial and wait for port to open:
-  Serial.begin(115200);
+  Serial.begin(9600);
   while (!Serial) {
     ; // wait for serial port to connect. Needed for native USB port only
   }
@@ -57,7 +56,7 @@ void setup() {
   }
 
   String fv = WiFi.firmwareVersion();
-  if (fv < WiFi_FIRMWARE_LATEST_VERSION) {
+  if (fv < WIFI_FIRMWARE_LATEST_VERSION) {
     Serial.println("Please upgrade the firmware");
   }
 

libraries/WiFiS3/src/Modem.cpp

@@ -193,19 +193,24 @@ bool ModemClass::buf_read(const string &prompt, string &data_res) {
       while( _serial->available() ){
          char c = _serial->read();
          data_res += c;
+         #ifdef SELECTABLE_MODEM_DEBUG
+         if(enable_dbg) {
+            Serial.print(c);
+         }
+         #endif
 
          if(read_by_size) {
             if(read_by_size_finished(data_res)) {
                found = true;
                read_by_size = false;
                res = true;
-               data_res = data_res.substr(0, data_res.length() - sizeof(RESULT_OK));
+               data_res = data_res.substr(0, data_res.length() - (sizeof(RESULT_OK) - 1));
             }
          }
          else {
             if(string::npos != data_res.rfind(RESULT_DATA)) {
                found = true;
-               data_res = data_res.substr(0, data_res.length() - sizeof(RESULT_DATA));
+               data_res = data_res.substr(0, data_res.length() - (sizeof(RESULT_DATA) - 1));
                if(prompt != DO_NOT_CHECK_CMD) {
                   if(removeAtBegin(data_res, prompt)) {
                      res = true;
@@ -218,7 +223,7 @@ bool ModemClass::buf_read(const string &prompt, string &data_res) {
             }
             else if(string::npos != data_res.rfind(RESULT_OK)){
                found = true;
-               data_res = data_res.substr(0, data_res.length() - sizeof(RESULT_OK));
+               data_res = data_res.substr(0, data_res.length() - (sizeof(RESULT_OK) - 1) );
                if(prompt != DO_NOT_CHECK_CMD) {
                   if(removeAtBegin(data_res, prompt)) {
                      res = true;
@@ -230,7 +235,7 @@ bool ModemClass::buf_read(const string &prompt, string &data_res) {
                break;
             } 
             else if (string::npos != data_res.rfind(RESULT_ERROR)) {
-               data_res.substr(0, data_res.length() - sizeof(RESULT_ERROR));
+               data_res.substr(0, data_res.length() - (sizeof(RESULT_ERROR) - 1));
                res = false;
                break;
             }

libraries/WiFiS3/src/Modem.h

@@ -9,6 +9,7 @@
 //#define MODEM_DEBUG
 //#define MODEM_DEBUG_PASSTHROUGH
 #define MODEM_TIMEOUT  10000
+//#define SELECTABLE_MODEM_DEBUG
 #define MAX_BUFF_SIZE  64
 
 #define DO_NOT_CHECK_CMD "NO_CMD_CHECK"
@@ -39,6 +40,11 @@ class ModemClass {
   } 
   bool beginned;
 
+  #ifdef SELECTABLE_MODEM_DEBUG
+  bool enable_dbg = false;
+  void debug(bool e) {enable_dbg = e;}
+  #endif
+
 private:
   bool buf_read(const string &cmd, string &data_res);
   bool delete_serial;