Implemented server

Former-commit-id: e47d524

Author: maidnl

libraries/WiFiS3/examples/SimpleWebServerWiFi/SimpleWebServerWiFi.ino

@@ -21,8 +21,7 @@
  by Tom Igoe
  */
 
-#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
@@ -35,7 +34,7 @@ int status = WL_IDLE_STATUS;
 WiFiServer server(80);
 
 void setup() {
-  Serial.begin(9600);      // initialize serial communication
+  Serial.begin(115200);      // initialize serial communication
   pinMode(led, OUTPUT);      // set the LED pin mode
 
   // check for the WiFi module:
@@ -46,7 +45,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");
   }
 
@@ -66,6 +65,7 @@ void setup() {
 
 
 void loop() {
+  delay(2000);
   WiFiClient client = server.available();   // listen for incoming clients
 
   if (client) {                             // if you get a client,
@@ -87,8 +87,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();
@@ -109,6 +109,7 @@ void loop() {
           digitalWrite(LED_BUILTIN, LOW);                // GET /L turns the LED off
         }
       }
+      
     }
     // close the connection:
     client.stop();

libraries/WiFiS3/src/Modem.cpp

@@ -48,17 +48,20 @@ bool ModemClass::passthrough(const uint8_t *data, size_t size) {
    bool res = false;
    bool found = false;
    string data_res = "";
+   
    unsigned long start_time = millis();
    while(millis() - start_time < _timeout && !found){
       while(_serial->available()){
          char c = _serial->read();
          data_res += c;
+         
          if(string::npos != data_res.rfind(RESULT_OK)){
             found = true;
             res = true;
             break;
          } 
          else if (string::npos != data_res.rfind(RESULT_ERROR)) {
+            found = true;
             res = false;
             break;
          }
@@ -190,8 +193,19 @@ bool ModemClass::buf_read(const string &prompt, string &data_res) {
                found = true;
                read_by_size = false;
                res = true;
-               while(_serial->available()){
-                  _serial->read();
+               
+               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_found = true;
+                        break;
+                     }
+                  }
                }
             }
          }

libraries/WiFiS3/src/WiFiClient.cpp

@@ -3,6 +3,11 @@
 /* -------------------------------------------------------------------------- */
 WiFiClient::WiFiClient() : _sock(-1) { }
 /* -------------------------------------------------------------------------- */
+
+/* -------------------------------------------------------------------------- */
+WiFiClient::WiFiClient(int s) : _sock(s) {
+}
+/* -------------------------------------------------------------------------- */
 
 /* -------------------------------------------------------------------------- */
 void WiFiClient::getSocket() {
@@ -186,6 +191,9 @@ void WiFiClient::stop() {
 uint8_t WiFiClient::connected() {
 /* -------------------------------------------------------------------------- */   
    uint8_t rv = 0;
+   if(this->available() > 0) {
+      return 1;
+   }
    if(_sock >= 0) {
       string res = "";
       modem.begin();

libraries/WiFiS3/src/WiFiClient.h

@@ -35,6 +35,7 @@ class WiFiClient : public Client {
 
 public:
   WiFiClient();
+  WiFiClient(int s);
   virtual int connect(IPAddress ip, uint16_t port);
   virtual int connect(const char *host, uint16_t port);
   virtual size_t write(uint8_t);
@@ -58,7 +59,7 @@ class WiFiClient : public Client {
   using Print::write;
 
 protected:
-  int8_t _sock;
+  int _sock;
   void getSocket();
   FifoBuffer<uint8_t,RX_BUFFER_DIM> rx_buffer;
   int _read();

libraries/WiFiS3/src/WiFiS3.h

@@ -22,5 +22,6 @@
 
 #include "WiFi.h"
 #include "WiFiClient.h"
+#include "WiFiServer.h"
 
 #endif

libraries/WiFiS3/src/WiFiServer.h

@@ -21,27 +21,27 @@
 #ifndef wifiserver_h
 #define wifiserver_h
 
-extern "C" {
-  #include "utility/wl_definitions.h"
-}
-
 #include "Server.h"
+#include "Modem.h"
+#include "WiFiClient.h"
 
 class WiFiClient;
 
 class WiFiServer : public Server {
 private:
-  uint8_t _sock;
-  uint8_t _lastSock;
-  uint16_t _port;
-  void*     pcb;
+  int _sock;
+  int _port;
+  
 public:
-  WiFiServer(uint16_t);
-  WiFiClient available(uint8_t* status = NULL);
+  WiFiServer();
+  WiFiServer(int p);
+  WiFiClient available();
+  void begin(int port);
   void begin();
   virtual size_t write(uint8_t);
   virtual size_t write(const uint8_t *buf, size_t size);
-  uint8_t status();
+  void end();
+  
 
   using Print::write;
 };