Resolves #186, Resolves #291 , Resolves #287 , Resolves #288 , Resolves #292 , Resolves #293 , Resolves #294

firmware-template-h3/memmap

@@ -1,6 +1,8 @@
 MEMORY
 {
-    ram : ORIGIN = 0x40000000, LENGTH = 16M  
+	SRAMA1 : ORIGIN = 0x00000000, LENGTH = 64K
+	SRAMA2 : ORIGIN = 0x00044000, LENGTH = 32K
+    ram    : ORIGIN = 0x40000000, LENGTH = 16M  
 }
 
 __ram_start = ORIGIN(ram);
@@ -21,6 +23,20 @@ __svc_cpus_stack_size = 0x10000;
 
 SECTIONS
 {
+  .srama1 :
+  {
+	. = ALIGN(4);
+    *(.srama1)
+    *(.srama1*)
+  } >SRAMA1 
+
+  .srama2 :
+  {
+	. = ALIGN(4);
+    *(.srama2)
+    *(.srama2*)
+  } >SRAMA2 
+
     .init : 
     {
     . = ALIGN(4);

firmware-template/libs.mk

@@ -33,10 +33,6 @@ ifeq ($(findstring E131_CONTROLLER,$(DEFINES)),E131_CONTROLLER)
 	endif
 endif
 
-ifeq ($(findstring NODE_SHOWFILE,$(DEFINES)),NODE_SHOWFILE)
-	LIBS+=showfile osc
-endif
-
 ifeq ($(findstring NODE_LTC_SMPTE,$(DEFINES)),NODE_LTC_SMPTE)
 	LIBS+=ltc tcnet midi input osc ws28xxdisplay ws28xx rgbpanel gps
 endif
@@ -63,6 +59,10 @@ ifeq ($(findstring ARTNET_CONTROLLER,$(DEFINES)),ARTNET_CONTROLLER)
 	endif
 endif
 
+ifeq ($(findstring NODE_SHOWFILE,$(DEFINES)),NODE_SHOWFILE)
+	LIBS+=showfile osc
+endif
+
 ifeq ($(findstring RDM_CONTROLLER,$(DEFINES)),RDM_CONTROLLER)
 	RDM=1
 	DMX=1

include/net/if.h

@@ -2,7 +2,7 @@
  * @file if.h
  *
  */
-/* Copyright (C) 2020 by Arjan van Vught mailto:info@orangepi-dmx.nl
+/* Copyright (C) 2020-2024 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
@@ -23,13 +23,21 @@
  * THE SOFTWARE.
  */
 
-#ifndef IF_H_
-#define IF_H_
+#ifndef NET_IF_H_
+#define NET_IF_H_
 
-#define IF_NAMESIZE     16
+/**
+ * https://pubs.opengroup.org/onlinepubs/009695399/basedefs/net/if.h.html
+ *
+ * The <net/if.h> header shall define the following symbolic constant for the length of a buffer containing
+ * an interface name (including the terminating NULL character):
+ * IF_NAMESIZE Interface name length.
+ */
+
+#define IF_NAMESIZE		16	///< Length of interface name (including the terminating NULL character).
 
 #ifndef IFNAMSIZ
-#define IFNAMSIZ        IF_NAMESIZE
+# define IFNAMSIZ		IF_NAMESIZE
 #endif
 
-#endif /* IF_H_ */
+#endif /* NET_IF_H_ */

include/string.h

@@ -189,11 +189,6 @@ inline int strncasecmp(const char *s1, const char *s2, size_t n) {
 	return 0;
 }
 
-inline char *strcat(char *s1, const char *s2) {
-	strcpy(s1 + strlen(s1), s2);
-	return s1;
-}
-
 inline char *strchr(const char *p, int ch) {
 	char c = (char) ch;
 

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="-868968903555373684" 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="-868850457862413684" 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="1924002177239169812" 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="1924120622932129812" 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>

lib-artnet/.cproject

@@ -374,6 +374,7 @@
 									<listOptionValue builtIn="false" value="LIGHTSET_PORTS=4"/>
 									<listOptionValue builtIn="false" value="ARTNET_HAVE_TIMECODE"/>
 									<listOptionValue builtIn="false" value="OUTPUT_HAVE_STYLESWITCH"/>
+									<listOptionValue builtIn="false" value="ARTNET_HAVE_TRIGGER"/>
 								</option>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="true" id="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.include.paths.653222067" name="Include paths (-I)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.include.paths" valueType="includePath"/>
 								<inputType id="ilg.gnuarmeclipse.managedbuild.cross.tool.assembler.input.1115950689" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.assembler.input"/>
@@ -393,6 +394,7 @@
 									<listOptionValue builtIn="false" value="LIGHTSET_PORTS=4"/>
 									<listOptionValue builtIn="false" value="ARTNET_HAVE_TIMECODE"/>
 									<listOptionValue builtIn="false" value="OUTPUT_HAVE_STYLESWITCH"/>
+									<listOptionValue builtIn="false" value="ARTNET_HAVE_TRIGGER"/>
 								</option>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="true" id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.include.paths.510275320" name="Include paths (-I)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.include.paths" useByScannerDiscovery="true" valueType="includePath"/>
 								<inputType id="ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler.input.2134415444" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler.input"/>
@@ -412,6 +414,7 @@
 									<listOptionValue builtIn="false" value="LIGHTSET_PORTS=4"/>
 									<listOptionValue builtIn="false" value="ARTNET_HAVE_TIMECODE"/>
 									<listOptionValue builtIn="false" value="OUTPUT_HAVE_STYLESWITCH"/>
+									<listOptionValue builtIn="false" value="ARTNET_HAVE_TRIGGER"/>
 								</option>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.include.paths.1645629639" name="Include paths (-I)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.include.paths" useByScannerDiscovery="true" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/include}&quot;"/>

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 class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuildCommandParser" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser" keep-relative-paths="false" name="CDT GCC Build Output Parser" parameter="([^/\\\\]*)((g?cc)|([gc]\+\+)|(clang))" prefer-non-shared="true"/>
-			<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-868968903555373684" 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="-868850457862413684" 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="-868968903555373684" 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="-868850457862413684" 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>
@@ -26,7 +26,7 @@
 	</configuration>
 	<configuration id="ilg.gnuarmeclipse.managedbuild.cross.toolchain.base.309283989.303033930.1702909156.1968016134.361802700" name="H3">
 		<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
-			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="true" env-hash="1360993027267989977" id="org.eclipse.embedcdt.managedbuild.cross.arm.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Arm Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="true" env-hash="1362671244237841593" id="org.eclipse.embedcdt.managedbuild.cross.arm.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Arm Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} ${cross_toolchain_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>

lib-artnet/include/artnetcontroller.h

@@ -2,10 +2,7 @@
  * @file artnetcontroller.h
  *
  */
-/**
- * Art-Net Designed by and Copyright Artistic Licence Holdings Ltd.
- */
-/* Copyright (C) 2017-2024 by Arjan van Vught mailto:[email protected]
+/* Copyright (C) 2017-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
@@ -113,16 +110,14 @@ class ArtNetController: public ArtNetPollTable {
 	}
 #endif
 
-	// Handler
-	void SetArtNetTrigger(ArtNetTrigger *pArtNetTrigger) {
-		m_pArtNetTrigger = pArtNetTrigger;
-	}
-	ArtNetTrigger *GetArtNetTrigger() const {
-		return m_pArtNetTrigger;
-	}
-
 	const uint8_t *GetSoftwareVersion();
 
+#if defined (ARTNET_HAVE_TRIGGER)
+	void SetArtTriggerCallbackFunctionPtr(ArtTriggerCallbackFunctionPtr artTriggerCallbackFunctionPtr) {
+		m_ArtTriggerCallbackFunctionPtr = artTriggerCallbackFunctionPtr;
+	}
+#endif
+
 	static ArtNetController *Get() {
 		return s_pThis;
 	}
@@ -153,7 +148,8 @@ class ArtNetController: public ArtNetPollTable {
 
 	artnet::ArtDmx *m_pArtDmx;
 	artnet::ArtSync *m_pArtSync;
-	ArtNetTrigger *m_pArtNetTrigger { nullptr }; // Trigger handler
+
+	ArtTriggerCallbackFunctionPtr m_ArtTriggerCallbackFunctionPtr { nullptr };
 
 	bool m_bSynchronization { true };
 	bool m_bUnicast { true };

lib-artnet/include/artnetnode.h

@@ -68,12 +68,6 @@
 # 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"
@@ -451,18 +445,20 @@ class ArtNetNode {
 		Network::Get()->SendTo(m_nHandle, &m_ArtTimeCode, sizeof(struct artnet::ArtTimeCode), m_Node.IPAddressTimeCode, artnet::UDP_PORT);
 	}
 
-	void SetTimeCodeHandler(ArtNetTimeCode *pArtNetTimeCode) {
-		m_pArtNetTimeCode = pArtNetTimeCode;
+	void SetArtTimeCodeCallbackFunction(ArtTimeCodeCallbackFunctionPtr artTimeCodeCallbackFunctionPtr) {
+		m_ArtTimeCodeCallbackFunctionPtr = artTimeCodeCallbackFunctionPtr;
 	}
 
 	void SetTimeCodeIp(const uint32_t nDestinationIp) {
 		m_Node.IPAddressTimeCode = nDestinationIp;
 	}
 #endif
 
-	void SetArtNetTrigger(ArtNetTrigger *pArtNetTrigger) {
-		m_pArtNetTrigger = pArtNetTrigger;
+#if defined (ARTNET_HAVE_TRIGGER)
+	void SetArtTriggerCallbackFunctionPtr(ArtTriggerCallbackFunctionPtr artTriggerCallbackFunctionPtr) {
+		m_ArtTriggerCallbackFunctionPtr = artTriggerCallbackFunctionPtr;
 	}
+#endif
 
 	void SetDestinationIp(const uint32_t nPortIndex, const uint32_t nDestinationIp) {
 		if (nPortIndex < artnetnode::MAX_PORTS) {
@@ -694,8 +690,8 @@ class ArtNetNode {
 
 	LightSet *m_pLightSet { nullptr };
 
-	ArtNetTimeCode *m_pArtNetTimeCode { nullptr };
-	ArtNetTrigger *m_pArtNetTrigger { nullptr };
+	ArtTimeCodeCallbackFunctionPtr m_ArtTimeCodeCallbackFunctionPtr { nullptr };
+	ArtTriggerCallbackFunctionPtr m_ArtTriggerCallbackFunctionPtr { nullptr };
 
 	artnetnode::Node m_Node;
 	artnetnode::State m_State;
@@ -726,9 +722,6 @@ class ArtNetNode {
 #if defined (ARTNET_ENABLE_SENDDIAG)
 	artnet::ArtDiagData m_DiagData;
 #endif
-#if defined (DMXCONFIGUDP_H_)
-	DmxConfigUdp m_DmxConfigUdp;
-#endif
 
 	static inline ArtNetNode *s_pThis;
 };

lib-artnet/include/artnetrdmresponder.h

@@ -53,7 +53,7 @@ class ArtNetRdmResponder final: public RDMDeviceResponder, RDMHandler {
 		DEBUG_EXIT
 	}
 
-	~ArtNetRdmResponder() {
+	~ArtNetRdmResponder() override {
 		DEBUG_ENTRY
 		DEBUG_EXIT
 	}

lib-artnet/include/artnettimecode.h

@@ -2,9 +2,6 @@
  * @file artnettimecode.h
  *
  */
-/**
- * Art-Net Designed by and Copyright Artistic Licence Holdings Ltd.
- */
 /* Copyright (C) 2016-2024 by Arjan van Vught mailto:[email protected]
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -41,10 +38,6 @@ struct TimeCode {
 } __attribute__((packed));
 }  // namespace artnet
 
-class ArtNetTimeCode {
-public:
-	virtual ~ArtNetTimeCode() = default;
-	virtual void Handler(const struct artnet::TimeCode *)= 0;
-};
+typedef void (*ArtTimeCodeCallbackFunctionPtr)(const struct artnet::TimeCode *);
 
 #endif /* ARTNETTIMECODE_H_ */

lib-artnet/include/artnettrigger.h

@@ -2,10 +2,7 @@
  * @file artnettrigger.h
  *
  */
-/**
- * Art-Net Designed by and Copyright Artistic Licence Holdings Ltd.
- */
-/* Copyright (C) 2019-2023 by Arjan van Vught mailto:[email protected]
+/* Copyright (C) 2019-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
@@ -31,27 +28,28 @@
 
 #include <cstdint>
 
-// When the Oem field = ffff16 the meaning of the SubKey field is defined by enum TArtTriggerKey
+// When the Oem field = ffff the meaning of the SubKey field is defined by enum ArtTriggerKey
 
-enum TArtTriggerKey {
+enum class ArtTriggerKey: uint8_t {
 	ART_TRIGGER_KEY_ASCII,	///< The SubKey field contains an ASCII character which the receiving device should process as if it were a keyboard press. (Payload not used).
 	ART_TRIGGER_KEY_MACRO,	///< The SubKey field contains the number of a Macro which the receiving device should execute. (Payload not used).
 	ART_TRIGGER_KEY_SOFT,	///< The SubKey field contains a soft-key number which the receiving device should process as if it were a soft-key keyboard press. (Payload not used).
-	ART_TRIGGER_KEY_SHOW	///< The SubKey field contains the number of a Show which the receiving device should run. (Payload not used).
+	ART_TRIGGER_KEY_SHOW,	///< The SubKey field contains the number of a Show which the receiving device should run. (Payload not used).
+	ART_TRIGGER_UNDEFINED
 };
 
-// If the Oem field is set to a value other than ffff16 then the Key and SubKey fields are manufacturer specific.
+inline bool operator== (uint8_t a, ArtTriggerKey b) {
+	return (static_cast<uint32_t>(a) == static_cast<uint32_t>(b));
+}
 
-struct TArtNetTrigger {
+// If the Oem field is set to a value other than ffff then the Key and SubKey fields are manufacturer specific.
+
+struct ArtNetTrigger {
 	uint8_t Key;		///< The Trigger Key.
 	uint8_t SubKey;		///< The Trigger SubKey.
 	uint8_t Data[512];	///< The interpretation of the payload is defined by the Key.
 }__attribute__((packed));
 
-class ArtNetTrigger {
-public:
-	virtual ~ArtNetTrigger() = default;
-	virtual void Handler(const struct TArtNetTrigger *ptArtNetTrigger)= 0;
-};
+typedef void (*ArtTriggerCallbackFunctionPtr)(const struct ArtNetTrigger *);
 
 #endif /* ARTNETTRIGGER_H_ */

lib-artnet/src/controller/artnetcontroller.cpp

@@ -2,9 +2,6 @@
  * @file artnetcontroller.cpp
  *
  */
-/**
- * Art-Net Designed by and Copyright Artistic Licence Holdings Ltd.
- */
 /* Copyright (C) 2017-2024 by Arjan van Vught mailto:[email protected]
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -383,13 +380,7 @@ void ArtNetController::HandleBlackout() {
 
 void ArtNetController::HandleTrigger() {
 	DEBUG_ENTRY
-	const ArtTrigger *pArtTrigger = &m_pArtNetPacket->ArtPacket.ArtTrigger;
-
-	if ((pArtTrigger->OemCodeHi == 0xFF && pArtTrigger->OemCodeLo == 0xFF) || (pArtTrigger->OemCodeHi == m_ArtNetController.Oem[0] && pArtTrigger->OemCodeLo == m_ArtNetController.Oem[1])) {
-		DEBUG_PRINTF("Key=%d, SubKey=%d, Data[0]=%d", pArtTrigger->Key, pArtTrigger->SubKey, pArtTrigger->Data[0]);
 
-		m_pArtNetTrigger->Handler(reinterpret_cast<const struct TArtNetTrigger*>(&pArtTrigger->Key));
-	}
 
 	DEBUG_EXIT
 }
@@ -464,11 +455,16 @@ void ArtNetController::Run() {
 	case artnet::OpCodes::OP_POLL:
 		HandlePoll();
 		break;
-	case artnet::OpCodes::OP_TRIGGER:
-		if (m_pArtNetTrigger != nullptr) {
-			HandleTrigger();
+#if defined (ARTNET_HAVE_TRIGGER)
+	case artnet::OpCodes::OP_TRIGGER: {
+		const ArtTrigger *pArtTrigger = &m_pArtNetPacket->ArtPacket.ArtTrigger;
+		if ((pArtTrigger->OemCodeHi == 0xFF && pArtTrigger->OemCodeLo == 0xFF) || (pArtTrigger->OemCodeHi == m_ArtNetController.Oem[0] && pArtTrigger->OemCodeLo == m_ArtNetController.Oem[1])) {
+			DEBUG_PRINTF("Key=%d, SubKey=%d, Data[0]=%d", pArtTrigger->Key, pArtTrigger->SubKey, pArtTrigger->Data[0]);
+			m_ArtTriggerCallbackFunctionPtr(reinterpret_cast<const struct ArtNetTrigger*>(&pArtTrigger->Key));
 		}
+	}
 		break;
+#endif
 	default:
 		break;
 	}