diff --git a/wled00/cfg.cpp b/wled00/cfg.cpp index d694c9cc..f9bf3213 100644 --- a/wled00/cfg.cpp +++ b/wled00/cfg.cpp @@ -462,9 +462,9 @@ bool deserializeConfig(JsonObject doc, bool fromFS) { if (tdd >= 0) realtimeTimeoutMs = tdd * 100; #ifdef WLED_ENABLE_DMX_INPUT - CJSON(dmxTransmitPin, if_live_dmx[F("rxPin")]); - CJSON(dmxReceivePin, if_live_dmx[F("txPin")]); - CJSON(dmxEnablePin, if_live_dmx[F("enablePin")]); + CJSON(dmxInputTransmitPin, if_live_dmx[F("inputRxPin")]); + CJSON(dmxInputReceivePin, if_live_dmx[F("inputTxPin")]); + CJSON(dmxInputEnablePin, if_live_dmx[F("enablePin")]); #endif CJSON(arlsForceMaxBri, if_live[F("maxbri")]); @@ -947,9 +947,9 @@ void serializeConfig() { if_live_dmx[F("dss")] = DMXSegmentSpacing; if_live_dmx["mode"] = DMXMode; #ifdef WLED_ENABLE_DMX_INPUT - if_live_dmx[F("rxPin")] = dmxTransmitPin; - if_live_dmx[F("txPin")] = dmxReceivePin; - if_live_dmx[F("enablePin")] = dmxEnablePin; + if_live_dmx[F("rxPin")] = dmxInputTransmitPin; + if_live_dmx[F("txPin")] = dmxInputReceivePin; + if_live_dmx[F("enablePin")] = dmxInputEnablePin; #endif if_live[F("timeout")] = realtimeTimeoutMs / 100; diff --git a/wled00/dmx.cpp b/wled00/dmx.cpp index d7eddfa0..b0b9da53 100644 --- a/wled00/dmx.cpp +++ b/wled00/dmx.cpp @@ -102,9 +102,9 @@ void handleDMX() {} dmx_port_t dmxPort = 2; void initDMX() { /* Set the DMX hardware pins to the pins that we want to use. */ - if(dmxReceivePin > 0) { - USER_PRINTF("Listening for DMX on pin %u\n", dmxReceivePin); - dmx_set_pin(dmxPort, dmxTransmitPin, dmxReceivePin, dmxEnablePin); + if(dmxInputReceivePin > 0) { + USER_PRINTF("Listening for DMX on pin %u\n", dmxInputReceivePin); + dmx_set_pin(dmxPort, dmxInputTransmitPin, dmxInputReceivePin, dmxInputEnablePin); } else { USER_PRINTLN("DMX input disabled due to dmxReceivePin not being set"); @@ -122,7 +122,7 @@ bool dmxIsConnected = false; unsigned long dmxLastUpdate = 0; void handleDMXInput() { - if(dmxReceivePin < 1) { + if(dmxInputReceivePin < 1) { return; } byte dmxdata[DMX_PACKET_SIZE]; diff --git a/wled00/set.cpp b/wled00/set.cpp index 580857ef..cad06663 100644 --- a/wled00/set.cpp +++ b/wled00/set.cpp @@ -357,9 +357,9 @@ void handleSettingsSet(AsyncWebServerRequest *request, byte subPage) if (t >= -255 && t <= 255) arlsOffset = t; #ifdef WLED_ENABLE_DMX_INPUT - dmxTransmitPin = request->arg(F("DMT")).toInt(); - dmxReceivePin = request->arg(F("DMR")).toInt(); - dmxEnablePin= request->arg(F("DME")).toInt(); + dmxInputTransmitPin = request->arg(F("IDMT")).toInt(); + dmxInputReceivePin = request->arg(F("IDMR")).toInt(); + dmxInputEnablePin= request->arg(F("IDME")).toInt(); #endif alexaEnabled = request->hasArg(F("AL")); diff --git a/wled00/wled.cpp b/wled00/wled.cpp index f8871355..4815c063 100644 --- a/wled00/wled.cpp +++ b/wled00/wled.cpp @@ -574,9 +574,9 @@ void WLED::setup() pinManager.allocatePin(2, true, PinOwner::DMX); #endif #ifdef WLED_ENABLE_DMX_INPUT - if(dmxTransmitPin > 0) pinManager.allocatePin(dmxTransmitPin, true, PinOwner::DMX); - if(dmxReceivePin > 0) pinManager.allocatePin(dmxReceivePin, true, PinOwner::DMX); - if(dmxEnablePin > 0) pinManager.allocatePin(dmxEnablePin, true, PinOwner::DMX); + 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 // WLEDMM experimental: support for single neoPixel on Adafruit boards diff --git a/wled00/wled.h b/wled00/wled.h index 59c8da59..c3c400a0 100644 --- a/wled00/wled.h +++ b/wled00/wled.h @@ -420,9 +420,9 @@ WLED_GLOBAL bool arlsForceMaxBri _INIT(false); // enable to f WLED_GLOBAL uint16_t e131ProxyUniverse _INIT(0); // output this E1.31 (sACN) / ArtNet universe via MAX485 (0 = disabled) #endif #ifdef WLED_ENABLE_DMX_INPUT - WLED_GLOBAL int dmxTransmitPin _INIT(0); - WLED_GLOBAL int dmxReceivePin _INIT(0); - WLED_GLOBAL int dmxEnablePin _INIT(0); + WLED_GLOBAL int dmxInputTransmitPin _INIT(0); + WLED_GLOBAL int dmxInputReceivePin _INIT(0); + WLED_GLOBAL int dmxInputEnablePin _INIT(0); #endif WLED_GLOBAL uint16_t e131Universe _INIT(1); // settings for E1.31 (sACN) protocol (only DMX_MODE_MULTIPLE_* can span over consequtive universes) diff --git a/wled00/xml.cpp b/wled00/xml.cpp index 71f7f2ef..8086c326 100644 --- a/wled00/xml.cpp +++ b/wled00/xml.cpp @@ -580,9 +580,9 @@ void getSettingsJS(AsyncWebServerRequest* request, byte subPage, char* dest) //W oappend(SET_F("hideDMXInput();")); // WLEDMM hide "dmx input" settings #else oappend(SET_F("hideNoDMXInput();")); // WLEDMM hide "not compiled in" message - sappend('v',SET_F("DMT"),dmxTransmitPin); - sappend('v',SET_F("DMR"),dmxReceivePin); - sappend('v',SET_F("DME"),dmxEnablePin); + sappend('v',SET_F("IDMT"),dmxInputTransmitPin); + sappend('v',SET_F("IDMR"),dmxInputReceivePin); + sappend('v',SET_F("IDME"),dmxInputEnablePin); #endif sappend('v',SET_F("DA"),DMXAddress); sappend('v',SET_F("XX"),DMXSegmentSpacing);