From 11b48bc3745a7dd1b20857486c9d2c43e8ce294e Mon Sep 17 00:00:00 2001
From: Arne <arne@rnae.de>
Date: Wed, 23 Aug 2023 14:52:57 +0200
Subject: [PATCH] rename handleDMX() handleDMXOutput()

---
 wled00/dmx_output.cpp | 4 ++--
 wled00/fcn_declare.h  | 5 +----
 wled00/wled.cpp       | 2 +-
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/wled00/dmx_output.cpp b/wled00/dmx_output.cpp
index efdd902ec..1c883c15a 100644
--- a/wled00/dmx_output.cpp
+++ b/wled00/dmx_output.cpp
@@ -12,7 +12,7 @@
 
 #ifdef WLED_ENABLE_DMX_OUTPUT
 
-void handleDMX()
+void handleDMXOutput()
 {
   // don't act, when in DMX Proxy mode
   if (e131ProxyUniverse != 0) return;
@@ -77,5 +77,5 @@ void initDMX() {
 }
 #else
 void initDMX(){}
-void handleDMX() {}
+void handleDMXOutput() {}
 #endif
diff --git a/wled00/fcn_declare.h b/wled00/fcn_declare.h
index c3ada1a57..831cc68f8 100644
--- a/wled00/fcn_declare.h
+++ b/wled00/fcn_declare.h
@@ -185,14 +185,11 @@ void setRandomColor(byte* rgb);
 
 //dmx.cpp
 void initDMX();
-void handleDMX();
-<<<<<<< HEAD
-=======
+void handleDMXOutput();
 
 //dmx_input.cpp
 void initDMXInput();
 void handleDMXInput();
->>>>>>> b4bbf0a5 (Extract dmx_input from dmx.cpp into dmx_input.cpp.)
 
 //e131.cpp
 void handleE131Packet(e131_packet_t* p, IPAddress clientIP, byte protocol);
diff --git a/wled00/wled.cpp b/wled00/wled.cpp
index e19361a18..27f74af02 100644
--- a/wled00/wled.cpp
+++ b/wled00/wled.cpp
@@ -65,7 +65,7 @@ void WLED::loop()
   handleNotifications();
   handleTransitions();
   #ifdef WLED_ENABLE_DMX_OUTPUT
-  handleDMX();
+  handleDMXOutput();
   #endif
   #ifdef WLED_ENABLE_DMX_INPUT
   dmxInput.update();