Add NODE_RDMNET_LLRP_ONLY support and RDM fixes

vanvught · vanvught · commit 43cd2ec995b8 · 2026-03-08T14:16:28.000+01:00
Enable an RDMnet LLRP-only build mode across GD32 targets and integrate RDM support. Makefile changes: add NODE_RDMNET_LLRP_ONLY and RDM_DEVICE_PRODUCT_* defines to multiple GD32 Makefiles, add _i2c variants for DDP/E1.31 targets, and adjust store backend (SPI/I2C) and buffer counts where appropriate. Build rules: expose lib-rdm includes when NODE_RDMNET_LLRP_ONLY is present (display, dmxnode, pixeldmx, remoteconfig, e131). API and behavior changes: simplify ArtNet RDM controller inheritance, add LLRPDevice integration to E1.31 bridge, fix field name uses and debug prints in ArtNet handler and discovery handler, and refactor RDM discovery/state machine (enum cleanup, removed noisy prints, added state checks and IsRunning helper). RDM handler: rename enum members to consistent k-prefixed identifiers and tighten conditional compilation for RDM responder code. Misc: bump copyright year in e131 header.
diff --git a/gd32_emac_artnet_pixel_dmx_multi/Makefile.GD32 b/gd32_emac_artnet_pixel_dmx_multi/Makefile.GD32
@@ -3,6 +3,8 @@ DEFINES+=ARTNET_HAVE_TRIGGER
 #DEFINES+=ARTNET_HAVE_FAILSAFE_RECORD
 
 DEFINES+=NODE_RDMNET_LLRP_ONLY
+DEFINES+=RDM_DEVICE_PRODUCT_CATEGORY=E120_PRODUCT_CATEGORY_FIXTURE
+DEFINES+=RDM_DEVICE_PRODUCT_DETAIL=E120_PRODUCT_DETAIL_LED
 
 DEFINES+=DMXNODE_PORTS=66
 DEFINES+=CONFIG_DMXNODE_PIXEL_MAX_PORTS=16
diff --git a/gd32_emac_artnet_pixel_multi/Makefile-16x4u-i2c.GD32 b/gd32_emac_artnet_pixel_multi/Makefile-16x4u-i2c.GD32
@@ -9,6 +9,10 @@ DEFINES+=OUTPUT_DMX_PIXEL_MULTI PIXELPATTERNS_MULTI
 DEFINES+=DMXNODE_PORTS=32
 DEFINES+=CONFIG_DMXNODE_PIXEL_MAX_PORTS=8
 
+DEFINES+=NODE_RDMNET_LLRP_ONLY 
+DEFINES+=RDM_DEVICE_PRODUCT_CATEGORY=E120_PRODUCT_CATEGORY_FIXTURE
+DEFINES+=RDM_DEVICE_PRODUCT_DETAIL=E120_PRODUCT_DETAIL_LED
+
 DEFINES+=ENET_RXBUF_NUM=34 ENET_TXBUF_NUM=3
 
 DEFINES+=DISPLAY_UDF 
@@ -36,4 +40,3 @@ SRCDIR=firmware lib
 include ../firmware-template-gd32/Rules.mk
 
 prerequisites:
-	@echo "constexpr uint32_t DEVICE_SOFTWARE_VERSION_ID="$(shell date "+%s")";" > ./include/software_version_id.h
diff --git a/gd32_emac_artnet_pixel_multi/Makefile-16x4u.GD32 b/gd32_emac_artnet_pixel_multi/Makefile-16x4u.GD32
@@ -9,6 +9,10 @@ DEFINES+=OUTPUT_DMX_PIXEL_MULTI PIXELPATTERNS_MULTI
 DEFINES+=DMXNODE_PORTS=32
 DEFINES+=CONFIG_DMXNODE_PIXEL_MAX_PORTS=8
 
+DEFINES+=NODE_RDMNET_LLRP_ONLY 
+DEFINES+=RDM_DEVICE_PRODUCT_CATEGORY=E120_PRODUCT_CATEGORY_FIXTURE
+DEFINES+=RDM_DEVICE_PRODUCT_DETAIL=E120_PRODUCT_DETAIL_LED
+
 DEFINES+=ENET_RXBUF_NUM=34 ENET_TXBUF_NUM=3
 
 DEFINES+=DISPLAY_UDF 
@@ -36,4 +40,3 @@ SRCDIR=firmware lib
 include ../firmware-template-gd32/Rules.mk
 
 prerequisites:
-	@echo "constexpr uint32_t DEVICE_SOFTWARE_VERSION_ID="$(shell date "+%s")";" > ./include/software_version_id.h
diff --git a/gd32_emac_artnet_pixel_multi/Makefile.GD32 b/gd32_emac_artnet_pixel_multi/Makefile.GD32
@@ -9,6 +9,10 @@ DEFINES+=OUTPUT_DMX_PIXEL_MULTI PIXELPATTERNS_MULTI
 DEFINES+=DMXNODE_PORTS=32
 DEFINES+=CONFIG_DMXNODE_PIXEL_MAX_PORTS=8
 
+DEFINES+=NODE_RDMNET_LLRP_ONLY 
+DEFINES+=RDM_DEVICE_PRODUCT_CATEGORY=E120_PRODUCT_CATEGORY_FIXTURE
+DEFINES+=RDM_DEVICE_PRODUCT_DETAIL=E120_PRODUCT_DETAIL_LED
+
 DEFINES+=ENET_RXBUF_NUM=34 ENET_TXBUF_NUM=3
 
 DEFINES+=DISPLAY_UDF 
@@ -22,11 +26,6 @@ DEFINES+=DISABLE_FS
 
 DEFINES+=CONFIG_STORE_USE_SPI
 
-#DEFINES+=DEBUG_I2C
-#DEFINES+=DEBUG_HEAP
-#DEFINES+=DEBUG_STACK
-#DEFINES+=DEBUG_EMAC
-
 DEFINES+=NDEBUG
 
 LIBS=
diff --git a/gd32_emac_ddp_pixel_dmx_multi/Makefile.GD32 b/gd32_emac_ddp_pixel_dmx_multi/Makefile.GD32
@@ -1,8 +1,8 @@
 DEFINES =NODE_DDP_DISPLAY
 
-
-
-DEFINES+=NODE_RDMNET_LLRP_ONLY
+DEFINES+=NODE_RDMNET_LLRP_ONLY 
+DEFINES+=RDM_DEVICE_PRODUCT_CATEGORY=E120_PRODUCT_CATEGORY_FIXTURE
+DEFINES+=RDM_DEVICE_PRODUCT_DETAIL=E120_PRODUCT_DETAIL_LED
 
 DEFINES+=DMXNODE_PORTS=66
 DEFINES+=CONFIG_DMXNODE_PIXEL_MAX_PORTS=16
diff --git a/gd32_emac_ddp_pixel_multi/Makefile-i2c.GD32 b/gd32_emac_ddp_pixel_multi/Makefile-i2c.GD32
@@ -0,0 +1,31 @@
+DEFINES =NODE_DDP_DISPLAY
+
+DEFINES+=NODE_RDMNET_LLRP_ONLY 
+DEFINES+=RDM_DEVICE_PRODUCT_CATEGORY=E120_PRODUCT_CATEGORY_FIXTURE
+DEFINES+=RDM_DEVICE_PRODUCT_DETAIL=E120_PRODUCT_DETAIL_LED
+
+DEFINES+=DMXNODE_PORTS=64
+DEFINES+=CONFIG_DMXNODE_PIXEL_MAX_PORTS=16
+
+DEFINES+=OUTPUT_DMX_PIXEL_MULTI PIXELPATTERNS_MULTI
+
+DEFINES+=ENABLE_HTTPD ENABLE_CONTENT
+
+DEFINES+=ENET_RXBUF_NUM=70 ENET_TXBUF_NUM=8
+
+DEFINES+=CONFIG_STORE_USE_I2C
+
+DEFINES+=DISPLAY_UDF
+
+DEFINES+=DISABLE_RTC
+DEFINES+=DISABLE_FS
+
+DEFINES+=NDEBUG
+
+LIBS=
+
+SRCDIR=firmware lib
+
+include ../firmware-template-gd32/Rules.mk
+
+prerequisites:
diff --git a/gd32_emac_ddp_pixel_multi/Makefile.GD32 b/gd32_emac_ddp_pixel_multi/Makefile.GD32
@@ -1,8 +1,8 @@
-DEFINES =NODE_DDP_DISPLAY LIGHTSET_PORTS=64
-DEFINES+=CONFIG_PIXELDMX_MAX_PORTS=16
+DEFINES =NODE_DDP_DISPLAY
 
-
-DEFINES+=NODE_RDMNET_LLRP_ONLY
+DEFINES+=NODE_RDMNET_LLRP_ONLY 
+DEFINES+=RDM_DEVICE_PRODUCT_CATEGORY=E120_PRODUCT_CATEGORY_FIXTURE
+DEFINES+=RDM_DEVICE_PRODUCT_DETAIL=E120_PRODUCT_DETAIL_LED
 
 DEFINES+=DMXNODE_PORTS=64
 DEFINES+=CONFIG_DMXNODE_PIXEL_MAX_PORTS=16
@@ -13,7 +13,7 @@ DEFINES+=ENABLE_HTTPD ENABLE_CONTENT
 
 DEFINES+=ENET_RXBUF_NUM=70 ENET_TXBUF_NUM=8
 
-DEFINES+=CONFIG_STORE_USE_I2C
+DEFINES+=CONFIG_STORE_USE_SPI
 
 DEFINES+=DISPLAY_UDF
 
diff --git a/gd32_emac_e131_pixel_dmx_multi/Makefile.GD32 b/gd32_emac_e131_pixel_dmx_multi/Makefile.GD32
@@ -1,5 +1,8 @@
 DEFINES =NODE_E131_MULTI
+
 DEFINES+=NODE_RDMNET_LLRP_ONLY
+DEFINES+=RDM_DEVICE_PRODUCT_CATEGORY=E120_PRODUCT_CATEGORY_FIXTURE
+DEFINES+=RDM_DEVICE_PRODUCT_DETAIL=E120_PRODUCT_DETAIL_LED
 
 DEFINES+=DMXNODE_PORTS=66
 DEFINES+=CONFIG_DMXNODE_PIXEL_MAX_PORTS=16
diff --git a/gd32_emac_e131_pixel_multi/Makefile-i2c.GD32 b/gd32_emac_e131_pixel_multi/Makefile-i2c.GD32
@@ -0,0 +1,34 @@
+DEFINES =NODE_E131_MULTI
+
+DEFINES+=NODE_RDMNET_LLRP_ONLY
+DEFINES+=RDM_DEVICE_PRODUCT_CATEGORY=E120_PRODUCT_CATEGORY_FIXTURE
+DEFINES+=RDM_DEVICE_PRODUCT_DETAIL=E120_PRODUCT_DETAIL_LED
+
+DEFINES+=DMXNODE_PORTS=64
+DEFINES+=CONFIG_DMXNODE_PIXEL_MAX_PORTS=16
+
+DEFINES+=OUTPUT_DMX_PIXEL_MULTI PIXELPATTERNS_MULTI
+
+DEFINES+=ENABLE_HTTPD ENABLE_CONTENT
+
+DEFINES+=IGMP_MAX_JOINS_ALLOWED=70
+DEFINES+=ENET_RXBUF_NUM=70 ENET_TXBUF_NUM=8
+
+DEFINES+=RTL8201F_LED1_LINK_ALL
+
+DEFINES+=CONFIG_STORE_USE_I2C
+
+DEFINES+=DISPLAY_UDF
+
+DEFINES+=DISABLE_RTC
+DEFINES+=DISABLE_FS
+
+DEFINES+=NDEBUG
+
+LIBS=
+
+SRCDIR=firmware lib
+
+include ../firmware-template-gd32/Rules.mk
+
+prerequisites:
diff --git a/gd32_emac_e131_pixel_multi/Makefile.GD32 b/gd32_emac_e131_pixel_multi/Makefile.GD32
@@ -1,5 +1,8 @@
 DEFINES =NODE_E131_MULTI
+
 DEFINES+=NODE_RDMNET_LLRP_ONLY
+DEFINES+=RDM_DEVICE_PRODUCT_CATEGORY=E120_PRODUCT_CATEGORY_FIXTURE
+DEFINES+=RDM_DEVICE_PRODUCT_DETAIL=E120_PRODUCT_DETAIL_LED
 
 DEFINES+=DMXNODE_PORTS=64
 DEFINES+=CONFIG_DMXNODE_PIXEL_MAX_PORTS=16
@@ -13,7 +16,7 @@ DEFINES+=ENET_RXBUF_NUM=70 ENET_TXBUF_NUM=8
 
 DEFINES+=RTL8201F_LED1_LINK_ALL
 
-DEFINES+=CONFIG_STORE_USE_I2C
+DEFINES+=CONFIG_STORE_USE_SPI
 
 DEFINES+=DISPLAY_UDF
 
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-pixeldmx/Rules.mk b/lib-pixeldmx/Rules.mk
@@ -6,6 +6,9 @@ EXTRA_INCLUDES+=../lib-network/include
 EXTRA_SRCDIR+=src/json
 
 ifneq ($(MAKE_FLAGS),)
+	ifneq (,$(findstring NODE_RDMNET_LLRP_ONLY,$(MAKE_FLAGS)))
+		EXTRA_INCLUDES+=../lib-rdm/include
+	endif
 	ifeq ($(findstring OUTPUT_DMX_SEND,$(MAKE_FLAGS)), OUTPUT_DMX_SEND)
 		EXTRA_INCLUDES+=../lib-dmx/include
 	endif
diff --git a/lib-rdm/include/rdm_discovery.h b/lib-rdm/include/rdm_discovery.h
diff --git a/lib-rdm/include/rdm_discovery_statemachine.h b/lib-rdm/include/rdm_discovery_statemachine.h
diff --git a/lib-rdm/src/handlers/rdmhandler.cpp b/lib-rdm/src/handlers/rdmhandler.cpp
diff --git a/lib-remoteconfig/Rules.mk b/lib-remoteconfig/Rules.mk
