Merge pull request #271 from vanvught/development

Resolves #265 , Resolves #266 , Resolves #267 , Resolves #268 , Resolves #270
vanvught · Oct 7, 2023 · 8e421ea · 8e421ea
2 parents f27ae14 + 0406d60
commit 8e421ea
Show file tree

Hide file tree

Showing 650 changed files with 11,954 additions and 8,713 deletions.
diff --git a/firmware-template-h3/Rules.mk b/firmware-template-h3/Rules.mk
@@ -50,13 +50,20 @@ ifneq ($(findstring _TIME_STAMP_YEAR_,$(DEFINES)), _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")
 endif
 
+DEFINES+=-DPHY_TYPE=PHY_GENERIC
 DEFINES+=-DENABLE_TFTP_SERVER -D__FPU_PRESENT=1
 DEFINES+=-DCONFIG_MDNS_DOMAIN_REVERSE
 
 ifneq ($(findstring CONFIG_STORE_USE_SPI,$(DEFINES)), CONFIG_STORE_USE_SPI)
 	DEFINES+=-DCONFIG_STORE_USE_SPI
 endif
 
+ifeq ($(findstring ARTNET_VERSION=4,$(DEFINES)),ARTNET_VERSION=4)
+	ifeq ($(findstring ARTNET_HAVE_DMXIN,$(DEFINES)),ARTNET_HAVE_DMXIN)
+		DEFINES+=-DE131_HAVE_DMXIN
+	endif
+endif
+
 #DEFINES+=-DDEBUG_I2C
 #DEFINES+=-DDEBUG_STACK
 

diff --git a/firmware-template-h3/lib/Rules.mk b/firmware-template-h3/lib/Rules.mk
@@ -34,6 +34,7 @@ ifneq ($(findstring _TIME_STAMP_YEAR_,$(DEFINES)), _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")
 endif
 
+DEFINES+=-DPHY_TYPE=PHY_GENERIC
 DEFINES+=-DENABLE_TFTP_SERVER -D__FPU_PRESENT=1
 DEFINES+=-DCONFIG_MDNS_DOMAIN_REVERSE
 
@@ -52,6 +53,12 @@ ifeq ($(NO_EXT_LED),1)
 	DEFINES+=-DDO_NOT_USE_EXTERNAL_LED
 endif
 
+ifeq ($(findstring ARTNET_VERSION=4,$(DEFINES)),ARTNET_VERSION=4)
+	ifeq ($(findstring ARTNET_HAVE_DMXIN,$(DEFINES)),ARTNET_HAVE_DMXIN)
+		DEFINES+=-DE131_HAVE_DMXIN
+	endif
+endif
+
 $(info $$DEFINES [${DEFINES}])
 $(info $$MAKE_FLAGS [${MAKE_FLAGS}])
 

diff --git a/firmware-template-h3/memmap b/firmware-template-h3/memmap
@@ -40,6 +40,29 @@ SECTIONS
     . = ALIGN(4);
      *(.rodata*)
     } > ram
+
+      .preinit_array :
+  {
+    PROVIDE_HIDDEN (__preinit_array_start = .);
+    KEEP (*(.preinit_array*))
+    PROVIDE_HIDDEN (__preinit_array_end = .);
+  } > ram
+
+  .init_array :
+  {
+    PROVIDE_HIDDEN (__init_array_start = .);
+    KEEP (*(SORT(.init_array.*)))
+    KEEP (*(.init_array*))
+    PROVIDE_HIDDEN (__init_array_end = .);
+  } > ram
+
+  .fini_array :
+  {
+    PROVIDE_HIDDEN (__fini_array_start = .);
+    KEEP (*(.fini_array*))
+    KEEP (*(SORT(.fini_array.*)))
+    PROVIDE_HIDDEN (__fini_array_end = .);
+  } > ram
 
     .data : 
     {  

diff --git a/firmware-template-h3/vectors.S b/firmware-template-h3/vectors.S
@@ -147,12 +147,12 @@ reset:
 #endif
 
     bl vfp_init
-	bl mmu_enable
+	  bl mmu_enable
     bl hardware_init
 #if defined ( NO_EMAC )
 	bl emac_shutdown
 #endif
-
+    bl  __libc_init_array
     bl main
 halt:
     wfe

diff --git a/firmware-template-linux/Rules.mk b/firmware-template-linux/Rules.mk
@@ -39,6 +39,7 @@ ifdef LINUX
 			LDLIBS=-lbcm2835
 		endif
 		DEFINES+=RASPPI
+		DEFINES+=BCM2835_NO_DELAY_COMPATIBILITY
 	endif
 endif
 
@@ -52,6 +53,12 @@ DEFINES+=-DCONFIG_STORE_USE_FILE
 DEFINES+=-DCONFIG_MDNS_DOMAIN_REVERSE
 DEFINES+=$(addprefix -I,$(EXTRA_INCLUDES))
 
+ifeq ($(findstring ARTNET_VERSION=4,$(DEFINES)),ARTNET_VERSION=4)
+	ifeq ($(findstring ARTNET_HAVE_DMXIN,$(DEFINES)),ARTNET_HAVE_DMXIN)
+		DEFINES+=-DE131_HAVE_DMXIN
+	endif
+endif
+
 # The variable for the firmware include directories
 INCDIRS=$(wildcard ./lib) $(wildcard ./include) $(wildcard ./*/include) ../firmware-template-linux/include
 INCDIRS:=$(addprefix -I,$(INCDIRS)) -I../lib-display/include

diff --git a/firmware-template-linux/lib/Rules.mk b/firmware-template-linux/lib/Rules.mk
@@ -19,6 +19,12 @@ DEFINES+=-DENABLE_HTTPD
 DEFINES+=-DCONFIG_STORE_USE_FILE 
 DEFINES+=-DCONFIG_MDNS_DOMAIN_REVERSE
 
+ifeq ($(findstring ARTNET_VERSION=4,$(DEFINES)),ARTNET_VERSION=4)
+	ifeq ($(findstring ARTNET_HAVE_DMXIN,$(DEFINES)),ARTNET_HAVE_DMXIN)
+		DEFINES+=-DE131_HAVE_DMXIN
+	endif
+endif
+
 INCLUDES:=-I./include -I../lib-hal/include -I../lib-display/include -I../lib-debug/include
 INCLUDES+=$(addprefix -I,$(EXTRA_INCLUDES))
 ifeq ($(findstring CONFIG_DISPLAY_USE_CUSTOM,$(DEFINES)),CONFIG_DISPLAY_USE_CUSTOM)
@@ -37,16 +43,14 @@ endif
 
 ifeq ($(detected_OS),Linux) 
 	ifneq (, $(shell which vcgencmd))
-
 		BCM2835 = ./../lib-bcm2835_raspbian
-
 		ifneq "$(wildcard $(BCM2835) )" ""
 			INCLUDES+=-I../lib-bcm2835_raspbian/include
 		endif
-
 		ifneq ($(findstring RASPPI,$(DEFINES)),RASPPI)
 			DEFINES+=-DRASPPI
 		endif
+		DEFINES+=-DBCM2835_NO_DELAY_COMPATIBILITY
 	endif
 endif
 

diff --git a/firmware-template/libs.mk b/firmware-template/libs.mk
@@ -15,21 +15,14 @@ ifeq ($(findstring NODE_ARTNET,$(DEFINES)),NODE_ARTNET)
 	ifeq ($(findstring ARTNET_VERSION=3,$(DEFINES)),ARTNET_VERSION=3)
 		LIBS+=artnet
 	else
-		LIBS+=artnet4 artnet e131
-		DEFINES+=NODE_E131
-		ifeq ($(findstring ARTNET_HAVE_DMXIN,$(DEFINES)),ARTNET_HAVE_DMXIN)
-			LIBS+=dmxartnet
-		endif
+		LIBS+=artnet e131
 	endif
 endif
 
 ifeq ($(findstring NODE_E131,$(DEFINES)),NODE_E131)
 	ifneq ($(findstring e131,$(LIBS)),e131)
 		LIBS+=e131
 	endif
-	ifeq ($(findstring E131_HAVE_DMXIN,$(DEFINES)),E131_HAVE_DMXIN)
-		LIBS+=dmxe131
-	endif
 endif
 
 ifeq ($(findstring NODE_SHOWFILE,$(DEFINES)),NODE_SHOWFILE)

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="-1523021845402946799" 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="-1522590371054690799" 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>
@@ -16,8 +16,8 @@
 		<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
 			<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="1922535941615169812" 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 copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
+			<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="1922967415963425812" 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>