V2.0

- Improved build system
- Added stack debug framework
- Removed not used source files
- Added support DMX delta output
- Added Manufacturer PIDs (https://www.gd32-dmx.org/rdm.html)
- Added support for void __libc_init_array(void)
- Changed the layout of the config store.
    - Before upgrading the firmware it is advised to make a backup of the configuration.
    - After the upgrade, then restore the saved configuration.

Author: vanvught

.gitignore

@@ -63,6 +63,11 @@ lib-network/src/apps/*
 lib-network/src/emac/*
 lib-network/src/net/*
 
+*.list
+*.map
 *.bin
+*.size
+
 do-tftp.sh
 udp_send
+

Board-tester/.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="-1021011516338226530" 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="-1020270605534866530" 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>

Board-tester/gd32f10x.list

@@ -1,8 +1,57 @@
-INCLUDES:= -I./include -I../include -I../lib-hal/include -I../lib-debug/include 
+INCLUDES:=-I./include -I../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../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
+INCLUDES+=-I../lib-gd32/include
+
+USB_HOST=
+ifeq ($(findstring ENABLE_USB_HOST,$(DEFINES)), ENABLE_USB_HOST)
+	USB_HOST=1
+endif
+ifeq ($(findstring ENABLE_USB_HOST,$(MAKE_FLAGS)), ENABLE_USB_HOST)
+	USB_HOST=1
+endif
+
+USB_HOST_MSC=
+ifeq ($(findstring ENABLE_USB_HOST,$(DEFINES)), ENABLE_USB_HOST)
+	USB_HOST_MSC=1
+endif
+ifeq ($(findstring ENABLE_USB_HOST,$(MAKE_FLAGS)), ENABLE_USB_HOST)
+	USB_HOST_MSC=1
+endif
+
+ifdef USB_HOST
+	INCLUDES+=-I../lib-gd32/device/usb
+	INCLUDES+=-I../lib-hal/device/usb/host/gd32
+endif
+
+ifeq ($(findstring gd32f20x,$(FAMILY)), gd32f20x)
+	ifdef USB_HOST
+		INCLUDES+=-I../lib-gd32/${FAMILY}/GD32F20x_usbfs_library/driver/Include
+		INCLUDES+=-I../lib-gd32/${FAMILY}/GD32F20x_usbfs_library/host/core/Include
+		INCLUDES+=-I../lib-gd32/${FAMILY}/GD32F20x_usbfs_library/ustd/common
+		ifdef USB_HOST_MSC
+			INCLUDES+=-I../lib-gd32/${FAMILY}/GD32F20x_usbfs_library/host/class/msc/Include
+			INCLUDES+=-I../lib-gd32/${FAMILY}/GD32F20x_usbfs_library/ustd/class/msc
+		endif
+	endif
+endif
+
+ifeq ($(findstring gd32f4xx,$(FAMILY)), gd32f4xx)
+  ifdef USB_HOST	
+  	INCLUDES+=-I../lib-gd32/${FAMILY}/GD32F4xx_usb_library/driver/Include
+		INCLUDES+=-I../lib-gd32/${FAMILY}/GD32F4xx_usb_library/host/core/Include
+		INCLUDES+=-I../lib-gd32/${FAMILY}/GD32F4xx_usb_library/ustd/common
+		ifdef USB_HOST_MSC
+			INCLUDES+=-I../lib-gd32/${FAMILY}/GD32F4xx_usb_library/host/class/msc/Include
+			INCLUDES+=-I../lib-gd32/${FAMILY}/GD32F4xx_usb_library/ustd/class/msc
+		endif
+	endif
+endif
+
+ifdef USB_HOST_MSC
+		EXTRA_INCLUDES+=../lib-hal/ff12c
+endif

Board-tester/gd32f10x.map

@@ -0,0 +1,72 @@
+ifndef MCU
+	$(error MCU is not set)
+endif
+
+MCU_UC=$(shell echo $(MCU) | rev | cut -c3- | rev )
+MCU_LC=$(shell echo $(MCU_UC) | tr A-Z a-z )
+
+$(info $$MCU [${MCU}])
+$(info $$MCU_LC [${MCU_LC}])
+$(info $$MCU_UC [${MCU_UC}])
+
+ifeq ($(strip $(MCU)),GD32F103RC)
+	LINKER=$(FIRMWARE_DIR)gd32f103rc_flash.ld
+	FAMILY=gd32f10x
+	LINE=gd32f10x_hd
+endif
+
+ifeq ($(strip $(MCU)),GD32F107RC)
+	LINKER=$(FIRMWARE_DIR)gd32f107rc_flash.ld
+	FAMILY=gd32f10x
+	LINE=gd32f10x_cl
+endif
+
+ifeq ($(strip $(MCU)),GD32F207VC)
+	LINKER=$(FIRMWARE_DIR)gd32f207vc_flash.ld
+	FAMILY=gd32f20x
+	LINE=gd32f20x_cl
+endif
+	
+ifeq ($(strip $(MCU)),GD32F207RG)
+	LINKER=$(FIRMWARE_DIR)gd32f207rg_flash.ld
+	FAMILY=gd32f20x
+	LINE=gd32f20x_cl
+endif
+
+ifeq ($(strip $(MCU)),GD32F303RC)
+	LINKER=$(FIRMWARE_DIR)gd32f303rc_flash.ld
+	FAMILY=gd32f30x
+	LINE=gd32f30x_hd
+endif
+
+ifeq ($(strip $(MCU)),GD32F407RE) 
+  LINKER=$(FIRMWARE_DIR)gd32f407re_flash.ld
+  FAMILY=gd32f4xx
+  LINE=gd32f407
+endif
+
+ifeq ($(strip $(MCU)),GD32F450VE) 
+  LINKER=$(FIRMWARE_DIR)gd32f450ve_flash.ld
+  FAMILY=gd32f4xx
+  LINE=gd32f450
+endif
+
+ifeq ($(strip $(MCU)),GD32F450VI) 
+  LINKER=$(FIRMWARE_DIR)gd32f450vi_flash.ld
+  FAMILY=gd32f4xx
+  LINE=gd32f450
+endif
+
+ifndef LINKER
+	$(error MCU is not configured)
+endif
+
+FAMILY_UC=$(shell echo $(FAMILY) | tr a-w A-W)
+
+$(info $$FAMILY [${FAMILY}])
+$(info $$FAMILY_UC [${FAMILY_UC}])
+
+LINE_UC=$(shell echo $(LINE) | tr a-z A-Z)
+
+$(info $$LINE [${LINE}])
+$(info $$LINE_UC [${LINE_UC}])

firmware-template-gd32/Includes.mk

@@ -1,3 +1,5 @@
+$(info "Rules.mk")
+
 PREFIX ?= arm-none-eabi-
 
 CC	 = $(PREFIX)gcc
@@ -6,16 +8,9 @@ AS	 = $(CC)
 LD	 = $(PREFIX)ld
 AR	 = $(PREFIX)ar
 
-FAMILY?=gd32f10x
 BOARD?=BOARD_GD32F103RC
 
-FAMILY:=$(shell echo $(FAMILY) | tr A-Z a-z)
-FAMILY_UC=$(shell echo $(FAMILY) | tr a-w A-W)
-
-$(info $$FAMILY [${FAMILY}])
-$(info $$FAMILY_UC [${FAMILY_UC}])
-
-# Output 
+# Output
 TARGET=$(FAMILY).bin
 LIST=$(FAMILY).list
 MAP=$(FAMILY).map
@@ -24,17 +19,17 @@ BUILD=build_gd32/
 # Input
 SOURCE = ./
 FIRMWARE_DIR = ./../firmware-template-gd32/
-LINKER = $(FIRMWARE_DIR)/gd32f103rc_flash.ld
 
+DEFINES:=$(addprefix -D,$(DEFINES))
+DEFINES+=-DCONFIG_STORE_USE_ROM
+
+MCU=GD32F103RC
+
+include ../firmware-template-gd32/Mcu.mk
 include ../firmware-template/libs.mk
 
 LIBS+=c++ c gd32
 
-$(info [${LIBS}])
-	
-DEFINES:=$(addprefix -D,$(DEFINES))
-DEFINES+=-DCONFIG_STORE_USE_ROM
-
 include ../firmware-template-gd32/Includes.mk
 
 # The variable for the libraries include directory
@@ -51,21 +46,23 @@ LDLIBS:=$(addprefix -l,$(LIBS))
 # The variables for the dependency check 
 LIBDEP=$(addprefix ../lib-,$(LIBS))
 
+$(info $$BOARD [${BOARD}])
+$(info $$DEFINES [${DEFINES}])
+$(info $$LIBS [${LIBS}])
 $(info $$LIBDEP [${LIBDEP}])
 
-COPS=-DBARE_METAL -DGD32 -DGD32F10X_HD -D$(BOARD)
-#COPS+=-DDISABLE_PRINTF_FLOAT
-COPS+=$(DEFINES) $(MAKE_FLAGS) $(INCLUDES)
-COPS+=$(LIBINCDIRS)
+COPS=-DBARE_METAL -DGD32 -D$(LINE_UC) -D$(MCU) -D$(BOARD)
+COPS+=$(DEFINES) $(MAKE_FLAGS) $(INCLUDES) $(LIBINCDIRS)
 COPS+=-Os -mcpu=cortex-m3 -mthumb
 COPS+=-nostartfiles -ffreestanding -nostdlib
 COPS+=-fstack-usage
-COPS+=-Wstack-usage=4096
 COPS+=-ffunction-sections -fdata-sections
+COPS+=-Wall -Werror -Wpedantic -Wextra -Wunused -Wsign-conversion -Wconversion
+COPS+=-Wduplicated-cond -Wlogical-op
 
-CPPOPS=-std=c++11 
+CPPOPS=-std=c++11
 CPPOPS+=-Wnon-virtual-dtor -Woverloaded-virtual -Wnull-dereference -fno-rtti -fno-exceptions -fno-unwind-tables
-#CPPOPS+=-Wuseless-cast -Wold-style-cast
+CPPOPS+=-Wuseless-cast -Wold-style-cast
 CPPOPS+=-fno-threadsafe-statics
 
 LDOPS=--gc-sections --print-gc-sections
@@ -84,18 +81,17 @@ OBJECTS:=$(ASM_OBJECTS) $(C_OBJECTS)
 
 define compile-objects
 $(BUILD)$1/%.o: $(SOURCE)$1/%.cpp
-	$(CPP) $(COPS) $(CPPOPS) -c $$< -o $$@	
+	$(CPP) $(COPS) $(CPPOPS) -c $$< -o $$@
 
 $(BUILD)$1/%.o: $(SOURCE)$1/%.c
 	$(CC) $(COPS) -c $$< -o $$@
-	
+
 $(BUILD)$1/%.o: $(SOURCE)$1/%.S
 	$(CC) $(COPS) -D__ASSEMBLY__ -c $$< -o $$@
 endef
 
-
 all : builddirs prerequisites $(TARGET)
-	
+
 .PHONY: clean builddirs
 
 builddirs:
@@ -118,7 +114,7 @@ clean: $(LIBDEP)
 lisdep: $(LIBDEP)
 
 $(LIBDEP):
-	$(MAKE) -f Makefile.GD32 $(MAKECMDGOALS) 'FAMILY=${FAMILY}' 'MAKE_FLAGS=$(DEFINES)' -C $@ 
+	$(MAKE) -f Makefile.GD32 $(MAKECMDGOALS) 'FAMILY=${FAMILY}' 'MCU=${MCU}' 'BOARD=${BOARD}' 'MAKE_FLAGS=$(DEFINES)' -C $@
 
 # Build bin
 
@@ -127,13 +123,18 @@ $(BUILD_DIRS) :
 
 $(BUILD)startup_$(FAMILY)_hd.o : $(FIRMWARE_DIR)/startup_$(FAMILY)_hd.S
 	$(AS) $(COPS) -D__ASSEMBLY__ -c $(FIRMWARE_DIR)/startup_$(FAMILY)_hd.S -o $(BUILD)startup_$(FAMILY)_hd.o
-	
+
 $(BUILD)main.elf: Makefile.GD32 $(LINKER) $(BUILD)startup_$(FAMILY)_hd.o $(OBJECTS) $(LIBDEP)
 	$(LD) $(BUILD)startup_$(FAMILY)_hd.o $(OBJECTS) -Map $(MAP) -T $(LINKER) $(LDOPS) -o $(BUILD)main.elf $(LIBGD32) $(LDLIBS) $(PLATFORM_LIBGCC) -lgcc 
 	$(PREFIX)objdump -D $(BUILD)main.elf | $(PREFIX)c++filt > $(LIST)
-	$(PREFIX)size -A -x $(BUILD)main.elf
+	$(PREFIX)size -A -x $(BUILD)main.elf > $(FAMILY).size
+	$(MAKE) -f Makefile.GD32 calculate_unused_ram SIZE_FILE=$(FAMILY).size LINKER_SCRIPT=$(LINKER)
+
+$(TARGET) : $(BUILD)main.elf
+	$(PREFIX)objcopy $(BUILD)main.elf -O binary $(TARGET)
+
+$(foreach bdir,$(SRCDIR),$(eval $(call compile-objects,$(bdir))))
 
-$(TARGET) : $(BUILD)main.elf 
-	$(PREFIX)objcopy $(BUILD)main.elf -O binary $(TARGET)	
-	
-$(foreach bdir,$(SRCDIR),$(eval $(call compile-objects,$(bdir))))
+.PHONY: calculate_unused_ram
+calculate_unused_ram: $(FAMILY).size $(LINKER)
+	@$(FIRMWARE_DIR)/calculate_unused_ram.sh $(FAMILY).size $(LINKER)

firmware-template-gd32/Mcu.mk

@@ -0,0 +1,21 @@
+#!/bin/bash
+
+if [ $# -lt 2 ]; then
+  echo "Usage: $0 <size_file> <linker_script>"
+  exit 1
+fi
+
+size_file="$1"
+linker_script="$2"
+
+used_stack=$(grep ".stack" "$size_file" | awk '{print $2}')
+used_heap=$(grep ".heap" "$size_file" | awk '{print $2}')
+used_data=$(grep '.data' "$size_file" | tail -n 1 | awk '{print $2}')
+used_bss=$(grep ".bss" "$size_file" | awk '{print $2}')
+
+total_ram=$(grep "RAM (xrw)" "$linker_script" | awk '{print $NF}' | sed 's/K$//' | awk '{printf "%d", $0 * 1024}')
+unused_ram=$(( $(echo $total_ram) - $(echo $used_stack) - $(echo $used_heap) - $(echo $used_data) - $(echo $used_bss) ))
+
+cat $1
+echo "RAM $total_ram bytes, Unused: $unused_ram bytes"
+echo