3DPrinting/Prusa-Firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Language selection menu moved to marlin_main before printer calibration test.

Browse source
This commit is contained in:
michalprusa 2016-08-17 11:56:31 +02:00
parent 88bffa5341
commit 11dac765e7
3 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Firmware/Marlin_main.cpp
View file

@ -1034,7 +1034,11 @@ void setup()
// In the future, somewhere here would one compare the current firmware version against the firmware version stored in the EEPROM.
// If they differ, an update procedure may need to be performed. At the end of this block, the current firmware version
// is being written into the EEPROM, so the update procedure will be triggered only once.
lang_selected = eeprom_read_byte((uint8_t*)EEPROM_LANG);
if (lang_selected >= LANG_NUM){
lcd_mylang();
}
if (eeprom_read_byte((uint8_t*)EEPROM_BABYSTEP_Z_SET) == 0x0ff) {
// Reset the babystepping values, so the printer will not move the Z axis up when the babystepping is enabled.
// eeprom_update_byte((uint8_t*)EEPROM_BABYSTEP_X, 0x0ff);

4
Firmware/ultralcd.cpp
View file

@ -347,7 +347,7 @@ static void lcd_status_screen()
if (langsel) {
//strncpy_P(lcd_status_message, PSTR(">>>>>>>>>>>> PRESS v"), LCD_WIDTH);
// Entering the language selection screen in a modal mode.
lcd_mylang();
}
}
@ -2266,7 +2266,7 @@ void lcd_mylang() {
enc_dif = encoderDiff;
while ( (lang_selected == 255) && (MYSERIAL.available() < 2) ) {
while ( (lang_selected == 255) ) {
manage_heater();
manage_inactivity(true);

2
Firmware/ultralcd.h
View file

@ -28,7 +28,7 @@
void lcd_sdcard_stop();
void prusa_statistics(int _message);
void lcd_confirm_print();
void lcd_mylang();
bool lcd_detected(void);
static void lcd_selftest();