V1.5

- Renamed lib-spiflashstore to lib-configstore - Removed lib-spiflash - Added lib-flashcode
vanvught · Dec 17, 2022 · e55806d · e55806d
1 parent 0bc67e5
commit e55806d
Show file tree

Hide file tree

Showing 186 changed files with 30,617 additions and 30,583 deletions.
diff --git a/Board-tester/.settings/language.settings.xml b/Board-tester/.settings/language.settings.xml
@@ -4,8 +4,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 copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
-			<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="761104609654962471" 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.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="-1022803045680579490" 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/Board-tester/gd32f10x.list b/Board-tester/gd32f10x.list
@@ -2464,8 +2464,8 @@ Disassembly of section .text:
  80018be:	481b      	ldr	r0, [pc, #108]	; (800192c <Hardware::Hardware()+0x140>)
  80018c0:	f000 fc86 	bl	80021d0 <timer_enable>
  80018c4:	f000 fd2e 	bl	8002324 <gd32_adc_init()>
- 80018c8:	220b      	movs	r2, #11
- 80018ca:	2309      	movs	r3, #9
+ 80018c8:	2211      	movs	r2, #17
+ 80018ca:	230b      	movs	r3, #11
  80018cc:	2400      	movs	r4, #0
  80018ce:	e9cd 230c 	strd	r2, r3, [sp, #48]	; 0x30
  80018d2:	237a      	movs	r3, #122	; 0x7a

diff --git a/Board-tester/gd32f10x.map b/Board-tester/gd32f10x.map
diff --git a/firmware-template-gd32/Rules.mk b/firmware-template-gd32/Rules.mk
@@ -33,6 +33,7 @@ LIBS+=c++ c gd32
 $(info [${LIBS}])
 
 DEFINES:=$(addprefix -D,$(DEFINES))
+DEFINES+=-DCONFIG_STORE_USE_ROM
 
 include ../firmware-template-gd32/Includes.mk
 

diff --git a/firmware-template-gd32/include/software_version.h b/firmware-template-gd32/include/software_version.h
@@ -26,6 +26,6 @@
 #ifndef SOFTWARE_VERSION_H_
 #define SOFTWARE_VERSION_H_
 
-constexpr char SOFTWARE_VERSION[] = "1.4";
+constexpr char SOFTWARE_VERSION[] = "1.5";
 
 #endif /* SOFTWARE_VERSION_H_ */
diff --git a/firmware-template-gd32/lib/Rules.mk b/firmware-template-gd32/lib/Rules.mk
@@ -21,6 +21,7 @@ include ../firmware-template-gd32/Includes.mk
 
 DEFINES:=$(addprefix -D,$(DEFINES))
 DEFINES+=-D_TIME_STAMP_YEAR_=$(shell date  +"%Y") -D_TIME_STAMP_MONTH_=$(shell date  +"%-m") -D_TIME_STAMP_DAY_=$(shell date  +"%-d")
+DEFINES+=-DCONFIG_STORE_USE_ROM
 
 COPS=-DBARE_METAL -DGD32 -DGD32F10X_HD -D$(BOARD)
 #COPS+=-DDISABLE_PRINTF_FLOAT

diff --git a/firmware-template/libs.mk b/firmware-template/libs.mk
@@ -32,12 +32,12 @@ ifeq ($(findstring OUTPUT_DMX_PIXEL,$(DEFINES)),OUTPUT_DMX_PIXEL)
 	LIBS+=ws28xxdmx ws28xx
 endif
 
-LIBS+=spiflashstore spiflash network
+LIBS+=network
 
 ifeq ($(findstring DISPLAY_UDF,$(DEFINES)),DISPLAY_UDF)
 	LIBS+=displayudf
 endif
 
-LIBS+=properties lightset display hal
+LIBS+=configstore flashcode properties lightset display hal
 
 $(info $$LIBS [${LIBS}])
diff --git a/gd32_dmx_usb_pro/.cproject b/gd32_dmx_usb_pro/.cproject
@@ -66,7 +66,7 @@
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/lib-network/include}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/lib-display/include}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/lib-displayudf/include}&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/lib-spiflashstore/include}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/lib-configstore/include}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/lib-dmx/include}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/lib-dmxreceiver/include}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/lib-rdm/include}&quot;"/>

diff --git a/gd32_dmx_usb_pro/Makefile.GD32 b/gd32_dmx_usb_pro/Makefile.GD32
@@ -1,7 +1,7 @@
 DEFINES=RDM_CONTROLLER    
 DEFINES+=NO_EMAC
 DEFINES+=NO_HDMI_OUTPUT
-DEFINES+=HAVE_FLASHROM
+DEFINES+=WIDGET_HAVE_FLASHROM
 DEFINES+=ENABLE_SPIFLASH
 DEFINES+=DISABLE_RTC
 DEFINES+=DISABLE_FS

diff --git a/gd32_dmx_usb_pro/firmware/main.cpp b/gd32_dmx_usb_pro/firmware/main.cpp
@@ -36,8 +36,7 @@
 #include "widgetstore.h"
 #include "rdmdeviceparams.h"
 
-#include "flashrom.h"
-#include "spiflashstore.h"
+#include "configstore.h"
 
 #include "storewidget.h"
 #include "storerdmdevice.h"
@@ -56,8 +55,8 @@ void main() {
 	Network nw;
 	LedBlink lb;
 	Display display; // Not supported, yet.
-	FlashRom flashRom;
-	SpiFlashStore spiFlashStore;
+
+	ConfigStore configStore;
 
 	Widget widget;
 	widget.SetPortDirection(0, dmx::PortDirection::INP, false);
@@ -103,7 +102,7 @@ void main() {
 	for (;;) {
 		hw.WatchdogFeed();
 		widget.Run();
-		spiFlashStore.Flash();
+		configStore.Flash();
 		lb.Run();
 	}
 }