V1.1

- Renamed lib-spiflashinstall to lib-flashcodeinstall - Renamed lib-spiflashstore to lib-configstore - Removed lib-spiflash - Added lib-flashcode
vanvught · Dec 17, 2022 · 79f7f8e · 79f7f8e
1 parent 1561063
commit 79f7f8e
Show file tree

Hide file tree

Showing 154 changed files with 17,064 additions and 14,711 deletions.
diff --git a/bootloader-tftp/.cproject b/bootloader-tftp/.cproject
@@ -55,8 +55,8 @@
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/lib-network/include}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/include}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/lib-remoteconfig/include}&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/lib-spiflashstore/include}&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/lib-spiflashinstall/include}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/lib-configstore/include}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/lib-flashcodeinstall/include}&quot;"/>
 								</option>
 								<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.762735176" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
 							</tool>

diff --git a/bootloader-tftp/.settings/language.settings.xml b/bootloader-tftp/.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="757981198595729255" 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="758215147008721255" 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/bootloader-tftp/Makefile.GD32 b/bootloader-tftp/Makefile.GD32
@@ -2,16 +2,19 @@ DEFINES =DISABLE_JSON
 DEFINES+=DISABLE_BIN
 DEFINES+=DISABLE_RTC
 DEFINES+=DISABLE_FS
+DEFINES+=DISABLE_PRINTF_FLOAT
 
 DEFINES+=UDP_MAX_PORTS_ALLOWED=2
 
-DEFINES+=CONFIG_FLASHROM_USE_I2C
+#DEFINES+=ENET_LINK_CHECK_REG_POLL
+
+DEFINES+=CONFIG_STORE_USE_I2C
 
 DEFINES+=NDEBUG
 
 SRCDIR=firmware lib
 
-LIBS=display spiflashstore remoteconfig spiflashinstall spiflash
+LIBS=remoteconfig flashcodeinstall configstore display flash flashcode
 
 include ../firmware-template-gd32/Rules.mk
 

diff --git a/bootloader-tftp/firmware/main.cpp b/bootloader-tftp/firmware/main.cpp
@@ -40,8 +40,8 @@
 #include "firmwareversion.h"
 #include "software_version.h"
 
-#include "spiflashinstall.h"
-#include "spiflashstore.h"
+#include "flashcodeinstall.h"
+#include "configstore.h"
 
 #include "gd32.h"
 
@@ -101,8 +101,8 @@ int main(void) {
 
 	fw.Print("Bootloader TFTP Server");
 
-	SpiFlashInstall flashInstall;
-	SpiFlashStore flashStore;
+	FlashCodeInstall flashCodeInstall;
+	ConfigStore configStore;
 
 	StoreNetwork storeNetwork;
 	nw.SetNetworkStore(&storeNetwork);

diff --git a/bootloader-tftp/gd32f4xx.list b/bootloader-tftp/gd32f4xx.list
diff --git a/bootloader-tftp/gd32f4xx.map b/bootloader-tftp/gd32f4xx.map
diff --git a/bootloader-tftp/include/software_version.h b/bootloader-tftp/include/software_version.h
@@ -26,6 +26,6 @@
 #ifndef SOFTWARE_VERSION_H_
 #define SOFTWARE_VERSION_H_
 
-constexpr char SOFTWARE_VERSION[] = "1.0";
+constexpr char SOFTWARE_VERSION[] = "1.1";
 
 #endif /* SOFTWARE_VERSION_H_ */
diff --git a/bootloader-tftp/lib/networkdisplay.cpp b/bootloader-tftp/lib/networkdisplay.cpp
@@ -30,37 +30,36 @@
 #include "display.h"
 #include "display7segment.h"
 
-namespace networkdisplay {
+namespace network {
 static constexpr auto LINE_IP = 2U;
-}  // namespace networkdisplay
 
-void NetworkDisplay::ShowEmacStart() {
-	Display::Get()->ClearLine(networkdisplay::LINE_IP);
+void display_emac_start() {
+	Display::Get()->ClearLine(LINE_IP);
 	Display::Get()->PutString("Ethernet start");
 }
 
-void NetworkDisplay::ShowIp() {
-	Display::Get()->ClearLine(networkdisplay::LINE_IP);
-	Display::Get()->Printf(networkdisplay::LINE_IP, "" IPSTR "/%d %c", IP2STR(Network::Get()->GetIp()), Network::Get()->GetNetmaskCIDR(), Network::Get()->GetAddressingMode());
+void display_ip() {
+	Display::Get()->ClearLine(LINE_IP);
+	Display::Get()->Printf(LINE_IP, "" IPSTR "/%d %c", IP2STR(Network::Get()->GetIp()), Network::Get()->GetNetmaskCIDR(), Network::Get()->GetAddressingMode());
 }
 
-void NetworkDisplay::ShowNetMask() {
-	ShowIp();
+void display_netmask() {
+	display_ip();
 }
 
-void NetworkDisplay::ShowGatewayIp() {
+void display_gateway() {
 }
 
-void NetworkDisplay::ShowHostName() {
+void display_hostname() {
 }
 
-void NetworkDisplay::ShowShutdown() {
-	Display::Get()->ClearLine(networkdisplay::LINE_IP);
+void display_emac_shutdown() {
+	Display::Get()->ClearLine(LINE_IP);
 	Display::Get()->PutString("Ethernet shutdown");
 }
 
-void NetworkDisplay::ShowDhcpStatus(network::dhcp::ClientStatus nStatus) {
-	Display::Get()->ClearLine(networkdisplay::LINE_IP);
+void display_dhcp_status(network::dhcp::ClientStatus nStatus) {
+	Display::Get()->ClearLine(LINE_IP);
 
 	switch (nStatus) {
 	case network::dhcp::ClientStatus::IDLE:
@@ -85,3 +84,4 @@ void NetworkDisplay::ShowDhcpStatus(network::dhcp::ClientStatus nStatus) {
 		break;
 	}
 }
+}  // namespace network
diff --git a/firmware-template-gd32/Rules.mk b/firmware-template-gd32/Rules.mk
@@ -36,6 +36,7 @@ LIBS+=c++ c gd32
 $(info [${LIBS}])
 
 DEFINES:=$(addprefix -D,$(DEFINES))
+DEFINES+=-DCONFIG_STORE_USE_I2C
 
 ifeq ($(findstring BOARD_BW_OPIDMX4,$(BOARD)), BOARD_BW_OPIDMX4)
 	DEFINES+=-DCONSOLE_I2C

diff --git a/firmware-template-gd32/gd32f450vi_flash.ld b/firmware-template-gd32/gd32f450vi_flash.ld
@@ -157,6 +157,7 @@ SECTIONS
   	. = ALIGN(4);
     *(.bkpsram)
     *(.bkpsram*)
+    *(.configstore*)
   } >BKPSRAM AT>BKPSRAM
 
   /DISCARD/ :

diff --git a/firmware-template-gd32/lib/Rules.mk b/firmware-template-gd32/lib/Rules.mk
@@ -24,6 +24,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_I2C
 
 COPS=-DBARE_METAL -DGD32 -DGD32F450 -D$(BOARD)
 COPS+=$(DEFINES) $(MAKE_FLAGS) $(INCLUDES)

diff --git a/lib-c++/.settings/language.settings.xml b/lib-c++/.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="757981198595729255" 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="758215147008721255" 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-c/.cproject b/lib-c/.cproject
@@ -23,7 +23,7 @@
 							<builder arguments="-f Makefile.GD32" id="cdt.managedbuild.builder.gnu.cross.883324977" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="cdt.managedbuild.builder.gnu.cross"/>
 							<tool id="cdt.managedbuild.tool.gnu.cross.c.compiler.22051247" name="Cross GCC Compiler" superClass="cdt.managedbuild.tool.gnu.cross.c.compiler">
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.c.compiler.option.include.paths.321243516" superClass="gnu.c.compiler.option.include.paths" valueType="includePath">
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/lib-spiflashinstall/include}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/lib-flashcodeinstall/include}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/include}&quot;"/>
 								</option>
 								<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.634822811" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>

diff --git a/lib-c/.settings/language.settings.xml b/lib-c/.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="757981198595729255" 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="758215147008721255" 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-c/src/malloc.c b/lib-c/src/malloc.c
@@ -65,7 +65,7 @@ struct block_bucket {
 	struct block_header *free_list;
 };
 
-#include "../lib-spiflashinstall/include/spiflashinstall.h"
+#include "../lib-flashcodeinstall/include/flashcodeinstall.h"
 
 static struct block_bucket s_block_bucket[] __attribute__((aligned(4))) = {{0x20, 0}, {0x40, 0}, {0x60, 0}, {0x80,0}, {0x100,0}, {0x140,0}, {0x180,0}, {0x200,0}, {0x300,0}, {0x400,0}, {FIRMWARE_MAX_SIZE,0}, {0,0}};