Merge branch 'MK3' into MK3_Dutch
This commit is contained in:
commit
b52f42b397
9 changed files with 53 additions and 25 deletions
|
@ -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
|
||||
|
|
|
@ -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();
|
||||
|
|
|
@ -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"
|
||||
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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]"
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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"
|
||||
|
|
Loading…
Reference in a new issue