From 00686a91d0bf953c1886d40ac7b89f22eca2a53f Mon Sep 17 00:00:00 2001
From: wh201906 <wh201906@yandex.com>
Date: Wed, 3 Jan 2024 15:39:50 +0800
Subject: [PATCH] Ignore button jitters in bootloader mode

---
 CHANGELOG.md      |  1 +
 bootrom/bootrom.c | 11 +++++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 28358328b..eb23959ae 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@ All notable changes to this project will be documented in this file.
 This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log...
 
 ## [unreleased][unreleased]
+ - Fixed bootloader - Ignore jitters when pressing the button (@wh201906)
 
 ## [Steamboat Willie.4.17768][2024-01-03]
  - Changed `mem spiffs dump -t` - now supports downloading direct into trace buffer (@hazardousvoltage)
diff --git a/bootrom/bootrom.c b/bootrom/bootrom.c
index c596c7886..e92b86e35 100644
--- a/bootrom/bootrom.c
+++ b/bootrom/bootrom.c
@@ -252,10 +252,17 @@ static void flash_mode(void) {
             }
         }
 
-        if (g_common_area.flags.button_pressed && BUTTON_PRESS() == false) {
+        bool button_state = BUTTON_PRESS();
+        // ~10ms, prevent jitter
+        delay_loop(3333);
+        if (button_state != BUTTON_PRESS()) {
+            // in jitter state, ignore
+            continue;
+        }
+        if (g_common_area.flags.button_pressed && button_state == false) {
             g_common_area.flags.button_pressed = 0;
         }
-        if (!g_common_area.flags.button_pressed && BUTTON_PRESS()) {
+        if (!g_common_area.flags.button_pressed && button_state) {
             /* Perform a reset to leave flash mode */
             g_common_area.flags.button_pressed = 1;
             usb_disable();