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

Merge branch 'MK3' into MK3_prep_Arudino-Boards_102

This commit is contained in:
3d-gussner 2019-10-17 14:16:37 +02:00
parent 2af43667c8 32befed255
commit 33a4319443
6 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Firmware/Marlin_main.cpp
View File

@ -1242,8 +1242,8 @@ void setup()
// 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.
eeprom_update_byte((uint8_t*)EEPROM_SILENT, SILENT_MODE_OFF);
#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
@ -2433,6 +2433,9 @@ void ramming() {
#ifdef TMC2130
void force_high_power_mode(bool start_high_power_section) {
#ifdef PSU_Delta
if (start_high_power_section == true) enable_force_z();
#endif //PSU_Delta
uint8_t silent;
silent = eeprom_read_byte((uint8_t*)EEPROM_SILENT);
if (silent == 1) {

4
Firmware/stepper.cpp
View File

@ -1564,10 +1564,6 @@ void st_current_init() //Initialize Digipot Motor Current
{
#ifdef MOTOR_CURRENT_PWM_XY_PIN
uint8_t SilentMode = eeprom_read_byte((uint8_t*)EEPROM_SILENT);
if (SilentMode == 0xff){ //set power to High Power (MK2.5) or Normal Power (MK3, unused)
SilentMode = SILENT_MODE_POWER;
eeprom_update_byte((uint8_t*)EEPROM_SILENT, SilentMode);
}
SilentModeMenu = SilentMode;
pinMode(MOTOR_CURRENT_PWM_XY_PIN, OUTPUT);
pinMode(MOTOR_CURRENT_PWM_Z_PIN, OUTPUT);

21
Firmware/ultralcd.cpp
View File

@ -1843,8 +1843,8 @@ static void lcd_menu_fails_stats_total()
//! @code{.unparsed}
//! |01234567890123456789|
//! |Last print failures | c=20 r=1
//! | Power failures: 000| c=14 r=1
//! | Filam. runouts: 000| c=14 r=1
//! | Power failures 000| c=14 r=1
//! | Filam. runouts 000| c=14 r=1
//! | Crash X:000 Y:000| c=7 r=1
//! ----------------------
//! @endcode
@ -1890,6 +1890,7 @@ static void lcd_menu_fails_stats()
}
#elif defined(FILAMENT_SENSOR)
static const char failStatsFmt[] PROGMEM = "%S\n" " %-16.16S%-3d\n" "%S\n" " %-16.16S%-3d\n";
//!
//! @brief Print last print and total filament run outs
//!
@ -1900,9 +1901,9 @@ static void lcd_menu_fails_stats()
//! @code{.unparsed}
//! |01234567890123456789|
//! |Last print failures | c=20 r=1
//! | Filam. runouts: 000| c=14 r=1
//! | Filam. runouts 000| c=14 r=1
//! |Total failures | c=20 r=1
//! | Filam. runouts: 000| c=14 r=1
//! | Filam. runouts 000| c=14 r=1
//! ----------------------
//! @endcode
//! @todo Positioning of the messages and values on LCD aren't fixed to their exact place. This causes issues with translations.
@ -1912,11 +1913,13 @@ static void lcd_menu_fails_stats()
uint8_t filamentLast = eeprom_read_byte((uint8_t*)EEPROM_FERROR_COUNT);
uint16_t filamentTotal = eeprom_read_word((uint16_t*)EEPROM_FERROR_COUNT_TOT);
lcd_home();
lcd_printf_P(PSTR("Last print failures\n" ////c=20 r=1
" Filam. runouts %-3d\n" ////c=14 r=1
"Total failures\n" ////c=20 r=1
" Filam. runouts %-3d"), filamentLast, filamentTotal); ////c=14 r=1
menu_back_if_clicked();
lcd_printf_P(failStatsFmt,
_i("Last print failures"), ////c=20 r=1
_i("Filam. runouts"), filamentLast, ////c=14 r=1
_i("Total failures"), ////c=20 r=1
_i("Filam. runouts"), filamentTotal); ////c=14 r=1
menu_back_if_clicked();
}
#else
static void lcd_menu_fails_stats()

2
lang/lang_en_cz.txt
View File

@ -72,7 +72,7 @@
#MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4
"Autoloading filament available only when filament sensor is turned on..."
"Automaticke zavadeni filamentu je dostupne pouze pri zapnutem filament senzoru..."
"Automaticke zavadeni filamentu je mozne pouze pri zapnutem filament senzoru..."
#MSG_AUTOLOADING_ENABLED c=20 r=4
"Autoloading filament is active, just press the knob and insert filament..."

4
lang/lang_en_es.txt
View File

@ -72,11 +72,11 @@
#MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4
"Autoloading filament available only when filament sensor is turned on..."
"La carga automatica de filamento solo funciona si el sensor de filamento esta activado..."
"La carga automatica solo funciona si el sensor de filamento esta activado..."
#MSG_AUTOLOADING_ENABLED c=20 r=4
"Autoloading filament is active, just press the knob and insert filament..."
"La carga automatica de filamento esta activada, pulse el dial e inserte el filamento..."
"La carga automatica esta activada, pulse el dial e inserte el filamento..."
#MSG_SELFTEST_AXIS_LENGTH
"Axis length"

2
lang/lang_en_pl.txt
View File

@ -72,7 +72,7 @@
#MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4
"Autoloading filament available only when filament sensor is turned on..."
"Autoladowanie filamentu dostepne tylko gdy czujnik filamentu jest wlaczony..."
"Autoladowanie fil. dostepne tylko gdy czujnik filamentu jest wlaczony..."
#MSG_AUTOLOADING_ENABLED c=20 r=4
"Autoloading filament is active, just press the knob and insert filament..."