Merge pull request #110 from NemesisXB/BackButton

Improve menu navigation.

Author: eamars

src/and_scale_calibrate.c

@@ -91,8 +91,16 @@ uint8_t scale_calibrate_with_external_weight() {
     strcpy(line1, "Confirm pan is empty");
     strcpy(line2, "Press Next to continue");
     show_next_key = true;
-    while (button_wait_for_input(true) != BUTTON_ENCODER_PRESSED) {
-        ;
+    while (true) {
+        ButtonEncoderEvent_t ev = button_wait_for_input(true);
+        if (ev == BUTTON_RST_PRESSED) {
+            show_next_key = false;
+            vTaskSuspend(scale_calibration_render_task_handler);
+            return 31;  // back to Scale menu
+        }
+        if (ev == BUTTON_ENCODER_PRESSED) {
+            break;
+        }
     }
     show_next_key = false;
     scale_press_print_key();
@@ -108,8 +116,16 @@ uint8_t scale_calibrate_with_external_weight() {
     strcpy(line2, "Press Next to continue");
 
     show_next_key = true;
-    while (button_wait_for_input(true) != BUTTON_ENCODER_PRESSED) {
-        ;
+    while (true) {
+        ButtonEncoderEvent_t ev = button_wait_for_input(true);
+        if (ev == BUTTON_RST_PRESSED) {
+            show_next_key = false;
+            vTaskSuspend(scale_calibration_render_task_handler);
+            return 31;  // back to Scale menu
+        }
+        if (ev == BUTTON_ENCODER_PRESSED) {
+            break;
+        }
     }
     show_next_key = false;
     scale_press_print_key();
@@ -124,8 +140,16 @@ uint8_t scale_calibrate_with_external_weight() {
     strcpy(line2, "Press Next to continue");
 
     show_next_key = true;
-    while (button_wait_for_input(true) != BUTTON_ENCODER_PRESSED) {
-        ;
+    while (true) {
+        ButtonEncoderEvent_t ev = button_wait_for_input(true);
+        if (ev == BUTTON_RST_PRESSED) {
+            show_next_key = false;
+            vTaskSuspend(scale_calibration_render_task_handler);
+            return 31;  // back to Scale menu
+        }
+        if (ev == BUTTON_ENCODER_PRESSED) {
+            break;
+        }
     }
     show_next_key = false;
 

src/menu.c

@@ -29,6 +29,41 @@ extern const size_t muif_cnt;
 
 AppState_t exit_state = APP_STATE_DEFAULT;
 
+static uint8_t menu_get_parent_form_id(uint8_t form_id) {
+    // Parent relationships for "one level up" navigation.
+    // Root is form 1.
+    switch (form_id) {
+        case 10: return 1;
+        case 11: return 10;
+        case 12: return 10;
+        case 13: return 10;
+
+        case 20: return 1;
+
+        case 30: return 1;
+        case 31: return 30;
+        case 32: return 30;
+        case 33: return 32;
+        case 34: return 32;
+        case 38: return 34;
+        case 35: return 30;
+        case 36: return 30;
+        case 37: return 30;
+        case 39: return 30;
+
+        case 40: return 1;
+        case 41: return 40;
+
+        case 51: return 31;
+        case 53: return 31;
+        case 60: return 37;
+        case 61: return 37;
+
+        default:
+            return 1;
+    }
+}
+
 
 void menu_task(void *p){
     u8g2_t * display_handler = get_display_handler();
@@ -56,6 +91,14 @@ void menu_task(void *p){
             else if (button_encoder_event == BUTTON_ENCODER_PRESSED) {
                 mui_SendSelect(&mui);
             }
+            else if (button_encoder_event == BUTTON_RST_PRESSED) {
+                // Global back: deterministic "one menu level up" until root (form 1).
+                uint8_t current_form_id = mui_GetCurrentFormId(&mui);
+                if (current_form_id != 1) {
+                    uint8_t parent_form_id = menu_get_parent_form_id(current_form_id);
+                    mui_GotoForm(&mui, parent_form_id, 0);
+                }
+            }
             else if (button_encoder_event == OVERRIDE_FROM_REST) {
                 // Assuming the caller code will set the exit_state
                 mui_SaveForm(&mui);          // store the current form and position so that the child can jump back

src/mui_menu.c

@@ -374,8 +374,9 @@ fds_t fds_data[] = {
     MUI_LABEL(5, 37, "press Next to trickle")
 
     MUI_STYLE(0)
-    MUI_XYAT("BN",14, 59, 10, "Back")
+    // Put "Next" first so it is focused by default
     MUI_XYAT("LV", 115, 59, 1, "Next")  // APP_STATE_ENTER_CHARGE_MODE
+    MUI_XYAT("BN",14, 59, 10, "Back")
 
     // Menu 20: Cleanup
     MUI_FORM(20)