Add NODE_RDMNET_LLRP_ONLY support and RDM fixes

vanvught · vanvught · commit 5e57bf6b16aa · 2026-03-08T14:39:13.000+01:00
Enable NODE_RDMNET_LLRP_ONLY across targets and libraries, add necessary includes and conditional inheritance, and fix several RDM/discovery and handler bugs.

Changes include:
- Toggle NODE_RDMNET_LLRP_ONLY in Common.mk for targets and add EXTRA_INCLUDES in multiple Rules.mk files so lib-rdm headers are available when building LLRP-only nodes.
- Integrate LLRPDevice into ArtNet/E131 bridges via conditional inheritance and includes, and update prints to call LLRPDevice::Print() when applicable.
- Fix ArtNet and handler bugs: use correct struct member names (kArtAddress-&gt;command), use the passed discovery type variable for logging, and correct port index usage in TOD handling.
- Refactor rdm::discovery API and state machine: move/format Type enum, add StateMachine IsRunning helper, adjust Discovery run/finish logic and remove/clean several debug prints.
- Rename enum entries in RDM handler to prefixed forms (kFullOff, kStandby, kNormal, kCold) and update checks accordingly; restrict GetSupportedParameters behind RDM_RESPONDER.
- Minor: bump copyright year in e131bridge.h.

These changes prepare and fix build/runtime behavior for LLRP-only RDMNet nodes and clean up discovery/handler logic and diagnostics.
diff --git a/gd32_emac_artnet_dmx_multi/Common.mk b/gd32_emac_artnet_dmx_multi/Common.mk
@@ -5,6 +5,8 @@ DEFINES+=ARTNET_HAVE_FAILSAFE_RECORD
 DEFINES+=OUTPUT_DMX_SEND_MULTI
 DEFINES+=OUTPUT_HAVE_STYLESWITCH
 
+#DEFINES+=NODE_RDMNET_LLRP_ONLY
+
 DEFINES+=RDM_CONTROLLER
 
 DEFINES+=CONFIG_STORE_USE_SPI
diff --git a/gd32_emac_e131_dmx_multi/Common.mk b/gd32_emac_e131_dmx_multi/Common.mk
@@ -1,3 +1,5 @@
+DEFINES+=NODE_RDMNET_LLRP_ONLY
+
 DEFINES+=CONFIG_STORE_USE_SPI
 
 DEFINES+=RTL8201F_LED1_LINK_ALL
diff --git a/lib-artnet/include/artnetrdmcontroller.h b/lib-artnet/include/artnetrdmcontroller.h
@@ -33,10 +33,6 @@
 #include "rdm_discovery.h"
 #include "rdm_device_base.h"
 #include "dmxnode.h"
-#if defined(NODE_RDMNET_LLRP_ONLY)
-#include "rdmdevice.h"
-#include "llrp/llrpdevice.h"
-#endif
 
 namespace artnet::rdm::controller
 {
@@ -46,18 +42,12 @@ void DiscoveryStart(uint32_t port_index);
 void DiscoveryDone(uint32_t port_index);
 } // namespace artnet::rdm::controller
 
-#if defined(NODE_RDMNET_LLRP_ONLY)
-class ArtNetRdmController final : rdm::Discovery, LLRPDevice
-#else
 class ArtNetRdmController final : rdm::Discovery
-#endif
 {
    public:
     ArtNetRdmController()
     {
-#if defined(NODE_RDMNET_LLRP_ONLY)
-		rdm::device::Device::Instance().Print();
-#else
+#if !defined(NODE_RDMNET_LLRP_ONLY)
         rdm::device::Base::Instance().Print();
 #endif
     }
diff --git a/lib-artnet/src/node/artnetnodehandleaddress.cpp b/lib-artnet/src/node/artnetnodehandleaddress.cpp
@@ -312,7 +312,7 @@ void ArtNetNode::HandleAddress()
             break;
 #endif
         default:
-            [[unlikely]] DEBUG_PRINTF("> Not implemented: %u [%x]", kArtAddress->Command, kArtAddress->Command);
+            [[unlikely]] DEBUG_PRINTF("> Not implemented: %u [%x]", kArtAddress->command, kArtAddress->command);
             break;
     }
 
diff --git a/lib-artnet/src/node/rdm/controller/handlerdm.cpp b/lib-artnet/src/node/rdm/controller/handlerdm.cpp
@@ -42,15 +42,15 @@ namespace rdm::discovery
 {
 void Starting(uint32_t port_index, [[maybe_unused]] Type type)
 {
-	DEBUG_PRINTF("%u:%c", port_index, rdm::discovery::Type::kFull ? 'F' : 'I');
+	DEBUG_PRINTF("%u:%c", port_index, type == rdm::discovery::Type::kFull ? 'F' : 'I');
     
 	auto& artnet = *ArtNetNode::Get();
     artnet.StopOutputPort(port_index);
 }
 
 void Finished(uint32_t port_index, [[maybe_unused]] Type type)
 {
-	DEBUG_PRINTF("%u:%c", port_index, rdm::discovery::Type::kFull ? 'F' : 'I');
+	DEBUG_PRINTF("%u:%c", port_index, type == rdm::discovery::Type::kFull ? 'F' : 'I');
 	
     auto& artnet = *ArtNetNode::Get();
     artnet.SendArtTodData(port_index);
@@ -169,7 +169,7 @@ void ArtNetNode::HandleTodData()
             return;
         }
 
-        DEBUG_PRINTF("bind_index=%u -> port_index=%u, kPortAddress=%u, uid_count=%u", kArtTodData->bind_index, port_index, kPortAddress,
+        DEBUG_PRINTF("bind_index=%u -> kPortIndex=%u, kPortAddress=%u, uid_count=%u", kArtTodData->bind_index, kPortIndex, kPortAddress,
                      kArtTodData->uid_count);
 
         for (uint32_t uid_index = 0; uid_index < kArtTodData->uid_count; uid_index++)
diff --git a/lib-displayudf/Rules.mk b/lib-displayudf/Rules.mk
@@ -14,6 +14,10 @@ ifneq ($(MAKE_FLAGS),)
 		EXTRA_SRCDIR+=src/e131
 	endif
 	
+	ifneq (,$(findstring NODE_RDMNET_LLRP_ONLY,$(MAKE_FLAGS)))
+		EXTRA_INCLUDES+=../lib-rdm/include
+	endif
+	
 	ifneq (,$(findstring NODE_DDP_DISPLAY,$(MAKE_FLAGS)))
 		EXTRA_INCLUDES+=../lib-ddp/include
 	endif
diff --git a/lib-dmxnode/Rules.mk b/lib-dmxnode/Rules.mk
@@ -8,6 +8,9 @@ ifneq ($(MAKE_FLAGS),)
 	ifeq ($(findstring NODE_E131,$(MAKE_FLAGS)), NODE_E131)
 		EXTRA_INCLUDES+=../lib-e131/include
 	endif
+	ifneq (,$(findstring NODE_RDMNET_LLRP_ONLY,$(MAKE_FLAGS)))
+		EXTRA_INCLUDES+=../lib-rdm/include
+	endif
 	ifneq (,$(findstring RDM_RESPONDER,$(MAKE_FLAGS)))
 		EXTRA_INCLUDES+=../lib-rdmsensor/include
 	endif
diff --git a/lib-e131/Rules.mk b/lib-e131/Rules.mk
@@ -19,8 +19,8 @@ ifneq ($(MAKE_FLAGS),)
 		EXTRA_SRCDIR+=src/controller
 	endif
 
-	ifeq ($(findstring NODE_NODE,$(MAKE_FLAGS)), NODE_NODE)
-		EXTRA_SRCDIR+=src/node
+	ifneq (,$(findstring NODE_RDMNET_LLRP_ONLY,$(MAKE_FLAGS)))
+		EXTRA_INCLUDES+=../lib-rdm/include
 	endif
 
 	ifeq ($(findstring OUTPUT_DMX_SEND,$(MAKE_FLAGS)), OUTPUT_DMX_SEND)
diff --git a/lib-e131/include/e131bridge.h b/lib-e131/include/e131bridge.h
@@ -1,7 +1,7 @@
 /**
  * @file e131bridge.h
  */
-/* Copyright (C) 2016-2025 by Arjan van Vught mailto:info@gd32-dmx.org
+/* Copyright (C) 2016-2026 by Arjan van Vught mailto:info@gd32-dmx.org
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -36,6 +36,9 @@
 #include "e131sync.h"
 #include "dmxnode_outputtype.h"
 #include "softwaretimers.h"
+#if defined (NODE_RDMNET_LLRP_ONLY)
+#include "llrp/llrpdevice.h"
+#endif
 
 #ifndef ALIGNED
 #define ALIGNED __attribute__((aligned(4)))
@@ -122,6 +125,9 @@ struct InputPort
 } // namespace e131bridge
 
 class E131Bridge
+#if defined (NODE_RDMNET_LLRP_ONLY)
+: LLRPDevice
+#endif
 {
    public:
     E131Bridge();
diff --git a/lib-e131/src/node/e131bridge.cpp b/lib-e131/src/node/e131bridge.cpp
@@ -499,6 +499,10 @@ void E131Bridge::Print()
     {
         printf(" Synchronize is disabled\n");
     }
+	
+	#if defined (NODE_RDMNET_LLRP_ONLY)
+	LLRPDevice::Print();
+	#endif
 }
 
 #if defined(__GNUC__) && !defined(__clang__)
diff --git a/lib-rdm/include/rdm_discovery.h b/lib-rdm/include/rdm_discovery.h
@@ -39,13 +39,15 @@ namespace rdm
 {
 namespace discovery
 {
-	enum class Type {
-		kFull, kIncremental
-	};
-	
-	void Starting(uint32_t port_index, Type type);
-	void Finished(uint32_t port_index, Type type);
-}
+enum class Type
+{
+    kFull,
+    kIncremental
+};
+
+void Starting(uint32_t port_index, Type type);
+void Finished(uint32_t port_index, Type type);
+} // namespace discovery
 inline static constexpr uint32_t kBackgroundIntervalMinutes = 1;
 
 class Discovery : rdm::discovery::StateMachine
@@ -70,9 +72,6 @@ class Discovery : rdm::discovery::StateMachine
     {
         assert(port_index < kPorts);
         enabled_ |= (1U << port_index);
-
-        printf("%s: %u -> enabled=%.2x, bg=%.2x, waiting=%.2x, type=%.2x [running=%d]\n", __FUNCTION__, port_index, enabled_, s_bg_discovery, waiting_, type_,
-               running_);
     }
 
     bool IsEnabled(uint32_t port_index) const { return (((1U << port_index) & enabled_) == (1U << port_index)); }
@@ -81,9 +80,6 @@ class Discovery : rdm::discovery::StateMachine
     {
         assert(port_index < kPorts);
         enabled_ &= ~(1U << port_index);
-
-        printf("%s: %u -> enabled=%.2x, bg=%.2x, waiting=%.2x, type=%.2x [running=%d]\n", __FUNCTION__, port_index, enabled_, s_bg_discovery, waiting_, type_,
-               running_);
     }
 
     void EnableBackground(uint32_t port_index)
@@ -99,9 +95,6 @@ class Discovery : rdm::discovery::StateMachine
             s_timer_id = SoftwareTimerAdd((1000U * 60U) * kBackgroundIntervalMinutes, TimerBackGround);
             printf("s_timer_id=%d\n", s_timer_id);
         }
-
-        printf("%s: %u -> enabled=%.2x, bg=%.2x, waiting=%.2x, type=%.2x [running=%d]\n", __FUNCTION__, port_index, enabled_, s_bg_discovery, waiting_, type_,
-               running_);
     }
 
     void DisableBackground(uint32_t port_index)
@@ -117,9 +110,6 @@ class Discovery : rdm::discovery::StateMachine
         {
             SoftwareTimerDelete(s_timer_id);
         }
-
-        printf("%s: %u -> enabled=%.2x, bg=%.2x, waiting=%.2x, type=%.2x [running=%d]\n", __FUNCTION__, port_index, enabled_, s_bg_discovery, waiting_, type_,
-               running_);
     }
 
     bool IsEnabledBackground(uint32_t port_index) const { return (((1U << port_index) & s_bg_discovery) == (1U << port_index)); }
@@ -133,9 +123,6 @@ class Discovery : rdm::discovery::StateMachine
             type_ |= (1U << port_index);
             running_ = true;
         }
-
-        printf("%s: %u -> enabled=%.2x, bg=%.2x, waiting=%.2x, type=%.2x [running=%d]\n", __FUNCTION__, port_index, enabled_, s_bg_discovery, waiting_, type_,
-               running_);
     }
 
     void Incremental(uint32_t port_index)
@@ -147,9 +134,6 @@ class Discovery : rdm::discovery::StateMachine
             type_ &= ~(1U << port_index);
             running_ = true;
         }
-
-        printf("%s: %u -> enabled=%.2x, bg=%.2x, waiting=%.2x, type=%.2x [running=%d]\n", __FUNCTION__, port_index, enabled_, s_bg_discovery, waiting_, type_,
-               running_);
     }
 
     void Stop(uint32_t port_index)
@@ -168,9 +152,6 @@ class Discovery : rdm::discovery::StateMachine
                 }
             }
         }
-
-        printf("%s: %u -> enabled=%.2x, bg=%.2x, waiting=%.2x, type=%.2x [running=%d]\n", __FUNCTION__, port_index, enabled_, s_bg_discovery, waiting_, type_,
-               running_);
     }
 
     bool IsRunning(uint32_t portindex, bool& is_incremental) { return rdm::discovery::StateMachine::IsRunning(portindex, is_incremental); }
@@ -217,26 +198,43 @@ class Discovery : rdm::discovery::StateMachine
             return;
         }
 
-        uint32_t port_index;
+        if (rdm::discovery::StateMachine::IsRunning()) return;
+
         bool is_incremental;
 
-        const auto kIsRunning = rdm::discovery::StateMachine::IsRunning(port_index, is_incremental);
+        uint32_t port_index;
+        if (rdm::discovery::StateMachine::IsFinished(port_index, is_incremental))
+        {
+            assert(port_index_ == port_index);
+            printf("Finished:%u\n", port_index_);
+            rdm::discovery::Finished(port_index_, is_incremental ? rdm::discovery::Type::kIncremental : rdm::discovery::Type::kFull);
+
+            port_index_++;
+            if (port_index_ == kPorts) port_index_ = 0;
 
-        if ((!kIsRunning) && (waiting_))
+            if (waiting_ == 0)
+            {
+                running_ = false;
+                port_index_ = 0;
+            }
+        }
+
+        if (waiting_)
         {
             if (((1U << port_index_) & waiting_) == (1U << port_index_))
             {
                 if (((1U << port_index_) & type_) == (1U << port_index_))
+
                 {
-					rdm::discovery::Starting(port_index, rdm::discovery::Type::kFull);
+                    rdm::discovery::Starting(port_index_, rdm::discovery::Type::kFull);
                     rdm::discovery::StateMachine::Full(port_index_, &s_tod[port_index_]);
-					printf("Full:%u\n", port_index_);
+                    printf("Full:%u\n", port_index_);
                 }
                 else
                 {
-					rdm::discovery::Starting(port_index, rdm::discovery::Type::kIncremental);
+                    rdm::discovery::Starting(port_index_, rdm::discovery::Type::kIncremental);
                     rdm::discovery::StateMachine::Incremental(port_index_, &s_tod[port_index_]);
-					printf("Incremental:%u\n", port_index_);
+                    printf("Incremental:%u\n", port_index_);
                 }
 
                 waiting_ &= ~(1U << port_index_);
@@ -249,22 +247,6 @@ class Discovery : rdm::discovery::StateMachine
 
             return;
         }
-
-        if (rdm::discovery::StateMachine::IsFinished(port_index, is_incremental))
-        {
-            assert(port_index_ == port_index);
-            printf("Finished:%u\n", port_index);
-			rdm::discovery::Finished(port_index, is_incremental ? rdm::discovery::Type::kIncremental : rdm::discovery::Type::kFull);
-
-            port_index_++;
-            if (port_index_ == kPorts) port_index_ = 0;
-
-            if (waiting_ == 0)
-            {
-                running_ = false;
-                port_index_ = 0;
-            }
-        }
     }
 
     uint32_t TodUidCount(uint32_t port_index)
diff --git a/lib-rdm/include/rdm_discovery_statemachine.h b/lib-rdm/include/rdm_discovery_statemachine.h
@@ -69,6 +69,11 @@ class StateMachine
 
     bool Stop();
 
+	bool IsRunning()
+	{
+		return (state_ != rdm::discovery::State::kIdle);		
+	}
+	
     bool IsRunning(uint32_t& port_index, bool& is_incremental) const
     {
         port_index = port_index_;
diff --git a/lib-rdm/src/handlers/rdmhandler.cpp b/lib-rdm/src/handlers/rdmhandler.cpp
@@ -51,16 +51,16 @@
 
 enum class PowerState : uint8_t
 {
-    FULL_OFF = 0x00,  ///< Completely disengages power to device. Device can no longer respond.
+    kFullOff = 0x00,  ///< Completely disengages power to device. Device can no longer respond.
     kShutdown = 0x01, ///< Reduced power mode, may require device reset to return to normal operation. Device still responds to messages.
-    STANDBY = 0x02,   ///< Reduced power mode. Device can return to NORMAL without a reset. Device still responds to messages.
-    NORMAL = 0xFF,    ///< Normal Operating Mode.
+    kStandby = 0x02,  ///< Reduced power mode. Device can return to NORMAL without a reset. Device still responds to messages.
+    kNormal = 0xFF,   ///< Normal Operating Mode.
 };
 
 enum class ResetMode : uint8_t
 {
     kWarm = 0x01,
-    COLD = 0xFF ///< A cold reset is the equivalent of removing and reapplying power to the device.
+    kCold = 0xFF ///< A cold reset is the equivalent of removing and reapplying power to the device.
 };
 
 const RDMHandler::PidDefinition RDMHandler::PID_DEFINITIONS[]{
@@ -549,7 +549,7 @@ void RDMHandler::GetQueuedMessage([[maybe_unused]] uint16_t sub_device)
 }
 #endif
 
-#if !defined(NODE_RDMNET_LLRP_ONLY)
+#if defined(RDM_RESPONDER)
 void RDMHandler::GetSupportedParameters(uint16_t sub_device)
 {
     uint8_t nSupportedParams = 0;
@@ -833,7 +833,7 @@ void RDMHandler::SetResetDevice([[maybe_unused]] bool is_broadcast, [[maybe_unus
 
     const auto kMode = static_cast<ResetMode>(in->param_data[0]);
 
-    if ((kMode != ResetMode::kWarm) && (kMode != ResetMode::COLD))
+    if ((kMode != ResetMode::kWarm) && (kMode != ResetMode::kCold))
     {
         RespondMessageNack(E120_NR_DATA_OUT_OF_RANGE);
         return;
@@ -842,7 +842,7 @@ void RDMHandler::SetResetDevice([[maybe_unused]] bool is_broadcast, [[maybe_unus
     auto* out = reinterpret_cast<struct TRdmMessage*>(m_pRdmDataOut);
     out->param_data_length = 0;
 
-    if (kMode == ResetMode::COLD)
+    if (kMode == ResetMode::kCold)
     {
         RespondMessageNack(E120_NR_WRITE_PROTECT);
         return;
@@ -1459,15 +1459,15 @@ void RDMHandler::SetPowerState([[maybe_unused]] bool is_broadcast, [[maybe_unuse
 
     const auto nState = static_cast<PowerState>(pRdmDataIn->param_data[0]);
 
-    if ((nState != PowerState::NORMAL) && (nState > PowerState::STANDBY))
+    if ((nState != PowerState::kNormal) && (nState > PowerState::kStandby))
     {
         RespondMessageNack(E120_NR_DATA_OUT_OF_RANGE);
         return;
     }
 
     auto* pRdmDataOut = reinterpret_cast<struct TRdmMessage*>(m_pRdmDataOut);
 
-    if (nState == PowerState::NORMAL)
+    if (nState == PowerState::kNormal)
     {
         pRdmDataOut->param_data_length = 0;
         RespondMessageAck();
diff --git a/lib-remoteconfig/Rules.mk b/lib-remoteconfig/Rules.mk
diff --git a/lib-showfile/Rules.mk b/lib-showfile/Rules.mk

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+DEFINES+=NODE_RDMNET_LLRP_ONLY`
	`2`	`+`
`1`	`3`	`DEFINES+=CONFIG_STORE_USE_SPI`
`2`	`4`
`3`	`5`	`DEFINES+=RTL8201F_LED1_LINK_ALL`
Original file line number	Diff line number	Diff line change
`@@ -312,7 +312,7 @@ void ArtNetNode::HandleAddress()`
`312`	`312`	`break;`
`313`	`313`	`#endif`
`314`	`314`	`default:`
`315`		`- [[unlikely]] DEBUG_PRINTF("> Not implemented: %u [%x]", kArtAddress->Command, kArtAddress->Command);`
	`315`	`+ [[unlikely]] DEBUG_PRINTF("> Not implemented: %u [%x]", kArtAddress->command, kArtAddress->command);`
`316`	`316`	`break;`
`317`	`317`	`}`
`318`	`318`
Original file line number	Diff line number	Diff line change
`@@ -42,15 +42,15 @@ namespace rdm::discovery`
`42`	`42`	`{`
`43`	`43`	`void Starting(uint32_t port_index, [[maybe_unused]] Type type)`
`44`	`44`	`{`
`45`		`- DEBUG_PRINTF("%u:%c", port_index, rdm::discovery::Type::kFull ? 'F' : 'I');`
	`45`	`+ DEBUG_PRINTF("%u:%c", port_index, type == rdm::discovery::Type::kFull ? 'F' : 'I');`
`46`	`46`
`47`	`47`	`auto& artnet = *ArtNetNode::Get();`
`48`	`48`	`artnet.StopOutputPort(port_index);`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`void Finished(uint32_t port_index, [[maybe_unused]] Type type)`
`52`	`52`	`{`
`53`		`- DEBUG_PRINTF("%u:%c", port_index, rdm::discovery::Type::kFull ? 'F' : 'I');`
	`53`	`+ DEBUG_PRINTF("%u:%c", port_index, type == rdm::discovery::Type::kFull ? 'F' : 'I');`
`54`	`54`
`55`	`55`	`auto& artnet = *ArtNetNode::Get();`
`56`	`56`	`artnet.SendArtTodData(port_index);`
`@@ -169,7 +169,7 @@ void ArtNetNode::HandleTodData()`
`169`	`169`	`return;`
`170`	`170`	`}`
`171`	`171`
`172`		`- DEBUG_PRINTF("bind_index=%u -> port_index=%u, kPortAddress=%u, uid_count=%u", kArtTodData->bind_index, port_index, kPortAddress,`
	`172`	`+ DEBUG_PRINTF("bind_index=%u -> kPortIndex=%u, kPortAddress=%u, uid_count=%u", kArtTodData->bind_index, kPortIndex, kPortAddress,`
`173`	`173`	`kArtTodData->uid_count);`
`174`	`174`
`175`	`175`	`for (uint32_t uid_index = 0; uid_index < kArtTodData->uid_count; uid_index++)`
Original file line number	Diff line number	Diff line change
`@@ -499,6 +499,10 @@ void E131Bridge::Print()`
`499`	`499`	`{`
`500`	`500`	`printf(" Synchronize is disabled\n");`
`501`	`501`	`}`
	`502`	`+`
	`503`	`+ #if defined (NODE_RDMNET_LLRP_ONLY)`
	`504`	`+ LLRPDevice::Print();`
	`505`	`+ #endif`
`502`	`506`	`}`
`503`	`507`
`504`	`508`	`#if defined(__GNUC__) && !defined(__clang__)`