Merge pull request #4 from vden/feature/extended-machine-settings

- Change console image button
- Added power button
- Added extruder fan control
- Added light switch (compile time selection)
- ILI9488 freeze low mem crash fix by decreasing LVGL memory

Author: seeul8er

main/images/consolebutton.c

@@ -159,7 +159,7 @@ void draw_header(lv_obj_t *parent_screen) {
     lv_obj_t *cont_header_right = lv_cont_create(cont_header, NULL);
     lv_cont_set_fit(cont_header_right, LV_FIT_TIGHT);
     lv_cont_set_layout(cont_header_right, LV_LAYOUT_ROW_M);
-    lv_obj_align(cont_header_right, cont_header, LV_ALIGN_IN_TOP_RIGHT, -120, 12);
+    lv_obj_align(cont_header_right, cont_header, LV_ALIGN_IN_TOP_RIGHT, -130, 12);
 
     lv_obj_t *click_cont = lv_cont_create(cont_header_right, NULL);
     lv_cont_set_fit(click_cont, LV_FIT_TIGHT);

main/images_orig/console_button.png

@@ -110,6 +110,11 @@ typedef struct {
     bool z_homed;
 } reprap_axes_t;
 
+typedef struct {
+    bool power;
+    int fan;
+} reprap_params_t;
+
 typedef struct {
     int number;
     char name[MAX_TOOL_NAME_LEN];
@@ -156,6 +161,7 @@ extern int num_tools;     // max is MAX_NUM_TOOLS
 extern int current_visible_tool_indx;   // current indx of tool where temp data is displayed on process screen
 
 extern reprap_axes_t reprap_axes;
+extern reprap_params_t reprap_params;
 extern reprap_tool_t reprap_tools[MAX_NUM_TOOLS];
 extern reprap_bed_t reprap_bed;
 extern reprap_tool_poss_temps_t reprap_tool_poss_temps;

main/reppanel.c

@@ -18,20 +18,34 @@
 #define TAG     "Machine"
 
 reprap_axes_t reprap_axes;
-static lv_style_t not_homed_style;
+reprap_params_t reprap_params;
+
+static lv_style_t not_homed_style, homed_style;
 static char *cali_opt_map[] = {"True Bed Leveling", "Mesh Bed Leveling"};
 static char *cali_opt_list = {"True Bed Leveling\nMesh Bed Leveling"};
 
 #define AWAY_BTN    0
 #define CLOSER_BTN  1
 
+#define USE_LIGHTNING
+#define LIGHTNING_CMD_ON "M42 P2 S1"
+#define LIGHTNING_CMD_HALF "M42 P2 S0.5"
+#define LIGHTNING_CMD_OFF "M42 P2 S0"
+
 lv_obj_t *machine_page;
 lv_obj_t *ddlist_cali_options;
 lv_obj_t *btnm_height;
 lv_obj_t *btn_closer;
 lv_obj_t *btn_away;
 lv_obj_t *cont_heigh_adj_diag, *label_z_pos_cali;
 lv_obj_t *btn_home_all, *btn_home_y, *btn_home_x, *btn_home_z;
+lv_obj_t *btn_power, *label_power;
+lv_obj_t *btn_fan_off, *label_fan, *slider;
+
+#ifdef USE_LIGHTNING
+    lv_obj_t *btn_light_off, *btn_light_half, *btn_light_on;
+#endif
+
 
 static void _home_all_event(lv_obj_t *obj, lv_event_t event) {
     if (event == LV_EVENT_CLICKED) {
@@ -57,6 +71,47 @@ static void _home_z_event(lv_obj_t *obj, lv_event_t event) {
     }
 }
 
+#ifdef USE_LIGHTNING
+static void _light_off_event(lv_obj_t *obj, lv_event_t event) {
+    if (event == LV_EVENT_CLICKED) {
+        reprap_send_gcode(LIGHTNING_CMD_OFF);
+    }
+}
+
+static void _light_half_event(lv_obj_t *obj, lv_event_t event) {
+    if (event == LV_EVENT_CLICKED) {
+        reprap_send_gcode(LIGHTNING_CMD_HALF);
+    }
+}
+
+static void _light_on_event(lv_obj_t *obj, lv_event_t event) {
+    if (event == LV_EVENT_CLICKED) {
+        reprap_send_gcode(LIGHTNING_CMD_ON);
+    }
+}
+#endif
+
+static void _power_toggle_event(lv_obj_t *obj, lv_event_t event) {
+    if (event == LV_EVENT_CLICKED) {
+        reprap_send_gcode(reprap_params.power ? "M81" : "M80");
+    }
+}
+
+static void _fan_off_event(lv_obj_t *obj, lv_event_t event) {
+    if (event == LV_EVENT_CLICKED) {
+        reprap_send_gcode("M106 S0");
+    }
+}
+
+static void slider_event_cb(lv_obj_t * slider, lv_event_t event)
+{
+    if(event == LV_EVENT_RELEASED) {        
+        static char buf[11]; /* max 10 bytes for number plus 1 null terminating byte */
+        snprintf(buf, 11, "M106 S%.2f", (lv_slider_get_value(slider) / 100.));
+        reprap_send_gcode(buf);
+    }
+}
+
 static void _next_height_adjust_event(lv_obj_t *obj, lv_event_t event) {
     if (event == LV_EVENT_CLICKED) {
         if (reprap_send_gcode("M292")) {
@@ -185,12 +240,8 @@ void update_ui_machine() {
     portENTER_CRITICAL(&mutex); // not sure this really helps?!
     if (label_z_pos_cali) lv_label_set_text_fmt(label_z_pos_cali, "%.02f mm", reprap_axes.z);
     portEXIT_CRITICAL(&mutex);
+    
     if (btn_home_x) {
-        static lv_style_t homed_style;
-        lv_style_copy(&homed_style, lv_btn_get_style(btn_home_x, LV_BTN_STYLE_REL));
-        homed_style.body.main_color = REP_PANEL_DARK_ACCENT;
-        homed_style.body.grad_color = REP_PANEL_DARK_ACCENT;
-        homed_style.text.color = REP_PANEL_DARK;
         if (reprap_axes.x_homed)
             lv_btn_set_style(btn_home_x, LV_BTN_STYLE_REL, &homed_style);
         else
@@ -211,6 +262,19 @@ void update_ui_machine() {
         else
             lv_btn_set_style(btn_home_all, LV_BTN_STYLE_REL, &not_homed_style);
     }
+    if (btn_power) {
+        if (reprap_params.power) {
+            lv_btn_set_style(btn_power, LV_BTN_STYLE_REL, &homed_style);
+            lv_label_set_text(label_power, "On");
+        } else {
+            lv_btn_set_style(btn_power, LV_BTN_STYLE_REL, &not_homed_style);
+            lv_label_set_text(label_power, "Off");
+        }
+    }
+    if (label_fan) {
+        lv_label_set_text_fmt(label_fan, " %u%% ", reprap_params.fan);
+        lv_slider_set_value(slider, reprap_params.fan, LV_ANIM_ON);
+    }
 }
 
 void draw_machine(lv_obj_t *parent_screen) {
@@ -229,11 +293,16 @@ void draw_machine(lv_obj_t *parent_screen) {
     btn_home_x = create_button(home_cont, btn_home_x, " X ", _home_x_event);
     btn_home_y = create_button(home_cont, btn_home_y, " Y ", _home_y_event);
     btn_home_z = create_button(home_cont, btn_home_z, " Z ", _home_z_event);
+    
     lv_style_copy(&not_homed_style, lv_btn_get_style(btn_home_x, LV_BTN_STYLE_REL));
+    lv_style_copy(&homed_style, lv_btn_get_style(btn_home_x, LV_BTN_STYLE_REL));
+    homed_style.body.main_color = REP_PANEL_DARK_ACCENT;
+    homed_style.body.grad_color = REP_PANEL_DARK_ACCENT;
+    homed_style.text.color = REP_PANEL_DARK;
 
     lv_obj_t *cont_cali = lv_cont_create(machine_page, NULL);
     lv_cont_set_fit(cont_cali, LV_FIT_TIGHT);
-    lv_cont_set_layout(cont_cali, LV_LAYOUT_ROW_M);
+    lv_cont_set_layout(cont_cali,  LV_LAYOUT_ROW_M);
 
     ddlist_cali_options = lv_ddlist_create(cont_cali, NULL);
     lv_ddlist_set_options(ddlist_cali_options, cali_opt_list);
@@ -245,5 +314,41 @@ void draw_machine(lv_obj_t *parent_screen) {
     static lv_obj_t *do_cali_butn;
     create_button(cont_cali, do_cali_butn, "Start", _start_cali_event);
 
+    lv_obj_t *power_cont = lv_cont_create(machine_page, NULL);
+    lv_cont_set_layout(power_cont,  LV_LAYOUT_ROW_M);
+    lv_cont_set_fit(power_cont, LV_FIT_TIGHT);
+    lv_obj_t *label_power_header = lv_label_create(power_cont, NULL);
+    lv_label_set_text(label_power_header, "Power:");
+    
+    btn_power = lv_btn_create(power_cont, NULL);
+    lv_btn_set_fit(btn_power, LV_FIT_TIGHT);
+    lv_obj_set_event_cb(btn_power, _power_toggle_event);
+    lv_obj_align(btn_power, power_cont, LV_ALIGN_CENTER, 0, 0);
+    label_power = lv_label_create(btn_power, NULL);
+    lv_label_set_text(label_power, reprap_params.power ? "On" : "Off");
+
+    #ifdef USE_LIGHTNING
+    lv_obj_t *label_light = lv_label_create(power_cont, NULL);
+    lv_label_set_text(label_light, "Light:");
+    btn_light_on = create_button(power_cont, btn_light_on, "On", _light_on_event);
+    btn_light_half = create_button(power_cont, btn_light_half, "50%", _light_half_event);
+    btn_light_off = create_button(power_cont, btn_light_off, "Off", _light_off_event);
+    #endif
+
+    lv_obj_t *fan_cont = lv_cont_create(machine_page, NULL);
+    lv_cont_set_layout(fan_cont,  LV_LAYOUT_ROW_M);
+    lv_cont_set_fit(fan_cont, LV_FIT_TIGHT);
+    lv_obj_t *label_fan_title = lv_label_create(fan_cont, NULL);
+    lv_label_set_text(label_fan_title, "Fan:  ");    
+    
+    slider = lv_slider_create(fan_cont, NULL);
+    lv_obj_set_width(slider, LV_DPI * 2);
+    lv_obj_align(slider, NULL, LV_ALIGN_CENTER, 0, 0);
+    lv_obj_set_event_cb(slider, slider_event_cb);
+    lv_slider_set_range(slider, 0, 100);
+    label_fan = lv_label_create(fan_cont, NULL);
+    lv_label_set_text_fmt(label_fan, " %u%% ", reprap_params.fan);    
+    btn_fan_off = create_button(fan_cont, btn_fan_off, " Off ", _fan_off_event);
+
     update_ui_machine();
 }

main/reppanel.h

@@ -119,6 +119,18 @@ void process_reprap_status(char *buff) {
         }
     }
 
+    cJSON *params = cJSON_GetObjectItem(root, "params");
+    if (params) {
+        cJSON *atxPower = cJSON_GetObjectItem(params, "atxPower");
+        if (atxPower && cJSON_IsNumber(atxPower)) {
+            reprap_params.power = atxPower->valueint == 1;
+        }
+        cJSON *fanPercent = cJSON_GetObjectItem(params, "fanPercent");
+        if (fanPercent && cJSON_IsArray(fanPercent)) {
+            reprap_params.fan = cJSON_GetArrayItem(fanPercent, 0)->valueint;
+        }        
+    }    
+
     int _heater_states[MAX_NUM_TOOLS];  // bed heater state must be on pos 0
     cJSON *duet_temps = cJSON_GetObjectItem(root, DUET_TEMPS);
     if (duet_temps) {

main/reppanel_machine.c

@@ -7,7 +7,7 @@
 
 #define MAX_REQ_ADDR_LENGTH     256 + 512
 #define JSON_BUFF_SIZE          1024 * 4        // d2wc settings is > 2800 bytes
-#define UART_RESP_BUFF_SIZE     1024 * 3
+#define UART_RESP_BUFF_SIZE     1024 * 4
 
 typedef struct {
     char buffer[JSON_BUFF_SIZE];

main/reppanel_request.c

@@ -325,7 +325,7 @@ CONFIG_LOG_DEFAULT_LEVEL=3
 CONFIG_LOG_COLORS=y
 CONFIG_LWIP_LOCAL_HOSTNAME="reppanel"
 # CONFIG_LWIP_L2_TO_L3_COPY is not set
-# CONFIG_LWIP_IRAM_OPTIMIZATION is not set
+CONFIG_LWIP_IRAM_OPTIMIZATION=y
 CONFIG_LWIP_TIMERS_ONDEMAND=y
 CONFIG_LWIP_MAX_SOCKETS=10
 # CONFIG_LWIP_USE_ONLY_LWIP_SELECT is not set