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

Lang - text "PowerUp" removed from dictionary

Browse Source
This commit is contained in:
Robert Pelnar 2018-11-22 18:24:21 +01:00
parent f0e3021d33
commit 0fceade481
10 changed files with 4 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Firmware/Marlin_main.cpp
View File

@ -1150,12 +1150,12 @@ void setup()
// Check startup - does nothing if bootloader sets MCUSR to 0
byte mcu = MCUSR;
/* if (mcu & 1) SERIAL_ECHOLNRPGM(_T(MSG_POWERUP));
/* if (mcu & 1) SERIAL_ECHOLNRPGM(MSG_POWERUP);
if (mcu & 2) SERIAL_ECHOLNRPGM(MSG_EXTERNAL_RESET);
if (mcu & 4) SERIAL_ECHOLNRPGM(MSG_BROWNOUT_RESET);
if (mcu & 8) SERIAL_ECHOLNRPGM(MSG_WATCHDOG_RESET);
if (mcu & 32) SERIAL_ECHOLNRPGM(MSG_SOFTWARE_RESET);*/
if (mcu & 1) puts_P(_T(MSG_POWERUP));
if (mcu & 1) puts_P(MSG_POWERUP);
if (mcu & 2) puts_P(MSG_EXTERNAL_RESET);
if (mcu & 4) puts_P(MSG_BROWNOUT_RESET);
if (mcu & 8) puts_P(MSG_WATCHDOG_RESET);

2
Firmware/messages.c
View File

@ -62,7 +62,6 @@ const char MSG_NOZZLE[] PROGMEM_I1 = ISTR("Nozzle"); ////c=0 r=0
const char MSG_PAPER[] PROGMEM_I1 = ISTR("Place a sheet of paper under the nozzle during the calibration of first 4 points. If the nozzle catches the paper, power off the printer immediately."); ////c=20 r=8
const char MSG_PLACE_STEEL_SHEET[] PROGMEM_I1 = ISTR("Please place steel sheet on heatbed."); ////c=20 r=4
const char MSG_PLEASE_WAIT[] PROGMEM_I1 = ISTR("Please wait"); ////c=20 r=0
const char MSG_POWERUP[] PROGMEM_I1 = ISTR("PowerUp"); ////c=0 r=0
const char MSG_PREHEAT_NOZZLE[] PROGMEM_I1 = ISTR("Preheat the nozzle!"); ////c=20 r=0
const char MSG_PRESS_TO_UNLOAD[] PROGMEM_I1 = ISTR("Please press the knob to unload filament"); ////c=20 r=4
const char MSG_PRINT_ABORTED[] PROGMEM_I1 = ISTR("Print aborted"); ////c=20 r=0
@ -122,3 +121,4 @@ const char MSG_SD_ERR_WRITE_TO_FILE[] PROGMEM_N1 = "error writing to file"; ////
const char MSG_OK[] PROGMEM_N1 = "ok"; ////c=0 r=0
const char MSG_SD_OPEN_FILE_FAIL[] PROGMEM_N1 = "open failed, File: "; ////c=0 r=0
const char MSG_ENDSTOP_OPEN[] PROGMEM_N1 = "open"; ////c=0 r=0
const char MSG_POWERUP[] PROGMEM_N1 = "PowerUp"; ////c=0 r=0

2
Firmware/messages.h
View File

@ -63,7 +63,6 @@ extern const char MSG_NOZZLE[];
extern const char MSG_PAPER[];
extern const char MSG_PLACE_STEEL_SHEET[];
extern const char MSG_PLEASE_WAIT[];
extern const char MSG_POWERUP[];
extern const char MSG_PREHEAT_NOZZLE[];
extern const char MSG_PRESS_TO_UNLOAD[];
extern const char MSG_PRINT_ABORTED[];
@ -123,6 +122,7 @@ extern const char MSG_SD_ERR_WRITE_TO_FILE[];
extern const char MSG_OK[];
extern const char MSG_SD_OPEN_FILE_FAIL[];
extern const char MSG_ENDSTOP_OPEN[];
extern const char MSG_POWERUP[];
#if defined(__cplusplus)
}

3
lang/lang_en.txt
View File

@ -628,9 +628,6 @@
#MSG_PLEASE_WAIT c=20 r=0
"Please wait"
#MSG_POWERUP c=0 r=0
"PowerUp"
#
"Please remove shipping helpers first."

4
lang/lang_en_cz.txt
View File

@ -838,10 +838,6 @@
"Please wait"
"Prosim cekejte"
#MSG_POWERUP c=0 r=0
"PowerUp"
"Zapnuti"
#
"Please remove shipping helpers first."
"Nejprve prosim sundejte transportni soucastky."

4
lang/lang_en_de.txt
View File

@ -838,10 +838,6 @@
"Please wait"
"Bitte warten"
#MSG_POWERUP c=0 r=0
"PowerUp"
"Einschalten"
#
"Please remove shipping helpers first."
"Bitte zuerst Transportsicherungen entfernen."

4
lang/lang_en_es.txt
View File

@ -838,10 +838,6 @@
"Please wait"
"Por Favor Espere"
#MSG_POWERUP c=0 r=0
"PowerUp"
"Encendido"
#
"Please remove shipping helpers first."
"Por favor retira los soportes de envio primero."

4
lang/lang_en_fr.txt
View File

@ -838,10 +838,6 @@
"Please wait"
"Merci de patienter"
#MSG_POWERUP c=0 r=0
"PowerUp"
"Demarrage"
#
"Please remove shipping helpers first."
"Veuillez retirer d'abord les protections d'envoi."

4
lang/lang_en_it.txt
View File

@ -838,10 +838,6 @@
"Please wait"
"Attendere"
#MSG_POWERUP c=0 r=0
"PowerUp"
"Accendi"
#
"Please remove shipping helpers first."
"Per favore rimuovete i materiali da spedizione"

4
lang/lang_en_pl.txt
View File

@ -838,10 +838,6 @@
"Please wait"
"Prosze czekac"
#MSG_POWERUP c=0 r=0
"PowerUp"
"Uruchamianie"
#
"Please remove shipping helpers first."
"Najpierw usun zabezpieczenia transportowe"