MDI actions and observables, UI work and fixing crashes

Author: thingsapart

firmware/cnc_interface/lvgl_ui

@@ -188,6 +188,37 @@ void lv_cam_positioning_set_probe_cbs(lv_obj_t *obj,
 /// Calling this while a probe operation is in-flight also cancels the op.
 void lv_cam_positioning_wizard_cancel(lv_obj_t *obj);
 
+// ---------------------------------------------------------------------------
+// Local camera-connection status label
+// ---------------------------------------------------------------------------
+
+/**
+ * @brief Show a status message overlaid on the camera area.
+ *
+ * Displays a semi-transparent label centred on the camera view.  The message
+ * is "locked in" — the auto-managed "Connecting to camera..." text will not
+ * appear until lv_cam_positioning_clear_status_text() is called.
+ *
+ * Pass an empty string or call lv_cam_positioning_clear_status_text() to
+ * return to automatic management (label shows when no frame, hides when
+ * the camera starts streaming).
+ *
+ * @param obj  The lv_cam_positioning widget.
+ * @param text The message to display, or NULL / "" to clear.
+ */
+void lv_cam_positioning_show_status_text(lv_obj_t *obj, const char *text);
+
+/**
+ * @brief Clear any manually set status message and return to auto-management.
+ *
+ * After this call the widget manages the label automatically: the
+ * "Connecting to camera..." message is shown when no frame has arrived and
+ * hidden once the stream is live.
+ *
+ * @param obj  The lv_cam_positioning widget.
+ */
+void lv_cam_positioning_clear_status_text(lv_obj_t *obj);
+
 #ifdef __cplusplus
 }
 #endif

firmware/cnc_interface/src/ui/components/lv_cam_positioning.c

@@ -1,4 +1,4 @@
-#define UI_DEBUG_LOCAL_LEVEL D_VERBOSE
+#define UI_DEBUG_LOCAL_LEVEL D_WARN
 #include "debug.h"
 
 #include "lv_probing_wizard.h"

firmware/cnc_interface/src/ui/components/lv_cam_positioning.h

@@ -269,6 +269,11 @@ static bool on_log_message(machine_interface_t *machine, void *user_data,
   interface_t *interface = (interface_t *)user_data;
   // Log verbatim to the pendant's serial output regardless.
   LOGI(TAG, "Hub msg: %s", message);
+
+  // Let the MDI handler append to its log buffer and check for 'ok' acks.
+  // This runs in the machine thread: mdi_handler_on_log() only sets flags.
+  mdi_handler_on_log(&interface->mdi, message);
+
   // Suppress noisy "Error: Bad command:" lines from the toast bar — these are
   // echoed back by the machine when it doesn't recognise a polled M409 query
   // and do not represent actionable errors for the operator.
@@ -278,6 +283,7 @@ static bool on_log_message(machine_interface_t *machine, void *user_data,
 
   // If a prior handler already claimed this message, avoid showing the toast.
   if (machine && machine->last_log_message_handled) {
+    LOGI(TAG, "Skipped log entry: %s", message);
     return false; // not handled by UI
   }
 
@@ -288,6 +294,15 @@ static bool on_log_message(machine_interface_t *machine, void *user_data,
   return true;
 }
 
+/**
+ * @brief Long-press handler on the "all axes homed" LED in the title bar.
+ * Opens the "Home all axes?" confirmation modal.
+ */
+static void homed_led_longpress_cb(lv_event_t *e) {
+  machine_interface_t *machine = (machine_interface_t *)lv_event_get_user_data(e);
+  if (machine) show_home_all_modal(machine);
+}
+
 // --- Public API ---
 
 void interface_init(interface_t *interface, machine_interface_t *machine) {
@@ -309,6 +324,10 @@ void interface_init(interface_t *interface, machine_interface_t *machine) {
 
   ui_action_handler_init(interface);
 
+  // Initialise the MDI backend (allocates log buffer, finds widget IDs,
+  // registers the LV_EVENT_READY handler on the input textarea).
+  mdi_handler_init(&interface->mdi, machine);
+
   // Register callbacks to get state updates from the machine
   machine_interface_add_state_change_cb(machine, interface,
                                         on_machine_state_change);
@@ -342,6 +361,15 @@ void interface_init(interface_t *interface, machine_interface_t *machine) {
       lv_obj_add_event_cb(disconnected_overlay, disconnected_overlay_event_handler, LV_EVENT_LONG_PRESSED, NULL);
   }
 
+  // Attach long-press handler to the "all axes homed" LED in the title bar
+  // so the operator can quickly trigger a home-all confirmation.
+  lv_obj_t* homed_led = obj_registry_get("homed_all_led");
+  if (homed_led) {
+      lv_obj_add_flag(homed_led, LV_OBJ_FLAG_CLICKABLE);
+      lv_obj_add_event_cb(homed_led, homed_led_longpress_cb,
+                          LV_EVENT_LONG_PRESSED, machine);
+  }
+
   // Wire the machine's axis limits into the cam_positioning overlay so the
   // physical coordinate grid can be drawn.
   lv_obj_t* cam_pos = obj_registry_get("cam_positioning");
@@ -391,6 +419,9 @@ void interface_init(interface_t *interface, machine_interface_t *machine) {
 }
 
 void interface_tick(interface_t *interface) {
+  // Flush MDI log-buffer and busy-state to data-binding observers every tick.
+  mdi_handler_tick(&interface->mdi);
+
   if (interface->dirty_flags == UI_DIRTY_NONE) {
     return;
   }

firmware/cnc_interface/src/ui/components/lv_probing_wizard.c

@@ -8,6 +8,7 @@ extern "C" {
 #include "lvgl.h"
 #include "machine/machine_interface.h"
 #include "probe/mos_probe_handler.h"
+#include "ui/mdi_handler.h"
 
 #ifdef DWC_MACHINE_MODE
 #include "config/dwc_settings.h"
@@ -31,6 +32,7 @@ typedef enum {
   UI_DIRTY_FILES_GCODES = (1 << 10),
   UI_DIRTY_FILES_MACROS = (1 << 11),
   UI_DIRTY_LOG_MESSAGE  = (1 << 12),  // Verbatim message from hub to toast
+  UI_DIRTY_MDI_LOG      = (1 << 13),  // New MDI log content / busy-state change
   UI_DIRTY_ALL = 0xFFFFFFFF,
 } ui_dirty_flags_t;
 
@@ -44,6 +46,7 @@ typedef struct {
   lv_obj_t *toast_bar;        // Currently visible toast bar, or NULL.
 
   mos_probe_handler_t probe_handler;  ///< MOS back-end for cam_positioning probe wizard
+  mdi_handler_t mdi;                  ///< MDI (Manual Data Input) back-end
 
 #ifdef DWC_MACHINE_MODE
   dwc_settings_t setup_settings;  // Temporary storage for the DWC setup flow

firmware/cnc_interface/src/ui/interface.c

@@ -6,6 +6,7 @@
 
 #include "debug.h"
 #include "lvgl_ui.h"
+#include "ui/mdi_handler.h"
 
 static const char *TAG = "UI_ACTION_HANDLER";
 
@@ -50,7 +51,7 @@ static void home_all_modal_event_handler(lv_event_t * e) {
  * @brief Creates and displays a modal dialog asking the user to home all axes.
  * @param machine A pointer to the machine interface, passed to the event handler.
  */
-static void show_home_all_modal(machine_interface_t * machine) {
+void show_home_all_modal(machine_interface_t * machine) {
     static const char * btns[] = {"Ok", "Cancel", ""};
     lv_obj_t * mbox = lv_msgbox_create(lv_screen_active());
     lv_msgbox_add_title(mbox, "Home all?");
@@ -167,6 +168,54 @@ static void app_action_handler(const char *action_name, binding_value_t value,
     machine->probe(machine, gcode);
   }
 
+  // --- MDI Actions ---
+  // Forward all "MDI.*" actions to the MDI handler.
+  else if (strncmp(action_name, "MDI.", 4) == 0) {
+    mdi_handle_action(&interface->mdi, action_name, value);
+  }
+
+  // --- Probe dimension settings (from the probe-mode tab numeric dialogs) ---
+  // Each action receives the user-entered float value and:
+  //   1. Notifies the bound observable so the label refreshes.
+  //   2. (Future) Could persist the value here.
+  else if (strcmp(action_name, "set_probe_width") == 0 &&
+           value.type == BINDING_TYPE_FLOAT) {
+    data_binding_notify_state_changed(
+        "probe_w",
+        (binding_value_t){.type = BINDING_TYPE_FLOAT, .as.f_val = value.as.f_val});
+  }
+  else if (strcmp(action_name, "set_probe_height") == 0 &&
+           value.type == BINDING_TYPE_FLOAT) {
+    data_binding_notify_state_changed(
+        "probe_h",
+        (binding_value_t){.type = BINDING_TYPE_FLOAT, .as.f_val = value.as.f_val});
+  }
+  else if (strcmp(action_name, "set_probe_cl") == 0 &&
+           value.type == BINDING_TYPE_FLOAT) {
+    data_binding_notify_state_changed(
+        "probe_cl",
+        (binding_value_t){.type = BINDING_TYPE_FLOAT, .as.f_val = value.as.f_val});
+  }
+  else if (strcmp(action_name, "set_probe_ov") == 0 &&
+           value.type == BINDING_TYPE_FLOAT) {
+    data_binding_notify_state_changed(
+        "probe_ov",
+        (binding_value_t){.type = BINDING_TYPE_FLOAT, .as.f_val = value.as.f_val});
+  }
+  else if (strcmp(action_name, "set_probe_quick") == 0) {
+    // Boolean toggle from the quick-mode switch widget.
+    bool quick = (value.type == BINDING_TYPE_BOOL) ? value.as.b_val
+                                                    : (value.as.f_val != 0.0f);
+    data_binding_notify_state_changed(
+        "probe_quick",
+        (binding_value_t){.type = BINDING_TYPE_BOOL, .as.b_val = quick});
+  }
+
+  // --- ask_home_all: programmatically triggered (e.g. from C callbacks) ---
+  else if (strcmp(action_name, "action.ask_home_all") == 0) {
+    show_home_all_modal(machine);
+  }
+
   else {
     LOGW(TAG, "Unhandled action: %s", action_name);
   }

firmware/cnc_interface/src/ui/interface.h

@@ -15,4 +15,15 @@
  */
 void ui_action_handler_init(interface_t *interface);
 
+/**
+ * @brief Creates and displays a "Home all axes?" confirmation modal.
+ *
+ * If the user confirms, machines->home_all() is called.
+ * This function is also invoked from the long-press callback on the
+ * "all axes homed" LED in the title bar.
+ *
+ * @param machine A pointer to the machine interface.
+ */
+void show_home_all_modal(machine_interface_t *machine);
+
 #endif  // UI_ACTION_HANDLER_H