Merge branch 'master' into develop

platformio.ini

@@ -72,6 +72,7 @@ lib_ignore =
     SdFat
     WifiManager
     Ethernet
+    Ethernet5100
     Ethernet3
     Ethernet5100
     httpClient
@@ -130,6 +131,7 @@ lib_ignore =
     SD
     SdFat
     Ethernet
+    Ethernet5100
     Ethernet2
     Ethernet3
     Ethernet5100
@@ -186,6 +188,7 @@ lib_ignore =
     SD
     SdFat
     Ethernet
+    Ethernet5100
     Ethernet2
     Ethernet3
     Ethernet5100
@@ -311,7 +314,6 @@ lib_deps =
     https://github.com/anklimov/CmdArduino
     https://github.com/anklimov/ModbusMaster
     https://github.com/anklimov/Ethernet.git
-    ;https://github.com/anklimov/Ethernet2.git
     https://github.com/knolleary/pubsubclient.git
     https://github.com/anklimov/Artnet.git
     FastLED@3.3.2
@@ -385,6 +387,7 @@ lib_ignore =
         DueFlashStorage
         WifiManager
         Ethernet
+        Ethernet5100
         Ethernet3
         Ethernet5100
         HTTPClient
@@ -448,6 +451,7 @@ lib_ignore =
     Ethernet2
     Ethernet5100
     Ethernet
+    Ethernet5100
     NRFFlashStorage
     UIPEthernet
     EEPROM
@@ -646,6 +650,7 @@ lib_ignore =
     WifiManager
     Ethernet3
     Ethernet2
+    Ethernet
     NRFFlashStorage
     WebServer
     UIPEthernet
@@ -693,6 +698,7 @@ lib_ignore =
     WifiManager
     FastLED
     Ethernet
+    Ethernet5100
     DMXSerial
     DmxSimple
     httpClient