Sync with local development

vanvught · Dec 21, 2023 · 572c01a · 572c01a
1 parent 2496f63
commit 572c01a
Show file tree

Hide file tree

Showing 15 changed files with 14 additions and 190 deletions.
diff --git a/firmware-template-gd32/Includes.mk b/firmware-template-gd32/Includes.mk
@@ -1,12 +1,11 @@
 $(info "Includes.mk")
 
-INCLUDES:=-I./include -I../include -I../lib-hal/include -I../lib-debug/include 
+INCLUDES:=-I./include -I../include -I../lib-configstore/include -I../lib-flash/include -I../lib-flashcode/include -I../lib-hal/include -I../lib-debug/include 
 INCLUDES+=$(addprefix -I,$(EXTRA_INCLUDES))
 INCLUDES+=-I../firmware-template-gd32/include
 INCLUDES+=-I../firmware-template-gd32/template
 INCLUDES+=-I../CMSIS/Core/Include
 INCLUDES+=-I../lib-gd32/${FAMILY}/${FAMILY_UC}_standard_peripheral/Include
-#INCLUDES+=-I../lib-gd32/${FAMILY}/CMSIS
 INCLUDES+=-I../lib-gd32/${FAMILY}/CMSIS/GD/${FAMILY_UC}/Include
 INCLUDES+=-I../lib-gd32/include
 

diff --git a/gd32_emac_artnet_pixel_dmx_multi/include/sofware_version_id.h b/gd32_emac_artnet_pixel_dmx_multi/include/sofware_version_id.h
@@ -1 +1 @@
-constexpr uint32_t DEVICE_SOFTWARE_VERSION_ID=1702811908;
+constexpr uint32_t DEVICE_SOFTWARE_VERSION_ID=1703179673;
diff --git a/gd32_emac_artnet_pixel_multi/include/sofware_version_id.h b/gd32_emac_artnet_pixel_multi/include/sofware_version_id.h
@@ -1 +1 @@
-constexpr uint32_t DEVICE_SOFTWARE_VERSION_ID=1702811908;
+constexpr uint32_t DEVICE_SOFTWARE_VERSION_ID=1703179698;
diff --git a/gd32_emac_ddp_pixel_dmx_multi/include/sofware_version_id.h b/gd32_emac_ddp_pixel_dmx_multi/include/sofware_version_id.h
@@ -1 +1 @@
-constexpr uint32_t DEVICE_SOFTWARE_VERSION_ID=1702811913;
+constexpr uint32_t DEVICE_SOFTWARE_VERSION_ID=1703179706;
diff --git a/gd32_emac_ddp_pixel_multi/include/sofware_version_id.h b/gd32_emac_ddp_pixel_multi/include/sofware_version_id.h
@@ -1 +1 @@
-constexpr uint32_t DEVICE_SOFTWARE_VERSION_ID=1702811915;
+constexpr uint32_t DEVICE_SOFTWARE_VERSION_ID=1703179714;
diff --git a/gd32_emac_e131_pixel_dmx_multi/include/sofware_version_id.h b/gd32_emac_e131_pixel_dmx_multi/include/sofware_version_id.h
@@ -1,2 +1 @@
-// Generated do 14 sep 2023 12:39:45 CEST
-constexpr uint32_t DEVICE_SOFTWARE_VERSION_ID=1694687985;
+constexpr uint32_t DEVICE_SOFTWARE_VERSION_ID=1703179728;
diff --git a/gd32_emac_e131_pixel_multi/include/sofware_version_id.h b/gd32_emac_e131_pixel_multi/include/sofware_version_id.h
@@ -1,2 +1 @@
-// Generated do 14 sep 2023 12:39:46 CEST
-constexpr uint32_t DEVICE_SOFTWARE_VERSION_ID=1694687986;
+constexpr uint32_t DEVICE_SOFTWARE_VERSION_ID=1703179736;
diff --git a/lib-configstore/.cproject b/lib-configstore/.cproject
@@ -76,7 +76,6 @@
 						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src/dmx"/>
 						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src/e131"/>
 						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src/pixel"/>
-						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src/rdm"/>
 					</sourceEntries>
 				</configuration>
 			</storageModule>
@@ -185,7 +184,6 @@
 						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src/dmx"/>
 						<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="src/e131"/>
 						<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="src/pixel"/>
-						<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="src/rdm"/>
 					</sourceEntries>
 				</configuration>
 			</storageModule>

diff --git a/lib-configstore/Rules.mk b/lib-configstore/Rules.mk
@@ -1,6 +1,6 @@
 $(info $$MAKE_FLAGS [${MAKE_FLAGS}])
 
-EXTRA_INCLUDES =../lib-flashcode/include ../lib-flash/include
+EXTRA_INCLUDES =../lib-flashcode/include
 EXTRA_INCLUDES+=../lib-hal/include ../lib-properties/include ../lib-lightset/include ../lib-network/include
 
 ifneq ($(MAKE_FLAGS),)

diff --git a/lib-configstore/include/storepca9685.h b/lib-configstore/include/storepca9685.h
diff --git a/lib-configstore/include/storerdmdevice.h b/lib-configstore/include/storerdmdevice.h
diff --git a/lib-configstore/src/rdm/storerdmdevice.cpp b/lib-configstore/src/rdm/storerdmdevice.cpp
diff --git a/lib-debug/.settings/language.settings.xml b/lib-debug/.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="-987039757082782242" 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="-987013254894174242" 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-rdm/include/rdmhandler.h b/lib-rdm/include/rdmhandler.h
@@ -128,6 +128,9 @@ class RDMHandler {
 #endif
 #if defined (ENABLE_RDM_PRESET_PLAYBACK)
 	void SetPresetPlayback(bool IsBroadcast, uint16_t nSubDevice);
+#endif
+#if defined (ENABLE_RDM_MANUFACTURER_PIDS)
+	void SetManufacturerPid(bool IsBroadcast, uint16_t nSubDevice);
 #endif
 	// ANSI E1.37-1
 	void SetIdentifyMode(bool IsBroadcast, uint16_t nSubDevice);

diff --git a/lib-remoteconfig/Rules.mk b/lib-remoteconfig/Rules.mk
@@ -1,7 +1,7 @@
 $(info $$MAKE_FLAGS [${MAKE_FLAGS}])
 
-EXTRA_INCLUDES=../lib-hal/include ../lib-network/include ../lib-properties/include ../lib-display/include ../lib-lightset/include ../lib-configstore/include
-EXTRA_INCLUDES+=../lib-flash/include ../lib-flashcode/include ../lib-flashcodeinstall/include
+EXTRA_INCLUDES=../lib-network/include ../lib-properties/include ../lib-display/include ../lib-lightset/include ../lib-configstore/include
+EXTRA_INCLUDES+=../lib-flashcode/include ../lib-flashcodeinstall/include
 
 ifneq ($(MAKE_FLAGS),)
 	ifneq (,$(findstring ENABLE_HTTPD,$(MAKE_FLAGS)))