Merge remote-tracking branch 'origin/wifi_leven_dev' into modem_fix

maidnl · maidnl · commit 35993a06d1b4 · 2023-05-19T11:34:51.000+02:00
Former-commit-id: a6aaa88
diff --git a/extras/santiago-leven-usb-bridge b/extras/santiago-leven-usb-bridge
@@ -1 +1 @@
-Subproject commit 27c7393c47afdc44170c02330eb98269eaea91a5
+Subproject commit 60cb657e729b06c94f8400160854525c1b3f39a3
diff --git a/libraries/WiFiS3/src/Modem.cpp b/libraries/WiFiS3/src/Modem.cpp
@@ -56,7 +56,6 @@ bool ModemClass::buf_read(const string &prompt, string &data_res) {
       while(_serial->available()){
          char c = _serial->read();
          data_res += c;
-         //Serial.print(c);
          if(string::npos != data_res.rfind(PROMPT_OK)){
             found = true;
             data_res = data_res.substr(0, data_res.length() - sizeof(PROMPT_OK));
diff --git a/libraries/WiFiS3/src/WiFi.cpp b/libraries/WiFiS3/src/WiFi.cpp
@@ -300,7 +300,11 @@ uint8_t CWifi::encryptionType() {
 /* -------------------------------------------------------------------------- */
 uint8_t CWifi::status() {
 /* -------------------------------------------------------------------------- */   
-  return 0;
+   string res = "";
+   if(modem.write(string(PROMPT(_GETSTATUS)), res, CMD_READ(_GETSTATUS))) {
+      return atoi(res.c_str());
+   }
+   return 0;
 }
 
 /* -------------------------------------------------------------------------- */
