diff --git a/Firmware/Configuration.h b/Firmware/Configuration.h index d3544c93f..87b5023f9 100644 --- a/Firmware/Configuration.h +++ b/Firmware/Configuration.h @@ -16,8 +16,8 @@ extern uint16_t nPrinterType; extern PGM_P sPrinterName; // Firmware version -#define FW_VERSION "3.8.0" -#define FW_COMMIT_NR 2684 +#define FW_VERSION "3.8.1-RC1" +#define FW_COMMIT_NR 2851 // FW_VERSION_UNKNOWN means this is an unofficial build. // The firmware should only be checked into github with this symbol. #define FW_DEV_VERSION FW_VERSION_UNKNOWN diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 6d48686c7..45dd118c4 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -1234,6 +1234,21 @@ void setup() plan_init(); // Initialize planner; factory_reset(); + if (eeprom_read_dword((uint32_t*)(EEPROM_TOP - 4)) == 0x0ffffffff && + eeprom_read_dword((uint32_t*)(EEPROM_TOP - 8)) == 0x0ffffffff) + { + // Maiden startup. The firmware has been loaded and first started on a virgin RAMBo board, + // where all the EEPROM entries are set to 0x0ff. + // Once a firmware boots up, it forces at least a language selection, which changes + // EEPROM_LANG to number lower than 0x0ff. + // 1) Set a high power mode. +#ifdef TMC2130 + eeprom_write_byte((uint8_t*)EEPROM_SILENT, 0); + tmc2130_mode = TMC2130_MODE_NORMAL; +#endif //TMC2130 + eeprom_write_byte((uint8_t*)EEPROM_WIZARD_ACTIVE, 1); //run wizard + } + lcd_encoder_diff=0; #ifdef TMC2130 @@ -1345,20 +1360,6 @@ void setup() // Enable Toshiba FlashAir SD card / WiFi enahanced card. card.ToshibaFlashAir_enable(eeprom_read_byte((unsigned char*)EEPROM_TOSHIBA_FLASH_AIR_COMPATIBLITY) == 1); - if (eeprom_read_dword((uint32_t*)(EEPROM_TOP - 4)) == 0x0ffffffff && - eeprom_read_dword((uint32_t*)(EEPROM_TOP - 8)) == 0x0ffffffff) { - // Maiden startup. The firmware has been loaded and first started on a virgin RAMBo board, - // where all the EEPROM entries are set to 0x0ff. - // Once a firmware boots up, it forces at least a language selection, which changes - // EEPROM_LANG to number lower than 0x0ff. - // 1) Set a high power mode. -#ifdef TMC2130 - eeprom_write_byte((uint8_t*)EEPROM_SILENT, 0); - tmc2130_mode = TMC2130_MODE_NORMAL; -#endif //TMC2130 - eeprom_write_byte((uint8_t*)EEPROM_WIZARD_ACTIVE, 1); //run wizard - } - // Force SD card update. Otherwise the SD card update is done from loop() on card.checkautostart(false), // but this times out if a blocking dialog is shown in setup(). card.initsd(); diff --git a/lang/lang_en.txt b/lang/lang_en.txt index c9346b2b5..a7756bfe0 100755 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -1,3 +1,6 @@ +# +"[%.7s]Live adj. Z\x0avalue set, continue\x0aor start from zero?\x0a%cContinue%cReset" + #MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 " of 4" diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index d3b004b18..64673af42 100755 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -1,3 +1,7 @@ +# +"[%.7s]Live adj. Z\x0avalue set, continue\x0aor start from zero?\x0a%cContinue%cReset" +"[%.7s]Doladeni Z\x0auz nastaveno, pouzit\x0anebo reset od nuly?\x0a%cPokracovat%cReset" + #MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 " of 4" " z 4" diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index ff4edab79..0aec39d12 100755 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -1,3 +1,7 @@ +# +"[%.7s]Live adj. Z\x0avalue set, continue\x0aor start from zero?\x0a%cContinue%cReset" +"[%.7s]Z Einstell.\x0aWert gesetzt,weiter\x0aoder mit 0 beginnen?\x0a%cWeiter%cNeu beginnen" + #MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 " of 4" " von 4" @@ -852,7 +856,7 @@ #MSG_BED_CORRECTION_RIGHT c=14 r=1 "Right side[um]" -"Rechts [um]" +"Rechts [um]" #MSG_SECOND_SERIAL_ON c=17 r=1 "RPi port [on]" diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index 19900fad9..3f6007c88 100755 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -1,3 +1,7 @@ +# +"[%.7s]Live adj. Z\x0avalue set, continue\x0aor start from zero?\x0a%cContinue%cReset" +"[%.7s]Ajuste Z\x0aAjustado, continuar\x0ao empezar de nuevo?\x0a%cContinuar%cRepetir" + #MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 " of 4" " de 4" @@ -812,7 +816,7 @@ # "Print FAN" -"Vent.extr" +"Vent. extr" #MSG_PRUSA3D "prusa3d.com" @@ -1052,11 +1056,11 @@ # "Total filament" -"Filamento total:" +"Filamento total" # "Total print time" -"Tiempo total :" +"Tiempo total" #MSG_TUNE "Tune" diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index 216abda1e..729778c27 100755 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -1,10 +1,14 @@ +# +"[%.7s]Live adj. Z\x0avalue set, continue\x0aor start from zero?\x0a%cContinue%cReset" +"[%.7s]Ajust. du Z\x0aValeur enreg, contin\x0aou depart a zero?\x0a%cContinuer%cReset" + #MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 " of 4" -"de 4" +" de 4" #MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2 c=14 " of 9" -"de 9" +" de 9" #MSG_MEASURED_OFFSET "[0;0] point offset" @@ -872,7 +876,7 @@ #MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON c=19 r=1 "SD card [flshAir]" -"CarteSD [flshAir]" +"Carte SD[flshAir]" # "Right" diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index bf9748110..4d175221f 100755 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -1,10 +1,14 @@ +# +"[%.7s]Live adj. Z\x0avalue set, continue\x0aor start from zero?\x0a%cContinue%cReset" +"[%.7s]Set valori\x0aComp. Z, continuare\x0ao iniziare da zero?\x0a%cContinua%cReset" + #MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 " of 4" " su 4" #MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2 c=14 " of 9" -"su 9" +" su 9" #MSG_MEASURED_OFFSET "[0;0] point offset" @@ -492,7 +496,7 @@ #MSG_BED_CORRECTION_LEFT c=14 r=1 "Left side [um]" -"Sinistra [um]" +"Sinistra [um]" # "Lin. correction" diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index 9425da7fe..9e6d8e707 100755 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -1,3 +1,7 @@ +# +"[%.7s]Live adj. Z\x0avalue set, continue\x0aor start from zero?\x0a%cContinue%cReset" +"[%.7s]Live Adj. Z\x0austaw., kontynuowac\x0aczy zaczac od 0?\x0a%cKontynuuj%cReset" + #MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 " of 4" " z 4"