3d_print_resources/Marlin
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Apply standards

Browse source
This commit is contained in:
Scott Lahteine 2020-11-10 04:34:28 -06:00
parent 2c6e5a1be0
commit 1312edac85
16 changed files with 212 additions and 487 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Marlin/src/MarlinCore.cpp
View file

@ -1299,7 +1299,7 @@ void setup() {
SETUP_RUN(password.lock_machine()); // Will not proceed until correct password provided SETUP_RUN(password.lock_machine()); // Will not proceed until correct password provided
#endif #endif
#if HAS_LCD_MENU && ENABLED(TOUCH_SCREEN_CALIBRATION) && EITHER(TFT_CLASSIC_UI, TFT_COLOR_UI) #if BOTH(HAS_LCD_MENU, TOUCH_SCREEN_CALIBRATION) && EITHER(TFT_CLASSIC_UI, TFT_COLOR_UI)
ui.check_touch_calibration(); ui.check_touch_calibration();
#endif #endif

15
Marlin/src/gcode/lcd/M995.cpp
View file

@ -25,21 +25,24 @@
#if ENABLED(TOUCH_SCREEN_CALIBRATION) #if ENABLED(TOUCH_SCREEN_CALIBRATION)
#include "../gcode.h" #include "../gcode.h"
#if DISABLED(TFT_LVGL_UI)
#include "../../lcd/menu/menu.h" #if ENABLED(TFT_LVGL_UI)
#else
#include "../../lcd/extui/lib/mks_ui/draw_touch_calibration.h" #include "../../lcd/extui/lib/mks_ui/draw_touch_calibration.h"
#else
#include "../../lcd/menu/menu.h"
#endif #endif
/** /**
* M995: Touch screen calibration for TFT display * M995: Touch screen calibration for TFT display
*/ */
void GcodeSuite::M995() { void GcodeSuite::M995() {
#if DISABLED(TFT_LVGL_UI)
ui.goto_screen(touch_screen_calibration); #if ENABLED(TFT_LVGL_UI)
#else
lv_draw_touch_calibration_screen(); lv_draw_touch_calibration_screen();
#else
ui.goto_screen(touch_screen_calibration);
#endif #endif
} }
#endif // TOUCH_SCREEN_CALIBRATION #endif // TOUCH_SCREEN_CALIBRATION

8
Marlin/src/lcd/dogm/u8g_dev_tft_upscale_from_128x64.cpp
View file

@ -321,12 +321,10 @@ static uint8_t page;
#if HAS_TOUCH_BUTTONS #if HAS_TOUCH_BUTTONS
static bool redrawTouchButtons = true; static bool redrawTouchButtons = true;
static void drawTouchButtons(u8g_t *u8g, u8g_dev_t *dev) { static void drawTouchButtons(u8g_t *u8g, u8g_dev_t *dev) {
if (!redrawTouchButtons) { if (!redrawTouchButtons) return;
return;
}
redrawTouchButtons = false; redrawTouchButtons = false;
// Bottom buttons
// Bottom buttons
setWindow(u8g, dev, BUTTOND_X_LO, BUTTON_Y_LO, BUTTOND_X_HI, BUTTON_Y_HI); setWindow(u8g, dev, BUTTOND_X_LO, BUTTON_Y_LO, BUTTOND_X_HI, BUTTON_Y_HI);
drawImage(buttonD, u8g, dev, BUTTON_DRAW_WIDTH, BUTTON_DRAW_HEIGHT, TFT_BTCANCEL_COLOR); drawImage(buttonD, u8g, dev, BUTTON_DRAW_WIDTH, BUTTON_DRAW_HEIGHT, TFT_BTCANCEL_COLOR);
@ -471,6 +469,7 @@ uint8_t u8g_com_hal_tft_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_p
U8G_PB_DEV(u8g_dev_tft_320x240_upscale_from_128x64, WIDTH, HEIGHT, PAGE_HEIGHT, u8g_dev_tft_320x240_upscale_from_128x64_fn, U8G_COM_HAL_TFT_FN); U8G_PB_DEV(u8g_dev_tft_320x240_upscale_from_128x64, WIDTH, HEIGHT, PAGE_HEIGHT, u8g_dev_tft_320x240_upscale_from_128x64_fn, U8G_COM_HAL_TFT_FN);
#if ENABLED(TOUCH_SCREEN_CALIBRATION) #if ENABLED(TOUCH_SCREEN_CALIBRATION)
static void drawCross(uint16_t x, uint16_t y, uint16_t color) { static void drawCross(uint16_t x, uint16_t y, uint16_t color) {
tftio.set_window(x - 15, y, x + 15, y); tftio.set_window(x - 15, y, x + 15, y);
tftio.WriteMultiple(color, 31); tftio.WriteMultiple(color, 31);
@ -527,6 +526,7 @@ U8G_PB_DEV(u8g_dev_tft_320x240_upscale_from_128x64, WIDTH, HEIGHT, PAGE_HEIGHT,
} while (u8g.nextPage()); } while (u8g.nextPage());
drawing_screen = false; drawing_screen = false;
} }
#endif // TOUCH_SCREEN_CALIBRATION #endif // TOUCH_SCREEN_CALIBRATION
#endif // HAS_MARLINUI_U8GLIB && (FSMC_CS_PIN || HAS_SPI_GRAPHICAL_TFT) #endif // HAS_MARLINUI_U8GLIB && (FSMC_CS_PIN || HAS_SPI_GRAPHICAL_TFT)

6
Marlin/src/lcd/extui/lib/mks_ui/draw_touch_calibration.cpp
View file

@ -21,7 +21,7 @@
*/ */
#include "../../../../inc/MarlinConfigPre.h" #include "../../../../inc/MarlinConfigPre.h"
#if HAS_TFT_LVGL_UI && ENABLED(TOUCH_SCREEN_CALIBRATION) #if BOTH(HAS_TFT_LVGL_UI, TOUCH_SCREEN_CALIBRATION)
#include "draw_ui.h" #include "draw_ui.h"
#include "draw_touch_calibration.h" #include "draw_touch_calibration.h"
@ -100,7 +100,7 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
} }
} }
void lv_draw_touch_calibration_screen(void) { void lv_draw_touch_calibration_screen() {
disp_state_stack._disp_index = 0; disp_state_stack._disp_index = 0;
ZERO(disp_state_stack._disp_state); ZERO(disp_state_stack._disp_state);
scr = lv_screen_create(TOUCH_CALIBRATION_UI, ""); scr = lv_screen_create(TOUCH_CALIBRATION_UI, "");
@ -117,4 +117,4 @@ void lv_clear_touch_calibration_screen() {
lv_obj_del(scr); lv_obj_del(scr);
} }
#endif // HAS_TFT_LVGL_UI #endif // HAS_TFT_LVGL_UI && TOUCH_SCREEN_CALIBRATION

2
Marlin/src/lcd/extui/lib/mks_ui/draw_touch_calibration.h
View file

@ -25,7 +25,7 @@
extern "C" { /* C-declarations for C++ */ extern "C" { /* C-declarations for C++ */
#endif #endif
extern void lv_draw_touch_calibration_screen(void); extern void lv_draw_touch_calibration_screen();
extern void lv_clear_touch_calibration_screen(); extern void lv_clear_touch_calibration_screen();
extern void lv_update_touch_calibration_screen(); extern void lv_update_touch_calibration_screen();

551
Marlin/src/lcd/extui/lib/mks_ui/draw_ui.cpp
View file

@ -1142,232 +1142,94 @@ void clear_cur_ui() {
last_disp_state = disp_state_stack._disp_state[disp_state_stack._disp_index]; last_disp_state = disp_state_stack._disp_state[disp_state_stack._disp_index];
switch (disp_state_stack._disp_state[disp_state_stack._disp_index]) { switch (disp_state_stack._disp_state[disp_state_stack._disp_index]) {
case PRINT_READY_UI: case PRINT_READY_UI: //Get_Temperature_Flg = 0;
//Get_Temperature_Flg = 0; lv_clear_ready_print(); break;
lv_clear_ready_print(); case PRINT_FILE_UI: lv_clear_print_file(); break;
break; case PRINTING_UI: lv_clear_printing(); break;
case PRINT_FILE_UI: case MOVE_MOTOR_UI: lv_clear_move_motor(); break;
lv_clear_print_file(); case OPERATE_UI: lv_clear_operation(); break;
break; case PAUSE_UI: /* Clear_pause(); */ break;
case PRINTING_UI: case EXTRUSION_UI: lv_clear_extrusion(); break;
lv_clear_printing(); case PRE_HEAT_UI: lv_clear_preHeat(); break;
break; case CHANGE_SPEED_UI: lv_clear_change_speed(); break;
case MOVE_MOTOR_UI: case FAN_UI: lv_clear_fan(); break;
lv_clear_move_motor(); case SET_UI: lv_clear_set(); break;
break; case ZERO_UI: lv_clear_home(); break;
case OPERATE_UI: case SPRAYER_UI: /* Clear_Sprayer(); */ break;
lv_clear_operation(); case MACHINE_UI: /* Clear_Machine(); */ break;
break; case LANGUAGE_UI: lv_clear_language(); break;
case PAUSE_UI: case ABOUT_UI: lv_clear_about(); break;
//Clear_pause(); case LOG_UI: /* Clear_Connect(); */ break;
break; case DISK_UI: /* Clear_Disk(); */ break;
case EXTRUSION_UI:
lv_clear_extrusion();
break;
case PRE_HEAT_UI:
lv_clear_preHeat();
break;
case CHANGE_SPEED_UI:
lv_clear_change_speed();
break;
case FAN_UI:
lv_clear_fan();
break;
case SET_UI:
lv_clear_set();
break;
case ZERO_UI:
lv_clear_home();
break;
case SPRAYER_UI:
//Clear_Sprayer();
break;
case MACHINE_UI:
//Clear_Machine();
break;
case LANGUAGE_UI:
lv_clear_language();
break;
case ABOUT_UI:
lv_clear_about();
break;
case LOG_UI:
//Clear_Connect();
break;
case DISK_UI:
//Clear_Disk();
break;
#if ENABLED(USE_WIFI_FUNCTION) #if ENABLED(USE_WIFI_FUNCTION)
case WIFI_UI: case WIFI_UI: lv_clear_wifi(); break;
lv_clear_wifi();
break;
#endif #endif
case MORE_UI: case MORE_UI: /* Clear_more(); */ break;
//Clear_more(); case FILETRANSFER_UI: /* Clear_fileTransfer(); */ break;
break; case DIALOG_UI: lv_clear_dialog(); break;
case FILETRANSFER_UI: case FILETRANSFERSTATE_UI: /* Clear_WifiFileTransferdialog(); */ break;
//Clear_fileTransfer(); case PRINT_MORE_UI: /* Clear_Printmore(); */ break;
break; case FILAMENTCHANGE_UI: lv_clear_filament_change(); break;
case DIALOG_UI: case LEVELING_UI: lv_clear_manualLevel(); break;
lv_clear_dialog(); case BIND_UI: /* Clear_Bind(); */ break;
break;
case FILETRANSFERSTATE_UI:
//Clear_WifiFileTransferdialog();
break;
case PRINT_MORE_UI:
//Clear_Printmore();
break;
case FILAMENTCHANGE_UI:
lv_clear_filament_change();
break;
case LEVELING_UI:
lv_clear_manualLevel();
break;
case BIND_UI:
//Clear_Bind();
break;
#if HAS_BED_PROBE #if HAS_BED_PROBE
case NOZZLE_PROBE_OFFSET_UI: case NOZZLE_PROBE_OFFSET_UI: lv_clear_auto_level_offset_settings(); break;
lv_clear_auto_level_offset_settings();
break;
#endif #endif
case TOOL_UI: case TOOL_UI: lv_clear_tool(); break;
lv_clear_tool(); case MESHLEVELING_UI: /* Clear_MeshLeveling(); */ break;
break; case HARDWARE_TEST_UI: /* Clear_Hardwaretest(); */ break;
case MESHLEVELING_UI:
//Clear_MeshLeveling();
break;
case HARDWARE_TEST_UI:
//Clear_Hardwaretest();
break;
#if ENABLED(USE_WIFI_FUNCTION) #if ENABLED(USE_WIFI_FUNCTION)
case WIFI_LIST_UI: case WIFI_LIST_UI: lv_clear_wifi_list(); break;
lv_clear_wifi_list();
break;
#endif #endif
case KEY_BOARD_UI: case KEY_BOARD_UI: lv_clear_keyboard(); break;
lv_clear_keyboard();
break;
#if ENABLED(USE_WIFI_FUNCTION) #if ENABLED(USE_WIFI_FUNCTION)
case WIFI_TIPS_UI: case WIFI_TIPS_UI: lv_clear_wifi_tips(); break;
lv_clear_wifi_tips();
break;
#endif #endif
case MACHINE_PARA_UI: case MACHINE_PARA_UI: lv_clear_machine_para(); break;
lv_clear_machine_para(); case MACHINE_SETTINGS_UI: lv_clear_machine_settings(); break;
break; case TEMPERATURE_SETTINGS_UI: /* Clear_TemperatureSettings(); */ break;
case MACHINE_SETTINGS_UI: case MOTOR_SETTINGS_UI: lv_clear_motor_settings(); break;
lv_clear_machine_settings(); case MACHINETYPE_UI: /* Clear_MachineType(); */ break;
break; case STROKE_UI: /* Clear_Stroke(); */ break;
case TEMPERATURE_SETTINGS_UI: case HOME_DIR_UI: /* Clear_HomeDir(); */ break;
//Clear_TemperatureSettings(); case ENDSTOP_TYPE_UI: /* Clear_EndstopType(); */ break;
break; case FILAMENT_SETTINGS_UI: lv_clear_filament_settings(); break;
case MOTOR_SETTINGS_UI: case LEVELING_SETTIGNS_UI: /* Clear_LevelingSettings(); */ break;
lv_clear_motor_settings(); case LEVELING_PARA_UI: lv_clear_level_settings(); break;
break; case DELTA_LEVELING_PARA_UI: /* Clear_DeltaLevelPara(); */ break;
case MACHINETYPE_UI: case MANUAL_LEVELING_POSIGION_UI: lv_clear_manual_level_pos_settings(); break;
//Clear_MachineType(); case MAXFEEDRATE_UI: lv_clear_max_feedrate_settings(); break;
break; case STEPS_UI: lv_clear_step_settings(); break;
case STROKE_UI: case ACCELERATION_UI: lv_clear_acceleration_settings(); break;
//Clear_Stroke(); case JERK_UI: TERN_(HAS_CLASSIC_JERK, lv_clear_jerk_settings()); break;
break; case MOTORDIR_UI: /* Clear_MotorDir(); */ break;
case HOME_DIR_UI: case HOMESPEED_UI: /* Clear_HomeSpeed(); */ break;
//Clear_HomeDir(); case NOZZLE_CONFIG_UI: /* Clear_NozzleConfig(); */ break;
break; case HOTBED_CONFIG_UI: /* Clear_HotbedConfig(); */ break;
case ENDSTOP_TYPE_UI: case ADVANCED_UI: lv_clear_advance_settings(); break;
//Clear_EndstopType(); case DOUBLE_Z_UI: /* Clear_DoubleZ(); */ break;
break; case ENABLE_INVERT_UI: /* Clear_EnableInvert(); */ break;
case FILAMENT_SETTINGS_UI: case NUMBER_KEY_UI: lv_clear_number_key(); break;
lv_clear_filament_settings(); case BABY_STEP_UI: lv_clear_baby_stepping(); break;
break; case PAUSE_POS_UI: lv_clear_pause_position(); break;
case LEVELING_SETTIGNS_UI:
//Clear_LevelingSettings();
break;
case LEVELING_PARA_UI:
lv_clear_level_settings();
break;
case DELTA_LEVELING_PARA_UI:
//Clear_DeltaLevelPara();
break;
case MANUAL_LEVELING_POSIGION_UI:
lv_clear_manual_level_pos_settings();
break;
case MAXFEEDRATE_UI:
lv_clear_max_feedrate_settings();
break;
case STEPS_UI:
lv_clear_step_settings();
break;
case ACCELERATION_UI:
lv_clear_acceleration_settings();
break;
case JERK_UI:
#if HAS_CLASSIC_JERK
lv_clear_jerk_settings();
#endif
break;
case MOTORDIR_UI:
//Clear_MotorDir();
break;
case HOMESPEED_UI:
//Clear_HomeSpeed();
break;
case NOZZLE_CONFIG_UI:
//Clear_NozzleConfig();
break;
case HOTBED_CONFIG_UI:
//Clear_HotbedConfig();
break;
case ADVANCED_UI:
lv_clear_advance_settings();
break;
case DOUBLE_Z_UI:
//Clear_DoubleZ();
break;
case ENABLE_INVERT_UI:
//Clear_EnableInvert();
break;
case NUMBER_KEY_UI:
lv_clear_number_key();
break;
case BABY_STEP_UI:
lv_clear_baby_stepping();
break;
case PAUSE_POS_UI:
lv_clear_pause_position();
break;
#if HAS_TRINAMIC_CONFIG #if HAS_TRINAMIC_CONFIG
case TMC_CURRENT_UI: case TMC_CURRENT_UI: lv_clear_tmc_current_settings(); break;
lv_clear_tmc_current_settings();
break;
#endif #endif
case EEPROM_SETTINGS_UI: case EEPROM_SETTINGS_UI: lv_clear_eeprom_settings(); break;
lv_clear_eeprom_settings();
break;
#if HAS_STEALTHCHOP #if HAS_STEALTHCHOP
case TMC_MODE_UI: case TMC_MODE_UI: lv_clear_tmc_step_mode_settings(); break;
lv_clear_tmc_step_mode_settings();
break;
#endif #endif
#if ENABLED(USE_WIFI_FUNCTION) #if ENABLED(USE_WIFI_FUNCTION)
case WIFI_SETTINGS_UI: case WIFI_SETTINGS_UI: lv_clear_wifi_settings(); break;
lv_clear_wifi_settings();
break;
#endif #endif
#if USE_SENSORLESS #if USE_SENSORLESS
case HOMING_SENSITIVITY_UI: case HOMING_SENSITIVITY_UI: lv_clear_homing_sensitivity_settings(); break;
lv_clear_homing_sensitivity_settings();
break;
#endif #endif
#if HAS_ROTARY_ENCODER #if HAS_ROTARY_ENCODER
case ENCODER_SETTINGS_UI: case ENCODER_SETTINGS_UI: lv_clear_encoder_settings(); break;
lv_clear_encoder_settings();
break;
#endif #endif
#if ENABLED(TOUCH_SCREEN_CALIBRATION) #if ENABLED(TOUCH_SCREEN_CALIBRATION)
case TOUCH_CALIBRATION_UI: case TOUCH_CALIBRATION_UI: lv_clear_touch_calibration_screen(); break;
lv_clear_touch_calibration_screen();
break;
#endif #endif
default: break; default: break;
} }
@ -1379,227 +1241,98 @@ void draw_return_ui() {
disp_state_stack._disp_index--; disp_state_stack._disp_index--;
switch (disp_state_stack._disp_state[disp_state_stack._disp_index]) { switch (disp_state_stack._disp_state[disp_state_stack._disp_index]) {
case PRINT_READY_UI: case PRINT_READY_UI: lv_draw_ready_print(); break;
lv_draw_ready_print(); case PRINT_FILE_UI: lv_draw_print_file(); break;
break;
case PRINT_FILE_UI: case PRINTING_UI: if (gCfgItems.from_flash_pic)
lv_draw_print_file(); flash_preview_begin = true;
break; else
case PRINTING_UI: default_preview_flg = true;
if (gCfgItems.from_flash_pic) flash_preview_begin = true;
else default_preview_flg = true;
lv_draw_printing(); lv_draw_printing();
break; break;
case MOVE_MOTOR_UI:
lv_draw_move_motor();
break;
case OPERATE_UI:
lv_draw_operation();
break;
#if 1 case MOVE_MOTOR_UI: lv_draw_move_motor(); break;
case PAUSE_UI: case OPERATE_UI: lv_draw_operation(); break;
//draw_pause(); case PAUSE_UI: /* draw_pause(); */ break;
break; case EXTRUSION_UI: lv_draw_extrusion(); break;
#endif case PRE_HEAT_UI: lv_draw_preHeat(); break;
case CHANGE_SPEED_UI: lv_draw_change_speed(); break;
case FAN_UI: lv_draw_fan(); break;
case SET_UI: lv_draw_set(); break;
case ZERO_UI: lv_draw_home(); break;
case SPRAYER_UI: /* draw_Sprayer(); */ break;
case MACHINE_UI: /* draw_Machine(); */ break;
case LANGUAGE_UI: lv_draw_language(); break;
case ABOUT_UI: lv_draw_about(); break;
case EXTRUSION_UI: case CALIBRATE_UI: /* draw_calibrate(); */ break;
lv_draw_extrusion(); case DISK_UI: /* draw_Disk(); */ break;
break;
case PRE_HEAT_UI:
lv_draw_preHeat();
break;
case CHANGE_SPEED_UI:
lv_draw_change_speed();
break;
case FAN_UI:
lv_draw_fan();
break;
case SET_UI:
lv_draw_set();
break;
case ZERO_UI:
lv_draw_home();
break;
case SPRAYER_UI:
//draw_Sprayer();
break;
case MACHINE_UI:
//draw_Machine();
break;
case LANGUAGE_UI:
lv_draw_language();
break;
case ABOUT_UI:
lv_draw_about();
break;
case CALIBRATE_UI:
//draw_calibrate();
break;
case DISK_UI:
//draw_Disk();
break;
#if ENABLED(USE_WIFI_FUNCTION) #if ENABLED(USE_WIFI_FUNCTION)
case WIFI_UI: case WIFI_UI: lv_draw_wifi(); break;
lv_draw_wifi();
break;
#endif #endif
case MORE_UI: case MORE_UI: /* draw_More(); */ break;
//draw_More(); case PRINT_MORE_UI: /* draw_printmore(); */ break;
break; case FILAMENTCHANGE_UI: lv_draw_filament_change(); break;
case PRINT_MORE_UI: case LEVELING_UI: lv_draw_manualLevel(); break;
//draw_printmore(); case BIND_UI: /* draw_bind(); */ break;
break;
case FILAMENTCHANGE_UI:
lv_draw_filament_change();
break;
case LEVELING_UI:
lv_draw_manualLevel();
break;
case BIND_UI:
//draw_bind();
break;
#if HAS_BED_PROBE #if HAS_BED_PROBE
case NOZZLE_PROBE_OFFSET_UI: case NOZZLE_PROBE_OFFSET_UI: lv_draw_auto_level_offset_settings(); break;
lv_draw_auto_level_offset_settings();
break;
#endif #endif
case TOOL_UI: case TOOL_UI: lv_draw_tool(); break;
lv_draw_tool(); case MESHLEVELING_UI: /* draw_meshleveling(); */ break;
break; case HARDWARE_TEST_UI: /* draw_Hardwaretest(); */ break;
case MESHLEVELING_UI:
//draw_meshleveling();
break;
case HARDWARE_TEST_UI:
//draw_Hardwaretest();
break;
case WIFI_LIST_UI:
#if ENABLED(USE_WIFI_FUNCTION) #if ENABLED(USE_WIFI_FUNCTION)
lv_draw_wifi_list(); case WIFI_LIST_UI: lv_draw_wifi_list(); break;
#endif #endif
break; case KEY_BOARD_UI: lv_draw_keyboard(); break;
case KEY_BOARD_UI:
lv_draw_keyboard();
break;
case WIFI_TIPS_UI:
#if ENABLED(USE_WIFI_FUNCTION) #if ENABLED(USE_WIFI_FUNCTION)
lv_draw_wifi_tips(); case WIFI_TIPS_UI: lv_draw_wifi_tips(); break;
#endif #endif
break; case MACHINE_PARA_UI: lv_draw_machine_para(); break;
case MACHINE_PARA_UI: case MACHINE_SETTINGS_UI: lv_draw_machine_settings(); break;
lv_draw_machine_para(); case TEMPERATURE_SETTINGS_UI: /* draw_TemperatureSettings(); */ break;
break; case MOTOR_SETTINGS_UI: lv_draw_motor_settings(); break;
case MACHINE_SETTINGS_UI: case MACHINETYPE_UI: /* draw_MachineType(); */ break;
lv_draw_machine_settings(); case STROKE_UI: /* draw_Stroke(); */ break;
break; case HOME_DIR_UI: /* draw_HomeDir(); */ break;
case TEMPERATURE_SETTINGS_UI: case ENDSTOP_TYPE_UI: /* draw_EndstopType(); */ break;
//draw_TemperatureSettings(); case FILAMENT_SETTINGS_UI: lv_draw_filament_settings(); break;
break; case LEVELING_SETTIGNS_UI: /* draw_LevelingSettings(); */ break;
case MOTOR_SETTINGS_UI: case LEVELING_PARA_UI: lv_draw_level_settings(); break;
lv_draw_motor_settings(); case DELTA_LEVELING_PARA_UI: /* draw_DeltaLevelPara(); */ break;
break; case MANUAL_LEVELING_POSIGION_UI: lv_draw_manual_level_pos_settings(); break;
case MACHINETYPE_UI: case MAXFEEDRATE_UI: lv_draw_max_feedrate_settings(); break;
//draw_MachineType(); case STEPS_UI: lv_draw_step_settings(); break;
break; case ACCELERATION_UI: lv_draw_acceleration_settings(); break;
case STROKE_UI:
//draw_Stroke();
break;
case HOME_DIR_UI:
//draw_HomeDir();
break;
case ENDSTOP_TYPE_UI:
//draw_EndstopType();
break;
case FILAMENT_SETTINGS_UI:
lv_draw_filament_settings();
break;
case LEVELING_SETTIGNS_UI:
//draw_LevelingSettings();
break;
case LEVELING_PARA_UI:
lv_draw_level_settings();
break;
case DELTA_LEVELING_PARA_UI:
//draw_DeltaLevelPara();
break;
case MANUAL_LEVELING_POSIGION_UI:
lv_draw_manual_level_pos_settings();
break;
case MAXFEEDRATE_UI:
lv_draw_max_feedrate_settings();
break;
case STEPS_UI:
lv_draw_step_settings();
break;
case ACCELERATION_UI:
lv_draw_acceleration_settings();
break;
case JERK_UI:
#if HAS_CLASSIC_JERK #if HAS_CLASSIC_JERK
lv_draw_jerk_settings(); case JERK_UI: lv_draw_jerk_settings(); break;
#endif #endif
break; case MOTORDIR_UI: /* draw_MotorDir(); */ break;
case MOTORDIR_UI: case HOMESPEED_UI: /* draw_HomeSpeed(); */ break;
//draw_MotorDir(); case NOZZLE_CONFIG_UI: /* draw_NozzleConfig(); */ break;
break; case HOTBED_CONFIG_UI: /* draw_HotbedConfig(); */ break;
case HOMESPEED_UI: case ADVANCED_UI: lv_draw_advance_settings(); break;
//draw_HomeSpeed(); case DOUBLE_Z_UI: /* draw_DoubleZ(); */ break;
break; case ENABLE_INVERT_UI: /* draw_EnableInvert(); */ break;
case NOZZLE_CONFIG_UI: case NUMBER_KEY_UI: lv_draw_number_key(); break;
//draw_NozzleConfig(); case DIALOG_UI: /* draw_dialog(uiCfg.dialogType); */ break;
break; case BABY_STEP_UI: lv_draw_baby_stepping(); break;
case HOTBED_CONFIG_UI: case PAUSE_POS_UI: lv_draw_pause_position(); break;
//draw_HotbedConfig();
break;
case ADVANCED_UI:
lv_draw_advance_settings();
break;
case DOUBLE_Z_UI:
//draw_DoubleZ();
break;
case ENABLE_INVERT_UI:
//draw_EnableInvert();
break;
case NUMBER_KEY_UI:
lv_draw_number_key();
break;
case DIALOG_UI:
//draw_dialog(uiCfg.dialogType);
break;
case BABY_STEP_UI:
lv_draw_baby_stepping();
break;
case PAUSE_POS_UI:
lv_draw_pause_position();
break;
#if HAS_TRINAMIC_CONFIG #if HAS_TRINAMIC_CONFIG
case TMC_CURRENT_UI: case TMC_CURRENT_UI: lv_draw_tmc_current_settings(); break;
lv_draw_tmc_current_settings();
break;
#endif #endif
case EEPROM_SETTINGS_UI: case EEPROM_SETTINGS_UI: lv_draw_eeprom_settings(); break;
lv_draw_eeprom_settings();
break;
#if HAS_STEALTHCHOP #if HAS_STEALTHCHOP
case TMC_MODE_UI: case TMC_MODE_UI: lv_draw_tmc_step_mode_settings(); break;
lv_draw_tmc_step_mode_settings();
break;
#endif #endif
#if ENABLED(USE_WIFI_FUNCTION) #if ENABLED(USE_WIFI_FUNCTION)
case WIFI_SETTINGS_UI: case WIFI_SETTINGS_UI: lv_draw_wifi_settings(); break;
lv_draw_wifi_settings();
break;
#endif #endif
#if USE_SENSORLESS #if USE_SENSORLESS
case HOMING_SENSITIVITY_UI: case HOMING_SENSITIVITY_UI: lv_draw_homing_sensitivity_settings(); break;
lv_draw_homing_sensitivity_settings();
break;
#endif #endif
#if HAS_ROTARY_ENCODER #if HAS_ROTARY_ENCODER
case ENCODER_SETTINGS_UI: case ENCODER_SETTINGS_UI: lv_draw_encoder_settings(); break;
lv_draw_encoder_settings();
break;
#endif #endif
default: break; default: break;
} }
@ -1888,15 +1621,11 @@ void LV_TASK_HANDLER() {
lv_task_handler(); lv_task_handler();
if (mks_test_flag == 0x1E) mks_hardware_test(); if (mks_test_flag == 0x1E) mks_hardware_test();
#if HAS_GCODE_PREVIEW TERN_(HAS_GCODE_PREVIEW, disp_pre_gcode(2, 36));
disp_pre_gcode(2, 36);
#endif
GUI_RefreshPage(); GUI_RefreshPage();
#if ENABLED(USE_WIFI_FUNCTION) TERN_(USE_WIFI_FUNCTION, get_wifi_commands());
get_wifi_commands();
#endif
//sd_detection(); //sd_detection();

2
Marlin/src/lcd/marlinui.h
View file

@ -317,7 +317,7 @@ public:
// LCD implementations // LCD implementations
static void clear_lcd(); static void clear_lcd();
#if HAS_LCD_MENU && ENABLED(TOUCH_SCREEN_CALIBRATION) #if BOTH(HAS_LCD_MENU, TOUCH_SCREEN_CALIBRATION)
static void check_touch_calibration() { static void check_touch_calibration() {
if (touch_calibration.need_calibration()) currentScreen = touch_calibration_screen; if (touch_calibration.need_calibration()) currentScreen = touch_calibration_screen;
} }

4
Marlin/src/lcd/menu/menu_bed_leveling.cpp
View file

@ -37,8 +37,10 @@
#endif #endif
#if HAS_GRAPHICAL_TFT #if HAS_GRAPHICAL_TFT
#include "../tft/touch.h"
#include "../tft/tft.h" #include "../tft/tft.h"
#if ENABLED(TOUCH_SCREEN)
#include "../tft/touch.h"
#endif
#endif #endif
#if EITHER(PROBE_MANUALLY, MESH_BED_LEVELING) #if EITHER(PROBE_MANUALLY, MESH_BED_LEVELING)

7
Marlin/src/lcd/tft/touch.h
View file

@ -23,11 +23,12 @@
#include "../../inc/MarlinConfigPre.h" #include "../../inc/MarlinConfigPre.h"
#if ENABLED(TOUCH_SCREEN)
#include "tft_color.h" #include "tft_color.h"
#include "tft_image.h" #include "tft_image.h"
#if ENABLED(TOUCH_SCREEN_CALIBRATION)
#include "../tft_io/touch_calibration.h" #include "../tft_io/touch_calibration.h"
#endif
#include HAL_PATH(../../HAL, tft/xpt2046.h) #include HAL_PATH(../../HAL, tft/xpt2046.h)
#define TOUCH_DRIVER XPT2046 #define TOUCH_DRIVER XPT2046
@ -117,5 +118,3 @@ class Touch {
}; };
extern Touch touch; extern Touch touch;
#endif // TOUCH_SCREEN

6
Marlin/src/lcd/tft_io/touch_calibration.cpp
View file

@ -17,11 +17,11 @@
* *
*/ */
#include "touch_calibration.h" #include "../../inc/MarlinConfig.h"
#if ENABLED(TOUCH_SCREEN_CALIBRATION) #if ENABLED(TOUCH_SCREEN_CALIBRATION)
#include "../../inc/MarlinConfig.h" #include "touch_calibration.h"
TouchCalibration touch_calibration; TouchCalibration touch_calibration;
@ -78,4 +78,4 @@ bool TouchCalibration::handleTouch(uint16_t x, uint16_t y) {
return true; return true;
} }
#endif // ENABLED(TOUCH_SCREEN_CALIBRATION) #endif // TOUCH_SCREEN_CALIBRATION

16
Marlin/src/lcd/tft_io/touch_calibration.h
View file

@ -36,21 +36,15 @@
#define TOUCH_ORIENTATION TOUCH_LANDSCAPE #define TOUCH_ORIENTATION TOUCH_LANDSCAPE
#endif #endif
#if ENABLED(TOUCH_SCREEN_CALIBRATION)
typedef struct __attribute__((__packed__)) { typedef struct __attribute__((__packed__)) {
int32_t x; int32_t x, y;
int32_t y; int16_t offset_x, offset_y;
int16_t offset_x;
int16_t offset_y;
uint8_t orientation; uint8_t orientation;
} touch_calibration_t; } touch_calibration_t;
typedef struct __attribute__((__packed__)) { typedef struct __attribute__((__packed__)) {
uint16_t x; uint16_t x, y;
uint16_t y; int16_t raw_x, raw_y;
int16_t raw_x;
int16_t raw_y;
} touch_calibration_point_t; } touch_calibration_point_t;
enum calibrationState : uint8_t { enum calibrationState : uint8_t {
@ -97,5 +91,3 @@ public:
}; };
extern TouchCalibration touch_calibration; extern TouchCalibration touch_calibration;
#endif