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

🎨 Apply F() to MKS UI errors, assets

Browse Source
This commit is contained in:
Scott Lahteine 2021-09-28 19:28:29 -05:00
parent 24dbeceb45
commit 492d70424d
5 changed files with 159 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Marlin/src/lcd/extui/mks_ui/draw_error_message.cpp
View File

@ -33,11 +33,12 @@
static lv_obj_t *scr; static lv_obj_t *scr;
void lv_draw_error_message(PGM_P const msg) { void lv_draw_error_message(FSTR_P const fmsg) {
FSTR_P fhalted = F("PRINTER HALTED"), fplease = F("Please Reset");
SPI_TFT.LCD_clear(0x0000); SPI_TFT.LCD_clear(0x0000);
if (msg) disp_string((TFT_WIDTH - strlen(msg) * 16) / 2, 100, msg, 0xFFFF, 0x0000); if (fmsg) disp_string((TFT_WIDTH - strlen_P(FTOP(fmsg)) * 16) / 2, 100, fmsg, 0xFFFF, 0x0000);
disp_string((TFT_WIDTH - strlen("PRINTER HALTED") * 16) / 2, 140, "PRINTER HALTED", 0xFFFF, 0x0000); disp_string((TFT_WIDTH - strlen_P(FTOP(fhalted)) * 16) / 2, 140, fhalted, 0xFFFF, 0x0000);
disp_string((TFT_WIDTH - strlen("Please Reset") * 16) / 2, 180, "Please Reset", 0xFFFF, 0x0000); disp_string((TFT_WIDTH - strlen_P(FTOP(fplease)) * 16) / 2, 180, fplease, 0xFFFF, 0x0000);
} }
void lv_clear_error_message() { lv_obj_del(scr); } void lv_clear_error_message() { lv_obj_del(scr); }

2
Marlin/src/lcd/extui/mks_ui/draw_error_message.h
View File

@ -29,7 +29,7 @@
#define PGM_P const char * #define PGM_P const char *
#endif #endif
void lv_draw_error_message(PGM_P const msg); void lv_draw_error_message(FSTR_P const fmsg);
void lv_clear_error_message(); void lv_clear_error_message();
#ifdef __cplusplus #ifdef __cplusplus

28
Marlin/src/lcd/extui/mks_ui/mks_hardware.cpp
View File

@ -697,24 +697,28 @@ void disp_char_1624(uint16_t x, uint16_t y, uint8_t c, uint16_t charColor, uint1
} }
} }
void disp_string(uint16_t x, uint16_t y, const char * string, uint16_t charColor, uint16_t bkColor) { void disp_string(uint16_t x, uint16_t y, const char * cstr, uint16_t charColor, uint16_t bkColor) {
while (*string != '\0') { for (char c; (c = *cstr); cstr++, x += 16)
disp_char_1624(x, y, *string, charColor, bkColor); disp_char_1624(x, y, c, charColor, bkColor);
string++; }
x += 16;
} void disp_string(uint16_t x, uint16_t y, FSTR_P const fstr, uint16_t charColor, uint16_t bkColor) {
PGM_P pstr = FTOP(fstr);
for (char c; (c = pgm_read_byte(pstr)); pstr++, x += 16)
disp_char_1624(x, y, c, charColor, bkColor);
} }
void disp_assets_update() { void disp_assets_update() {
SPI_TFT.LCD_clear(0x0000); SPI_TFT.LCD_clear(0x0000);
disp_string(100, 140, "Assets Updating...", 0xFFFF, 0x0000); disp_string(100, 140, F("Assets Updating..."), 0xFFFF, 0x0000);
} }
void disp_assets_update_progress(const char *msg) { void disp_assets_update_progress(FSTR_P const fmsg) {
char buf[30]; static constexpr int buflen = 30;
memset(buf, ' ', COUNT(buf)); char buf[buflen];
strncpy(buf, msg, strlen(msg)); memset(buf, ' ', buflen);
buf[COUNT(buf) - 1] = '\0'; strncpy_P(buf, FTOP(fmsg), buflen - 1);
buf[buflen - 1] = '\0';
disp_string(100, 165, buf, 0xFFFF, 0x0000); disp_string(100, 165, buf, 0xFFFF, 0x0000);
} }

5
Marlin/src/lcd/extui/mks_ui/mks_hardware.h
View File

@ -36,6 +36,7 @@
#endif #endif
// String display and assets // String display and assets
void disp_string(uint16_t x, uint16_t y, const char * string, uint16_t charColor, uint16_t bkColor); void disp_string(uint16_t x, uint16_t y, const char * cstr, uint16_t charColor, uint16_t bkColor);
void disp_string(uint16_t x, uint16_t y, FSTR_P const fstr, uint16_t charColor, uint16_t bkColor);
void disp_assets_update(); void disp_assets_update();
void disp_assets_update_progress(const char *msg); void disp_assets_update_progress(FSTR_P const msg);

268
Marlin/src/lcd/extui/mks_ui/pic_manager.cpp
View File

@ -40,186 +40,186 @@ extern uint16_t DeviceCode;
extern char *createFilename(char * const buffer, const dir_t &p); extern char *createFilename(char * const buffer, const dir_t &p);
#endif #endif
static const char assets[][LONG_FILENAME_LENGTH] = { static FSTR_P const assets[] = {
// Homing screen // Homing screen
"bmp_zeroAll.bin", F("bmp_zeroAll.bin"),
"bmp_zero.bin", F("bmp_zero.bin"),
"bmp_zeroX.bin", F("bmp_zeroX.bin"),
"bmp_zeroY.bin", F("bmp_zeroY.bin"),
"bmp_zeroZ.bin", F("bmp_zeroZ.bin"),
"bmp_manual_off.bin", F("bmp_manual_off.bin"),
// Tool screen // Tool screen
"bmp_preHeat.bin", F("bmp_preHeat.bin"),
"bmp_extruct.bin", F("bmp_extruct.bin"),
"bmp_mov.bin", F("bmp_mov.bin"),
"bmp_leveling.bin", F("bmp_leveling.bin"),
"bmp_filamentchange.bin", F("bmp_filamentchange.bin"),
"bmp_more.bin", F("bmp_more.bin"),
// Fan screen // Fan screen
"bmp_Add.bin", F("bmp_Add.bin"),
"bmp_Dec.bin", F("bmp_Dec.bin"),
"bmp_speed255.bin", F("bmp_speed255.bin"),
"bmp_speed127.bin", F("bmp_speed127.bin"),
"bmp_speed0.bin", F("bmp_speed0.bin"),
"bmp_bed.bin", F("bmp_bed.bin"),
"bmp_step1_degree.bin", F("bmp_step1_degree.bin"),
"bmp_step5_degree.bin", F("bmp_step5_degree.bin"),
"bmp_step10_degree.bin", F("bmp_step10_degree.bin"),
// Extrusion screen // Extrusion screen
"bmp_in.bin", F("bmp_in.bin"),
"bmp_out.bin", F("bmp_out.bin"),
"bmp_extru1.bin", F("bmp_extru1.bin"),
#if HAS_MULTI_EXTRUDER #if HAS_MULTI_EXTRUDER
"bmp_extru2.bin", F("bmp_extru2.bin"),
#endif #endif
"bmp_speed_high.bin", F("bmp_speed_high.bin"),
"bmp_speed_slow.bin", F("bmp_speed_slow.bin"),
"bmp_speed_normal.bin", F("bmp_speed_normal.bin"),
"bmp_step1_mm.bin", F("bmp_step1_mm.bin"),
"bmp_step5_mm.bin", F("bmp_step5_mm.bin"),
"bmp_step10_mm.bin", F("bmp_step10_mm.bin"),
// Select file screen // Select file screen
"bmp_pageUp.bin", F("bmp_pageUp.bin"),
"bmp_pageDown.bin", F("bmp_pageDown.bin"),
"bmp_back.bin", //TODO: why two back buttons? Why not just one? (return / back) F("bmp_back.bin"), // TODO: why two back buttons? Why not just one? (return / back)
"bmp_dir.bin", F("bmp_dir.bin"),
"bmp_file.bin", F("bmp_file.bin"),
// Move motor screen // Move motor screen
// TODO: 6 equal icons, just in diffenct rotation... it may be optimized too // TODO: 6 equal icons, just in diffenct rotation... it may be optimized too
"bmp_xAdd.bin", F("bmp_xAdd.bin"),
"bmp_xDec.bin", F("bmp_xDec.bin"),
"bmp_yAdd.bin", F("bmp_yAdd.bin"),
"bmp_yDec.bin", F("bmp_yDec.bin"),
"bmp_zAdd.bin", F("bmp_zAdd.bin"),
"bmp_zDec.bin", F("bmp_zDec.bin"),
"bmp_step_move0_1.bin", F("bmp_step_move0_1.bin"),
"bmp_step_move1.bin", F("bmp_step_move1.bin"),
"bmp_step_move10.bin", F("bmp_step_move10.bin"),
// Operation screen // Operation screen
"bmp_auto_off.bin", F("bmp_auto_off.bin"),
"bmp_speed.bin", F("bmp_speed.bin"),
"bmp_fan.bin", F("bmp_fan.bin"),
"bmp_temp.bin", F("bmp_temp.bin"),
"bmp_extrude_opr.bin", F("bmp_extrude_opr.bin"),
"bmp_move_opr.bin", F("bmp_move_opr.bin"),
// Change speed screen // Change speed screen
"bmp_step1_percent.bin", F("bmp_step1_percent.bin"),
"bmp_step5_percent.bin", F("bmp_step5_percent.bin"),
"bmp_step10_percent.bin", F("bmp_step10_percent.bin"),
"bmp_extruct_sel.bin", F("bmp_extruct_sel.bin"),
"bmp_mov_changespeed.bin", F("bmp_mov_changespeed.bin"),
"bmp_mov_sel.bin", F("bmp_mov_sel.bin"),
"bmp_speed_extruct.bin", F("bmp_speed_extruct.bin"),
// Printing screen // Printing screen
"bmp_pause.bin", F("bmp_pause.bin"),
"bmp_resume.bin", F("bmp_resume.bin"),
"bmp_stop.bin", F("bmp_stop.bin"),
"bmp_ext1_state.bin", F("bmp_ext1_state.bin"),
#if HAS_MULTI_EXTRUDER #if HAS_MULTI_EXTRUDER
"bmp_ext2_state.bin", F("bmp_ext2_state.bin"),
#endif #endif
"bmp_bed_state.bin", F("bmp_bed_state.bin"),
"bmp_fan_state.bin", F("bmp_fan_state.bin"),
"bmp_time_state.bin", F("bmp_time_state.bin"),
"bmp_zpos_state.bin", F("bmp_zpos_state.bin"),
"bmp_operate.bin", F("bmp_operate.bin"),
// Manual Level screen (only if auto level is disabled) // Manual Level screen (only if auto level is disabled)
#if DISABLED(AUTO_BED_LEVELING_BILINEAR) #if DISABLED(AUTO_BED_LEVELING_BILINEAR)
"bmp_leveling1.bin", F("bmp_leveling1.bin"),
"bmp_leveling2.bin", F("bmp_leveling2.bin"),
"bmp_leveling3.bin", F("bmp_leveling3.bin"),
"bmp_leveling4.bin", F("bmp_leveling4.bin"),
"bmp_leveling5.bin", F("bmp_leveling5.bin"),
#endif #endif
// Language Select screen // Language Select screen
#if HAS_LANG_SELECT_SCREEN #if HAS_LANG_SELECT_SCREEN
"bmp_language.bin", F("bmp_language.bin"),
"bmp_simplified_cn.bin", F("bmp_simplified_cn.bin"),
"bmp_simplified_cn_sel.bin", F("bmp_simplified_cn_sel.bin"),
"bmp_traditional_cn.bin", F("bmp_traditional_cn.bin"),
"bmp_traditional_cn_sel.bin", F("bmp_traditional_cn_sel.bin"),
"bmp_english.bin", F("bmp_english.bin"),
"bmp_english_sel.bin", F("bmp_english_sel.bin"),
"bmp_russian.bin", F("bmp_russian.bin"),
"bmp_russian_sel.bin", F("bmp_russian_sel.bin"),
"bmp_spanish.bin", F("bmp_spanish.bin"),
"bmp_spanish_sel.bin", F("bmp_spanish_sel.bin"),
"bmp_french.bin", F("bmp_french.bin"),
"bmp_french_sel.bin", F("bmp_french_sel.bin"),
"bmp_italy.bin", F("bmp_italy.bin"),
"bmp_italy_sel.bin", F("bmp_italy_sel.bin"),
#endif // HAS_LANG_SELECT_SCREEN #endif // HAS_LANG_SELECT_SCREEN
// G-code preview // G-code preview
#if HAS_GCODE_DEFAULT_VIEW_IN_FLASH #if HAS_GCODE_DEFAULT_VIEW_IN_FLASH
"bmp_preview.bin", F("bmp_preview.bin"),
#endif #endif
#if HAS_LOGO_IN_FLASH #if HAS_LOGO_IN_FLASH
"bmp_logo.bin", F("bmp_logo.bin"),
#endif #endif
// Settings screen // Settings screen
"bmp_about.bin", F("bmp_about.bin"),
"bmp_eeprom_settings.bin", F("bmp_eeprom_settings.bin"),
"bmp_machine_para.bin", F("bmp_machine_para.bin"),
"bmp_function1.bin", F("bmp_function1.bin"),
// Start screen // Start screen
"bmp_printing.bin", F("bmp_printing.bin"),
"bmp_set.bin", F("bmp_set.bin"),
"bmp_tool.bin", F("bmp_tool.bin"),
// Base icons // Base icons
"bmp_arrow.bin", F("bmp_arrow.bin"),
"bmp_back70x40.bin", F("bmp_back70x40.bin"),
"bmp_value_blank.bin", F("bmp_value_blank.bin"),
"bmp_blank_sel.bin", F("bmp_blank_sel.bin"),
"bmp_disable.bin", F("bmp_disable.bin"),
"bmp_enable.bin", F("bmp_enable.bin"),
"bmp_return.bin", F("bmp_return.bin"),
#if ENABLED(MKS_WIFI_MODULE) #if ENABLED(MKS_WIFI_MODULE)
// Wifi screen // Wifi screen
"bmp_wifi.bin", F("bmp_wifi.bin"),
"bmp_cloud.bin", F("bmp_cloud.bin"),
#endif #endif
#if ENABLED(MULTI_VOLUME) #if ENABLED(MULTI_VOLUME)
"bmp_usb_disk.bin", F("bmp_usb_disk.bin"),
// "bmp_usb_disk_sel.bin", //F("bmp_usb_disk_sel.bin"),
"bmp_sd.bin", F("bmp_sd.bin"),
// "bmp_sd_sel.bin", //F("bmp_sd_sel.bin"),
#endif #endif
// Babystep screen // Babystep screen
"bmp_baby_move0_01.bin", F("bmp_baby_move0_01.bin"),
"bmp_baby_move0_05.bin", F("bmp_baby_move0_05.bin"),
"bmp_baby_move0_1.bin", F("bmp_baby_move0_1.bin"),
// More screen // More screen
"bmp_custom1.bin", F("bmp_custom1.bin"),
"bmp_custom2.bin", F("bmp_custom2.bin"),
"bmp_custom3.bin", F("bmp_custom3.bin"),
"bmp_custom4.bin", F("bmp_custom4.bin"),
"bmp_custom5.bin", F("bmp_custom5.bin"),
"bmp_custom6.bin", F("bmp_custom6.bin"),
"bmp_custom7.bin" F("bmp_custom7.bin")
}; };
#if HAS_SPI_FLASH_FONT #if HAS_SPI_FLASH_FONT
static char fonts[][LONG_FILENAME_LENGTH] = { "FontUNIGBK.bin" }; static FSTR_P const fonts[] = { F("FontUNIGBK.bin") };
#endif #endif
uint8_t currentFlashPage = 0; uint8_t currentFlashPage = 0;
@ -386,9 +386,9 @@ uint32_t Pic_Info_Write(uint8_t *P_name, uint32_t P_size) {
longName[j] = '\0'; longName[j] = '\0';
} }
static int8_t arrayFindStr(const char arr[][LONG_FILENAME_LENGTH], uint8_t arraySize, const char *str) { static int8_t arrayFindStr(FSTR_P const arr[], uint8_t arraySize, const char *str) {
for (uint8_t a = 0; a < arraySize; a++) { for (uint8_t a = 0; a < arraySize; a++) {
if (strcasecmp(arr[a], str) == 0) if (strcasecmp(FTOP(arr[a]), str) == 0)
return a; return a;
} }
return -1; return -1;
@ -403,7 +403,7 @@ uint32_t Pic_Info_Write(uint8_t *P_name, uint32_t P_size) {
#define ASSET_TYPE_TITLE_LOGO 2 #define ASSET_TYPE_TITLE_LOGO 2
#define ASSET_TYPE_G_PREVIEW 3 #define ASSET_TYPE_G_PREVIEW 3
#define ASSET_TYPE_FONT 4 #define ASSET_TYPE_FONT 4
static void loadAsset(SdFile &dir, dir_t& entry, const char *fn, int8_t assetType) { static void loadAsset(SdFile &dir, dir_t& entry, FSTR_P const fn, int8_t assetType) {
SdFile file; SdFile file;
char dosFilename[FILENAME_LENGTH]; char dosFilename[FILENAME_LENGTH];
createFilename(dosFilename, entry); createFilename(dosFilename, entry);
@ -429,14 +429,14 @@ uint32_t Pic_Info_Write(uint8_t *P_name, uint32_t P_size) {
do { do {
watchdog_refresh(); watchdog_refresh();
pbr = file.read(public_buf, BMP_WRITE_BUF_LEN); pbr = file.read(public_buf, BMP_WRITE_BUF_LEN);
Pic_Logo_Write((uint8_t *)fn, public_buf, pbr); Pic_Logo_Write((uint8_t*)fn, public_buf, pbr);
} while (pbr >= BMP_WRITE_BUF_LEN); } while (pbr >= BMP_WRITE_BUF_LEN);
} }
else if (assetType == ASSET_TYPE_TITLE_LOGO) { else if (assetType == ASSET_TYPE_TITLE_LOGO) {
do { do {
watchdog_refresh(); watchdog_refresh();
pbr = file.read(public_buf, BMP_WRITE_BUF_LEN); pbr = file.read(public_buf, BMP_WRITE_BUF_LEN);
Pic_TitleLogo_Write((uint8_t *)fn, public_buf, pbr); Pic_TitleLogo_Write((uint8_t*)fn, public_buf, pbr);
} while (pbr >= BMP_WRITE_BUF_LEN); } while (pbr >= BMP_WRITE_BUF_LEN);
} }
else if (assetType == ASSET_TYPE_G_PREVIEW) { else if (assetType == ASSET_TYPE_G_PREVIEW) {
@ -447,7 +447,7 @@ uint32_t Pic_Info_Write(uint8_t *P_name, uint32_t P_size) {
} while (pbr >= BMP_WRITE_BUF_LEN); } while (pbr >= BMP_WRITE_BUF_LEN);
} }
else if (assetType == ASSET_TYPE_ICON) { else if (assetType == ASSET_TYPE_ICON) {
Pic_Write_Addr = Pic_Info_Write((uint8_t *)fn, pfileSize); Pic_Write_Addr = Pic_Info_Write((uint8_t*)fn, pfileSize);
SPIFlash.beginWrite(Pic_Write_Addr); SPIFlash.beginWrite(Pic_Write_Addr);
#if HAS_SPI_FLASH_COMPRESSION #if HAS_SPI_FLASH_COMPRESSION
do { do {
@ -492,16 +492,16 @@ uint32_t Pic_Info_Write(uint8_t *P_name, uint32_t P_size) {
if (dir.open(&root, assetsPath, O_RDONLY)) { if (dir.open(&root, assetsPath, O_RDONLY)) {
disp_assets_update(); disp_assets_update();
disp_assets_update_progress("Erasing pics..."); disp_assets_update_progress(F("Erasing pics..."));
watchdog_refresh(); watchdog_refresh();
spiFlashErase_PIC(); spiFlashErase_PIC();
#if HAS_SPI_FLASH_FONT #if HAS_SPI_FLASH_FONT
disp_assets_update_progress("Erasing fonts..."); disp_assets_update_progress(F("Erasing fonts..."));
watchdog_refresh(); watchdog_refresh();
spiFlashErase_FONT(); spiFlashErase_FONT();
#endif #endif
disp_assets_update_progress("Reading files..."); disp_assets_update_progress(F("Reading files..."));
dir_t d; dir_t d;
while (dir.readDir(&d, card.longFilename) > 0) { while (dir.readDir(&d, card.longFilename) > 0) {
// If we don't get a long name, but gets a short one, try it // If we don't get a long name, but gets a short one, try it
@ -513,11 +513,11 @@ uint32_t Pic_Info_Write(uint8_t *P_name, uint32_t P_size) {
int8_t a = arrayFindStr(assets, COUNT(assets), card.longFilename); int8_t a = arrayFindStr(assets, COUNT(assets), card.longFilename);
if (a >= 0 && a < (int8_t)COUNT(assets)) { if (a >= 0 && a < (int8_t)COUNT(assets)) {
uint8_t assetType = ASSET_TYPE_ICON; uint8_t assetType = ASSET_TYPE_ICON;
if (strstr(assets[a], "_logo")) if (strstr_P(FTOP(assets[a]), PSTR("_logo")))
assetType = ASSET_TYPE_LOGO; assetType = ASSET_TYPE_LOGO;
else if (strstr(assets[a], "_titlelogo")) else if (strstr_P(FTOP(assets[a]), PSTR("_titlelogo")))
assetType = ASSET_TYPE_TITLE_LOGO; assetType = ASSET_TYPE_TITLE_LOGO;
else if (strstr(assets[a], "_preview")) else if (strstr_P(FTOP(assets[a]), PSTR("_preview")))
assetType = ASSET_TYPE_G_PREVIEW; assetType = ASSET_TYPE_G_PREVIEW;
loadAsset(dir, d, assets[a], assetType); loadAsset(dir, d, assets[a], assetType);