rename handleDMX() handleDMXOutput()

This commit is contained in:
Arne 2023-08-23 14:52:57 +02:00 committed by Will Tatam
parent fa80c62b28
commit 11b48bc374
3 changed files with 4 additions and 7 deletions

View File

@ -12,7 +12,7 @@
#ifdef WLED_ENABLE_DMX_OUTPUT #ifdef WLED_ENABLE_DMX_OUTPUT
void handleDMX() void handleDMXOutput()
{ {
// don't act, when in DMX Proxy mode // don't act, when in DMX Proxy mode
if (e131ProxyUniverse != 0) return; if (e131ProxyUniverse != 0) return;
@ -77,5 +77,5 @@ void initDMX() {
} }
#else #else
void initDMX(){} void initDMX(){}
void handleDMX() {} void handleDMXOutput() {}
#endif #endif

View File

@ -185,14 +185,11 @@ void setRandomColor(byte* rgb);
//dmx.cpp //dmx.cpp
void initDMX(); void initDMX();
void handleDMX(); void handleDMXOutput();
<<<<<<< HEAD
=======
//dmx_input.cpp //dmx_input.cpp
void initDMXInput(); void initDMXInput();
void handleDMXInput(); void handleDMXInput();
>>>>>>> b4bbf0a5 (Extract dmx_input from dmx.cpp into dmx_input.cpp.)
//e131.cpp //e131.cpp
void handleE131Packet(e131_packet_t* p, IPAddress clientIP, byte protocol); void handleE131Packet(e131_packet_t* p, IPAddress clientIP, byte protocol);

View File

@ -65,7 +65,7 @@ void WLED::loop()
handleNotifications(); handleNotifications();
handleTransitions(); handleTransitions();
#ifdef WLED_ENABLE_DMX_OUTPUT #ifdef WLED_ENABLE_DMX_OUTPUT
handleDMX(); handleDMXOutput();
#endif #endif
#ifdef WLED_ENABLE_DMX_INPUT #ifdef WLED_ENABLE_DMX_INPUT
dmxInput.update(); dmxInput.update();