Sync with local development

vanvught · Feb 25, 2024 · 24e1275 · 24e1275
1 parent b1d6eab
commit 24e1275
Show file tree

Hide file tree

Showing 62 changed files with 900 additions and 293 deletions.
diff --git a/firmware-template-gd32/Board.mk b/firmware-template-gd32/Board.mk
@@ -0,0 +1,99 @@
+$(info "Board.mk")
+
+ifndef BOARD
+	$(error BOARD is not set)
+endif
+
+ifndef DEFINES
+	DEFINES=
+endif
+
+ifeq ($(strip $(BOARD)),BOARD_GD32F103RC)
+	MCU=GD32F103RC
+	DEFINES+=-DCONFIG_STORE_USE_ROM
+	DEFINES+=-DNO_EMAC
+endif
+
+ifeq ($(strip $(BOARD)),BOARD_GD32F107RC)
+	MCU=GD32F107RC
+	DEFINES+=-DCONFIG_STORE_USE_SPI
+endif
+
+ifeq ($(strip $(BOARD)),BOARD_GD32F207RG)
+	MCU=GD32F207RG
+	DEFINES+=-DCONFIG_STORE_USE_SPI
+endif
+
+ifeq ($(strip $(BOARD)),BOARD_GD32F207VC_2)
+	MCU=GD32F207VC
+	DEFINES+=-DCONFIG_STORE_USE_ROM
+	BITBANGING595=1
+endif
+
+ifeq ($(strip $(BOARD)),BOARD_GD32F207VC_4)
+	MCU=GD32F207VC
+	DEFINES+=-DCONFIG_STORE_USE_ROM
+	BITBANGING595=1
+endif
+
+ifeq ($(strip $(BOARD)),BOARD_GD32F303RC)
+	MCU=GD32F303RC
+	DEFINES+=-DCONFIG_STORE_USE_ROM
+	DEFINES+=-DNO_EMAC
+endif
+
+ifeq ($(strip $(BOARD)),BOARD_GD32F407RE)
+	MCU=GD32F407RE
+	DEFINES+=-DCONFIG_STORE_USE_SPI
+endif
+
+ifeq ($(strip $(BOARD)),BOARD_GD32F450VE)
+	MCU=GD32F450VE
+	DEFINES+=-DCONFIG_STORE_USE_RAM
+	BITBANGING595=1
+endif
+
+ifeq ($(strip $(BOARD)),BOARD_GD32F450VI)
+	MCU=GD32F450VI
+endif
+
+ifeq ($(strip $(BOARD)),BOARD_16X4U_PIXEL)
+	MCU=GD32F450VI
+endif
+
+ifeq ($(strip $(BOARD)),BOARD_GD32F207C_EVAL)
+	MCU=GD32F207VC
+	DEFINES+=-DCONFIG_STORE_USE_ROM
+endif
+
+ifeq ($(strip $(BOARD)),BOARD_GD32F470Z_EVAL)
+	MCU=GD32F470ZK
+endif
+
+ifeq ($(strip $(BOARD)),BOARD_GD32H759I_EVAL)
+	MCU=GD32H759IM
+endif
+
+ifeq ($(strip $(BOARD)),BOARD_BW_OPIDMX4)
+	BOARD_DMX=4
+endif
+
+ifeq ($(strip $(BOARD)),BOARD_DMX3)
+	BOARD_DMX=3
+endif
+
+ifeq ($(strip $(BOARD)),BOARD_DMX4)
+ BOARD_DMX=4
+endif
+
+ifdef BOARD_DMX
+	ifeq ($(MCU),GD32F207RG)
+	else ifeq ($(MCU),GD32F407RE)
+	else
+		$(error MCU is not support for BOARD_DMX)
+	endif
+endif
+
+ifndef MCU
+	$(error BOARD is not configured)
+endif
diff --git a/firmware-template-gd32/FreeRTOS.mk b/firmware-template-gd32/FreeRTOS.mk
@@ -0,0 +1,35 @@
+$(info "FreeRTOS.mk")
+
+ifndef ARMOPS
+	$(error ARMOPS is not set)
+endif
+
+ifeq ($(findstring USE_FREE_RTOS,$(DEFINES)), USE_FREE_RTOS)
+	USEFREERTOS=1
+endif
+ifeq ($(findstring USE_FREE_RTOS,$(MAKE_FLAGS)), USE_FREE_RTOS)
+	USEFREERTOS=1
+endif
+
+ifdef USEFREERTOS
+  INCLUDES+=-I../lib-gd32/FreeRTOS/FreeRTOS-Kernel/include
+
+  ifeq ($(findstring cortex-m3,$(ARMOPS)), cortex-m3)
+  	FREE_RTOS_PORTABLE=ARM_CM3
+  endif
+
+  ifeq ($(findstring cortex-m4,$(ARMOPS)), cortex-m4)
+  	FREE_RTOS_PORTABLE=ARM_CM4F
+  endif
+
+  ifeq ($(findstring cortex-m7,$(ARMOPS)), cortex-m7)
+  	FREE_RTOS_PORTABLE=ARM_CM7
+  endif
+
+  ifndef FREE_RTOS_PORTABLE
+  	$(error FREE_RTOS_PORTABLE is not set)
+  endif
+
+  INCLUDES+=-I../lib-gd32/FreeRTOS/FreeRTOS-Kernel/portable/GCC/$(FREE_RTOS_PORTABLE)
+  DEFINES+=-D$(FREE_RTOS_PORTABLE)
+endif
diff --git a/firmware-template-gd32/Includes.mk b/firmware-template-gd32/Includes.mk
@@ -2,13 +2,13 @@ $(info "Includes.mk")
 
 INCLUDES:=-I./include -I../include 
 INCLUDES+=-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/GD/${FAMILY_UC}/Include
 INCLUDES+=-I../lib-gd32/include
+INCLUDES+=$(addprefix -I,$(EXTRA_INCLUDES))
 
 ifeq ($(findstring ENABLE_USB_HOST,$(DEFINES)), ENABLE_USB_HOST)
 	USB_HOST=1
@@ -66,5 +66,5 @@ ifeq ($(findstring gd32h7xx,$(FAMILY)), gd32h7xx)
 endif
 
 ifdef USB_HOST_MSC
-		EXTRA_INCLUDES+=../lib-hal/ff14b/source
+		INCLUDES+=-I../lib-hal/ff14b/source
 endif
diff --git a/firmware-template-gd32/Mcu.mk b/firmware-template-gd32/Mcu.mk
@@ -65,10 +65,41 @@ ifeq ($(strip $(MCU)),GD32F470ZK)
   LINE=gd32f470
 endif
 
+ifeq ($(strip $(MCU)),GD32H759IM) 
+  LINKER=$(FIRMWARE_DIR)gd32h7xx_M_flash.ld
+  FAMILY=gd32h7xx
+  LINE=gd32h759
+endif
+
 ifndef LINKER
 	$(error MCU is not configured)
 endif
 
+CMSISOPS=-D__Vendor_SysTickConfig=0
+
+ifeq ($(FAMILY),gd32f10x)
+	ARMOPS=-mcpu=cortex-m3 -mthumb -mfloat-abi=soft
+endif
+
+ifeq ($(FAMILY),gd32f20x)
+	ARMOPS=-mcpu=cortex-m3 -mthumb -mfloat-abi=soft
+endif
+
+ifeq ($(FAMILY),gd32f30x)
+	ARMOPS=-mcpu=cortex-m4 -mthumb -mfloat-abi=hard -mfpu=fpv4-sp-d16 -fsingle-precision-constant
+	CMSISOPS+=-D__FPU_PRESENT=1 -DARM_MATH_CM4
+endif
+
+ifeq ($(FAMILY),gd32f4xx)
+	ARMOPS=-mcpu=cortex-m4 -mthumb -mfloat-abi=hard -mfpu=fpv4-sp-d16 -fsingle-precision-constant
+	CMSISOPS+=-D__FPU_PRESENT=1 -DARM_MATH_CM4
+endif
+
+ifeq ($(FAMILY),gd32h7xx)
+	ARMOPS=-mcpu=cortex-m7 -mthumb -mfloat-abi=hard -mfpu=fpv5-d16 -fsingle-precision-constant
+	CMSISOPS+=-D__FPU_PRESENT=1 -DARM_MATH_CM7
+endif
+
 FAMILY_UC=$(shell echo $(FAMILY) | tr a-w A-W)
 FAMILY_UCA=$(shell echo $(FAMILY) | tr a-z A-Z)
 LINE_UC=$(shell echo $(LINE) | tr a-z A-Z)

diff --git a/gd32_emac_artnet_pixel_dmx_multi/.cproject b/gd32_emac_artnet_pixel_dmx_multi/.cproject
@@ -40,7 +40,6 @@
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/lib-ws28xx/include}&quot;"/>
 								</option>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.c.compiler.option.preprocessor.def.symbols.967936222" name="Defined symbols (-D)" superClass="gnu.c.compiler.option.preprocessor.def.symbols" useByScannerDiscovery="false" valueType="definedSymbols">
-									<listOptionValue builtIn="false" value="BARE_METAL"/>
 									<listOptionValue builtIn="false" value="GD32"/>
 									<listOptionValue builtIn="false" value="BOARD_GD32F450VI"/>
 									<listOptionValue builtIn="false" value="GD32F450"/>
@@ -83,7 +82,6 @@
 								</option>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.cpp.compiler.option.preprocessor.def.1392881180" name="Defined symbols (-D)" superClass="gnu.cpp.compiler.option.preprocessor.def" useByScannerDiscovery="false" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="GD32F450"/>
-									<listOptionValue builtIn="false" value="BARE_METAL"/>
 									<listOptionValue builtIn="false" value="GD32"/>
 									<listOptionValue builtIn="false" value="BOARD_GD32F450VI"/>
 									<listOptionValue builtIn="false" value="DISABLE_FS"/>

diff --git a/gd32_emac_artnet_pixel_dmx_multi/do-tftp.sh b/gd32_emac_artnet_pixel_dmx_multi/do-tftp.sh
@@ -11,13 +11,24 @@ echo '!tftp#1' | udp_send $1
 ON_LINE=$(echo '?tftp#' | udp_send $1 ) || true
 echo [$ON_LINE]
 
+while  [ "$ON_LINE" == "" ]
+ do
+    sleep 1
+    echo '!tftp#1' | udp_send $1 
+    ON_LINE=$(echo '?tftp#' | udp_send $1 )  || true
+done
+
+echo [$ON_LINE]
+
 while  [ "$ON_LINE" == "tftp:Off" ]
  do
     sleep 1
     echo '!tftp#1' | udp_send $1 
     ON_LINE=$(echo '?tftp#' | udp_send $1 )  || true
 done
 
+echo [$ON_LINE]
+
 sleep 1
 echo -e "Rebooting..."
 echo '?reboot##' | udp_send $1 
@@ -30,7 +41,26 @@ while  [ "$ON_LINE" == "" ]
 done
 
 echo '!tftp#1' | udp_send $1 
-echo '?tftp#' | udp_send $1 
+ON_LINE=$(echo '?tftp#' | udp_send $1 ) || true
+echo [$ON_LINE]
+
+while  [ "$ON_LINE" == "" ]
+ do
+    sleep 1
+    echo '!tftp#1' | udp_send $1 
+    ON_LINE=$(echo '?tftp#' | udp_send $1 )  || true
+done
+
+echo [$ON_LINE]
+
+while  [ "$ON_LINE" == "tftp:Off" ]
+ do
+    sleep 1
+    echo '!tftp#1' | udp_send $1 
+    ON_LINE=$(echo '?tftp#' | udp_send $1 )  || true
+done
+
+echo [$ON_LINE]
 
 tftp $1 << -EOF
 binary
@@ -39,9 +69,27 @@ quit
 -EOF
 
 echo '!tftp#0' | udp_send $1 
-sleep 1
-echo '?tftp#' | udp_send $1 
-sleep 2
+ON_LINE=$(echo '?tftp#' | udp_send $1 ) || true
+echo [$ON_LINE]
+
+while  [ "$ON_LINE" == "" ]
+ do
+    sleep 1
+    echo '!tftp#0' | udp_send $1 
+    ON_LINE=$(echo '?tftp#' | udp_send $1 )  || true
+done
+
+echo [$ON_LINE]
+
+while  [ "$ON_LINE" == "tftp:On" ]
+ do
+    sleep 1
+    echo '!tftp#0' | udp_send $1 
+    ON_LINE=$(echo '?tftp#' | udp_send $1 )  || true
+done
+
+echo [$ON_LINE]
+
 echo -e "Rebooting..."
 echo '?reboot##' | udp_send $1 
 

diff --git a/gd32_emac_artnet_pixel_multi/.cproject b/gd32_emac_artnet_pixel_multi/.cproject
@@ -38,7 +38,6 @@
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/lib-ws28xxdmx/include}&quot;"/>
 								</option>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.c.compiler.option.preprocessor.def.symbols.1904163046" name="Defined symbols (-D)" superClass="gnu.c.compiler.option.preprocessor.def.symbols" useByScannerDiscovery="false" valueType="definedSymbols">
-									<listOptionValue builtIn="false" value="BARE_METAL"/>
 									<listOptionValue builtIn="false" value="GD32"/>
 									<listOptionValue builtIn="false" value="BOARD_GD32F450V"/>
 									<listOptionValue builtIn="false" value="GD32F450"/>
@@ -81,7 +80,6 @@
 								</option>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.cpp.compiler.option.preprocessor.def.1773537341" name="Defined symbols (-D)" superClass="gnu.cpp.compiler.option.preprocessor.def" useByScannerDiscovery="false" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="GD32F450"/>
-									<listOptionValue builtIn="false" value="BARE_METAL"/>
 									<listOptionValue builtIn="false" value="GD32"/>
 									<listOptionValue builtIn="false" value="BOARD_GD32F450V"/>
 									<listOptionValue builtIn="false" value="DISABLE_FS"/>