cleanup: GPIO Button handling

Author: tuxuser

firmware/preloader/src/main.c

@@ -72,9 +72,9 @@ int main(void) {
 
 
     // 2 second wait, debounced 
-    if (!(GPIOA->IDR & GPIO_IDR_ID13)) {
+    if (!(GPIOA->IDR & (1 << PIN_13))) {
         delayMs(DEBOUNCE_DELAY);
-        if (!(GPIOA->IDR & GPIO_IDR_ID0)) {  // check again
+        if (!(GPIOA->IDR & (1 << PIN_13))) {  // check again
             // button pressed -> system bootloader
             resetToSystemBootLoader();
         }

firmware/userapp/Core/Inc/button.h

@@ -9,7 +9,8 @@ extern "C" {
 
 extern bool button_pressed;
 
-bool Button_IsPressed(uint32_t *duration_ms);
+bool Button_IsPressed();
+uint32_t Button_IsPressedDuration();
 void Button_Tick();
 
 #ifdef __cplusplus

firmware/userapp/Core/Src/button.c

@@ -1,25 +1,24 @@
 #include "button.h"
 
 #define DELAY_TIME_MS 10
-
-static uint32_t btnpress_duration = 0;
 bool button_pressed = false;
 
-bool Button_IsPressed(uint32_t *duration_ms) {
-    *duration_ms = 0;
-    if (HAL_GPIO_ReadPin(ENTER_BL_GPIO_Port, ENTER_BL_Pin) == GPIO_PIN_RESET) {
+bool Button_IsPressed() {
+    return (HAL_GPIO_ReadPin(ENTER_BL_GPIO_Port, ENTER_BL_Pin) == GPIO_PIN_RESET);
+}
+
+uint32_t Button_IsPressedDuration() {
+    uint32_t duration_ms = 0;
+    if (Button_IsPressed()) {
         // Measure duration of button press
-        while (HAL_GPIO_ReadPin(ENTER_BL_GPIO_Port, ENTER_BL_Pin) == GPIO_PIN_RESET) {
+        while (Button_IsPressed()) {
             HAL_Delay(DELAY_TIME_MS);
-            *duration_ms += DELAY_TIME_MS;
+            duration_ms += DELAY_TIME_MS;
         }
-        return true;
     }
-    return false;
+    return duration_ms;
 }
 
 void Button_Tick() {
-    if (Button_IsPressed(&btnpress_duration)) {
-        // Do something
-    }
+    button_pressed = Button_IsPressed();
 }

firmware/userapp/Core/Src/display.c

@@ -2,6 +2,7 @@
 #include "u8g2.h"
 #include "postcodes.h"
 #include "bootloader.h"
+#include "button.h"
 
 #define OLED_Addr (0x3C << 1)
 #define DISPLAY_INIT_FUNC u8g2_Setup_ssd1306_i2c_64x32_1f_f
@@ -133,7 +134,6 @@ void Display_Init(void)
 
     // Cleanup
     u8g2_ClearDisplay(&myDisplay);
-    Display_ShowCode(0x4242, 0x71);
 }
 
 void Display_ShowCode(uint16_t code, uint8_t segment) {
@@ -167,6 +167,8 @@ void Display_Tick(void)
             POST_ReadCode(),
             POST_ReadSegment()
         );
+    } else if (Button_IsPressed()) {
+        Display_Print("BtnPress");
     }
 }