Build H.bin or H4.bin depend from board

Remove dead code
DiSlord · Jan 10, 2023 · c60f20a · Ho-Ro · Jan 10, 2023 · Ho-Ro
1 parent 83b7cd1
commit c60f20a
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 14 deletions.
diff --git a/Makefile b/Makefile
@@ -96,7 +96,11 @@ endif
 #
 
 # Define project name here
-PROJECT = ch
+ifeq ($(TARGET),F303)
+  PROJECT = H4
+else
+  PROJECT = H
+endif
 
 # Imported source files and paths
 #CHIBIOS = ../ChibiOS-RT
@@ -265,7 +269,7 @@ ULIBS = -lm
 RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
 include $(RULESPATH)/rules.mk
 
-flash: build/ch.bin
+flash: build/build/$(PROJECT).bin
 	dfu-util -d 0483:df11 -a 0 -s 0x08000000:leave -D build/ch.bin
 
 dfu:

diff --git a/NANOVNA_STM32_F072/board.c b/NANOVNA_STM32_F072/board.c
@@ -104,7 +104,7 @@ void __early_init(void) {
     // set msp for system memory
     __set_MSP(SYSTEM_BOOT_MSP); 
     // jump to system memory
-    ( (void (*)(void)) (*((uint32_t *)(STM32F072xB_SYSTEM_MEMORY+4))) )();
+    ((void (*)(void))(*((uint32_t *)(STM32F072xB_SYSTEM_MEMORY + 4))))();
     while (1);
   }
 

diff --git a/NANOVNA_STM32_F072/board.h b/NANOVNA_STM32_F072/board.h
@@ -36,10 +36,10 @@
  */
 #define STM32F072xB
 
-#define STM32F072xB_SYSTEM_MEMORY 0x1FFFC800
+#define STM32F072xB_SYSTEM_MEMORY            0x1FFFC800
 #define BOOT_FROM_SYTEM_MEMORY_MAGIC_ADDRESS 0x20003FF0
-#define BOOT_FROM_SYTEM_MEMORY_MAGIC 0xDEADBEEF
-#define SYSTEM_BOOT_MSP 0x20002250
+#define BOOT_FROM_SYTEM_MEMORY_MAGIC         0xDEADBEEF
+#define SYSTEM_BOOT_MSP                      0x20002250
 
 /*
  * IO pins assignments

diff --git a/NANOVNA_STM32_F303/board.c b/NANOVNA_STM32_F303/board.c
@@ -63,8 +63,8 @@ const PALConfig pal_default_config = {
 #endif
 
 void boardDFUEnter(void) {
-  __set_MSP(SYSTEM_BOOT_MSP);
-  ( (void (*)(void)) (*((uint32_t *)(STM32F303xC_SYSTEM_MEMORY + 4))) )(); // jump to DFU
+  __set_MSP(*((uint32_t *)(STM32F303xC_SYSTEM_MEMORY)));
+  ((void (*)(void))(*((uint32_t *)(STM32F303xC_SYSTEM_MEMORY + 4))))(); // jump to DFU
 }
 
 /*

diff --git a/NANOVNA_STM32_F303/board.h b/NANOVNA_STM32_F303/board.h
@@ -38,11 +38,9 @@
  */
 #define STM32F303xC
 
-#define STM32F303xC_SYSTEM_MEMORY 0x1FFFD800
-#define BOOT_FROM_SYTEM_MEMORY_MAGIC_ADDRESS 0x20009FF0
-#define BOOT_FROM_SYTEM_MEMORY_MAGIC 0xDEADBEEF
-//#define SYSTEM_BOOT_MSP *(uint32_t *)0  // 0x20001258
-#define SYSTEM_BOOT_MSP 0x20001258
+#define STM32F303xC_SYSTEM_MEMORY            0x1FFFD800
+#define BOOT_FROM_SYTEM_MEMORY_MAGIC_ADDRESS 0x20009FFC
+#define BOOT_FROM_SYTEM_MEMORY_MAGIC         0xDEADBEEF
 
 /*
  * IO pins assignments

diff --git a/main.c b/main.c
@@ -125,7 +125,7 @@ static uint16_t p_sweep = 0;
 float measured[2][SWEEP_POINTS_MAX][2];
 
 #undef VERSION
-#define VERSION "1.2.18"
+#define VERSION "1.2.19"
 
 // Version text, displayed in Config->Version menu, also send by info command
 const char *info_about[]={