fixup! [WIP] Improving parse function in modem class

Author: andreagilardoni

libraries/WiFiS3/src/Modem.cpp

@@ -141,16 +141,16 @@ ModemClass::ParseResult ModemClass::buf_read(const string &prompt, string &data_
     *   + "+COMMAND: 4| 123OK<CR><LF>"
     */
    enum class at_parse_state_t {
-      Begin,
-      Cmd,
-      Data,
-      Sized,
-      ResWaitLF,
-      Res,
-      Error,
-      ParseError,
-      Ok,
-      Completed,
+      Begin       = 0,
+      Cmd         = 1,
+      Data        = 2,
+      Sized       = 3,
+      ResWaitLF   = 4,
+      Res         = 5,
+      Error       = 6,
+      ParseError  = 7,
+      Ok          = 8,
+      Completed   = 9,
    };
 
    at_parse_state_t state = at_parse_state_t::Begin;
@@ -189,6 +189,9 @@ ModemClass::ParseResult ModemClass::buf_read(const string &prompt, string &data_
             } else {
                _serial_debug->print(c);
             }
+         } else if(_serial_debug  && _debug_level >= 2) {
+            _serial_debug->print(" State ");
+            _serial_debug->println((int)state);
          }
 
          switch(state) {
@@ -289,9 +292,11 @@ ModemClass::ParseResult ModemClass::buf_read(const string &prompt, string &data_
             } if(c == RESULT_OK[0]) { // OK response
                res = Ok;
                state = at_parse_state_t::Ok;
+               result_parse = 1;
             } else if(c == RESULT_ERROR[0]) { // Error response
                res = Error;
                state = at_parse_state_t::Error;
+               result_parse = 1;
             }
             // if we uncomment this we can force strict response matching
             // else {
@@ -303,8 +308,7 @@ ModemClass::ParseResult ModemClass::buf_read(const string &prompt, string &data_
              * In this state we want to match the exact 'K<CR><LF>' response
              */
 
-            if(c != RESULT_OK[++result_parse]) {
-               _serial_debug->println("pippo");
+            if(c != RESULT_OK[result_parse++]) {
                state = at_parse_state_t::ParseError;
             }
 
@@ -317,7 +321,7 @@ ModemClass::ParseResult ModemClass::buf_read(const string &prompt, string &data_
              * In this state we want to match the exact 'RROR<CR><LF>' response
              */
 
-            if(c != RESULT_ERROR[++result_parse]) {
+            if(c != RESULT_ERROR[result_parse++]) {
                state = at_parse_state_t::ParseError;
             }