Implement settings, temp control, extrude/retract, untested status display

CYD-Klipper-Display/src/ui/main_ui.cpp

@@ -98,7 +98,7 @@ static void on_state_change(void * s, lv_msg_t * m){
         error_ui();
     }
     else {
-        nav_buttons_setup(1);
+        nav_buttons_setup(0);
     }
 }
 

CYD-Klipper-Display/src/ui/nav_buttons.cpp

@@ -8,6 +8,7 @@ static lv_style_t nav_button_style;
 
 static char temp_buffer[10];
 static char z_pos_buffer[10];
+static char time_buffer[10];
 
 static lv_style_t nav_button_text_style;
 
@@ -25,6 +26,39 @@ static void update_printer_data_temp(lv_event_t * e) {
     lv_label_set_text(label, temp_buffer);
 }
 
+static void update_printer_data_time(lv_event_t * e){
+    lv_obj_t * label = lv_event_get_target(e);
+
+    if (printer.state == PRINTER_STATE_IDLE){
+        lv_label_set_text(label, "Idle");
+        return;
+    }
+
+    if (printer.state == PRINTER_STATE_PAUSED){
+        lv_label_set_text(label, "Paused");
+        return;
+    }
+
+    unsigned long time = printer.remaining_time_s;
+    unsigned long hours = time / 3600;
+    unsigned long minutes = (time % 3600) / 60;
+    unsigned long seconds = (time % 3600) % 60;
+
+    if (hours > 99){
+        lv_label_set_text(label, ">99h");
+        return;
+    }
+
+    if (hours >= 1){
+        sprintf(time_buffer, "%02luh%02lum", hours, minutes);
+    } else {
+        sprintf(time_buffer, "%02lum%02lus", minutes, seconds);
+    }
+
+    lv_label_set_text(label, time_buffer);
+
+}
+
 static void btn_click_files(lv_event_t * e){
     nav_buttons_setup(0);
 }
@@ -66,6 +100,8 @@ void nav_buttons_setup(unsigned char active_panel){
     lv_label_set_text(label, "Idle");
     lv_obj_align(label, LV_ALIGN_CENTER, 0, icon_text_spacing);
     lv_obj_add_style(label, &nav_button_text_style, 0);
+    lv_obj_add_event_cb(label, update_printer_data_time, LV_EVENT_MSG_RECEIVED, NULL);
+    lv_msg_subsribe_obj(DATA_PRINTER_STATE, label, NULL);
 
     // Move
     btn = lv_btn_create(lv_scr_act());

CYD-Klipper-Display/src/ui/panels/move_panel.cpp

@@ -18,7 +18,7 @@ static void move_printer(const char* axis, float amount) {
 
     const char * space = "%20";
 
-    sprintf(gcode, "G1%s%s%s%.1f", space, axis, extra, amount);
+    sprintf(gcode, "G1%s%s%s%.1f%sF6000", space, axis, extra, amount, space);
     send_gcode(true, gcode);
 
     if (absolute_coords) {

CYD-Klipper-Display/src/ui/panels/panel.h

@@ -3,4 +3,5 @@
 void settings_panel_init(lv_obj_t* panel);
 void temp_panel_init(lv_obj_t* panel);
 void print_panel_init(lv_obj_t* panel);
-void move_panel_init(lv_obj_t* panel);
+void move_panel_init(lv_obj_t* panel);
+void progress_panel_init(lv_obj_t* panel);

CYD-Klipper-Display/src/ui/panels/print_panel.cpp

@@ -1,6 +1,10 @@
 #include "lvgl.h"
 #include "panel.h"
+#include "../../core/data_setup.h"
 
 void print_panel_init(lv_obj_t* panel){
-    
+    if (printer.state == PRINTER_STATE_PRINTING || printer.state == PRINTER_STATE_PAUSED || true){
+        progress_panel_init(panel);
+        return;
+    }
 }

CYD-Klipper-Display/src/ui/panels/progress_panel.cpp

@@ -0,0 +1,120 @@
+#include "panel.h"
+#include "../../core/data_setup.h"
+#include <stdio.h>
+
+char time_buffer[12];
+
+char* time_display(unsigned long time){
+    unsigned long hours = time / 3600;
+    unsigned long minutes = (time % 3600) / 60;
+    unsigned long seconds = (time % 3600) % 60;
+    sprintf(time_buffer, "%02lu:%02lu:%02lu", hours, minutes, seconds);
+    return time_buffer;
+}
+
+static void progress_bar_update(lv_event_t* e){
+    lv_obj_t * bar = lv_event_get_target(e);
+    lv_bar_set_value(bar, printer.print_progress * 100, LV_ANIM_ON);
+}
+
+static void update_printer_data_elapsed_time(lv_event_t * e){
+    lv_obj_t * label = lv_event_get_target(e);
+    lv_label_set_text(label, time_display(printer.elapsed_time_s));
+}
+
+static void update_printer_data_remaining_time(lv_event_t * e){
+    lv_obj_t * label = lv_event_get_target(e);
+    lv_label_set_text(label, time_display(printer.remaining_time_s));
+}
+
+static void update_printer_data_percentage(lv_event_t * e){
+    lv_obj_t * label = lv_event_get_target(e);
+    char percentage_buffer[12];
+    sprintf(percentage_buffer, "%.2f%%", printer.print_progress * 100);
+    lv_label_set_text(label, percentage_buffer);
+}
+
+static void btn_click_stop(lv_event_t * e){
+    // TODO: Implement
+}
+
+static void btn_click_pause(lv_event_t * e){
+    // TODO: Implement
+}
+
+static void btn_click_resume(lv_event_t * e){
+    // TODO: Implement
+}
+
+void progress_panel_init(lv_obj_t* panel){
+    auto panel_width = TFT_HEIGHT - 40;
+    auto panel_width_margin = panel_width - 30;
+
+    // Filename
+    lv_obj_t * label = lv_label_create(panel);
+    lv_label_set_text(label, printer.print_filename);
+    lv_obj_align(label, LV_ALIGN_CENTER, 0, -40);
+    lv_label_set_long_mode(label, LV_LABEL_LONG_SCROLL_CIRCULAR);
+    lv_obj_set_width(label, panel_width_margin);
+    
+    // Progress Bar
+    lv_obj_t * bar = lv_bar_create(panel);
+    lv_obj_align(bar, LV_ALIGN_CENTER, 0, 0);
+    lv_obj_set_size(bar, panel_width_margin, 20);
+    lv_obj_add_event_cb(bar, progress_bar_update, LV_EVENT_MSG_RECEIVED, NULL);
+    lv_msg_subsribe_obj(DATA_PRINTER_DATA, bar, NULL);
+
+    // Elapsed Time
+    label = lv_label_create(panel);
+    lv_label_set_text(label, "???");
+    lv_obj_align(label, LV_ALIGN_LEFT_MID, 10, 20);
+    lv_obj_add_event_cb(label, update_printer_data_elapsed_time, LV_EVENT_MSG_RECEIVED, NULL);
+    lv_msg_subsribe_obj(DATA_PRINTER_DATA, label, NULL);
+
+    // Remaining Time
+    label = lv_label_create(panel);
+    lv_label_set_text(label, "???");
+    lv_obj_align(label, LV_ALIGN_RIGHT_MID, -10, 20);
+    lv_obj_add_event_cb(label, update_printer_data_remaining_time, LV_EVENT_MSG_RECEIVED, NULL);
+    lv_msg_subsribe_obj(DATA_PRINTER_DATA, label, NULL);
+
+    // Percentage
+    label = lv_label_create(panel);
+    lv_label_set_text(label, "???");
+    lv_obj_align(label, LV_ALIGN_CENTER, 0, 20);
+    lv_obj_add_event_cb(label, update_printer_data_percentage, LV_EVENT_MSG_RECEIVED, NULL);
+    lv_msg_subsribe_obj(DATA_PRINTER_DATA, label, NULL);
+
+    // Stop Button
+    lv_obj_t * btn = lv_btn_create(panel);
+    lv_obj_align(btn, LV_ALIGN_BOTTOM_RIGHT, -10, -10);
+    lv_obj_set_size(btn, 40, 40);
+    lv_obj_add_event_cb(btn, btn_click_stop, LV_EVENT_CLICKED, NULL);
+
+    label = lv_label_create(btn);
+    lv_label_set_text(label, LV_SYMBOL_STOP);
+    lv_obj_center(label);
+
+    // Resume Button
+    if (printer.state == PRINTER_STATE_PAUSED){
+        btn = lv_btn_create(panel);
+        lv_obj_align(btn, LV_ALIGN_BOTTOM_RIGHT, -60, -10);
+        lv_obj_set_size(btn, 40, 40);
+        lv_obj_add_event_cb(btn, btn_click_resume, LV_EVENT_CLICKED, NULL);
+
+        label = lv_label_create(btn);
+        lv_label_set_text(label, LV_SYMBOL_PLAY);
+        lv_obj_center(label);
+    }
+    // Pause Button
+    else {
+        btn = lv_btn_create(panel);
+        lv_obj_align(btn, LV_ALIGN_BOTTOM_RIGHT, -60, -10);
+        lv_obj_set_size(btn, 40, 40);
+        lv_obj_add_event_cb(btn, btn_click_pause, LV_EVENT_CLICKED, NULL);
+
+        label = lv_label_create(btn);
+        lv_label_set_text(label, LV_SYMBOL_PAUSE);
+        lv_obj_center(label);
+    }
+}

CYD-Klipper-Display/src/ui/panels/settings_panel.cpp

@@ -1,6 +1,99 @@
 #include "lvgl.h"
 #include "panel.h"
+#include "../../core/screen_driver.h"
+#include "../../conf/global_config.h"
+
+static void invert_color_switch(lv_event_t * e){
+    auto state = lv_obj_get_state(lv_event_get_target(e));
+    bool checked = (state & LV_STATE_CHECKED == LV_STATE_CHECKED);
+    global_config.invertColors = checked;
+    WriteGlobalConfig();
+    set_invert_display();
+}
+
+static void reset_calibration_click(lv_event_t * e){
+    global_config.screenCalibrated = false;
+    WriteGlobalConfig();
+    ESP.restart();
+}
+
+static void reset_wifi_click(lv_event_t * e){
+    global_config.wifiConfigured = false;
+    global_config.ipConfigured = false;
+    WriteGlobalConfig();
+    ESP.restart();
+}
+
+static void light_mode_switch(lv_event_t * e){
+    auto state = lv_obj_get_state(lv_event_get_target(e));
+    bool checked = (state & LV_STATE_CHECKED == LV_STATE_CHECKED);
+    global_config.lightMode = checked;
+    WriteGlobalConfig();
+    set_color_scheme();
+}
+
+static void theme_dropdown(lv_event_t * e){
+    lv_obj_t * dropdown = lv_event_get_target(e);
+    auto selected = lv_dropdown_get_selected(dropdown);
+    global_config.color_scheme = selected;
+    WriteGlobalConfig();
+    set_color_scheme();
+}
 
 void settings_panel_init(lv_obj_t* panel){
-    
+    auto panel_width = TFT_HEIGHT - 40;
+
+    lv_obj_t * btn = lv_btn_create(panel);
+    lv_obj_align(btn, LV_ALIGN_TOP_LEFT, 10, 5);
+    lv_obj_add_event_cb(btn, reset_wifi_click, LV_EVENT_CLICKED, NULL);
+    lv_obj_set_size(btn, panel_width / 2 - 15, 30);
+
+    lv_obj_t * label = lv_label_create(btn);
+    lv_label_set_text(label, "WiFi Setup");
+    lv_obj_center(label);
+
+    btn = lv_btn_create(panel);
+    lv_obj_align(btn, LV_ALIGN_TOP_RIGHT, -10, 5);
+    lv_obj_add_event_cb(btn, reset_calibration_click, LV_EVENT_CLICKED, NULL);
+    lv_obj_set_size(btn, panel_width / 2 - 15, 30);
+
+    label = lv_label_create(btn);
+    lv_label_set_text(label, "Touch Cal");
+    lv_obj_center(label);
+
+
+    lv_obj_t * toggle = lv_switch_create(panel);
+    lv_obj_align(toggle, LV_ALIGN_TOP_RIGHT, -14, 57);
+    lv_obj_add_event_cb(toggle, invert_color_switch, LV_EVENT_VALUE_CHANGED, NULL);
+
+    if (global_config.invertColors)
+        lv_obj_add_state(toggle, LV_STATE_CHECKED);
+
+    label = lv_label_create(panel);
+    lv_label_set_text(label, "Invert Colors");
+    lv_obj_align(label, LV_ALIGN_TOP_RIGHT, -10, 40);
+    lv_obj_set_style_text_font(label, &lv_font_montserrat_10, 0);
+
+    toggle = lv_switch_create(panel);
+    lv_obj_align(toggle, LV_ALIGN_TOP_LEFT, 13, 57);
+    lv_obj_add_event_cb(toggle, light_mode_switch, LV_EVENT_VALUE_CHANGED, NULL);
+
+    if (global_config.lightMode)
+        lv_obj_add_state(toggle, LV_STATE_CHECKED);
+
+    label = lv_label_create(panel);
+    lv_label_set_text(label, "Light Mode");
+    lv_obj_align(label, LV_ALIGN_TOP_LEFT, 10, 40);
+    lv_obj_set_style_text_font(label, &lv_font_montserrat_10, 0);
+
+    lv_obj_t * dropdown = lv_dropdown_create(panel);
+    lv_dropdown_set_options(dropdown, "Blue\nGreen\nGrey\nYellow\nOrange\nRed\nPurple");
+    lv_dropdown_set_selected(dropdown, global_config.color_scheme);
+    lv_obj_align(dropdown, LV_ALIGN_TOP_MID, 0, 55);
+    lv_obj_add_event_cb(dropdown, theme_dropdown, LV_EVENT_VALUE_CHANGED, NULL);
+
+    label = lv_label_create(panel);
+    lv_label_set_text(label, "Theme");
+    lv_obj_align(label, LV_ALIGN_TOP_MID, 0, 40);
+    lv_obj_set_style_text_font(label, &lv_font_montserrat_10, 0);
 }

CYD-Klipper-Display/src/ui/panels/temp_panel.cpp

@@ -1,6 +1,151 @@
 #include "lvgl.h"
 #include "panel.h"
+#include "../../core/data_setup.h"
+#include <HardwareSerial.h>
+
+// False: Hotend, True: Bed
+static bool hotend_or_bed = true;
+static char hotend_buff[40];
+static char bed_buff[40];
+
+static void update_printer_data_hotend_temp(lv_event_t * e){
+    lv_obj_t * label = lv_event_get_target(e);
+    sprintf(hotend_buff, "Hotend: %.0f C\nTarget: %.0f C", printer.extruder_temp, printer.extruder_target_temp);
+    lv_label_set_text(label, hotend_buff);
+}
+
+static void update_printer_data_bed_temp(lv_event_t * e){
+    lv_obj_t * label = lv_event_get_target(e);
+    sprintf(bed_buff, "Bed: %.0f C\nTarget: %.0f C", printer.bed_temp, printer.bed_target_temp);
+    lv_label_set_text(label, bed_buff);
+}
+
+static void keyboard_callback(lv_event_t * e){
+    lv_event_code_t code = lv_event_get_code(e);
+    lv_obj_t * ta = lv_event_get_target(e);
+    lv_obj_t * kb = (lv_obj_t *)lv_event_get_user_data(e);
+
+    if (code == LV_EVENT_READY) {
+        const char * text = lv_textarea_get_text(ta);
+
+        int temp = atoi(text);
+        if (temp < 0 || temp > 500){
+            return;
+        }
+
+        Serial.printf("%d %s %d\n", hotend_or_bed, text, temp);
+        char gcode[64];
+        const char* space = "%20";
+
+        if (hotend_or_bed){
+            sprintf(gcode, "M140%sS%d", space, temp);
+        } else {
+            sprintf(gcode, "M104%sS%d", space, temp);
+        }
+
+        send_gcode(true, gcode);
+    }
+
+    if(code == LV_EVENT_DEFOCUSED || code == LV_EVENT_CANCEL || code == LV_EVENT_READY) {
+        lv_keyboard_set_textarea(kb, NULL);
+        lv_obj_del(kb);
+        lv_obj_del(ta);
+    }
+}
+
+static void show_keyboard(lv_event_t * e){
+    lv_obj_t * panel = (lv_obj_t *)lv_event_get_user_data(e);
+    lv_obj_t * keyboard = lv_keyboard_create(panel);
+    lv_obj_t * ta = lv_textarea_create(panel);
+    lv_obj_set_size(ta, 100, 30);
+    lv_obj_align(ta, LV_ALIGN_TOP_MID, 0, 40);
+    lv_textarea_set_max_length(ta, 3);
+    lv_textarea_set_one_line(ta, true);
+    lv_textarea_set_text(ta, "");
+    lv_obj_add_event_cb(ta, keyboard_callback, LV_EVENT_ALL, keyboard);
+
+    lv_keyboard_set_mode(keyboard, LV_KEYBOARD_MODE_NUMBER);
+    lv_keyboard_set_textarea(keyboard, ta);
+}
+
+static void show_keyboard_with_hotend(lv_event_t * e){
+    hotend_or_bed = false;
+    show_keyboard(e);
+}
+
+static void show_keyboard_with_bed(lv_event_t * e){
+    hotend_or_bed = true;
+    show_keyboard(e);
+}
+
+static void cooldown_temp(lv_event_t * e){
+    send_gcode(true, "M104%20S0");
+    send_gcode(true, "M140%20S0");
+}
+
+static void btn_extrude(lv_event_t * e){
+    send_gcode(true, "M83");
+    send_gcode(true, "G1%20E25%20F300");
+}
+
+static void btn_retract(lv_event_t * e){
+    send_gcode(true, "M83");
+    send_gcode(true, "G1%20E-25%20F300");
+}
 
 void temp_panel_init(lv_obj_t* panel){
-    
+    auto panel_width = TFT_HEIGHT - 40;
+    lv_obj_t * label = lv_label_create(panel);
+    lv_label_set_text(label, "Hotend");
+    lv_obj_align(label, LV_ALIGN_TOP_LEFT, 10, 10);
+    lv_obj_add_event_cb(label, update_printer_data_hotend_temp, LV_EVENT_MSG_RECEIVED, NULL);
+    lv_msg_subscribe_obj(DATA_PRINTER_DATA, label, NULL);
+
+    label = lv_label_create(panel);
+    lv_label_set_text(label, "Bed");
+    lv_obj_align(label, LV_ALIGN_TOP_LEFT, 10, 50);
+    lv_obj_add_event_cb(label, update_printer_data_bed_temp, LV_EVENT_MSG_RECEIVED, NULL);
+    lv_msg_subscribe_obj(DATA_PRINTER_DATA, label, NULL);
+
+    lv_obj_t * btn = lv_btn_create(panel);
+    lv_obj_align(btn, LV_ALIGN_TOP_RIGHT, -10, 10);
+    lv_obj_add_event_cb(btn, show_keyboard_with_hotend, LV_EVENT_CLICKED, panel);
+
+    label = lv_label_create(btn);
+    lv_label_set_text(label, "Set");
+    lv_obj_center(label);
+
+    btn = lv_btn_create(panel);
+    lv_obj_align(btn, LV_ALIGN_TOP_RIGHT, -10, 50);
+    lv_obj_add_event_cb(btn, show_keyboard_with_bed, LV_EVENT_CLICKED, panel);
+
+    label = lv_label_create(btn);
+    lv_label_set_text(label, "Set");
+    lv_obj_center(label);
+
+    btn = lv_btn_create(panel);
+    lv_obj_align(btn, LV_ALIGN_TOP_MID, 0, 90);
+    lv_obj_add_event_cb(btn, cooldown_temp, LV_EVENT_CLICKED, panel);
+
+    label = lv_label_create(btn);
+    lv_label_set_text(label, "Cooldown");
+    lv_obj_center(label);
+
+    btn = lv_btn_create(panel);
+    lv_obj_align(btn, LV_ALIGN_BOTTOM_LEFT, 10, -5);
+    lv_obj_add_event_cb(btn, btn_extrude, LV_EVENT_CLICKED, NULL);
+    lv_obj_set_size(btn, panel_width / 2 - 15, 30);
+
+    label = lv_label_create(btn);
+    lv_label_set_text(label, LV_SYMBOL_DOWN " Extrude");
+    lv_obj_center(label);
+
+    btn = lv_btn_create(panel);
+    lv_obj_align(btn, LV_ALIGN_BOTTOM_RIGHT, -10, -5);
+    lv_obj_add_event_cb(btn, btn_retract, LV_EVENT_CLICKED, NULL);
+    lv_obj_set_size(btn, panel_width / 2 - 15, 30);
+
+    label = lv_label_create(btn);
+    lv_label_set_text(label, LV_SYMBOL_UP " Retract");
+    lv_obj_center(label);
 }