Refactor Art-Net, RDM and build system

Large refactor across Art-Net, RDM, DMX node utilities and build files:

- Rename and relocate lib-dmxnode/include/dmxnode_utils.h -> common/include/common/utils/utils_port.h; change namespace json -> common and remove static qualifiers from PortSet/PortGet.
- Update makefiles: add Timestamp.mk (adds -D_TIME_STAMP_ with epoch seconds), include it from gd32/Validate.mk; other small make tweaks and conditional source inclusion in lib-artnet/Rules.mk.
- Bump copyright years in sources.
- Remove/replace direct RdmDevice initialization/printing from several firmware mains; add product category/detail defines in gd32_rdm_responder/Common.mk instead and adjust LLRP-only behavior (print LLRP device, adjust FirmwareVersion construction).
- Major rework of lib-artnet/include/artnet.h: rename many struct fields and constants to snake_case/clearer names, add port address bounds, add OpCodes (ArtCommand, ArtDataRequest/Reply), add ArtCommand struct, refine comments and bit/flag names, and other API/ABI-preserving layout clarifications.
- Add/rename multiple RDM headers and sources (new rdm_device_*.h, discovery/statemachine renames, gd32 RDM device implementation), reorganize rdm-related source filenames.
- Misc: several firmware mains adjusted for RDM/L RRP handling and minor cleanup across many modules.

These changes standardize naming, improve build timestamping, consolidate utility code, and reorganize RDM/Art-Net interfaces for clearer semantics and conditional builds. Developers should verify ABI compatibility where packets/structs are serialized and update any code that referenced old identifiers.

Author: vanvught

lib-dmxnode/include/dmxnode_utils.h common/include/common/utils/utils_port.hlib-dmxnode/include/dmxnode_utils.h renamed to common/include/common/utils/utils_port.h

@@ -23,25 +23,25 @@
  * THE SOFTWARE.
  */
 
-#ifndef DMXNODE_UTILS_H_
-#define DMXNODE_UTILS_H_
+#ifndef COMMON_UTILS_UTILS_PORT_H_
+#define COMMON_UTILS_UTILS_PORT_H_
 
 #include <cstdint>
 
-namespace json
+namespace common
 {
-template <class S> static void PortSet(uint32_t port_index, S s, uint16_t& n)
+template <class S> void PortSet(uint32_t port_index, S s, uint16_t& n)
 {
     uint16_t value = n; // Create a local copy
     value &= static_cast<uint16_t>(~(0x3 << (port_index * 2)));
     value |= static_cast<uint16_t>((static_cast<uint32_t>(s) & 0x3) << (port_index * 2));
     n = value; // Write back to the original field
 }
 
-template <class S> static S PortGet(uint32_t port_index, uint16_t n)
+template <class S> S PortGet(uint32_t port_index, uint16_t n)
 {
     return static_cast<S>((n >> (port_index * 2)) & 0x3);
 }
-} // namespace json
+} // namespace common
 
-#endif  // DMXNODE_UTILS_H_
+#endif // COMMON_UTILS_UTILS_PORT_H_

common/make/Timestamp.mk

@@ -2,7 +2,8 @@ $(info "Timestamp.mk")
 
 ifneq ($(findstring _TIME_STAMP_YEAR_,$(DEFINES)), _TIME_STAMP_YEAR_)
 	DEFINES += \
-		-D_TIME_STAMP_YEAR_=$(shell date +"%Y") \
+        -D_TIME_STAMP_=$(shell date "+%s") \
+        -D_TIME_STAMP_YEAR_=$(shell date +"%Y") \
 		-D_TIME_STAMP_MONTH_=$(shell date +"%m" | sed 's/^0*//') \
 		-D_TIME_STAMP_DAY_=$(shell date +"%d" | sed 's/^0*//')
 endif

common/make/gd32/Validate.mk

@@ -8,7 +8,7 @@ ifeq ($(FLAGS),)
 endif
 
 ifneq ($(findstring _TIME_STAMP_YEAR_,$(FLAGS)),_TIME_STAMP_YEAR_)
-	DEFINES+=-D_TIME_STAMP_YEAR_=$(shell date  +"%Y") -D_TIME_STAMP_MONTH_=$(shell date  +"%-m") -D_TIME_STAMP_DAY_=$(shell date  +"%-d")
+	include ../common/make/Timestamp.mk
 endif
 
 ifneq (,$(findstring OUTPUT_DMX_SEND,$(FLAGS))$(findstring CONFIG_RDM,$(FLAGS))$(findstring RDM_CONTROLLER,$(FLAGS))$(findstring LTC,$(FLAGS)))

gd32_emac_e131_dmx_multi/firmware/main.cpp

@@ -35,8 +35,6 @@
 #include "dmxnodemsgconst.h"
 #if defined(NODE_RDMNET_LLRP_ONLY)
 #include "rdmnetdevice.h"
-#include "rdmdevice.h"
-#include "rdm_e120.h"
 #endif
 #if defined(NODE_SHOWFILE)
 #include "showfile.h"
@@ -45,7 +43,6 @@
 #include "configstore.h"
 #include "firmwareversion.h"
 #include "software_version.h"
-#include "software_version_id.h"
 
 namespace hal
 {
@@ -62,7 +59,7 @@ int main() // NOLINT
     DisplayUdf display;
     ConfigStore config_store;
     network::Init();
-    FirmwareVersion fw(SOFTWARE_VERSION, __DATE__, __TIME__, DEVICE_SOFTWARE_VERSION_ID);
+    FirmwareVersion fw(SOFTWARE_VERSION, __DATE__, __TIME__);
 
     fw.Print("sACN E1.31 DMX  {" STR(DMXNODE_PORTS) " Universes}");
 
@@ -87,13 +84,8 @@ int main() // NOLINT
     const auto kActivePorts = dmxnode_node.GetActiveInputPorts() + dmxnode_node.GetActiveOutputPorts();
 
 #if defined(NODE_RDMNET_LLRP_ONLY)
-    auto& rdm_device = RdmDevice::Get();
-    rdm_device.SetProductCategory(E120_PRODUCT_CATEGORY_DATA_DISTRIBUTION);
-    rdm_device.SetProductDetail(E120_PRODUCT_DETAIL_ETHERNET_NODE);
-    rdm_device.Init();
-    rdm_device.Print();
-
     RDMNetDevice llrp_only_device;
+    llrp_only_device.Print();
 #endif
 
 #if defined(NODE_SHOWFILE)

lib-artnet/Rules.mk

@@ -13,6 +13,9 @@ ifneq ($(MAKE_FLAGS),)
 	ifeq ($(findstring RDM_CONTROLLER,$(MAKE_FLAGS)), RDM_CONTROLLER)
 		EXTRA_SRCDIR+=src/node/rdm
 		EXTRA_SRCDIR+=src/node/rdm/controller
+		ifeq ($(findstring ARTNET_HAVE_DMXIN,$(MAKE_FLAGS)), ARTNET_HAVE_DMXIN)
+			EXTRA_SRCDIR+=src/node/rdm/controller/rdmin
+		endif
 		EXTRA_INCLUDES+=../lib-rdm/include ../lib-dmx/include
 		ifeq ($(findstring ENABLE_HTTPD,$(MAKE_FLAGS)), ENABLE_HTTPD)
 			EXTRA_SRCDIR+=src/node/rdm/controller/json

lib-artnet/include/artnet.h

@@ -140,7 +140,7 @@ class ArtNetController : public ArtNetPollTable
         union artnet::UArtPacket ArtPacket;
         uint32_t IPAddressFrom;
         uint16_t nLength;
-        artnet::OpCodes OpCode;
+        artnet::OpCodes op_code;
     };
     TArtNetPacket* m_pArtNetPacket;
 

lib-artnet/include/artnetcontroller.h

@@ -33,7 +33,6 @@
 #include <cstdint>
 #include <cstdarg>
 #include <cstring>
-#include <cassert>
 
 #if !defined(ARTNET_VERSION)
 #error ARTNET_VERSION is not defined
@@ -58,12 +57,14 @@
 #if defined(RDM_RESPONDER)
 #include "artnetrdmresponder.h"
 #endif
+#if defined(ARTNET_HAVE_TIMECODE)
+#include "network_udp.h"
+#endif
 #if (ARTNET_VERSION >= 4)
 #include "e131bridge.h"
 #endif
 #include "dmxnode.h"
 #include "dmxnode_outputtype.h"
-#include "network.h"
 #include "firmware/debug/debug_debug.h"
 
 #ifndef ALIGNED
@@ -73,6 +74,7 @@
 namespace artnetnode
 {
 inline constexpr uint32_t kPollReplyQueueSize = 4;
+inline constexpr uint32_t kTodRequestListSize = 4;
 
 enum class PollReplyState : uint8_t
 {
@@ -90,6 +92,9 @@ struct State
         uint32_t poll_reply_delay_millis;
         uint32_t dmx_ip;
         uint32_t sync_millis; ///< Latest ArtSync received time
+#if defined(RDM_CONTROLLER)
+        uint32_t tod_request_ip_list[kTodRequestListSize];
+#endif
         artnet::ArtPollQueue poll_reply_queue[kPollReplyQueueSize];
         uint8_t poll_reply_queue_index;
         uint8_t poll_reply_port_index;
@@ -226,9 +231,9 @@ class ArtNetNode
     bool GetRdm() const { return state_.is_rdm_enabled; }
 
     void SetRdm(uint32_t port_index, bool enable);
-    bool GetRdm(uint32_t port_index) const;
+    bool Rdm(uint32_t port_index) const;
 
-    void SendTod(uint32_t port_index);
+    void SendArtTodData(uint32_t port_index);
 
     void Print();
 
@@ -261,16 +266,15 @@ class ArtNetNode
 
     bool GetOutputPort(uint16_t universe, uint32_t& port_index);
 
-    void RestartOutputPort(uint32_t port_index);
+    void StopOutputPort(uint32_t port_index);
 
 #if defined(RDM_CONTROLLER)
-    void SetRdmController(ArtNetRdmController* art_net_rdm_controller, bool do_enable = true);
     uint32_t RdmCopyWorkingQueue(char* out_buffer, uint32_t out_buffer_size);
-    uint32_t RdmGetUidCount(uint32_t port_index);
+    uint32_t RdmTodUidCount(uint32_t port_index);
     uint32_t RdmCopyTod(uint32_t port_index, char* out_buffer, uint32_t out_buffer_size);
     bool RdmIsRunning(uint32_t port_index);
     bool RdmIsRunning(uint32_t port_index, bool& is_incremental);
-    bool GetRdmDiscovery(uint32_t port_index);
+    bool RdmBgDiscovery(uint32_t port_index);
 #endif
 
 #if defined(RDM_RESPONDER)
@@ -281,7 +285,7 @@ class ArtNetNode
     void SendTimeCode(const struct artnet::TimeCode* timecode)
     {
         assert(timecode != nullptr);
-        memcpy(&art_time_code_.Frames, timecode, sizeof(struct artnet::TimeCode));
+        memcpy(&art_time_code_.frames, timecode, sizeof(struct artnet::TimeCode));
         network::udp::Send(handle_, reinterpret_cast<const uint8_t*>(&art_time_code_), sizeof(struct artnet::ArtTimeCode), node_.ip_timecode, artnet::kUdpPort);
     }
 
@@ -319,23 +323,6 @@ class ArtNetNode
         return 0;
     }
 
-    /**
-     * LLRP
-     */
-    void SetRdmUID(const uint8_t* uid, bool supports_llrp = false)
-    {
-        memcpy(art_poll_reply_.DefaultUidResponder, uid, sizeof(art_poll_reply_.DefaultUidResponder));
-
-        if (supports_llrp)
-        {
-            art_poll_reply_.Status3 |= artnet::Status3::kSupportsLlrp;
-        }
-        else
-        {
-            art_poll_reply_.Status3 &= static_cast<uint8_t>(~artnet::Status3::kSupportsLlrp);
-        }
-    }
-
     void static StaticCallbackFunction(const uint8_t* buffer, uint32_t size, uint32_t from_ip, uint16_t from_port)
     {
         s_this->InputUdp(buffer, size, from_ip, from_port);
@@ -397,6 +384,7 @@ class ArtNetNode
 
     void ProcessPollReply(uint32_t port_index);
     void SendPollReply(uint32_t port_index, uint32_t destination_ip, artnet::ArtPollQueue* poll_queue = nullptr);
+    void PollReplyQueueAdd(uint16_t target_port_address_bottom, uint16_t target_port_address_top);
 
     void SendTodRequest(uint32_t port_index);
 
@@ -405,10 +393,6 @@ class ArtNetNode
     void FailSafeRecord();
     void FailSafePlayback();
 
-#if defined(RDM_CONTROLLER)
-    bool RdmDiscoveryRun();
-#endif
-
     void InputUdp(const uint8_t* buffer, uint32_t size, uint32_t from_ip, uint16_t from_port);
 
    private:
@@ -444,7 +428,7 @@ class ArtNetNode
     ArtNetRdmController rdm_controller_;
 #endif
 #if defined(RDM_RESPONDER)
-    ArtNetRdmResponder* rdm_responder_;
+    ArtNetRdmResponder* rdm_responder_{nullptr};
 #endif
 #endif
 #if defined(ARTNET_HAVE_TIMECODE)

lib-artnet/include/artnetnode.h

@@ -134,7 +134,7 @@ inline void ArtNetNode::SetPriority4(uint32_t port_index, uint8_t priority)
 
 inline void ArtNetNode::SetPriority4(uint32_t priority)
 {
-    art_poll_reply_.AcnPriority = static_cast<uint8_t>(priority);
+    art_poll_reply_.acn_priority = static_cast<uint8_t>(priority);
 
     for (uint32_t port_index = 0; port_index < dmxnode::kMaxPorts; port_index++)
     {

lib-artnet/include/artnetnode4_inline_impl.h

@@ -64,7 +64,7 @@ inline DmxNodeOutputType* ArtNetNode::GetOutput() const
 
 inline const char* ArtNetNode::GetLongName() const
 {
-    return reinterpret_cast<const char*>(art_poll_reply_.LongName);
+    return reinterpret_cast<const char*>(art_poll_reply_.long_name);
 }
 
 inline void ArtNetNode::SetDisableMergeTimeout(bool disable)
@@ -156,7 +156,7 @@ inline void ArtNetNode::SetFailSafe(dmxnode::FailSafe fail_safe)
 
 inline dmxnode::FailSafe ArtNetNode::GetFailSafe()
 {
-    const auto kNetworkloss = (art_poll_reply_.Status3 & artnet::Status3::kNetworklossMask);
+    const auto kNetworkloss = (art_poll_reply_.status3 & artnet::Status3::kNetworklossMask);
     switch (kNetworkloss)
     {
         case artnet::Status3::kNetworklossLastState:
@@ -214,7 +214,7 @@ inline void ArtNetNode::SetRdm(uint32_t port_index, bool enable)
     }
 }
 
-inline bool ArtNetNode::GetRdm(uint32_t port_index) const
+inline bool ArtNetNode::Rdm(uint32_t port_index) const
 {
     assert(port_index < dmxnode::kMaxPorts);
     return !((output_port_[port_index].good_output_b & artnet::GoodOutputB::kRdmDisabled) == artnet::GoodOutputB::kRdmDisabled);
@@ -278,13 +278,13 @@ inline bool ArtNetNode::GetOutputPort(uint16_t universe, uint32_t& port_index)
     return false;
 }
 
-inline void ArtNetNode::RestartOutputPort(uint32_t port_index)
+inline void ArtNetNode::StopOutputPort(uint32_t port_index)
 {
-    if (output_port_[port_index].is_transmitting)
-    {
-        dmxnode_output_type_->Stop(port_index);
-        dmxnode_output_type_->Start(port_index);
-    }
+	if (output_port_[port_index].is_transmitting)
+	{
+	    output_port_[port_index].is_transmitting = false;
+	    dmxnode_output_type_->Stop(port_index); // Stop DMX if was running
+	}
 }
 
 inline void ArtNetNode::Run()
@@ -311,7 +311,7 @@ inline void ArtNetNode::Run()
     }
 
 #if (DMXNODE_PORTS > 0)
-    if ((((art_poll_reply_.Status1 & artnet::Status1::kIndicatorMask) == artnet::Status1::kIndicatorNormalMode)) &&
+    if ((((art_poll_reply_.status1 & artnet::Status1::kIndicatorMask) == artnet::Status1::kIndicatorNormalMode)) &&
         (hal::statusled::GetMode() != hal::statusled::Mode::FAST))
     {
 #if (ARTNET_VERSION >= 4)
@@ -354,7 +354,7 @@ inline void ArtNetNode::Run()
 
             state_.art.poll_reply_port_index++;
 
-            if (state_.art.poll_reply_port_index == dmxnode::kMaxPorts)
+            if (state_.art.poll_reply_port_index >= dmxnode::kMaxPorts)
             {
                 entry.art_poll_millis = 0;
                 state_.art.poll_reply_state = artnetnode::PollReplyState::kWaitingTimeout;
@@ -393,7 +393,7 @@ inline void ArtNetNode::SendDiag([[maybe_unused]] const artnet::PriorityCodes kP
         return;
     }
 
-    diag_data_.Priority = static_cast<uint8_t>(kPriorityCode);
+    diag_data_.priority = static_cast<uint8_t>(kPriorityCode);
 
     va_list arp;
 
@@ -404,12 +404,12 @@ inline void ArtNetNode::SendDiag([[maybe_unused]] const artnet::PriorityCodes kP
     va_end(arp);
 
     diag_data_.data[sizeof(diag_data_.data) - 1] = '\0'; // Just be sure we have a last '\0'
-    diag_data_.LengthLo = static_cast<uint8_t>(i + 1);   // Text length including the '\0'
+    diag_data_.length_lo = static_cast<uint8_t>(i + 1);   // Text length including the '\0'
 
-    const uint16_t kSize = sizeof(struct artnet::ArtDiagData) - sizeof(diag_data_.data) + diag_data_.LengthLo;
+    const uint16_t kSize = sizeof(struct artnet::ArtDiagData) - sizeof(diag_data_.data) + diag_data_.length_lo;
 
     network::udp::Send(handle_, reinterpret_cast<const uint8_t*>(&diag_data_), kSize, state_.art.diag_ip, artnet::kUdpPort);
 #endif
 }
 
-#endif  // ARTNETNODE_INLINE_IMPL_H_
+#endif // ARTNETNODE_INLINE_IMPL_H_