From 691e2805cece48e2247a02601edfc922a25d7a66 Mon Sep 17 00:00:00 2001
From: DiSlord Live <dislordlive@gmail.com>
Date: Sat, 7 Jan 2023 13:39:11 +0300
Subject: [PATCH] Fix leveler pins and enter to TinySA3 DFU mode if button push
 on startup

---
 NANOVNA_STM32_F072/board.c | 21 ++++++++++++++++++++-
 NANOVNA_STM32_F072/board.h |  4 ++--
 NANOVNA_STM32_F303/board.h |  4 ++--
 3 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/NANOVNA_STM32_F072/board.c b/NANOVNA_STM32_F072/board.c
index f7d2f0e..0e71d6f 100644
--- a/NANOVNA_STM32_F072/board.c
+++ b/NANOVNA_STM32_F072/board.c
@@ -62,6 +62,25 @@ const PALConfig pal_default_config = {
 };
 #endif
 
+static bool needDFU(void) {
+  // Magick data in memory before reset
+  if (*((unsigned long *)BOOT_FROM_SYTEM_MEMORY_MAGIC_ADDRESS) == BOOT_FROM_SYTEM_MEMORY_MAGIC)
+    return true;
+  // init PortA (leveler port) and check press
+  rccEnableAHB(STM32_GPIO_EN_MASK, FALSE);
+  GPIOA->OTYPER  = VAL_GPIOA_OTYPER;
+  GPIOA->OSPEEDR = VAL_GPIOA_OSPEEDR;
+  GPIOA->PUPDR   = VAL_GPIOA_PUPDR;
+  GPIOA->ODR     = VAL_GPIOA_ODR;
+  GPIOA->AFRL    = VAL_GPIOA_AFRL;
+  GPIOA->AFRH    = VAL_GPIOA_AFRH;
+  GPIOA->MODER   = VAL_GPIOA_MODER;
+  if (palReadPort(GPIOA) & (1<<GPIOA_PUSH)) {
+    while(palReadPort(GPIOA) & (1<<GPIOA_PUSH)) {}; // Wait press
+    return true;
+  }
+  return false;
+}
 //extern void si5351_setup(void);
 
 /*
@@ -70,7 +89,7 @@ const PALConfig pal_default_config = {
  * any other initialization.
  */
 void __early_init(void) {
-  if ( *((unsigned long *)BOOT_FROM_SYTEM_MEMORY_MAGIC_ADDRESS) == BOOT_FROM_SYTEM_MEMORY_MAGIC ) {
+  if (needDFU()) {
     // require irq
     __enable_irq();
     // reset magic bytes
diff --git a/NANOVNA_STM32_F072/board.h b/NANOVNA_STM32_F072/board.h
index bc270a2..62ae414 100644
--- a/NANOVNA_STM32_F072/board.h
+++ b/NANOVNA_STM32_F072/board.h
@@ -49,8 +49,8 @@
 
 //#define GPIO_PE_SEL			0
 #define GPIOA_LEVER1			1
-#define GPIOA_LEVER2			2
-#define GPIOA_PUSH				3
+#define GPIOA_PUSH				2
+#define GPIOA_LEVER2			3
 //#define GPIO_RX_SEL            4
 //#define GPIO_LO_SEL			5
 #define GPIOA_XP				6
diff --git a/NANOVNA_STM32_F303/board.h b/NANOVNA_STM32_F303/board.h
index de76c85..76e0649 100644
--- a/NANOVNA_STM32_F303/board.h
+++ b/NANOVNA_STM32_F303/board.h
@@ -61,8 +61,8 @@
 #define GPIO_LED                0
 #define LINE_LED                PAL_LINE(GPIOA,GPIO_LED)
 #define GPIOA_LEVER1            1
-#define GPIOA_LEVER2            2
-#define GPIOA_PUSH              3
+#define GPIOA_PUSH              2
+#define GPIOA_LEVER2            3
 #define GPIO_SD_DAT2            4
 #define LINE_SD_DAT2            PAL_LINE(GPIOA,GPIO_SD_DAT2)
 #define GPIOA_DAC2              5