Merge branch 'master' into develop

This commit is contained in:
2020-10-13 01:34:24 +03:00
committed by GitHub

View File

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