Sternenlabor/WLED
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/aircoookie/WLED into dev

Browse Source
This commit is contained in:
Blaz Kristan
2021-12-07 17:18:38 +01:00
parent 44f9bc5f0e 7101ad81c4
commit 156b499f93
20 changed files with 248 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wled00/wled.cpp
View File

@@ -286,8 +286,10 @@ void WLED::setup()
WiFi.onEvent(WiFiEvent);
#endif
#ifdef WLED_ENABLE_ADALIGHT // reserve GPIO3 (RX) pin for ADALight
if (!pinManager.isPinAllocated(3)) {
#ifdef WLED_ENABLE_ADALIGHT
//Serial RX (Adalight, Improv, Serial JSON) only possible if GPIO3 unused
//Serial TX (Debug, Improv, Serial JSON) only possible if GPIO1 unused
if (!pinManager.isPinAllocated(3) && !pinManager.isPinAllocated(1)) {
Serial.println(F("Ada"));
pinManager.allocatePin(3,false);
} else {