bug fixing on Modem, plus setting soft AP ip address

maidnl · maidnl · commit ea1747597faa · 2023-05-31T18:17:28.000+02:00
Former-commit-id: bca036a
diff --git a/libraries/WiFiS3/examples/AP_SimpleWebServer/AP_SimpleWebServer.ino b/libraries/WiFiS3/examples/AP_SimpleWebServer/AP_SimpleWebServer.ino
@@ -16,16 +16,14 @@
   adapted to WiFi AP by Adafruit
  */
 
-#include "WiFi.h"
-#include "WiFiServer.h"
-
-
+#include "WiFiS3.h"
 
 #include "arduino_secrets.h" 
+
 ///////please enter your sensitive data in the Secret tab/arduino_secrets.h
 char ssid[] = SECRET_SSID;        // your network SSID (name)
-char pass[] = SECRET_PASS;    // your network password (use for WPA, or use as key for WEP)
-int keyIndex = 0;                // your network key index number (needed only for WEP)
+char pass[] = SECRET_PASS;        // your network password (use for WPA, or use as key for WEP)
+int keyIndex = 0;                 // your network key index number (needed only for WEP)
 
 int led =  LED_BUILTIN;
 int status = WL_IDLE_STATUS;
@@ -49,13 +47,13 @@ void setup() {
   }
 
   String fv = WiFi.firmwareVersion();
-  if (fv < WiFi_FIRMWARE_LATEST_VERSION) {
+  if (fv < WIFI_FIRMWARE_LATEST_VERSION) {
     Serial.println("Please upgrade the firmware");
   }
 
   // by default the local IP address will be 192.168.4.1
   // you can override it with the following:
-  //WiFi.config(IPAddress(10, 10, 5, 1));
+  WiFi.config(IPAddress(192,48,56,2));
 
   // print the network name (SSID);
   Serial.print("Creating access point named: ");
@@ -81,17 +79,18 @@ void setup() {
 
 
 void loop() {
+  
   // compare the previous status to the current status
-  if (status != WiFi.status()) {
+  if (1/*status != WiFi.status()*/) {
     // it has changed update the variable
-    status = WiFi.status();
+    /*status = WiFi.status()*/
 
     if (status == WL_AP_CONNECTED) {
       // a device has connected to the AP
-      Serial.println("Device connected to AP");
+      //Serial.println("Device connected to AP");
     } else {
       // a device has disconnected from the AP, and we are back in listening mode
-      Serial.println("Device disconnected from AP");
+      //Serial.println("Device disconnected from AP");
     }
   }
   
@@ -117,8 +116,8 @@ void loop() {
             client.println();
 
             // the content of the HTTP response follows the header:
-            client.print("<p style=\"font-size:7vw;\">Click <a href=\"/H\">here</a> turn the LED off<br></p>");
-            client.print("<p style=\"font-size:7vw;\">Click <a href=\"/L\">here</a> turn the LED on<br></p>");
+            client.print("<p style=\"font-size:7vw;\">Click <a href=\"/H\">here</a> turn the LED on<br></p>");
+            client.print("<p style=\"font-size:7vw;\">Click <a href=\"/L\">here</a> turn the LED off<br></p>");
 
             // The HTTP response ends with another blank line:
             client.println();
diff --git a/libraries/WiFiS3/src/Modem.cpp b/libraries/WiFiS3/src/Modem.cpp
@@ -153,7 +153,8 @@ bool ModemClass::read_by_size_finished(string &rx) {
          int pos_space = rx.find(" ");
          if(pos != string::npos && pos_space != string::npos) {
             string n = rx.substr(pos_space,pos);
-            data_to_be_received = atoi(n.c_str());
+            /* add 4 because OK\r\n is always added at the end of data */
+            data_to_be_received = atoi(n.c_str()) + 4;
             rx.clear();
             data_received = 0;
             st = WAIT_FOR_DATA; 
@@ -178,6 +179,8 @@ bool ModemClass::read_by_size_finished(string &rx) {
    return rv;
 }
 
+
+
 /* -------------------------------------------------------------------------- */
 bool ModemClass::buf_read(const string &prompt, string &data_res) {
 /* -------------------------------------------------------------------------- */   
@@ -186,29 +189,15 @@ bool ModemClass::buf_read(const string &prompt, string &data_res) {
    
    unsigned long start_time = millis();
    while((millis() - start_time < _timeout) && !found){
-      while(_serial->available()){
+      while( _serial->available() ){
          char c = _serial->read();
          data_res += c;
-         
+            
          if(read_by_size) {
             if(read_by_size_finished(data_res)) {
                found = true;
                read_by_size = false;
                res = true;
-               
-               unsigned long start = millis();
-               bool ok_found = false;
-               while(millis() - start < _timeout && !ok_found) {
-                  string ok = "";
-                  while(_serial->available()){
-                     char c = _serial->read();
-                     ok += c;
-                     if(ok.size() - ok.rfind("OK\r\n") == 4 && ok.rfind("OK\r\n") != string::npos) {
-                        ok_found = true;
-                        break;
-                     }
-                  }
-               }
             }
          }
          else {
diff --git a/libraries/WiFiS3/src/WiFi.cpp b/libraries/WiFiS3/src/WiFi.cpp
@@ -31,8 +31,7 @@ const char* CWifi::firmwareVersion() {
 /* -------------------------------------------------------------------------- */
 int CWifi::begin(const char* ssid) {
 /* -------------------------------------------------------------------------- */
-
-   return 0;
+   return begin(ssid,nullptr);;
 }
 
 /* -------------------------------------------------------------------------- */
@@ -42,9 +41,15 @@ int CWifi::begin(const char* ssid, const char *passphrase) {
    modem.begin();
    modem.write(string(PROMPT(_MODE)),res, "%s%d\r\n" , CMD_WRITE(_MODE), 1);
    
-
-   if(!modem.write(string(PROMPT(_BEGINSTA)),res, "%s%s,%s\r\n" , CMD_WRITE(_BEGINSTA), ssid, passphrase)) {
-      return WL_CONNECT_FAILED;
+   if(passphrase == nullptr) {
+      if(!modem.write(string(PROMPT(_BEGINSTA)),res, "%s%s\r\n" , CMD_WRITE(_BEGINSTA), ssid)) {
+         return WL_CONNECT_FAILED;
+      }
+   }
+   else {
+      if(!modem.write(string(PROMPT(_BEGINSTA)),res, "%s%s,%s\r\n" , CMD_WRITE(_BEGINSTA), ssid, passphrase)) {
+         return WL_CONNECT_FAILED;
+      }
    }
 
    unsigned long start_time = millis();
@@ -83,24 +88,21 @@ uint8_t CWifi::beginAP(const char *ssid, const char* passphrase, uint8_t channel
    modem.write(string(PROMPT(_MODE)),res, "%s%d\r\n" , CMD_WRITE(_MODE), 2);
 
    if(!modem.write(string(PROMPT(_BEGINSOFTAP)),res, "%s%s,%s,%d\r\n" , CMD_WRITE(_BEGINSOFTAP), ssid, passphrase, channel)) {
-      return WL_CONNECT_FAILED;
+      return WL_AP_FAILED;
    }
 
    if(atoi(res.c_str()) == 1) {
-      return true;
+      return WL_AP_LISTENING;
    }
 
-   return false;
+   return WL_AP_FAILED;
 }
 
-
-
-
 /* -------------------------------------------------------------------------- */
 void CWifi::config(IPAddress local_ip) {
 /* -------------------------------------------------------------------------- */
+  
   IPAddress _gw(local_ip[0],local_ip[1], local_ip[2], 1);
-  Serial.println(_gw);
   IPAddress _sm(255,255,255,0);
   IPAddress dns(0,0,0,0);
   return _config(local_ip, _gw, _sm,dns,dns);
@@ -136,7 +138,12 @@ void CWifi::_config(IPAddress local_ip, IPAddress gateway, IPAddress subnet, IPA
           _dns2 += to_string(dns2[2]) + ".";
           _dns2 += to_string(dns2[3]);              
 
-   modem.write(string(PROMPT(_SETIP)),res, "%s%s,%s,%s,%s,%s\r\n" , CMD_WRITE(_SETIP), ip.c_str(), gw.c_str(), nm.c_str(),_dns1.c_str(),_dns2.c_str());
+   ip_ap = local_ip;
+   gw_ap = gateway;
+   nm_ap = subnet;
+
+   modem.write(PROMPT(_SOFTAPCONFIG),res, "%s%s,%s,%s\r\n" , CMD_WRITE(_SOFTAPCONFIG), ip.c_str(), ip.c_str(), nm.c_str());
+   modem.write(string(PROMPT(_SETIP)),res, "%s%s,%s,%s,%s,%s\r\n" , CMD_WRITE(_SETIP), ip.c_str(), gw.c_str(), nm.c_str(),_dns1.c_str(),_dns2.c_str());   
 }
 
 /* -------------------------------------------------------------------------- */
@@ -152,6 +159,7 @@ void CWifi::config(IPAddress local_ip, IPAddress dns_server) {
 /* -------------------------------------------------------------------------- */
 void CWifi::config(IPAddress local_ip, IPAddress dns_server, IPAddress gateway) {
 /* -------------------------------------------------------------------------- */  
+   
    IPAddress _sm(255,255,255,0);
    IPAddress dns(0,0,0,0);
    return _config(local_ip, gateway, _sm,dns_server,dns); 
@@ -160,6 +168,7 @@ void CWifi::config(IPAddress local_ip, IPAddress dns_server, IPAddress gateway)
 /* -------------------------------------------------------------------------- */
 void CWifi::config(IPAddress local_ip, IPAddress dns_server, IPAddress gateway, IPAddress subnet) {
 /* -------------------------------------------------------------------------- */
+   
    IPAddress dns(0,0,0,0);
    return _config(local_ip, gateway, subnet,dns_server,dns); 
 }
@@ -181,7 +190,7 @@ void CWifi::setDNS(IPAddress dns_server1, IPAddress dns_server2) {
 void CWifi::setHostname(const char* name) {
 /* -------------------------------------------------------------------------- */
    string res = "";
-   modem.write(string(DO_NOT_CHECK_CMD),res, "%s%s\r\n" , CMD_WRITE(_BEGINSOFTAP), name);
+   modem.write(string(_HOSTNAME),res, "%s%s\r\n" , CMD_WRITE(_HOSTNAME), name);
 }
 
 /* -------------------------------------------------------------------------- */
@@ -323,11 +332,23 @@ IPAddress CWifi::localIP() {
 /* -------------------------------------------------------------------------- */
    modem.begin();
    string res = "";
-   if(modem.write(string(PROMPT(_IPSTA)),res, "%s%d\r\n" , CMD_WRITE(_IPSTA), IP_ADDR)) {
-      IPAddress local_IP;
-      local_IP.fromString(res.c_str());
-      return local_IP;
+   if(modem.write(string(PROMPT(_MODE)),res, "%s" , CMD_READ(_MODE)))  {
+      if(atoi(res.c_str()) == 1) {
+         if(modem.write(string(PROMPT(_IPSTA)),res, "%s%d\r\n" , CMD_WRITE(_IPSTA), IP_ADDR)) {
+            IPAddress local_IP;
+            local_IP.fromString(res.c_str());
+            return local_IP;
+         }
+      }
+      else if(atoi(res.c_str()) == 2) {
+         if(modem.write(string(PROMPT(_IPSOFTAP)),res,  CMD(_IPSOFTAP))) {
+            IPAddress local_IP;
+            local_IP.fromString(res.c_str());
+            return local_IP;
+         }
+      }
    }
+
    return IPAddress(0,0,0,0);
 }
 
@@ -432,8 +453,17 @@ uint8_t CWifi::channel(uint8_t networkItem) {
 const char* CWifi::SSID() {
 /* -------------------------------------------------------------------------- */
    string res = "";
-   if(modem.write(string(PROMPT(_GETSSID)), res, CMD_READ(_GETSSID))) {
-      return res.c_str();
+   if(modem.write(string(PROMPT(_MODE)),res, "%s" , CMD_READ(_MODE)))  {
+      if(atoi(res.c_str()) == 1) {
+         if(modem.write(string(PROMPT(_GETSSID)), res, CMD_READ(_GETSSID))) {
+            return res.c_str();
+         }
+      }
+      else if(atoi(res.c_str()) == 2) {
+         if(modem.write(string(PROMPT(_GETSOFTAPSSID)), res, CMD_READ(_GETSOFTAPSSID))) {
+            return res.c_str();
+         }
+      }
    }
    return "";
 }
@@ -443,8 +473,6 @@ uint8_t* CWifi::BSSID(uint8_t* bssid) {
 /* -------------------------------------------------------------------------- */    
    string res = "";
    if(modem.write(string(PROMPT(_GETBSSID)), res, CMD_READ(_GETBSSID))) {
-      Serial.print("BSSID: ");
-      Serial.println(res.c_str());
       macStr2macArray(bssid, res.c_str());
       return bssid;
    }
diff --git a/libraries/WiFiS3/src/WiFi.h b/libraries/WiFiS3/src/WiFi.h
@@ -11,6 +11,11 @@
 
 using namespace std;
 
+#define DEFAULT_IP_AP_ADDRESS           IPAddress(192,168,4,1)
+#define DEFAULT_GW_AP_ADDRESS           IPAddress(192,168,1,1)
+#define DEFAULT_NM_AP_ADDRESS           IPAddress(255,255,255,0)
+
+
 #define WIFI_FIRMWARE_LATEST_VERSION "0.1.0"
 
 class CAccessPoint {
@@ -32,6 +37,14 @@ class CWifi {
    unsigned long _timeout;
    uint8_t mak[6];
    vector<CAccessPoint> access_points;
+   
+
+   IPAddress ip_ap = DEFAULT_IP_AP_ADDRESS;
+   IPAddress gw_ap = DEFAULT_GW_AP_ADDRESS;
+   IPAddress nm_ap = DEFAULT_NM_AP_ADDRESS;
+
+
+
 
 public:
     CWifi();
