update: 添加新标志字段-提供全自动软件OTA能力

Author: Caotl21

Bootloader/boot_flag.c

@@ -62,17 +62,17 @@ void BootFlag_Read(BootFlag_t *out)
     else
     {
         /* 未初始化，填充默认值 */
-        out->valid_flag    = APP_VALID_FLAG;
-        out->boot_attempts = 0;
-        out->need_copy     = 0;
-        out->ota_complete  = 0;
-        out->reserved1     = 0;
-        out->app1_version  = 0;
-        out->app2_version  = 0;
-        out->app1_crc      = 0;
-        out->app2_crc      = 0;
-        out->boot_count    = 0;
-        out->reserved2     = 0;
+        out->valid_flag         = APP_VALID_FLAG;
+        out->boot_attempts      = 0;
+        out->need_copy          = 0;
+        out->ota_complete       = 0;
+        out->enter_bootloader   = 0;
+        out->app1_version       = 0;
+        out->app2_version       = 0;
+        out->app1_crc           = 0;
+        out->app2_crc           = 0;
+        out->boot_count         = 0;
+        out->reserved2          = 0;
     }
 }
 
@@ -106,3 +106,36 @@ void BootFlag_MarkBootSuccess(void)
     }
 }
 
+/**
+ * @brief  检查并清除进入Bootloader的请求标志
+ * @retval 1:需要进入Bootloader, 0:不需要
+ */
+uint8_t BootFlag_CheckAndClearEnterBootloader(void)
+{
+    BootFlag_t boot_flag;
+
+    BootFlag_Read(&boot_flag);
+    if (boot_flag.enter_bootloader == 0)
+    {
+        return 0;
+    }
+
+    boot_flag.enter_bootloader = 0;
+    BootFlag_Save(&boot_flag);
+    return 1;
+}
+
+/**
+ * @brief  请求进入Bootloader
+ */
+void BootFlag_RequestEnterBootloader(void)
+{
+    BootFlag_t boot_flag;
+    
+    BootFlag_Read(&boot_flag);
+    boot_flag.enter_bootloader = 1;
+    BootFlag_Save(&boot_flag);
+}
+
+
+

Bootloader/boot_flag.h

@@ -15,7 +15,7 @@ typedef struct
     uint8_t  boot_attempts;
     uint8_t  need_copy;
     uint8_t  ota_complete;
-    uint8_t  reserved1;
+    uint8_t  enter_bootloader;
     uint32_t app1_version;
     uint32_t app2_version;
     uint32_t app1_crc;
@@ -27,6 +27,8 @@ typedef struct
 void BootFlag_Read(BootFlag_t *out);
 int32_t BootFlag_Save(BootFlag_t *flag);
 void BootFlag_MarkBootSuccess(void);
+void BootFlag_RequestEnterBootloader(void);
+uint8_t BootFlag_CheckAndClearEnterBootloader(void);
 
 #endif
 

Bootloader/main.c

@@ -87,6 +87,12 @@ int main(void)
         Serial_SendString("\r\n");
     }
 
+    if(BootFlag_CheckAndClearEnterBootloader())
+    {
+        Serial_SendString("\r\n>>> Enter Bootloader Requested <<<\r\n");
+        Bootloader_CommandLoop();
+    }
+
     /* 等待3秒检测是否进入Bootloader模式 */
     Serial_SendString("Send 'B' within 3s to enter Bootloader mode...\r\n");
 

Bootloader/tools/ota_send.py

@@ -29,6 +29,7 @@
 
 PACKET_SIZE = 128
 PACKET_1K_SIZE = 1024
+OTA_TRIGGER = bytes([0x12, 0x34, 0x56, 0x78])
 
 
 class SerialConsole:
@@ -131,6 +132,18 @@ def build_header_payload(file_path: Path) -> bytes:
     return payload.ljust(PACKET_SIZE, b"\0")
 
 
+def wait_for_boot_menu_withinapp(cmd_port: serial.Serial, console: SerialConsole, seconds: float) -> None:
+    print("Waiting for bootloader menu on USART1...")
+    deadline = time.monotonic() + seconds
+
+    while time.monotonic() < deadline:
+        time.sleep(0.05)
+        console.poll()
+        if console.contains("READY") or console.contains("Commands:"):
+            return
+
+    raise TimeoutError("Bootloader menu was not detected on the command UART")
+
 def wait_for_boot_menu(cmd_port: serial.Serial, console: SerialConsole, seconds: float) -> None:
     print("Reset the board now. Sending 'B' repeatedly on the command UART...")
     deadline = time.monotonic() + seconds
@@ -209,6 +222,12 @@ def transfer_file(
     print("Ymodem transfer finished.")
 
 
+def send_ota_trigger(data_port: serial.Serial) -> None:
+    print("Sending OTA trigger to APP on USART2...")
+    data_port.write(OTA_TRIGGER)
+    data_port.flush()
+
+
 def parse_args() -> argparse.Namespace:
     parser = argparse.ArgumentParser(description="Send APP image to STM32 bootloader over two UARTs")
     parser.add_argument("--cmd-port", required=True, help="Command/debug UART, typically USART1 (for example COM5)")
@@ -238,11 +257,23 @@ def main() -> int:
 
         console = SerialConsole(cmd_port, "cmd")
 
-        wait_for_boot_menu(cmd_port, console, args.boot_window)
+        send_ota_trigger(data_port)
+
+        time.sleep(0.5)
+
+        cmd_port.reset_input_buffer()
+        data_port.reset_input_buffer()
+
+        wait_for_boot_menu_withinapp(cmd_port, console, args.boot_window)
+
+        #wait_for_boot_menu(cmd_port, console, args.boot_window)
         print("Bootloader menu detected, sending command '2'...")
         send_command(cmd_port, b"2", console)
         transfer_file(data_port, file_path, console, args.retries)
 
+        print("Sending OTA trigger...")
+        send_ota_trigger(data_port)
+
         print("Waiting for final bootloader output...")
         time.sleep(1.0)
         console.poll()