Merge pull request #275 from vanvught/development

Resolves #246
vanvught · Feb 23, 2024 · 3950ab1 · 3950ab1
2 parents 99e3f1e + 2e081c2
commit 3950ab1
Show file tree

Hide file tree

Showing 520 changed files with 5,808 additions and 12,671 deletions.
diff --git a/firmware-template-bcm/Rules.mk b/firmware-template-bcm/Rules.mk
@@ -90,7 +90,7 @@ $(BUILD)$1/%.o: $(SOURCE)$1/%.c
 	$(CC) $(COPS) -c $$< -o $$@
 
 $(BUILD)$1/%.o: $(SOURCE)$1/%.cpp
-	$(CPP) -pedantic -fno-exceptions -fno-unwind-tables -fno-rtti -fno-threadsafe-statics -std=c++11 $(COPS) -c $$< -o $$@	
+	$(CPP) -pedantic -fno-exceptions -fno-unwind-tables -fno-rtti -fno-threadsafe-statics -std=c++14 $(COPS) -c $$< -o $$@	
 endef
 
 define compile-objects7

diff --git a/firmware-template-bcm/lib/Rules.mk b/firmware-template-bcm/lib/Rules.mk
@@ -67,7 +67,7 @@ $(BUILD)$1/%.o: $1/%.c
 	$(CC) $(COPS) -c $$< -o $$@
 
 $(BUILD)$1/%.o: $1/%.cpp
-	$(CPP) $(COPS) -pedantic -fno-exceptions -fno-unwind-tables -fno-rtti -fno-threadsafe-statics -std=c++11 -c $$< -o $$@
+	$(CPP) $(COPS) -pedantic -fno-exceptions -fno-unwind-tables -fno-rtti -fno-threadsafe-statics -std=c++14 -c $$< -o $$@
 
 $(BUILD)$1/%.o: $1/%.S
 	$(CC) $(COPS) -D__ASSEMBLY__ -c $$< -o $$@	
@@ -78,7 +78,7 @@ $(BUILD7)$1/%.o: $1/%.c
 	$(CC) $(COPS7) -c $$< -o $$@
 
 $(BUILD7)$1/%.o: $1/%.cpp
-	$(CPP) $(COPS7) -pedantic -fno-exceptions -fno-unwind-tables -fno-rtti -fno-threadsafe-statics -std=c++11 -c $$< -o $$@	
+	$(CPP) $(COPS7) -pedantic -fno-exceptions -fno-unwind-tables -fno-rtti -fno-threadsafe-statics -std=c++14 -c $$< -o $$@	
 
 $(BUILD7)$1/%.o: $1/%.S	
 	$(CC) $(COPS7) -D__ASSEMBLY__ -c $$< -o $$@		

diff --git a/firmware-template-h3/Rules.mk b/firmware-template-h3/Rules.mk
@@ -54,9 +54,10 @@ endif
 
 DEFINES+=-DBARE_METAL -DH3
 DEFINES+=-DPHY_TYPE=PHY_GENERIC
-DEFINES+=-DENABLE_TFTP_SERVER -D__FPU_PRESENT=1
+DEFINES+=-DENABLE_TFTP_SERVER
 DEFINES+=-DCONFIG_MDNS_DOMAIN_REVERSE
 DEFINES+=-DISABLE_INTERNAL_RTC
+DEFINES+=-D__FPU_PRESENT=1 -D__GIC_PRESENT=1
 
 ifneq ($(findstring CONFIG_STORE_USE_SPI,$(DEFINES)), CONFIG_STORE_USE_SPI)
 	DEFINES+=-DCONFIG_STORE_USE_SPI
@@ -69,7 +70,7 @@ ifeq ($(findstring ARTNET_VERSION=4,$(DEFINES)),ARTNET_VERSION=4)
 endif
 
 # The variable for the firmware include directories
-INCDIRS+=../include $(wildcard ./include) $(wildcard ./*/include)  ../firmware-template-h3/include
+INCDIRS+=../include $(wildcard ./include) $(wildcard ./*/include)  ../firmware-template-h3/include ../lib-h3/CMSIS/Core_A/Include
 INCDIRS:=$(addprefix -I,$(INCDIRS))
 
 # The variable for the libraries include directory
@@ -93,10 +94,10 @@ COPS+=$(INCDIRS) $(LIBINCDIRS) $(addprefix -I,$(EXTRA_INCLUDES))
 COPS+=-mfpu=neon-vfpv4 -mcpu=cortex-a7 -mfloat-abi=hard -mhard-float
 COPS+=-nostartfiles -ffreestanding -nostdlib -fprefetch-loop-arrays
 COPS+=-O2 -Wall -Werror -Wpedantic -Wextra -Wunused -Wsign-conversion  -Wconversion
-COPS+=-Wduplicated-cond -Wlogical-op #-Wduplicated-branches
+COPS+=-Wduplicated-cond -Wlogical-op -Wduplicated-branches
 COPS+=-ffunction-sections -fdata-sections
 
-CPPOPS=-std=c++11 -Wuseless-cast -Wold-style-cast -Wnon-virtual-dtor -Woverloaded-virtual -Wnull-dereference -fno-rtti -fno-exceptions -fno-unwind-tables
+CPPOPS=-std=c++20 -Wuseless-cast -Wold-style-cast -Wnon-virtual-dtor -Woverloaded-virtual -Wnull-dereference -fno-rtti -fno-exceptions -fno-unwind-tables
 CPPOPS+=-fno-threadsafe-statics
 
 LDOPS=--gc-sections --print-gc-sections

diff --git a/firmware-template-h3/lib/Rules.mk b/firmware-template-h3/lib/Rules.mk
@@ -26,6 +26,7 @@ SRCDIR+=src/debug
 $(info [${SRCDIR}])
 
 INCLUDES:=-I./include -I../include -I../lib-device/include -I../lib-flash/include -I../lib-configstore/include -I../lib-hal/include -I../lib-debug/include -I../lib-h3/include -I../lib-arm/include 
+INCLUDES+=-I../lib-h3/CMSIS/Core_A/Include
 INCLUDES+=$(addprefix -I,$(EXTRA_INCLUDES))
 
 DEFINES:=-D$(PLATFORM) $(addprefix -D,$(DISPLAYS)) $(addprefix -D,$(DEFINES))
@@ -35,9 +36,10 @@ ifneq ($(findstring _TIME_STAMP_YEAR_,$(DEFINES)), _TIME_STAMP_YEAR_)
 endif
 
 DEFINES+=-DPHY_TYPE=PHY_GENERIC
-DEFINES+=-DENABLE_TFTP_SERVER -D__FPU_PRESENT=1
+DEFINES+=-DENABLE_TFTP_SERVER
 DEFINES+=-DCONFIG_MDNS_DOMAIN_REVERSE
 DEFINES+=-DISABLE_INTERNAL_RTC
+DEFINES+=-D__FPU_PRESENT=1 -D__GIC_PRESENT=1
 
 ifneq ($(findstring CONFIG_STORE_USE_SPI,$(DEFINES)), CONFIG_STORE_USE_SPI)
 	DEFINES+=-DCONFIG_STORE_USE_SPI
@@ -66,12 +68,11 @@ $(info $$MAKE_FLAGS [${MAKE_FLAGS}])
 COPS=-DBARE_METAL -DH3 $(DEFINES) $(MAKE_FLAGS) $(INCLUDES)
 COPS+=-mfpu=neon-vfpv4 -mcpu=cortex-a7 -mfloat-abi=hard -mhard-float
 COPS+=-nostartfiles -ffreestanding -nostdlib -fprefetch-loop-arrays
-#COPS+=-ftree-vectorize -fdump-tree-vect-details
 COPS+=-O2 -Wall -Werror -Wextra -Wpedantic -Wunused -Wsign-conversion -Wconversion 
-COPS+=-Wduplicated-cond -Wlogical-op #-Wduplicated-branches
+COPS+=-Wduplicated-cond -Wlogical-op -Wduplicated-branches
 COPS+=-ffunction-sections -fdata-sections
 
-CPPOPS=-std=c++11 -Wuseless-cast -Wold-style-cast -Wnon-virtual-dtor -Woverloaded-virtual -Wnull-dereference -fno-rtti -fno-exceptions -fno-unwind-tables
+CPPOPS=-std=c++20 -Wuseless-cast -Wold-style-cast -Wnon-virtual-dtor -Woverloaded-virtual -Wnull-dereference -fno-rtti -fno-exceptions -fno-unwind-tables
 CPPOPS+=-fno-threadsafe-statics
 
 CURR_DIR:=$(notdir $(patsubst %/,%,$(CURDIR)))

diff --git a/firmware-template-linux/Rules.mk b/firmware-template-linux/Rules.mk
@@ -101,12 +101,7 @@ else
 	COPS+=-Wduplicated-cond -Wlogical-op #-Wduplicated-branches
 #	CCPOPS+=-Wuseless-cast -Wold-style-cast
 endif
-
-ifeq ($(detected_OS),Cygwin)
-	CCPOPS+=-std=gnu++11
-else
-	CCPOPS+=-std=c++11
-endif
+CCPOPS+=-std=c++20
 
 COPS+=-ffunction-sections -fdata-sections
 

diff --git a/firmware-template-linux/lib/Rules.mk b/firmware-template-linux/lib/Rules.mk
@@ -17,7 +17,7 @@ DEFINES+=-DDISABLE_TFTP
 DEFINES+=-DENABLE_HTTPD
 DEFINES+=-DCONFIG_STORE_USE_FILE 
 DEFINES+=-DCONFIG_MDNS_DOMAIN_REVERSE
-DEFINES+=-DISABLE_INTERNAL_RTC
+DEFINES+=-DDISABLE_INTERNAL_RTC
 
 ifeq ($(findstring ARTNET_VERSION=4,$(DEFINES)),ARTNET_VERSION=4)
 	ifeq ($(findstring ARTNET_HAVE_DMXIN,$(DEFINES)),ARTNET_HAVE_DMXIN)
@@ -70,12 +70,7 @@ else
 endif
 
 CCPOPS=-fno-rtti -fno-exceptions -fno-unwind-tables -Wnon-virtual-dtor
-
-ifeq ($(detected_OS),Cygwin)
-	CCPOPS+=-std=gnu++11
-else
-	CCPOPS+=-std=c++11
-endif	
+CCPOPS+=-std=c++20
 
 COPS+=-ffunction-sections -fdata-sections
 

diff --git a/firmware-template/libs.mk b/firmware-template/libs.mk
@@ -2,7 +2,10 @@ $(info $$DEFINES [${DEFINES}])
 
 ifeq ($(findstring NO_EMAC,$(DEFINES)),NO_EMAC)
 else
-	LIBS+=remoteconfig
+	ifeq ($(findstring CONFIG_NETWORK_USE_MINIMUM,$(DEFINES)),CONFIG_NETWORK_USE_MINIMUM)
+	else
+		LIBS+=remoteconfig
+	endif
 endif
 
 ifeq ($(findstring NODE_NODE,$(DEFINES)),NODE_NODE)
@@ -24,6 +27,12 @@ ifeq ($(findstring NODE_E131,$(DEFINES)),NODE_E131)
 	endif
 endif
 
+ifeq ($(findstring E131_CONTROLLER,$(DEFINES)),E131_CONTROLLER)
+	ifneq ($(findstring e131,$(LIBS)),e131)
+		LIBS+=e131
+	endif
+endif
+
 ifeq ($(findstring NODE_SHOWFILE,$(DEFINES)),NODE_SHOWFILE)
 	LIBS+=showfile osc
 endif
@@ -55,12 +64,12 @@ ifeq ($(findstring ARTNET_CONTROLLER,$(DEFINES)),ARTNET_CONTROLLER)
 endif
 
 ifeq ($(findstring RDM_CONTROLLER,$(DEFINES)),RDM_CONTROLLER)
-	LIBS+=rdm
+	RDM=1
 	DMX=1
 endif
 
 ifeq ($(findstring RDM_RESPONDER,$(DEFINES)),RDM_RESPONDER)
-	LIBS+=rdm
+	RDM=1
 	ifneq ($(findstring NODE_ARTNET,$(DEFINES)),NODE_ARTNET)
 		ifneq ($(findstring dmxreceiver,$(LIBS)),dmxreceiver)
 			LIBS+=dmxreceiver
@@ -82,12 +91,7 @@ ifeq ($(findstring NODE_DMX,$(DEFINES)),NODE_DMX)
 endif
 
 ifeq ($(findstring NODE_RDMNET_LLRP_ONLY,$(DEFINES)),NODE_RDMNET_LLRP_ONLY)
-	ifneq ($(findstring RDM_CONTROLLER,$(DEFINES)),RDM_CONTROLLER)
-		LIBS+=rdm
-	endif
-	ifneq ($(findstring rdmnet,$(LIBS)),rdmnet)
-		LIBS+=rdmnet
-	endif
+	RDM=1
 	ifneq ($(findstring e131,$(LIBS)),e131)
 		LIBS+=e131
 	endif
@@ -99,10 +103,6 @@ ifeq ($(findstring NODE_RDMNET_LLRP_ONLY,$(DEFINES)),NODE_RDMNET_LLRP_ONLY)
 	endif
 endif
 
-ifeq ($(findstring e131,$(LIBS)),e131)
-	LIBS+=uuid
-endif
-
 ifeq ($(findstring OUTPUT_DMX_MONITOR,$(DEFINES)),OUTPUT_DMX_MONITOR)
 	LIBS+=dmxmonitor	
 endif
@@ -112,10 +112,18 @@ ifeq ($(findstring OUTPUT_DMX_SEND,$(DEFINES)),OUTPUT_DMX_SEND)
 	DMX=1
 endif
 
+ifdef RDM
+	LIBS+=rdm
+endif
+
 ifdef DMX
 	LIBS+=dmx
 endif
 
+ifeq ($(findstring e131,$(LIBS)),e131)
+	LIBS+=uuid
+endif
+
 ifeq ($(findstring OUTPUT_DDP_PIXEL_MULTI,$(DEFINES)),OUTPUT_DDP_PIXEL_MULTI)
 	LIBS+=ws28xxdmx ws28xx jamstapl
 else

diff --git a/include/dirent.h b/include/dirent.h
@@ -2,7 +2,7 @@
  * @file dirent.h
  *
  */
-/* Copyright (C) 2020 by Arjan van Vught mailto:[email protected]
+/* Copyright (C) 2020-2024 by Arjan van Vught mailto:[email protected]
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -28,7 +28,7 @@
 
 #include <stdio.h>
 
-#if !defined (_FATFS)
+#if !defined (FF_DEFINED)
 	typedef void *DIR;
 #endif
 

diff --git a/lib-arm/.settings/language.settings.xml b/lib-arm/.settings/language.settings.xml
@@ -5,7 +5,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
-			<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-1522357966463138799" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="952649484323753915" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
@@ -17,7 +17,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
-			<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="1923199820554977812" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="1923326226878881812" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>

diff --git a/lib-arm/include/arm/arm.h b/lib-arm/include/arm/arm.h
@@ -46,8 +46,6 @@ typedef enum arm_vector {
 # define ARM_VECTOR(x)	(unsigned *)(x)
 #endif
 
-#define	__enable_irq()	asm volatile ("cpsie i")
-#define	__disable_irq()	asm volatile ("cpsid i")
 #define	__enable_fiq()	asm volatile ("cpsie f")
 #define	__disable_fiq()	asm volatile ("cpsid f")
 

diff --git a/lib-artnet/.cproject b/lib-artnet/.cproject
@@ -50,6 +50,8 @@
 									<listOptionValue builtIn="false" value="ARTNET_VERSION=4"/>
 									<listOptionValue builtIn="false" value="RDM_RESPONDER"/>
 									<listOptionValue builtIn="false" value="CONFIG_PANELLED_RDM_PORT"/>
+									<listOptionValue builtIn="false" value="NODE_SHOWFILE"/>
+									<listOptionValue builtIn="false" value="CONFIG_SHOWFILE_PROTOCOL_NODE_ARTNET"/>
 								</option>
 								<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.272354303" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
 							</tool>
@@ -82,6 +84,8 @@
 									<listOptionValue builtIn="false" value="ARTNET_VERSION=4"/>
 									<listOptionValue builtIn="false" value="RDM_RESPONDER"/>
 									<listOptionValue builtIn="false" value="CONFIG_PANELLED_RDM_PORT"/>
+									<listOptionValue builtIn="false" value="NODE_SHOWFILE"/>
+									<listOptionValue builtIn="false" value="CONFIG_SHOWFILE_PROTOCOL_NODE_ARTNET"/>
 								</option>
 								<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.2086813026" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
 							</tool>
@@ -178,6 +182,8 @@
 									<listOptionValue builtIn="false" value="ARTNET_VERSION=4"/>
 									<listOptionValue builtIn="false" value="RDM_RESPONDER"/>
 									<listOptionValue builtIn="false" value="CONFIG_PANELLED_RDM_PORT"/>
+									<listOptionValue builtIn="false" value="NODE_SHOWFILE"/>
+									<listOptionValue builtIn="false" value="CONFIG_SHOWFILE_PROTOCOL_NODE_ARTNET"/>
 								</option>
 								<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1814233140" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
 							</tool>
@@ -209,6 +215,8 @@
 									<listOptionValue builtIn="false" value="ARTNET_VERSION=4"/>
 									<listOptionValue builtIn="false" value="RDM_RESPONDER"/>
 									<listOptionValue builtIn="false" value="CONFIG_PANELLED_RDM_PORT"/>
+									<listOptionValue builtIn="false" value="NODE_SHOWFILE"/>
+									<listOptionValue builtIn="false" value="CONFIG_SHOWFILE_PROTOCOL_NODE_ARTNET"/>
 								</option>
 								<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.138434766" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
 							</tool>
@@ -294,6 +302,8 @@
 									<listOptionValue builtIn="false" value="ARTNET_VERSION=4"/>
 									<listOptionValue builtIn="false" value="RDM_RESPONDER"/>
 									<listOptionValue builtIn="false" value="CONFIG_PANELLED_RDM_PORT"/>
+									<listOptionValue builtIn="false" value="NODE_SHOWFILE"/>
+									<listOptionValue builtIn="false" value="CONFIG_SHOWFILE_PROTOCOL_NODE_ARTNET"/>
 								</option>
 								<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1117533543" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
 							</tool>
@@ -327,6 +337,8 @@
 									<listOptionValue builtIn="false" value="ARTNET_VERSION=4"/>
 									<listOptionValue builtIn="false" value="RDM_RESPONDER"/>
 									<listOptionValue builtIn="false" value="CONFIG_PANELLED_RDM_PORT"/>
+									<listOptionValue builtIn="false" value="NODE_SHOWFILE"/>
+									<listOptionValue builtIn="false" value="CONFIG_SHOWFILE_PROTOCOL_NODE_ARTNET"/>
 								</option>
 								<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.168898796" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
 							</tool>

diff --git a/lib-artnet/.settings/language.settings.xml b/lib-artnet/.settings/language.settings.xml
@@ -5,7 +5,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
-			<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-1522357966463138799" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="952649484323753915" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
@@ -17,7 +17,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
-			<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-1522357966463138799" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="952649484323753915" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>

diff --git a/lib-artnet/Rules.mk b/lib-artnet/Rules.mk
@@ -44,6 +44,10 @@ ifneq ($(MAKE_FLAGS),)
 		EXTRA_INCLUDES+=../lib-e131/include
 	endif
 
+	ifeq ($(findstring OUTPUT_DMX_SEND,$(MAKE_FLAGS)), OUTPUT_DMX_SEND)
+			EXTRA_INCLUDES+=../lib-dmx/include
+	endif
+
 	ifneq (,$(findstring CONFIG_STORE_USE_ROM,$(MAKE_FLAGS)))
 		EXTRA_INCLUDES+=../lib-flashcode/include
 	endif
@@ -63,4 +67,6 @@ else
 	DEFINES+=RDM_CONTROLLER
 	DEFINES+=ARTNET_VERSION=4
 	DEFINES+=LIGHTSET_PORTS=1
+	DEFINES+=NODE_SHOWFILE 
+	DEFINES+=CONFIG_SHOWFILE_PROTOCOL_NODE_ARTNET
 endif
diff --git a/lib-artnet/include/artnetnode.h b/lib-artnet/include/artnetnode.h
@@ -60,6 +60,12 @@
 # include "e131bridge.h"
 #endif
 
+#if defined(OUTPUT_DMX_SEND) || defined(OUTPUT_DMX_SEND_MULTI)
+# if !defined(ARTNET_DISABLE_DMX_CONFIG_UDP)
+#  include "dmxconfigudp.h"
+# endif
+#endif
+
 #include "lightset.h"
 #include "hardware.h"
 #include "network.h"
@@ -266,8 +272,21 @@ class ArtNetNode {
 #endif
 			}
 		}
+
+#if defined (DMXCONFIGUDP_H)
+		m_DmxConfigUdp.Run();
+#endif
 	}
 
+#if defined (NODE_SHOWFILE) && defined (CONFIG_SHOWFILE_PROTOCOL_NODE_ARTNET)
+	void HandleShowFile(const artnet::ArtDmx *pArtDmx) {
+		m_nCurrentPacketMillis = Hardware::Get()->Millis();
+		m_nIpAddressFrom = Network::Get()->GetIp();
+		m_pReceiveBuffer = reinterpret_cast<uint8_t *>(const_cast<artnet::ArtDmx *>(pArtDmx));
+		HandleDmx();
+	}
+#endif
+
 	uint8_t GetVersion() const {
 		return artnet::VERSION;
 	}
@@ -701,6 +720,9 @@ class ArtNetNode {
 #if defined (ARTNET_ENABLE_SENDDIAG)
 	artnet::ArtDiagData m_DiagData;
 #endif
+#if defined (DMXCONFIGUDP_H_)
+	DmxConfigUdp m_DmxConfigUdp;
+#endif
 
 	static ArtNetNode *s_pThis;
 };