Merge branch 'master' into pr_wifimulti

Author: SuGlider

Diff for: libraries/WiFi/src/WiFiServer.cpp

@@ -32,12 +32,6 @@ int WiFiServer::setTimeout(uint32_t seconds){
   return setsockopt(sockfd, SOL_SOCKET, SO_SNDTIMEO, (char *)&tv, sizeof(struct timeval));
 }
 
-size_t WiFiServer::write(const uint8_t *data, size_t len){
-  return 0;
-}
-
-void WiFiServer::stopAll(){}
-
 WiFiClient WiFiServer::available(){
   return accept();
 }

Diff for: libraries/WiFi/src/WiFiServer.h

@@ -24,7 +24,7 @@
 #include "WiFiClient.h"
 #include "IPAddress.h"
 
-class WiFiServer : public Server {
+class WiFiServer {
   private:
     int sockfd;
     int _accepted_sockfd = -1;
@@ -51,18 +51,12 @@ class WiFiServer : public Server {
     void setNoDelay(bool nodelay);
     bool getNoDelay();
     bool hasClient();
-    size_t write(const uint8_t *data, size_t len);
-    size_t write(uint8_t data){
-      return write(&data, 1);
-    }
-    using Print::write;
 
     void end();
     void close();
     void stop();
     operator bool(){return _listening;}
     int setTimeout(uint32_t seconds);
-    void stopAll();
 };
 
 #endif /* _WIFISERVER_H_ */