Update Ethernet3 Library Patch

Author: khoih-prog

LibraryPatches/Ethernet2/src/Ethernet2.cpp

@@ -210,6 +210,21 @@ int EthernetClass::maintain(){
   return rc;
 }
 
+// KH add to report link status
+uint8_t EthernetClass::link() 
+{
+  return bitRead(w5500.getPHYCFGR(), 0);
+}
+
+const char* EthernetClass::linkReport() 
+{
+  if (bitRead(w5500.getPHYCFGR(), 0) == 1) 
+    return "LINK";
+  else 
+    return "NO LINK";
+}
+//////
+
 IPAddress EthernetClass::localIP()
 {
   IPAddress ret;

LibraryPatches/Ethernet2/src/Ethernet2.h

@@ -62,6 +62,11 @@ class EthernetClass {
 #endif
 
   int maintain();
+  
+  // KH add to report link status
+  uint8_t       link();           // returns the linkstate, 1 = linked, 0 = no link
+  const char*   linkReport();     // returns the linkstate as a string
+  //////
 
   // KH add to have similar function to Ethernet lib
   // Certainly we can use void macAddress(uint8_t mac[]) to read from W5x00.

LibraryPatches/Ethernet3/src/Ethernet3.cpp

@@ -297,7 +297,7 @@ void EthernetClass::phyMode(phyMode_t mode) {
   w5500.setPHYCFGR(val);
   }
 
-void EthernetClass::setHostname(char* hostname) {
+void EthernetClass::setHostname(const char* hostname) {
   memset(_customHostname, 0, 32);
   memcpy((void*)_customHostname, (void*)hostname, strlen(hostname) >= 31 ? 31 : strlen(hostname));
   }
@@ -327,12 +327,9 @@ uint8_t EthernetClass::speed()
 
     if (bitRead(w5500.getPHYCFGR(), 1) == 0) 
       return 10;
-      
-    // KH add to fix compile error in some boards   
-    return 0;  
   }
-  else 
-    return 0;
+
+  return 0;
 }
 
 const char* EthernetClass::speedReport() 
@@ -344,12 +341,9 @@ const char* EthernetClass::speedReport()
 
     if (bitRead(w5500.getPHYCFGR(), 1) == 0) 
       return "10 MB";
-      
-    // KH add to fix compile error in some boards   
-    return "NO LINK"; 
   }
-  else 
-    return "NO LINK";
+
+  return "NO LINK";
 }
 
 uint8_t EthernetClass::duplex() 
@@ -361,12 +355,9 @@ uint8_t EthernetClass::duplex()
 
     if (bitRead(w5500.getPHYCFGR(), 2) == 0) 
       return 1;
-      
-    // KH add to fix compile error in some boards  
-    return 0;   
   }
-  else 
-    return 0;
+
+  return 0;
 }
 
 const char* EthernetClass::duplexReport() 
@@ -378,12 +369,9 @@ const char* EthernetClass::duplexReport()
 
     if (bitRead(w5500.getPHYCFGR(), 2) == 0) 
       return "HALF DUPLEX";
-    
-    // KH add to fix compile error in some boards   
-    return "NO LINK";  
   }
-  else 
-    return "NO LINK";
+
+  return "NO LINK";
 }
 
 void EthernetClass::setRtTimeOut(uint16_t timeout) {

LibraryPatches/Ethernet3/src/Ethernet3.h

@@ -103,7 +103,7 @@ class EthernetClass {
   void macAddress(uint8_t mac[]); // get the MAC Address
   const char* macAddressReport(); // returns the the MAC Address as a string
 
-  void setHostname(char* hostname);
+  void setHostname(const char* hostname);
 
   // KH add to have similar function to Ethernet lib
   // Certainly we can use void macAddress(uint8_t mac[]) to read from W5x00.

LibraryPatches/esp32/cores/esp32/Server.h

@@ -0,0 +1,35 @@
+/*
+ Server.h - Base class that provides Server
+ Copyright (c) 2011 Adrian McEwen.  All right reserved.
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#ifndef server_h
+#define server_h
+
+#include "Print.h"
+
+class Server: public Print
+{
+public:
+    // KH, change to fix compiler error for EthernetWebServer
+    // error: cannot declare field 'EthernetWebServer::_server' to be of abstract type 'EthernetServer'
+    // virtual void begin(uint16_t port=0) =0;
+    //virtual void begin() = 0;
+    void begin() {};
+};
+
+#endif