bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

TFT Presets, Generic options, Sanity checks (#19723)

Browse Source
This commit is contained in:
Scott Lahteine
2020-10-15 03:00:27 -05:00
parent d81abf1d50
commit 7905aa64fa
116 changed files with 593 additions and 599 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Marlin/src/lcd/extui/lib/mks_ui/draw_print_file.cpp
View File

@ -520,7 +520,7 @@ void lv_gcode_file_read(uint8_t *data_buf) {
j = 0;
ignore_start = false;
}
#if ENABLED(TFT_LVGL_UI_SPI)
#if HAS_TFT_LVGL_UI_SPI
for (i = 0; i < 200;) {
p_index = (uint16_t *)(&public_buf[i]);
@ -529,7 +529,7 @@ void lv_gcode_file_read(uint8_t *data_buf) {
i += 2;
if (*p_index == 0x0000) *p_index = LV_COLOR_BACKGROUND.full;
}
#else
#else // !HAS_TFT_LVGL_UI_SPI
for (i = 0; i < 200;) {
p_index = (uint16_t *)(&public_buf[i]);
//Color = (*p_index >> 8);
@ -537,7 +537,7 @@ void lv_gcode_file_read(uint8_t *data_buf) {
i += 2;
if (*p_index == 0x0000) *p_index = LV_COLOR_BACKGROUND.full; // 0x18C3;
}
#endif // TFT_LVGL_UI_SPI
#endif // !HAS_TFT_LVGL_UI_SPI
memcpy(data_buf, public_buf, 200);
#endif // SDSUPPORT
}

4
Marlin/src/lcd/extui/lib/mks_ui/draw_ui.cpp
View File

@ -751,7 +751,7 @@ char *creat_title_text() {
card.openFileRead(cur_name);
card.setIndex((PREVIEW_LITTLE_PIC_SIZE + To_pre_view) + size * row + 8);
#if ENABLED(TFT_LVGL_UI_SPI)
#if HAS_TFT_LVGL_UI_SPI
SPI_TFT.setWindow(xpos_pixel, ypos_pixel + row, 200, 1);
#else
LCD_setWindowArea(xpos_pixel, ypos_pixel + row, 200, 1);
@ -782,7 +782,7 @@ char *creat_title_text() {
//#endif
}
#if ENABLED(TFT_LVGL_UI_SPI)
#if HAS_TFT_LVGL_UI_SPI
for (i = 0; i < 400;) {
p_index = (uint16_t *)(&bmp_public_buf[i]);