jessikitty/Marlin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🧑‍💻 Clarify MKS UI flags

Browse Source
This commit is contained in:
Scott Lahteine
2026-03-08 13:30:59 -05:00
parent a6ebfe14cc
commit b869afd4b2
11 changed files with 64 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Marlin/src/lcd/extui/mks_ui/SPI_TFT.cpp
+2 -2
View File
@@ -63,7 +63,7 @@ void TFT::lcdInit() {
#if PIN_EXISTS(TFT_BACKLIGHT)
OUT_WRITE(TFT_BACKLIGHT_PIN, HIGH);
#endif
TERN_(HAS_LOGO_IN_FLASH, delay(2000));
TERN_(MKS_LOGO_IN_FLASH, delay(2000));
}
void TFT::lcdClear(uint16_t color) {
@@ -72,7 +72,7 @@ void TFT::lcdClear(uint16_t color) {
}
void TFT::lcdDrawLogo() {
#if HAS_LOGO_IN_FLASH
#if MKS_LOGO_IN_FLASH
setWindow(0, 0, TFT_WIDTH, TFT_HEIGHT);
for (uint16_t i = 0; i < (TFT_HEIGHT); i++) {
picLogoRead((uint8_t *)"", (uint8_t *)bmp_public_buf, (TFT_WIDTH) * 2);
Marlin/src/lcd/extui/mks_ui/draw_dialog.cpp
+1 -1
View File
@@ -76,7 +76,7 @@ extern bool temps_update_flag;
static void btn_ok_event_cb(lv_obj_t *btn, lv_event_t event) {
if (event != LV_EVENT_RELEASED) return;
if (DIALOG_IS(TYPE_PRINT_FILE)) {
TERN_(HAS_GCODE_PREVIEW, preview_gcode_prehandle(list_file.file_name[sel_id]));
TERN_(MKS_GCODE_PREVIEW, preview_gcode_prehandle(list_file.file_name[sel_id]));
reset_print_time();
start_print_time();
Marlin/src/lcd/extui/mks_ui/draw_set.cpp
+1 -1
View File
@@ -117,7 +117,7 @@ void lv_draw_set() {
lv_big_button_create(scr, "F:/bmp_about.bin", set_menu.about, BTN_SIZE_X * 2 + INTERVAL_W * 3, titleHeight, event_handler, ID_S_ABOUT);
lv_big_button_create(scr, ENABLED(HAS_SUICIDE) ? "F:/bmp_manual_off.bin" : "F:/bmp_function1.bin", set_menu.TERN(HAS_SUICIDE, shutdown, motoroff), BTN_SIZE_X * 3 + INTERVAL_W * 4, titleHeight, event_handler, ID_S_MOTOR_OFF);
lv_big_button_create(scr, "F:/bmp_machine_para.bin", set_menu.machine_para, INTERVAL_W, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_S_MACHINE_PARA);
#if HAS_LANG_SELECT_SCREEN
#if MKS_LANG_SELECT_SCREEN
lv_big_button_create(scr, "F:/bmp_language.bin", set_menu.language, BTN_SIZE_X + INTERVAL_W * 2, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_S_LANGUAGE);
#endif
#if ENABLED(MKS_WIFI_MODULE)
Marlin/src/lcd/extui/mks_ui/draw_ui.cpp
+19 -19
View File
@@ -298,8 +298,8 @@ void tft_style_init() {
tft_style_label_rel.body.grad_color = LV_COLOR_BACKGROUND;
tft_style_label_rel.text.color = LV_COLOR_TEXT;
tft_style_label_rel.text.sel_color = LV_COLOR_TEXT;
tft_style_label_pre.text.font = TERN(HAS_SPI_FLASH_FONT, &gb2312_puhui32, LV_FONT_DEFAULT);
tft_style_label_rel.text.font = TERN(HAS_SPI_FLASH_FONT, &gb2312_puhui32, LV_FONT_DEFAULT);
tft_style_label_pre.text.font = TERN(MKS_SPI_FLASH_FONT, &gb2312_puhui32, LV_FONT_DEFAULT);
tft_style_label_rel.text.font = TERN(MKS_SPI_FLASH_FONT, &gb2312_puhui32, LV_FONT_DEFAULT);
tft_style_label_pre.line.width = 0;
tft_style_label_rel.line.width = 0;
tft_style_label_pre.text.letter_space = 0;
@@ -317,8 +317,8 @@ void tft_style_init() {
style_para_value_rel.body.grad_color = LV_COLOR_BACKGROUND;
style_para_value_rel.text.color = LV_COLOR_BLACK;
style_para_value_rel.text.sel_color = LV_COLOR_BLACK;
style_para_value_pre.text.font = TERN(HAS_SPI_FLASH_FONT, &gb2312_puhui32, LV_FONT_DEFAULT);
style_para_value_rel.text.font = TERN(HAS_SPI_FLASH_FONT, &gb2312_puhui32, LV_FONT_DEFAULT);
style_para_value_pre.text.font = TERN(MKS_SPI_FLASH_FONT, &gb2312_puhui32, LV_FONT_DEFAULT);
style_para_value_rel.text.font = TERN(MKS_SPI_FLASH_FONT, &gb2312_puhui32, LV_FONT_DEFAULT);
style_para_value_pre.line.width = 0;
style_para_value_rel.line.width = 0;
style_para_value_pre.text.letter_space = 0;
@@ -336,8 +336,8 @@ void tft_style_init() {
style_num_key_rel.body.grad_color = LV_COLOR_KEY_BACKGROUND;
style_num_key_rel.text.color = LV_COLOR_TEXT;
style_num_key_rel.text.sel_color = LV_COLOR_TEXT;
style_num_key_pre.text.font = TERN(HAS_SPI_FLASH_FONT, &gb2312_puhui32, LV_FONT_DEFAULT);
style_num_key_rel.text.font = TERN(HAS_SPI_FLASH_FONT, &gb2312_puhui32, LV_FONT_DEFAULT);
style_num_key_pre.text.font = TERN(MKS_SPI_FLASH_FONT, &gb2312_puhui32, LV_FONT_DEFAULT);
style_num_key_rel.text.font = TERN(MKS_SPI_FLASH_FONT, &gb2312_puhui32, LV_FONT_DEFAULT);
style_num_key_pre.line.width = 0;
style_num_key_rel.line.width = 0;
@@ -351,7 +351,7 @@ void tft_style_init() {
style_num_text.body.grad_color = LV_COLOR_WHITE;
style_num_text.text.color = LV_COLOR_BLACK;
style_num_text.text.sel_color = LV_COLOR_BLACK;
style_num_text.text.font = TERN(HAS_SPI_FLASH_FONT, &gb2312_puhui32, LV_FONT_DEFAULT);
style_num_text.text.font = TERN(MKS_SPI_FLASH_FONT, &gb2312_puhui32, LV_FONT_DEFAULT);
style_num_text.line.width = 0;
style_num_text.text.letter_space = 0;
style_num_text.text.line_space = -5;
@@ -361,7 +361,7 @@ void tft_style_init() {
style_sel_text.body.grad_color = LV_COLOR_BACKGROUND;
style_sel_text.text.color = LV_COLOR_YELLOW;
style_sel_text.text.sel_color = LV_COLOR_YELLOW;
style_sel_text.text.font = TERN(HAS_SPI_FLASH_FONT, &gb2312_puhui32, LV_FONT_DEFAULT);
style_sel_text.text.font = TERN(MKS_SPI_FLASH_FONT, &gb2312_puhui32, LV_FONT_DEFAULT);
style_sel_text.line.width = 0;
style_sel_text.text.letter_space = 0;
style_sel_text.text.line_space = -5;
@@ -378,7 +378,7 @@ void tft_style_init() {
style_para_value.body.shadow.width = 0;
style_para_value.body.radius = 3;
style_para_value.text.color = LV_COLOR_BLACK;
style_para_value.text.font = &TERN(HAS_SPI_FLASH_FONT, gb2312_puhui32, lv_font_roboto_22);
style_para_value.text.font = &TERN(MKS_SPI_FLASH_FONT, gb2312_puhui32, lv_font_roboto_22);
lv_style_copy(&style_para_back, &lv_style_plain);
style_para_back.body.border.color = LV_COLOR_BACKGROUND;
@@ -388,7 +388,7 @@ void tft_style_init() {
style_para_back.body.shadow.width = 0;
style_para_back.body.radius = 3;
style_para_back.text.color = LV_COLOR_WHITE;
style_para_back.text.font = &TERN(HAS_SPI_FLASH_FONT, gb2312_puhui32, lv_font_roboto_22);
style_para_back.text.font = &TERN(MKS_SPI_FLASH_FONT, gb2312_puhui32, lv_font_roboto_22);
lv_style_copy(&style_btn_rel, &lv_style_plain);
style_btn_rel.body.border.color = lv_color_hex3(0x269);
@@ -399,7 +399,7 @@ void tft_style_init() {
style_btn_rel.body.shadow.type = LV_SHADOW_BOTTOM;
style_btn_rel.body.radius = LV_RADIUS_CIRCLE;
style_btn_rel.text.color = lv_color_hex3(0xDEF);
style_btn_rel.text.font = &TERN(HAS_SPI_FLASH_FONT, gb2312_puhui32, lv_font_roboto_22);
style_btn_rel.text.font = &TERN(MKS_SPI_FLASH_FONT, gb2312_puhui32, lv_font_roboto_22);
lv_style_copy(&style_btn_pr, &style_btn_rel);
style_btn_pr.body.border.color = lv_color_hex3(0x46B);
@@ -407,7 +407,7 @@ void tft_style_init() {
style_btn_pr.body.grad_color = lv_color_hex3(0x24A);
style_btn_pr.body.shadow.width = 2;
style_btn_pr.text.color = lv_color_hex3(0xBCD);
style_btn_pr.text.font = &TERN(HAS_SPI_FLASH_FONT, gb2312_puhui32, lv_font_roboto_22);
style_btn_pr.text.font = &TERN(MKS_SPI_FLASH_FONT, gb2312_puhui32, lv_font_roboto_22);
lv_style_copy(&lv_bar_style_indic, &lv_style_pretty_color);
lv_bar_style_indic.text.color = lv_color_hex3(0xADF);
@@ -546,7 +546,7 @@ char *creat_title_text() {
return public_buf_m;
}
#if HAS_GCODE_PREVIEW
#if MKS_GCODE_PREVIEW
uintptr_t gPicturePreviewStart = 0;
@@ -620,7 +620,7 @@ char *creat_title_text() {
if (*p_index == 0x0000) *p_index = LV_COLOR_BACKGROUND.full;
}
SPI_TFT.tftio.writeSequence((uint16_t*)bmp_public_buf, 200);
#if HAS_BAK_VIEW_IN_FLASH
#if MKS_BAK_VIEW_IN_FLASH
W25QXX.init(SPI_QUARTER_SPEED);
if (row < 20) W25QXX.SPI_FLASH_SectorErase(BAK_VIEW_ADDR_TFT35 + row * 4096);
W25QXX.SPI_FLASH_BufferWrite(bmp_public_buf, BAK_VIEW_ADDR_TFT35 + row * 400, 400);
@@ -665,7 +665,7 @@ char *creat_title_text() {
static constexpr uint32_t pixel_count = (DEFAULT_VIEW_MAX_SIZE) / draw_count; // Number of pixels read per time (uint8_t)
int y_off = 0;
for (int index = 0; index < draw_count; index++) { // 200*200
#if HAS_BAK_VIEW_IN_FLASH
#if MKS_BAK_VIEW_IN_FLASH
if (sel == 1) {
flash_view_Read(bmp_public_buf, pixel_count); // 16k
}
@@ -685,13 +685,13 @@ char *creat_title_text() {
void disp_pre_gcode(int xpos_pixel, int ypos_pixel) {
if (gcode_preview_over) gcode_preview(list_file.file_name[sel_id], xpos_pixel, ypos_pixel);
#if HAS_BAK_VIEW_IN_FLASH
#if MKS_BAK_VIEW_IN_FLASH
if (flash_preview_begin) {
flash_preview_begin = false;
draw_default_preview(xpos_pixel, ypos_pixel, 1);
}
#endif
#if HAS_GCODE_DEFAULT_VIEW_IN_FLASH
#if MKS_GCODE_DEFAULT_VIEW_IN_FLASH
if (default_preview_flg) {
draw_default_preview(xpos_pixel, ypos_pixel, 0);
default_preview_flg = false;
@@ -699,7 +699,7 @@ char *creat_title_text() {
#endif
}
#endif // HAS_GCODE_PREVIEW
#endif // MKS_GCODE_PREVIEW
void print_time_run() {
static uint8_t lastSec = 0;
@@ -1362,7 +1362,7 @@ void LV_TASK_HANDLER() {
if (mks_test_flag == 0x1E) mks_hardware_test();
#endif
TERN_(HAS_GCODE_PREVIEW, disp_pre_gcode(2, 36));
TERN_(MKS_GCODE_PREVIEW, disp_pre_gcode(2, 36));
GUI_RefreshPage();
Marlin/src/lcd/extui/mks_ui/draw_ui.h
+1 -1
View File
@@ -458,7 +458,7 @@ void update_gcode_command(int addr, uint8_t *s);
void get_gcode_command(int addr, uint8_t *d);
void lv_serial_capt_hook(void *, uint8_t);
void lv_eom_hook(void *);
#if HAS_GCODE_PREVIEW
#if MKS_GCODE_PREVIEW
void disp_pre_gcode(int xpos_pixel, int ypos_pixel);
#endif
void GUI_RefreshPage();
Marlin/src/lcd/extui/mks_ui/gb2312_puhui16.cpp
+2 -2
View File
@@ -29,7 +29,7 @@
#include "../../../inc/MarlinConfig.h"
#if HAS_SPI_FLASH_FONT
#if MKS_SPI_FLASH_FONT
typedef struct {
uint16_t min;
@@ -102,5 +102,5 @@ void init_gb2312_font() {
gb2312_puhui32.base_line = 0;
}
#endif // HAS_SPI_FLASH_FONT
#endif // MKS_SPI_FLASH_FONT
#endif // HAS_TFT_LVGL_UI
Marlin/src/lcd/extui/mks_ui/pic_manager.cpp
+11 -11
View File
@@ -148,7 +148,7 @@ static FSTR_P const assets[] = {
#endif
// Language Select screen
#if HAS_LANG_SELECT_SCREEN
#if MKS_LANG_SELECT_SCREEN
F("bmp_language.bin"),
F("bmp_simplified_cn.bin"),
F("bmp_simplified_cn_sel.bin"),
@@ -164,14 +164,14 @@ static FSTR_P const assets[] = {
F("bmp_french_sel.bin"),
F("bmp_italy.bin"),
F("bmp_italy_sel.bin"),
#endif // HAS_LANG_SELECT_SCREEN
#endif // MKS_LANG_SELECT_SCREEN
// G-code preview
#if HAS_GCODE_DEFAULT_VIEW_IN_FLASH
#if MKS_GCODE_DEFAULT_VIEW_IN_FLASH
F("bmp_preview.bin"),
#endif
#if HAS_LOGO_IN_FLASH
#if MKS_LOGO_IN_FLASH
F("bmp_logo.bin"),
#endif
@@ -223,7 +223,7 @@ static FSTR_P const assets[] = {
F("bmp_custom7.bin")
};
#if HAS_SPI_FLASH_FONT
#if MKS_SPI_FLASH_FONT
static FSTR_P const fonts[] = { F("FontUNIGBK.bin") };
#endif
@@ -338,7 +338,7 @@ void spiFlashErase_PIC() {
}
}
#if HAS_SPI_FLASH_FONT
#if MKS_SPI_FLASH_FONT
void spiFlashErase_FONT() {
volatile uint32_t Font_sectorcnt = 0;
W25QXX.init(SPI_QUARTER_SPEED);
@@ -556,7 +556,7 @@ uint32_t picInfoWrite(uint8_t *P_name, uint32_t P_size) {
disp_assets_update_progress(F("Erasing pics..."));
hal.watchdog_refresh();
spiFlashErase_PIC();
#if HAS_SPI_FLASH_FONT
#if MKS_SPI_FLASH_FONT
disp_assets_update_progress(F("Erasing fonts..."));
hal.watchdog_refresh();
spiFlashErase_FONT();
@@ -586,7 +586,7 @@ uint32_t picInfoWrite(uint8_t *P_name, uint32_t P_size) {
continue;
}
#if HAS_SPI_FLASH_FONT
#if MKS_SPI_FLASH_FONT
a = arrayFindStr(fonts, COUNT(fonts), card.longFilename);
if (a >= 0 && a < (int8_t)COUNT(fonts))
loadAsset(dir, d, fonts[a], ASSET_TYPE_FONT);
@@ -604,7 +604,7 @@ uint32_t picInfoWrite(uint8_t *P_name, uint32_t P_size) {
#endif
}
#if HAS_SPI_FLASH_FONT
#if MKS_SPI_FLASH_FONT
void spi_flash_read_test() { W25QXX.SPI_FLASH_BufferRead(public_buf, UNIGBK_FLASH_ADDR, BMP_WRITE_BUF_LEN); }
#endif
@@ -647,7 +647,7 @@ void lv_pic_test(uint8_t *P_Rbuff, uint32_t addr, uint32_t size) {
#endif
}
#if HAS_SPI_FLASH_FONT
#if MKS_SPI_FLASH_FONT
void get_spi_flash_data(const char *rec_buf, int addr, int size) {
W25QXX.init(SPI_QUARTER_SPEED);
W25QXX.SPI_FLASH_BufferRead((uint8_t *)rec_buf, UNIGBK_FLASH_ADDR + addr, size);
@@ -672,7 +672,7 @@ void default_view_Read(uint8_t *default_view_Rbuff, uint32_t default_view_Readsi
default_view_addroffset = 0;
}
#if HAS_BAK_VIEW_IN_FLASH
#if MKS_BAK_VIEW_IN_FLASH
uint32_t flash_view_addroffset = 0;
void flash_view_Read(uint8_t *flash_view_Rbuff, uint32_t flash_view_Readsize) {
W25QXX.init(SPI_QUARTER_SPEED);
Marlin/src/lcd/extui/mks_ui/pic_manager.h
+12 -12
View File
@@ -33,23 +33,23 @@
#define USE_HASH_TABLE
#ifndef HAS_SPI_FLASH_FONT
#define HAS_SPI_FLASH_FONT 1 // Disabled until fix the font load code
#ifndef MKS_SPI_FLASH_FONT
#define MKS_SPI_FLASH_FONT 1 // Disabled until the font load code is fixed!
#endif
#ifndef HAS_GCODE_PREVIEW
#define HAS_GCODE_PREVIEW 1
#ifndef MKS_GCODE_PREVIEW
#define MKS_GCODE_PREVIEW 1
#endif
#ifndef HAS_LANG_SELECT_SCREEN
#define HAS_LANG_SELECT_SCREEN 1
#ifndef MKS_LANG_SELECT_SCREEN
#define MKS_LANG_SELECT_SCREEN 1
#endif
#ifndef HAS_BAK_VIEW_IN_FLASH
#define HAS_BAK_VIEW_IN_FLASH 1
#ifndef MKS_BAK_VIEW_IN_FLASH
#define MKS_BAK_VIEW_IN_FLASH 1
#endif
#ifndef HAS_GCODE_DEFAULT_VIEW_IN_FLASH
#define HAS_GCODE_DEFAULT_VIEW_IN_FLASH 1
#ifndef MKS_GCODE_DEFAULT_VIEW_IN_FLASH
#define MKS_GCODE_DEFAULT_VIEW_IN_FLASH 1
#endif
#ifndef HAS_LOGO_IN_FLASH
#define HAS_LOGO_IN_FLASH 1
#ifndef MKS_LOGO_IN_FLASH
#define MKS_LOGO_IN_FLASH 1
#endif
#ifndef SPI_FLASH_SIZE
#define SPI_FLASH_SIZE 0x1000000 // 16MB
Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.cpp
+3 -3
View File
@@ -73,7 +73,7 @@ XPT2046 touch;
#define TFT_HEIGHT 320
#endif
#if HAS_SPI_FLASH_FONT
#if MKS_SPI_FLASH_FONT
void init_gb2312_font();
#endif
@@ -133,7 +133,7 @@ void tft_lvgl_init() {
SPI_TFT.lcdInit();
hal.watchdog_refresh(); // LVGL init takes time
#if HAS_LOGO_IN_FLASH
#if MKS_LOGO_IN_FLASH
// Leave the boot screen visible for a moment
delay(1000);
hal.watchdog_refresh(); // LVGL init takes time
@@ -202,7 +202,7 @@ void tft_lvgl_init() {
systick_attach_callback(SysTick_Callback);
TERN_(HAS_SPI_FLASH_FONT, init_gb2312_font());
TERN_(MKS_SPI_FLASH_FONT, init_gb2312_font());
tft_style_init();
filament_pin_setup();
Marlin/src/pins/stm32f1/pins_CHITU3D_common.h
+6 -6
View File
@@ -146,12 +146,12 @@
#if HAS_TFT_LVGL_UI
// LVGL
#define HAS_SPI_FLASH_FONT 1
#define HAS_GCODE_PREVIEW 1
#define HAS_GCODE_DEFAULT_VIEW_IN_FLASH 0
#define HAS_LANG_SELECT_SCREEN 1
#define HAS_BAK_VIEW_IN_FLASH 0
#define HAS_LOGO_IN_FLASH 0
#define MKS_SPI_FLASH_FONT 1
#define MKS_GCODE_PREVIEW 1
#define MKS_GCODE_DEFAULT_VIEW_IN_FLASH 0
#define MKS_LANG_SELECT_SCREEN 1
#define MKS_BAK_VIEW_IN_FLASH 0
#define MKS_LOGO_IN_FLASH 0
#elif ENABLED(TFT_COLOR_UI)
// Color UI
#define TFT_BUFFER_WORDS 14400
Marlin/src/pins/stm32f4/pins_TRONXY_CXY_446_V10.h
+6 -6
View File
@@ -190,12 +190,12 @@
#define TOUCH_MOSI_PIN PB15
#if ENABLED(TFT_LVGL_UI)
#define HAS_SPI_FLASH_FONT 1
#define HAS_GCODE_PREVIEW 1
#define HAS_GCODE_DEFAULT_VIEW_IN_FLASH 0
#define HAS_LANG_SELECT_SCREEN 1
#define HAS_BAK_VIEW_IN_FLASH 0
#define HAS_LOGO_IN_FLASH 0
#define MKS_SPI_FLASH_FONT 1
#define MKS_GCODE_PREVIEW 1
#define MKS_GCODE_DEFAULT_VIEW_IN_FLASH 0
#define MKS_LANG_SELECT_SCREEN 1
#define MKS_BAK_VIEW_IN_FLASH 0
#define MKS_LOGO_IN_FLASH 0
#elif ANY(TFT_CLASSIC_UI, TFT_COLOR_UI)
//#define TFT_DRIVER ILI9488
#define TFT_BUFFER_WORDS 14400