jeans/WLED
jeans/WLED
1
0
Fork 0
mirror of https://github.com/wled/WLED.git synced 2025-07-23 10:46:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix merge error

Browse Source
This commit is contained in:
Will Tatam 2025-01-16 11:26:42 +00:00
parent 789d68e80d
commit 0ad31c90f6
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wled00/wled.cpp
View File

@ -423,14 +423,6 @@ void WLED::setup()
#ifdef WLED_ENABLE_DMX //reserve GPIO2 as hardcoded DMX pin #ifdef WLED_ENABLE_DMX //reserve GPIO2 as hardcoded DMX pin
PinManager::allocatePin(2, true, PinOwner::DMX); PinManager::allocatePin(2, true, PinOwner::DMX);
#endif #endif
<<<<<<< HEAD
#ifdef WLED_ENABLE_DMX_INPUT
if(dmxInputTransmitPin > 0) PinManager::allocatePin(dmxInputTransmitPin, true, PinOwner::DMX);
if(dmxInputReceivePin > 0) PinManager::allocatePin(dmxInputReceivePin, true, PinOwner::DMX);
if(dmxInputEnablePin > 0) PinManager::allocatePin(dmxInputEnablePin, true, PinOwner::DMX);
#endif
=======
>>>>>>> a516a7b8 (Move dmx_input pin allocations from wled.cpp to dmx.cpp)
DEBUG_PRINTLN(F("Registering usermods ...")); DEBUG_PRINTLN(F("Registering usermods ..."));
registerUsermods(); registerUsermods();