fixup! [WIP] Improving parse function in modem class

Author: andreagilardoni

libraries/WiFiS3/src/Modem.cpp

@@ -57,9 +57,9 @@ bool ModemClass::passthrough(const uint8_t *data, size_t size) {
       _serial_debug->println(data_res.c_str());
       if(res == Ok) {
          _serial_debug->println("   Result: OK");
-      } else if(res = Error) {
+      } else if(res == Error) {
          _serial_debug->println("   Result: ERROR");
-      } else if(res = Timeout) {
+      } else if(res == Timeout) {
          _serial_debug->println("   Result: TIMEOUT");
       } else {
          _serial_debug->println("   Result: ParseError");
@@ -112,9 +112,9 @@ bool ModemClass::write(const string &prompt, string &data_res, const char * fmt,
       _serial_debug->println(data_res.c_str());
       if(res == Ok) {
          _serial_debug->println("   Result: OK");
-      } else if(res = Error) {
+      } else if(res == Error) {
          _serial_debug->println("   Result: ERROR");
-      } else if(res = Timeout) {
+      } else if(res == Timeout) {
          _serial_debug->println("   Result: TIMEOUT");
       } else {
          _serial_debug->println("   Result: ParseError");
@@ -167,13 +167,16 @@ ModemClass::ParseResult ModemClass::buf_read(const string &prompt, string &data_
    }
 
    unsigned long start_time = millis();
-   while(state != at_parse_state_t::Completed) {
+   while(state != at_parse_state_t::Completed &&
+         state != at_parse_state_t::ParseError) {
       if(millis() - start_time > _timeout) {
          res = Timeout;
          break;
       }
 
-      while(_serial->available() && state != at_parse_state_t::Completed) {
+      while(_serial->available() &&
+            state != at_parse_state_t::Completed &&
+            state != at_parse_state_t::ParseError) {
          char c = _serial->read();
          if(_serial_debug  && _debug_level >= 1) {
             if(c == '\n') {
@@ -207,8 +210,10 @@ ModemClass::ParseResult ModemClass::buf_read(const string &prompt, string &data_
                state = at_parse_state_t::Cmd;
             } else if(c == RESULT_OK[result_parse]) { // FIXME this should also account for following characters
                state = at_parse_state_t::Ok;
+               result_parse++;
             } else if(c == RESULT_ERROR[result_parse]) { // FIXME this should also account for following characters
                state = at_parse_state_t::Error;
+               result_parse++;
             } else {
                data_res = "";
             }
@@ -290,11 +295,9 @@ ModemClass::ParseResult ModemClass::buf_read(const string &prompt, string &data_
                res = Error;
                state = at_parse_state_t::Completed;
             } 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;
             }
@@ -313,6 +316,7 @@ ModemClass::ParseResult ModemClass::buf_read(const string &prompt, string &data_
             }
 
             if(result_parse == strlen(RESULT_OK)) {
+               res = Ok;
                state = at_parse_state_t::Completed;
             }
             break;
@@ -326,6 +330,7 @@ ModemClass::ParseResult ModemClass::buf_read(const string &prompt, string &data_
             }
 
             if(result_parse == strlen(RESULT_ERROR)) {
+               res = Error;
                state = at_parse_state_t::Completed;
             }
             break;