From aa6d275a86efdbc8c57f52a1c27c66bf0189762e Mon Sep 17 00:00:00 2001
From: Will Tatam <will@netmindz.net>
Date: Thu, 7 Mar 2024 10:44:07 +0000
Subject: [PATCH] Swap DMX port to 1, persist user choice of port, validate
 port vs UART count

---
 wled00/cfg.cpp                | 2 ++
 wled00/data/settings_sync.htm | 2 +-
 wled00/dmx_input.cpp          | 3 ++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/wled00/cfg.cpp b/wled00/cfg.cpp
index 24e923c8..4de49f99 100644
--- a/wled00/cfg.cpp
+++ b/wled00/cfg.cpp
@@ -468,6 +468,7 @@ bool deserializeConfig(JsonObject doc, bool fromFS) {
     CJSON(dmxInputTransmitPin, if_live_dmx[F("inputRxPin")]);
     CJSON(dmxInputReceivePin, if_live_dmx[F("inputTxPin")]);
     CJSON(dmxInputEnablePin, if_live_dmx[F("inputEnablePin")]);
+    CJSON(dmxInputPort, if_live_dmx[F("dmxInputPort")]);
   #endif
 
   CJSON(arlsForceMaxBri, if_live[F("maxbri")]);
@@ -958,6 +959,7 @@ void serializeConfig() {
     if_live_dmx[F("inputRxPin")] = dmxInputTransmitPin;
     if_live_dmx[F("inputTxPin")] = dmxInputReceivePin;
     if_live_dmx[F("inputEnablePin")] = dmxInputEnablePin;
+    if_live_dmx[F("dmxInputPort")] = dmxInputPort;
   #endif
 
   if_live[F("timeout")] = realtimeTimeoutMs / 100;
diff --git a/wled00/data/settings_sync.htm b/wled00/data/settings_sync.htm
index ca55295d..068a2dee 100644
--- a/wled00/data/settings_sync.htm
+++ b/wled00/data/settings_sync.htm
@@ -178,7 +178,7 @@ Realtime LED offset: <input name="WO" type="number" min="-255" max="255" require
 	DMX RX: <input name="IDMR" type="number" min="-1" max="99">RO<br/>
 	DMX TX: <input name="IDMT" type="number" min="-1" max="99">DI<br/>
 	DMX Enable: <input name="IDME" type="number" min="-1" max="99">RE+DE<br/>
-	<div style="display: none">DMX Port: <input name="IDMP" type="number" min="1" max="2"><br/></div>
+	DMX Port: <input name="IDMP" type="number" min="1" max="2"><br/>
 </div> 
 <div id="dmxInputOff"> <!--WLEDMM-->
 	<br><em style="color:darkorange">This firmware build does not include DMX Input support. <br></em>
diff --git a/wled00/dmx_input.cpp b/wled00/dmx_input.cpp
index 77ebc859..821481e5 100644
--- a/wled00/dmx_input.cpp
+++ b/wled00/dmx_input.cpp
@@ -106,6 +106,7 @@ bool DMXInput::installDriver()
 {
 
   const auto config = createConfig();
+  USER_PRINTF("DMX port: %u\n", inputPortNum);
   if (!dmx_driver_install(inputPortNum, &config, DMX_INTR_FLAGS_DEFAULT)) {
     USER_PRINTF("Error: Failed to install dmx driver\n");
     return false;
@@ -134,7 +135,7 @@ void DMXInput::init(uint8_t rxPin, uint8_t txPin, uint8_t enPin, uint8_t inputPo
   // }
 #endif
 
-  if (inputPortNum < 3 && inputPortNum > 0) {
+  if (inputPortNum <= (SOC_UART_NUM - 1) && inputPortNum > 0) {
     this->inputPortNum = inputPortNum;
   }
   else {