josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Welcome message and language flashing

This commit is contained in:
Alex Voinea 2022-02-05 23:44:24 +01:00
parent f068c3258f
commit d06e74dd6f
5 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Firmware/Marlin_main.cpp
View File

@ -1677,7 +1677,7 @@ void setup()
eeprom_update_byte((uint8_t*)EEPROM_UVLO, 0);
lcd_update_enable(true);
lcd_update(2);
lcd_setstatuspgm(_T(WELCOME_MSG));
lcd_setstatuspgm(MSG_WELCOME);
}
*/
manage_heater(); // Update temperatures
@ -1699,7 +1699,7 @@ void setup()
eeprom_update_byte((uint8_t*)EEPROM_UVLO, 0);
lcd_update_enable(true);
lcd_update(2);
lcd_setstatuspgm(_T(WELCOME_MSG));
lcd_setstatuspgm(MSG_WELCOME);
}
}
}
@ -3445,7 +3445,7 @@ static void gcode_G80()
}
KEEPALIVE_STATE(NOT_BUSY);
// Restore custom message state
lcd_setstatuspgm(_T(WELCOME_MSG));
lcd_setstatuspgm(MSG_WELCOME);
custom_message_type = custom_message_type_old;
custom_message_state = custom_message_state_old;
lcd_update(2);
@ -3848,7 +3848,7 @@ static void gcode_M600(bool automatic, float x_position, float y_position, float
fsensor_check_autoload();
#endif //IR_SENSOR
lcd_setstatuspgm(_T(WELCOME_MSG));
lcd_setstatuspgm(MSG_WELCOME);
custom_message_type = CustomMsg::Status;
}
@ -3894,7 +3894,7 @@ void gcode_M701()
}
lcd_update_enable(true);
lcd_update(2);
lcd_setstatuspgm(_T(WELCOME_MSG));
lcd_setstatuspgm(MSG_WELCOME);
disable_z();
loading_flag = false;
custom_message_type = CustomMsg::Status;
@ -4361,7 +4361,7 @@ void process_commands()
if (IS_SD_PRINTING)
custom_message_type = CustomMsg::Status;
else
LCD_MESSAGERPGM(_T(WELCOME_MSG));
LCD_MESSAGERPGM(MSG_WELCOME);
}
#ifdef TMC2130
@ -6818,7 +6818,7 @@ Sigma_Exit:
#endif
powersupply = true;
LCD_MESSAGERPGM(_T(WELCOME_MSG));
LCD_MESSAGERPGM(MSG_WELCOME);
lcd_update(0);
break;
@ -11877,7 +11877,7 @@ void restore_print_from_ram_and_continue(float e_move)
//not sd printing nor usb printing
}
lcd_setstatuspgm(_T(WELCOME_MSG));
lcd_setstatuspgm(MSG_WELCOME);
saved_printing_type = PRINTING_TYPE_NONE;
saved_printing = false;
waiting_inside_plan_buffer_line_print_aborted = true; //unroll the stack

2
Firmware/messages.c
View File

@ -170,7 +170,7 @@ const char MSG_AUTO_DEPLETE[] PROGMEM_N1 = ISTR("SpoolJoin"); ////c=13
const char MSG_FIRMWARE[] PROGMEM_N1 = ISTR("Firmware"); ////c=8
const char MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY[] PROGMEM_N1 = ISTR("FlashAir"); ////c=8
const char MSG_PINDA[] PROGMEM_N1 = ISTR("PINDA");////c=5
const char WELCOME_MSG[] PROGMEM_N1 = ISTR(CUSTOM_MENDEL_NAME " OK."); ////c=20
const char MSG_WELCOME[] PROGMEM_N1 = WELCOME_MSG; ////c=20
const char MSG_SD_WORKDIR_FAIL[] PROGMEM_N1 = "workDir open failed"; ////
const char MSG_BROWNOUT_RESET[] PROGMEM_N1 = " Brown out Reset"; ////
const char MSG_EXTERNAL_RESET[] PROGMEM_N1 = " External Reset"; ////

4
Firmware/messages.h
View File

@ -7,6 +7,8 @@
extern "C" {
#endif //defined(__cplusplus)
#define WELCOME_MSG (CUSTOM_MENDEL_NAME " OK.")
// LCD Menu Messages
//internationalized messages
extern const char MSG_AUTO_HOME[];
@ -123,7 +125,7 @@ extern const char MSG_WIZARD_WELCOME[];
extern const char MSG_WIZARD_WELCOME_SHIPPING[];
extern const char MSG_YES[];
extern const char MSG_V2_CALIBRATION[];
extern const char WELCOME_MSG[];
extern const char MSG_WELCOME[];
extern const char MSG_OFF[];
extern const char MSG_ON[];
extern const char MSG_NA[];

2
Firmware/mmu.cpp
View File

@ -1366,7 +1366,7 @@ void lcd_mmu_load_to_nozzle(uint8_t filament_nr)
lcd_return_to_status();
lcd_update_enable(true);
lcd_load_filament_color_check();
lcd_setstatuspgm(_T(WELCOME_MSG));
lcd_setstatuspgm(MSG_WELCOME);
custom_message_type = CustomMsg::Status;
}
else

22
Firmware/ultralcd.cpp
View File

@ -97,7 +97,7 @@ static float manual_feedrate[] = MANUAL_FEEDRATE;
/* !Configuration settings */
uint8_t lcd_status_message_level;
char lcd_status_message[LCD_WIDTH + 1] = ""; //////WELCOME!
char lcd_status_message[LCD_WIDTH + 1] = WELCOME_MSG;
static uint8_t lay1cal_filament = 0;
@ -642,8 +642,7 @@ void lcdui_print_status_line(void)
} else {
if (custom_message_state == 3)
{
lcd_puts_P(_T(WELCOME_MSG));
lcd_setstatuspgm(_T(WELCOME_MSG));
lcd_setstatuspgm(MSG_WELCOME);
custom_message_type = CustomMsg::Status;
}
if (custom_message_state > 3 && custom_message_state <= 10 ) {
@ -1147,7 +1146,7 @@ void lcd_commands()
if (lcd_commands_step == 1 && !blocks_queued() && cmd_buffer_empty())
{
lcd_setstatuspgm(_T(WELCOME_MSG));
lcd_setstatuspgm(MSG_WELCOME);
lcd_commands_step = 0;
lcd_commands_type = 0;
if (eeprom_read_byte((uint8_t*)EEPROM_WIZARD_ACTIVE) == 1) {
@ -1236,7 +1235,7 @@ void lcd_commands()
lcd_commands_step = 1;
break;
case 1:
lcd_setstatuspgm(_T(WELCOME_MSG));
lcd_setstatuspgm(MSG_WELCOME);
lcd_commands_step = 0;
lcd_commands_type = LcdCommands::Idle;
if (eeprom_read_byte((uint8_t*)EEPROM_WIZARD_ACTIVE) == 1)
@ -1330,7 +1329,7 @@ void lcd_commands()
lcd_commands_step = 1;
}
if ((lcd_commands_step == 1) && display_time.expired(2000)) { //calibration finished message
lcd_setstatuspgm(_T(WELCOME_MSG));
lcd_setstatuspgm(MSG_WELCOME);
custom_message_type = CustomMsg::Status;
pid_temp = DEFAULT_PID_TEMP;
lcd_commands_step = 0;
@ -5023,7 +5022,7 @@ void lcd_wizard(WizState state)
msg = _T(MSG_WIZARD_DONE);
lcd_reset_alert_level();
lcd_setstatuspgm(_T(WELCOME_MSG));
lcd_setstatuspgm(MSG_WELCOME);
lcd_return_to_status();
break;
@ -6290,7 +6289,7 @@ void unload_filament(bool automatic)
lcd_update_enable(true);
lcd_setstatuspgm(_T(WELCOME_MSG));
lcd_setstatuspgm(MSG_WELCOME);
custom_message_type = CustomMsg::Status;
}
@ -7014,7 +7013,7 @@ void lcd_print_stop()
finishAndDisableSteppers(); //M84
lcd_setstatuspgm(_T(WELCOME_MSG));
lcd_setstatuspgm(MSG_WELCOME);
custom_message_type = CustomMsg::Status;
planner_abort_hard(); //needs to be done since plan_buffer_line resets waiting_inside_plan_buffer_line_print_aborted to false. Also copies current to destination.
@ -8479,7 +8478,7 @@ static bool check_file(const char* filename) {
cmdqueue_serial_disabled = false;
card.printingHasFinished();
lcd_setstatuspgm(_T(WELCOME_MSG));
lcd_setstatuspgm(MSG_WELCOME);
lcd_finishstatus();
return result;
}
@ -8572,7 +8571,6 @@ void ultralcd_init()
lcd_oldcardstatus = IS_SD_INSERTED;
#endif//(SDCARDDETECT > 0)
lcd_encoder_diff = 0;
lcd_setstatuspgm(_T(WELCOME_MSG));
}
@ -8815,7 +8813,7 @@ void menu_lcd_lcdupdate_func(void)
card.initsd(false); //delay the sorting to the sd menu. Otherwise, removing the SD card while sorting will not menu_back()
card.presort_flag = true; //force sorting of the SD menu
}
LCD_MESSAGERPGM(_T(WELCOME_MSG));
LCD_MESSAGERPGM(MSG_WELCOME);
bMain=false; // flag (i.e. 'fake parameter') for 'lcd_sdcard_menu()' function
menu_submenu(lcd_sdcard_menu);
lcd_timeoutToStatus.start();