New UI + DWC implementation

Author: thingsapart

firmware/cnc_interface/.vscode/settings.json

@@ -115,6 +115,11 @@
         "feed_rate_view.h": "c",
         "task.h": "c",
         "lvgl_ui.h": "c",
-        "data_binding.h": "c"
+        "data_binding.h": "c",
+        "esp_http_client.h": "c",
+        "machine_rrf.h": "c",
+        "math.h": "c",
+        "cjson.h": "c",
+        "dwc_http_client_wrapper.h": "c"
     }
 }

firmware/cnc_interface/data/files_default.txt

@@ -5,5 +5,6 @@ src/main/main.cpp
 src/tasks/*.c
 src/ui/*.c
 src/ui/*.h
+src/debug.h
 platformio.ini
 README.md

firmware/cnc_interface/docs/data_bindings.md

@@ -0,0 +1,119 @@
+# Data Binding: `action` and `observes`
+
+The data binding system provides a mechanism to connect the state of your application (the machine interface) to the UI, and to receive events from the UI back into your application logic. It is based on a "Model-View-ViewModel" (MVVM) pattern that creates a clean separation of concerns:
+
+*   **View:** The UI definition in your YAML file.
+*   **Model:** The `machine_interface_t` struct, representing the CNC machine's state.
+*   **ViewModel:** The `data_binding` library, which mediates between the Model and the View.
+
+This system is comprised of two main features, configured by the `action` and `observes` keys in your UI definition.
+
+## `action`: UI to Machine Communication
+
+The `action` key allows widgets to send commands to the machine. When a user interacts with a widget (e.g., clicks a button), a named action is dispatched to a handler that calls the corresponding function on the `machine_interface_t`.
+
+### Action Reference
+
+| Action Name | Description | Value Type | YAML Example |
+| :--- | :--- | :--- | :--- |
+| **Homing & Control** |
+| `home_machine` | Homes all axes (`G28`). | `trigger` | `{ home_machine: trigger }` |
+| `home_machine_x` | Homes the X axis (`G28 X`). | `trigger` | `{ home_machine_x: trigger }` |
+| `home_machine_y` | Homes the Y axis (`G28 Y`). | `trigger` | `{ home_machine_y: trigger }` |
+| `home_machine_z` | Homes the Z axis (`G28 Z`). | `trigger` | `{ home_machine_z: trigger }` |
+| `feed_hold` | Toggles feed hold (`!`) and resume (`~`). | `trigger` | `{ feed_hold: trigger }` |
+| `program_run` | Starts or resumes the current job (`M24`). | `trigger` | `{ program_run: trigger }` |
+| `program_stop` | Issues a soft reset (`Ctrl+X`). | `trigger` | `{ program_stop: trigger }` |
+| **Overrides** |
+| `set_feed_override` | Sets the feed rate override percentage. | `float` | `{ set_feed_override: 110.0 }` |
+| `set_speed_override` | Sets the spindle speed override percentage. | `float` | `{ set_speed_override: 95.0 }` |
+| **Movement & Jogging** |
+| `jog_continuous_start_x_plus` | Starts a continuous positive jog on the X axis. | `trigger` | `{ jog_continuous_start_x_plus: trigger }` |
+| `jog_continuous_start_x_minus` | Starts a continuous negative jog on the X axis. | `trigger` | `{ jog_continuous_start_x_minus: trigger }` |
+| ..._y_plus/minus | (Same for Y axis) | `trigger` | ... |
+| ..._z_plus/minus | (Same for Z axis) | `trigger` | ... |
+| `jog_continuous_stop` | Stops any continuous jog. | `trigger` | `{ jog_continuous_stop: trigger }` |
+| `jog_step_x_plus` | Steps the X axis by `jog_step` distance. | `trigger` | `{ jog_step_x_plus: trigger }` |
+| `jog_step_x_minus` | Steps the X axis by `-jog_step` distance. | `trigger` | `{ jog_step_x_minus: trigger }` |
+| ..._y_plus/minus | (Same for Y axis) | `trigger` | ... |
+| ..._z_plus/minus | (Same for Z axis) | `trigger` | ... |
+| `cycle_jog_step` | Cycles through predefined jog step distances. | `cycle` | `{ cycle_jog_step: [0.01, 0.1, 1.0, 10.0] }` |
+| `set_move_axis_x` | Sets the currently active axis for jogging to X. | `trigger` | `{ set_move_axis_x: trigger }` |
+| `set_move_axis_y` | Sets the currently active axis for jogging to Y. | `trigger` | `{ set_move_axis_y: trigger }` |
+| `set_move_axis_z` | Sets the currently active axis for jogging to Z. | `trigger` | `{ set_move_axis_z: trigger }` |
+| `set_move_axis_off` | Deactivates axis jogging selection. | `trigger` | `{ set_move_axis_off: trigger }` |
+| `cycle_move_axis` | Cycles the active jog axis (X -> Y -> Z -> OFF). | `trigger` | `{ cycle_move_axis: trigger }` |
+| **Coordinate Systems (WCS)** |
+| `set_wcs` | Sets the current Work Coordinate System. | `float` | `{ set_wcs: 2.0 }` (for G55) |
+| `cycle_wcs` | Cycles to the next WCS (e.g., G54 -> G55). | `trigger` | `{ cycle_wcs: trigger }` |
+| `zero_wcs_x` | Sets the current X position as the origin for the current WCS. | `trigger` | `{ zero_wcs_x: trigger }` |
+| `zero_wcs_y` | Sets the current Y position as the origin for the current WCS. | `trigger` | `{ zero_wcs_y: trigger }` |
+| `zero_wcs_z` | Sets the current Z position as the origin for the current WCS. | `trigger` | `{ zero_wcs_z: trigger }` |
+| **Files & Macros** |
+| `list_files` | Requests a file listing for a given path. | `string` | `{ list_files: "/gcodes" }` |
+| `run_macro` | Runs a macro file by name. | `string` | `{ run_macro: "probe.g" }` |
+| `start_job` | Starts a job file by name. | `string` | `{ start_job: "my_part.gcode" }` |
+| **Probing** |
+| `probe` | Executes a G-code probing routine. | `string` | `{ probe: "G38.2 Z-20 F100" }` |
+| **Dialogs / Modals** |
+| `dialog_ok` | Responds "OK" to the current modal dialog. | `trigger` | `{ dialog_ok: trigger }` |
+| `dialog_cancel` | Responds "Cancel" to the current modal dialog. | `trigger` | `{ dialog_cancel: trigger }` |
+| `dialog_choice` | Responds with a choice to a multi-choice dialog. | `float` | `{ dialog_choice: 1.0 }` (for 2nd choice) |
+| `dialog_input_int` | Submits an integer value from an input dialog. | `float` | `{ dialog_input_int: 123.0 }` |
+| `dialog_input_float`| Submits a float value from an input dialog. | `float` | `{ dialog_input_float: 45.6 }` |
+| `dialog_input_str` | Submits a string value from an input dialog. | `string` | `{ dialog_input_str: "my_value" }` |
+| **G-Code** |
+| `send_gcode` | Sends a raw G-code string to the machine. | `string` | `{ send_gcode: "M3 S10000" }` |
+
+## `observes`: Machine to UI Communication
+
+The `observes` key allows widgets to automatically update their appearance in response to changes in the machine's state. You simply notify the data binding system when a piece of your data changes, and it handles updating the UI.
+
+### Observable State Reference
+
+| State Name | Description | Value Type | YAML Example |
+| :--- | :--- | :--- | :--- |
+| **Machine Status** |
+| `is_connected` | `true` if a connection to the machine is active. | `bool` | `{ is_connected: { visible: { true: true, false: false } } }` |
+| `machine_mode`| The current high-level status (e.g., "IDLE", "AUTO", "PAUSED").| `string` | `{ machine_mode: { text: "%s" } }` |
+| `program_running` | `true` if a job is currently running. | `bool` | `{ program_running: { style: { true: '@style_active' } } }` |
+| `program_paused` | `true` if a job is currently paused. | `bool` | `{ program_paused: { visible: true } }` |
+| **Position** |
+| `pos_x` / `_y` / `_z` | Machine-space X, Y, or Z position. | `float` | `{ pos_x: { text: "X: %.3f" } }` |
+| `wcs_pos_x` / `_y` / `_z` | Work-space (WCS) X, Y, or Z position. | `float` | `{ wcs_pos_x: { text: "%.3f" } }` |
+| `target_pos_x` / `_y` / `_z` | The final target position for the current move. | `float` | `{ target_pos_x: { text: "Target: %.3f" } }` |
+| **Homing** |
+| `x_is_homed` | `true` if the X axis has been homed. | `bool` | `{ x_is_homed: { style: { true: '@style_homed' } } }` |
+| `y_is_homed` | `true` if the Y axis has been homed. | `bool` | `{ y_is_homed: { checked: { true: true, false: false } } }` |
+| `z_is_homed` | `true` if the Z axis has been homed. | `bool` | `{ z_is_homed: { disabled: { true: false, false: true } } }` |
+| **Coordinate Systems (WCS)** |
+| `wcs_name` | The name of the active WCS (e.g., "G54", "G55"). | `string` | `{ wcs_name: { text: "%s" } }` |
+| `wcs_number` | The number of the active WCS (1 for G54, etc.). | `float` | `{ wcs_number: { value: [LV_ANIM_OFF] } }` |
+| `z_offset` | The current Z-offset value. | `float` | `{ z_offset: { text: "Z-Off: %.3f" } }` |
+| **Feed & Speed** |
+| `feed` | The current actual feed rate. | `float` | `{ feed: { text: "Feed: %.0f" } }` |
+| `feed_requested` | The requested feed rate from G-code. | `float` | `{ feed_requested: { text: "Req: %.0f" } }` |
+| `feed_override` | The current feed override percentage (e.g., 100.0 for 100%). | `float` | `{ feed_override: { value: [LV_ANIM_ON] } }` |
+| **Spindle & Tool** |
+| `spindle_0_rpm` | RPM of the first spindle. | `float` | `{ spindle_0_rpm: { text: "RPM: %.0f" } }` |
+| `spindle_0_name` | Name of the first spindle. | `string` | `{ spindle_0_name: { text: "%s" } }` |
+| `spindle_0_on` | `true` if the first spindle is active. | `bool` | `{ spindle_0_on: { style: { true: '@style_active' } } }` |
+| `tool_name` | The name of the currently active tool. | `string` | `{ tool_name: { text: "Tool: %s" } }` |
+| **Jogging & UI State** |
+| `move_is_relative` | `true` if G-code moves are in relative mode (G91). | `bool` | `{ move_is_relative: { visible: true } }` |
+| `move_is_step` | `true` if jogging is in step mode. | `bool` | `{ move_is_step: { style: { true: '@style_active' } } }` |
+| `current_move_axis`| The currently selected jog axis ("X", "Y", "Z", or "OFF"). | `string` | `{ current_move_axis: { text: "Axis: %s" } }` |
+| `jog_step` | The current step distance for jogging. | `float` | `{ jog_step: { text: "%.2f" } }` |
+| **Sensors** |
+| `probe_0_value` | The value of the first probe. | `float` | `{ probe_0_value: { text: "%.3f" } }` |
+| `end_stop_0_triggered`| `true` if the first endstop is triggered. | `bool` | `{ end_stop_0_triggered: { visible: true } }` |
+| **Files** |
+| `filelist_gcodes`| A newline-separated list of g-code files. For `dropdown` widgets.| `string`| `{ filelist_gcodes: { text: "%s" } }`|
+| `filelist_macros`| A newline-separated list of macro files. For `dropdown` widgets.| `string`| `{ filelist_macros: { text: "%s" } }`|
+| **Dialogs / Modals** |
+| `dialog_active` | `true` if a modal dialog is currently active. | `bool` | `{ dialog_active: { visible: true } }` |
+| `dialog_title`| The title of the current dialog. | `string` | `{ dialog_title: { text: "%s" } }` |
+| `dialog_text` | The main text/message of the current dialog. | `string` | `{ dialog_text: { text: "%s" } }` |
+| `dialog_choices`| Newline-separated list of choices for a choice dialog. | `string` | `{ dialog_choices: { text: "%s" } }` |
+| `dialog_mode` | The type of dialog (see `message_box_mode_t`). | `float` | `{ dialog_mode: { visible: { 2.0: true } } }` |
+

firmware/cnc_interface/platformio.ini

@@ -243,6 +243,10 @@ build_flags             = ${env:display32s3.build_flags}
                             -D USB_UART_PIN_RX=44
 upload_speed            = 460800
 
+[env:display-dwc-guition-4848s040]
+extends                 = env:display-guition-4848s040
+build_flags             = ${env:display-guition-4848s040.build_flags}
+                            -D DWC_MACHINE_MODE=1
 
 [env:display-wt32-sc01-plus]
 extends                 = env:display32s3
@@ -286,6 +290,14 @@ build_flags             = ${env:display32s3.build_flags}
 
 upload_speed            = 921600
 
+[env:display-dwc-wt32-sc01-plus]
+extends                 = env:display-wt32-sc01-plus
+build_flags             = ${env:display-wt32-sc01-plus.build_flags}
+                            -D DWC_MACHINE_MODE=1
+lib_deps                 = ${env:display-wt32-sc01-plus.lib_deps}
+                            arduino-libraries/ArduinoHttpClient
+                            arduino-libraries/ArduinoMDNS
+
 [env:display-jc1060p470-old]
 ; https://github.com/esp-arduino-libs/ESP32_Display_Panel
 ; https://github.com/espressif/esp-idf/tree/master/examples/peripherals/lcd/mipi_dsi

firmware/cnc_interface/src/compat/queue.c

@@ -12,6 +12,8 @@
 extern "C" {
 #endif
 
+const char *TAG = "queue";
+
 // Initialize the G-code queue
 void gcode_queue_init(gcode_queue_t *queue) {
   queue->head = 0;
@@ -22,13 +24,13 @@ void gcode_queue_init(gcode_queue_t *queue) {
 // Add a G-code command to the queue (FIFO).  Handles wraparound.
 bool gcode_queue_push(gcode_queue_t *queue, const char *gcode) {
   if (queue->count >= MAX_GCODE_Q_LEN) {
-    _d(2, "G-code queue overflow!");
+    LOGE(TAG, "G-code queue overflow!");
     return false;  // Indicate failure
   }
 
   size_t len = strlen(gcode);
   if (len >= sizeof(queue->buffer[0])) {
-    _df(2, "G-code command too long: %s", gcode);
+    LOGE(TAG, "G-code command too long: %s", gcode);
     return false;  // Command too long for buffer
   }
 

firmware/cnc_interface/src/config/dwc_settings.cpp

@@ -0,0 +1,101 @@
+#include "dwc_settings.h"
+#include <string.h>
+
+#ifdef ESP32_HW
+#include <Preferences.h>
+#endif
+
+#include "debug.h"
+
+static const char* TAG = "dwc_settings";
+static const char* NVS_NAMESPACE = "dwc-config";
+
+// Keys for NVS
+static const char* KEY_SSID = "ssid";
+static const char* KEY_PASSWORD = "password";
+static const char* KEY_HOST = "host";
+
+static dwc_settings_t g_settings;
+static bool g_loaded = false;
+
+#ifdef ESP32_HW
+static Preferences preferences;
+#endif
+
+void dwc_settings_init() {
+    memset(&g_settings, 0, sizeof(dwc_settings_t));
+    g_loaded = false;
+}
+
+bool dwc_settings_load() {
+#ifdef ESP32_HW
+    if (!preferences.begin(NVS_NAMESPACE, false)) {
+        LOGE(TAG, "Failed to initialize preferences");
+        return false;
+    }
+
+    preferences.getString(KEY_SSID, g_settings.ssid, sizeof(g_settings.ssid));
+    preferences.getString(KEY_PASSWORD, g_settings.password, sizeof(g_settings.password));
+    preferences.getString(KEY_HOST, g_settings.host, sizeof(g_settings.host));
+
+    preferences.end();
+    g_loaded = true;
+    LOGI(TAG, "Loaded settings: SSID='%s', Host='%s'", g_settings.ssid, g_settings.host);
+    return true;
+#else
+    LOGW(TAG, "DWC settings not supported on this platform.");
+    // Simulate empty settings for native builds
+    g_loaded = true;
+    return true;
+#endif
+}
+
+void dwc_settings_clear() {
+#ifdef ESP32_HW
+    preferences.clear();
+#endif
+}
+
+bool dwc_settings_save(const dwc_settings_t* settings) {
+#ifdef ESP32_HW
+    if (!preferences.begin(NVS_NAMESPACE, false)) {
+        LOGE(TAG, "Failed to initialize preferences for writing");
+        return false;
+    }
+
+    bool success = true;
+    if (preferences.putString(KEY_SSID, settings->ssid) == 0) {
+        LOGE(TAG, "Failed to save SSID");
+        success = false;
+    }
+    if (preferences.putString(KEY_PASSWORD, settings->password) == 0) {
+        LOGE(TAG, "Failed to save password");
+        success = false;
+    }
+    if (preferences.putString(KEY_HOST, settings->host) == 0) {
+        LOGE(TAG, "Failed to save host");
+        success = false;
+    }
+
+    preferences.end(); // This commits the changes to flash and returns void.
+
+    if (success) {
+        LOGI(TAG, "Saved settings: SSID='%s', Host='%s'", settings->ssid, settings->host);
+        memcpy(&g_settings, settings, sizeof(dwc_settings_t));
+    } else {
+        LOGE(TAG, "Failed to write one or more settings to NVS");
+    }
+    return success;
+#else
+    LOGW(TAG, "DWC settings not supported on this platform.");
+    return false;
+#endif
+}
+
+bool dwc_settings_are_valid() {
+    return g_loaded && g_settings.ssid[0] != '\0' && g_settings.host[0] != '\0';
+}
+
+const dwc_settings_t* dwc_settings_get() {
+    return &g_settings;
+}

firmware/cnc_interface/src/config/dwc_settings.h

@@ -0,0 +1,60 @@
+#ifndef DWC_SETTINGS_H
+#define DWC_SETTINGS_H
+
+#include <stdbool.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// Structure to hold the DWC configuration
+typedef struct {
+    char ssid[33];      // 32 max SSID length + null terminator
+    char password[65];  // 64 max password length + null terminator
+    char host[64];      // Hostname or IP address
+} dwc_settings_t;
+
+/**
+ * @brief Initializes the DWC settings module.
+ */
+void dwc_settings_init();
+
+/**
+ * @brief Loads the DWC settings from non-volatile storage.
+ *
+ * @return true if settings were loaded successfully, false otherwise.
+ */
+bool dwc_settings_load();
+
+/**
+ * @brief Clears the DWC settings from non-volatile storage.
+ */
+void dwc_settings_clear();
+
+/**
+ * @brief Saves the DWC settings to non-volatile storage.
+ *
+ * @param settings A pointer to the settings structure to save.
+ * @return true if settings were saved successfully, false otherwise.
+ */
+bool dwc_settings_save(const dwc_settings_t* settings);
+
+/**
+ * @brief Checks if valid settings have been loaded.
+ *
+ * @return true if the loaded SSID is not empty, false otherwise.
+ */
+bool dwc_settings_are_valid();
+
+/**
+ * @brief Gets a pointer to the currently loaded settings.
+ *
+ * @return A const pointer to the internal settings structure. Do not modify.
+ */
+const dwc_settings_t* dwc_settings_get();
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // DWC_SETTINGS_H