Update button behaviour. Still WIP

caveman99 · caveman99 · commit 15ecc90a3f6b · 2025-03-20T21:15:43.000+01:00
diff --git a/src/ButtonThread.cpp b/src/ButtonThread.cpp
@@ -73,7 +73,9 @@ ButtonThread::ButtonThread() : OSThread("Button")
     userButton.setDebounceMs(1);
     userButton.attachDoubleClick(userButtonDoublePressed);
     userButton.attachMultiClick(userButtonMultiPressed, this); // Reference to instance: get click count from non-static OneButton
-#ifndef T_DECK // T-Deck immediately wakes up after shutdown, so disable this function
+#if !defined(T_DECK) &&                                                                                                          \
+    !defined(                                                                                                                    \
+        ELECROW_ThinkNode_M2) // T-Deck immediately wakes up after shutdown, Thinknode M2 has this on the smaller ALT button
     userButton.attachLongPressStart(userButtonPressedLongStart);
     userButton.attachLongPressStop(userButtonPressedLongStop);
 #endif
@@ -85,11 +87,10 @@ ButtonThread::ButtonThread() : OSThread("Button")
     // Some platforms (nrf52) have a SENSE variant which allows wake from sleep - override what OneButton did
     pinMode(BUTTON_PIN_ALT, INPUT_PULLUP_SENSE);
 #endif
-    userButtonAlt.attachClick(userButtonPressed);
+    userButtonAlt.attachClick(userButtonPressedScreen);
     userButtonAlt.setClickMs(BUTTON_CLICK_MS);
     userButtonAlt.setPressMs(BUTTON_LONGPRESS_MS);
     userButtonAlt.setDebounceMs(1);
-    userButtonAlt.attachDoubleClick(userButtonDoublePressed);
     userButtonAlt.attachLongPressStart(userButtonPressedLongStart);
     userButtonAlt.attachLongPressStop(userButtonPressedLongStop);
 #endif
@@ -200,7 +201,12 @@ int32_t ButtonThread::runOnce()
             break;
         }
 
-        case BUTTON_EVENT_PRESSED1: {
+        case BUTTON_EVENT_PRESSED_SCREEN: {
+            // turn screen on or off
+            screen_flag = !screen_flag;
+            if (screen)
+                screen->setOn(screen_flag);
+            break;
         }
 
         case BUTTON_EVENT_DOUBLE_PRESSED: {
@@ -217,10 +223,6 @@ int32_t ButtonThread::runOnce()
             break;
         }
 
-        case BUTTON_EVENT_DOUBLE_PRESSED1: {
-            break;
-        }
-
         case BUTTON_EVENT_MULTI_PRESSED: {
             LOG_BUTTON("Mulitipress! %hux", multipressClickCount);
             switch (multipressClickCount) {
@@ -236,20 +238,10 @@ int32_t ButtonThread::runOnce()
 #elif defined(ELECROW_ThinkNode_M2)
             case 3:
                 LOG_INFO("3 clicks: toggle buzzer");
-                pinMode(M2_buzzer, OUTPUT);
-
-                if (!buzzer_flag) {
-                    buzzer_test();
-                    BEEP_STATE = true;
-
-                    analogWriteFrequency(4000);
-                } else {
-                    currentState = OFF;
-                    isBuzzing = false;
-                    cont = 0;
-                    BEEP_STATE = false;
-                }
                 buzzer_flag = !buzzer_flag;
+                if (buzzer_flag) {
+                    playBeep();
+                }
                 break;
 #endif
 
@@ -301,22 +293,6 @@ int32_t ButtonThread::runOnce()
             break;
         }
 
-        case BUTTON_EVENT_LONG_PRESSED1: {
-            currentState = OFF;
-            isBuzzing = false;
-            cont = 0;
-            BEEP_STATE = false;
-            pinMode(18, INPUT);
-            screen->setOn(false);
-            delay(1000);
-            pinMode(1, OUTPUT);
-            digitalWrite(1, LOW);
-            pinMode(6, OUTPUT);
-            digitalWrite(6, LOW);
-
-            break;
-        }
-
 #ifdef BUTTON_PIN_TOUCH
         case BUTTON_EVENT_TOUCH_LONG_PRESSED: {
             LOG_BUTTON("Touch press!");
@@ -341,113 +317,6 @@ int32_t ButtonThread::runOnce()
     return 50;
 }
 
-void ButtonThread::buzzer_test()
-{
-    currentState = SHORT_BEEP; // 初始化状态
-    stateStartTime = millis(); // 获取当前时间
-}
-
-void ButtonThread::buzzer_updata()
-{
-    unsigned long currentTime = millis(); // 获取当前时间
-    switch (currentState) {
-    case SHORT_BEEP:
-        if (isBuzzing) {
-            // 如果正在响，检查时间
-            if (currentTime - stateStartTime >= beepDuration) {
-                // 停止蜂鸣器
-                analogWriteFrequency(4000);
-                analogWrite(M2_buzzer, 0);
-                stateStartTime = currentTime; // 记录停的时间
-                isBuzzing = false;            // 更新状态
-            }
-        } else {
-            // 如果未响，检查时间
-            if (currentTime - stateStartTime >= 200) {
-                // 启动蜂鸣器
-                if (cont == 3) {
-                    currentState = LONG_BEEP;
-                    cont = 0;
-                    isBuzzing = false;
-                } else {
-                    analogWriteFrequency(4000);
-                    analogWrite(M2_buzzer, 127);
-                    isBuzzing = true; // 更新状态
-                    cont = cont + 1;
-                }
-                stateStartTime = currentTime; // 记录响的时间
-            }
-        }
-        break;
-    case LONG_BEEP:
-        if (isBuzzing) {
-            // 如果正在响，检查时间
-            if (currentTime - stateStartTime >= longBeepDuration) {
-                // 停止蜂鸣器
-                analogWriteFrequency(4000);
-                analogWrite(M2_buzzer, 0);
-                stateStartTime = currentTime; // 记录停的时间
-                isBuzzing = false;            // 更新状态
-            }
-        } else {
-            // 如果未响，检查时间
-            if (currentTime - stateStartTime >= 200) {
-                // 启动蜂鸣器
-                if (cont == 3) {
-                    currentState = SHORT_BEEP1;
-                    cont = 0;
-                    isBuzzing = false;
-                } else {
-                    analogWriteFrequency(4000);
-                    analogWrite(M2_buzzer, 127);
-                    isBuzzing = true; // 更新状态
-                    cont = cont + 1;
-                }
-                stateStartTime = currentTime; // 记录响的时间
-            }
-        }
-        break;
-    case SHORT_BEEP1:
-        if (isBuzzing) {
-            // 如果正在响，检查时间
-            if (currentTime - stateStartTime >= beepDuration) {
-                // 停止蜂鸣器
-                analogWriteFrequency(4000);
-                analogWrite(M2_buzzer, 0);
-                stateStartTime = currentTime; // 记录停的时间
-                isBuzzing = false;            // 更新状态
-            }
-        } else {
-            // 如果未响，检查时间
-            if (currentTime - stateStartTime >= 200) {
-                // 启动蜂鸣器
-                if (cont == 3) {
-                    currentState = WAIT;
-                    cont = 0;
-                    isBuzzing = false;
-                } else {
-                    analogWriteFrequency(4000);
-                    analogWrite(M2_buzzer, 127);
-                    isBuzzing = true; // 更新状态
-                    cont = cont + 1;
-                }
-                stateStartTime = currentTime; // 记录响的时间
-            }
-        }
-        break;
-    case WAIT:
-        if (currentTime - stateStartTime >= pauseDuration) {
-            buzzer_test();
-        }
-        break;
-    case OFF:
-        break;
-    default:
-        // 其他状态处理
-        break;
-    }
-}
-
 /*
  * Attach (or re-attach) hardware interrupts for buttons
  * Public method. Used outside class when waking from MCU sleep
@@ -573,13 +442,6 @@ void ButtonThread::userButtonPressedLongStart()
     }
 }
 
-void ButtonThread::userButtonPressedLongStart1()
-{
-    if (millis() > c_holdOffTime) {
-        btnEvent = BUTTON_EVENT_LONG_PRESSED1;
-    }
-}
-
 void ButtonThread::userButtonPressedLongStop()
 {
     if (millis() > c_holdOffTime) {
diff --git a/src/ButtonThread.h b/src/ButtonThread.h
@@ -16,8 +16,6 @@
 #define BUTTON_TOUCH_MS 400
 #endif
 
-extern int screen_flag;
-
 class ButtonThread : public concurrency::OSThread
 {
   public:
@@ -26,12 +24,10 @@ class ButtonThread : public concurrency::OSThread
     enum ButtonEventType {
         BUTTON_EVENT_NONE,
         BUTTON_EVENT_PRESSED,
-        BUTTON_EVENT_PRESSED1,
+        BUTTON_EVENT_PRESSED_SCREEN,
         BUTTON_EVENT_DOUBLE_PRESSED,
-        BUTTON_EVENT_DOUBLE_PRESSED1,
         BUTTON_EVENT_MULTI_PRESSED,
         BUTTON_EVENT_LONG_PRESSED,
-        BUTTON_EVENT_LONG_PRESSED1,
         BUTTON_EVENT_LONG_RELEASED,
         BUTTON_EVENT_TOUCH_LONG_PRESSED,
     };
@@ -42,19 +38,6 @@ class ButtonThread : public concurrency::OSThread
     void detachButtonInterrupts();
     void storeClickCount();
 
-    bool BEEP_STATE = false;
-    void buzzer_updata();
-    void buzzer_test();
-    enum BuzzerState { OFF, SHORT_BEEP, LONG_BEEP, SHORT_BEEP1, WAIT };
-
-    bool buzzer_flag = false;
-    BuzzerState currentState = OFF;
-    const int beepDuration = 1000;     // 发声持续时间
-    const int pauseDuration = 1000;    // 间隔时间
-    const int longBeepDuration = 3000; // 长音持续时间
-    unsigned long stateStartTime = 0;
-    bool isBuzzing = false; // 蜂鸣器状态
-    int cont = 0;
     // Disconnect and reconnect interrupts for light sleep
 #ifdef ARCH_ESP32
     int beforeLightSleep(void *unused);
@@ -81,6 +64,8 @@ class ButtonThread : public concurrency::OSThread
 
     // set during IRQ
     static volatile ButtonEventType btnEvent;
+    bool buzzer_flag = false;
+    bool screen_flag = true;
 
     // Store click count during callback, for later use
     volatile int multipressClickCount = 0;
@@ -89,17 +74,15 @@ class ButtonThread : public concurrency::OSThread
 
     // IRQ callbacks
     static void userButtonPressed() { btnEvent = BUTTON_EVENT_PRESSED; }
-    static void userButtonPressed1()
+    static void userButtonPressedScreen()
     {
         if (millis() > c_holdOffTime) {
-            btnEvent = BUTTON_EVENT_PRESSED1;
+            btnEvent = BUTTON_EVENT_PRESSED_SCREEN;
         }
     }
     static void userButtonDoublePressed() { btnEvent = BUTTON_EVENT_DOUBLE_PRESSED; }
-    static void userButtonDoublePressed1() { btnEvent = BUTTON_EVENT_DOUBLE_PRESSED1; }
     static void userButtonMultiPressed(void *callerThread); // Retrieve click count from non-static Onebutton while still valid
     static void userButtonPressedLongStart();
-    static void userButtonPressedLongStart1();
     static void userButtonPressedLongStop();
     static void touchPressedLongStart() { btnEvent = BUTTON_EVENT_TOUCH_LONG_PRESSED; }
 };
diff --git a/src/buzz/buzz.cpp b/src/buzz/buzz.cpp
@@ -30,8 +30,11 @@ struct ToneDuration {
 #define NOTE_B3 247
 #define NOTE_CS4 277
 
-const int DURATION_1_8 = 125; // 1/8 note
-const int DURATION_1_4 = 250; // 1/4 note
+const int DURATION_1_8 = 125;  // 1/8 note
+const int DURATION_1_4 = 250;  // 1/4 note
+const int DURATION_1_2 = 500;  // 1/2 note
+const int DURATION_3_4 = 750;  // 1/4 note
+const int DURATION_1_1 = 1000; // 1/1 note
 
 void playTones(const ToneDuration *tone_durations, int size)
 {
@@ -55,6 +58,12 @@ void playBeep()
     playTones(melody, sizeof(melody) / sizeof(ToneDuration));
 }
 
+void playLongBeep()
+{
+    ToneDuration melody[] = {{NOTE_B3, DURATION_1_1}};
+    playTones(melody, sizeof(melody) / sizeof(ToneDuration));
+}
+
 void playGPSEnableBeep()
 {
     ToneDuration melody[] = {{NOTE_C3, DURATION_1_8}, {NOTE_FS3, DURATION_1_4}, {NOTE_CS4, DURATION_1_4}};
diff --git a/src/buzz/buzz.h b/src/buzz/buzz.h
@@ -1,6 +1,7 @@
 #pragma once
 
 void playBeep();
+void playLongBeep();
 void playStartMelody();
 void playShutdownMelody();
 void playGPSEnableBeep();
diff --git a/variants/ELECROW-ThinkNode-M2/platformio.ini b/variants/ELECROW-ThinkNode-M2/platformio.ini
@@ -1,11 +1,7 @@
 [env:ThinkNode-M2]
 extends = esp32s3_base
 board = ESP32-S3-WROOM-1-N4
-board_level = extra
 build_flags =
   ${esp32s3_base.build_flags}
   -D ELECROW_ThinkNode_M2
   -I variants/ELECROW-ThinkNode-M2
-
-lib_deps = ${esp32s3_base.lib_deps}
-  ; lewisxhe/PCF8563_Library@^1.0.1
diff --git a/variants/ELECROW-ThinkNode-M2/variant.h b/variants/ELECROW-ThinkNode-M2/variant.h
@@ -10,7 +10,7 @@
 #define POWER_CHRG 6
 #define POWER_FULL 42
 
-#define M2_buzzer 5
+#define PIN_BUZZER 5
 
 #define I2C_SCL 15
 #define I2C_SDA 16
