Clean up, move unused to the bottom, add headings

This commit is contained in:
Scott Lahteine 2014-12-18 10:33:00 -08:00
parent 0c06e97e98
commit e970461adb
14 changed files with 438 additions and 381 deletions

View File

@ -147,6 +147,8 @@
#define MSG_BABYSTEPPING_Z "Babystepping Z"
#define MSG_SERIAL_ERROR_MENU_STRUCTURE "Error in menu structure"
// LCD Menu Messages
#if LANGUAGE_CHOICE == en // English
#include "language_en.h"
#elif LANGUAGE_CHOICE == pl // Polish
@ -175,4 +177,4 @@
#include "language_eu.h"
#endif
#endif // ifndef LANGUAGE_H
#endif //__LANGUAGE_H

View File

@ -1,9 +1,13 @@
/**
* Aragonese
*
* LCD Menu Messages
* Please note these are limited to 17 characters!
*
*/
#ifndef LANGUAGE_AN_H
#define LANGUAGE_AN_H
// LCD Menu Messages
// Please note these are limited to 17 characters!
#define WELCOME_MSG MACHINE_NAME " parada."
#define MSG_SD_INSERTED "Tarcheta colocada"
#define MSG_SD_REMOVED "Tarcheta retirada"
@ -80,7 +84,6 @@
#define MSG_YSTEPS "Y trangos/mm"
#define MSG_ZSTEPS "Z trangos/mm"
#define MSG_ESTEPS "E trangos/mm"
#define MSG_RECTRACT "Retraer"
#define MSG_TEMPERATURE "Temperatura"
#define MSG_MOTION "Movimiento"
#define MSG_CONTRAST "Contrast"
@ -122,14 +125,15 @@
#define MSG_BABYSTEP_Z "Babystep Z"
#define MSG_ENDSTOP_ABORT "Endstop abort"
#define MSG_RECTRACT "Retraer"
#define MSG_RECTRACT_WIDE "Retraer"
#define MSG_TEMPERATURE_WIDE "Temperatura"
#define MSG_TEMPERATURE_RTN "Temperatura"
#define MSG_MAIN_WIDE "Menu Prencipal"
#define MSG_MOTION_WIDE "Movimiento"
#define MSG_PREPARE_ALT "Preparar"
#define MSG_CONTROL_ARROW "Control"
#define MSG_RETRACT_ARROW "Retraer"
#define MSG_CONTROL_ARROW "Control \x7E"
#define MSG_RETRACT_ARROW "Retraer \x7E"
#define MSG_STEPPER_RELEASED "Desacoplada."
#endif // LANGUAGE_AN_H

View File

@ -1,9 +1,13 @@
/**
* Catalan
*
* LCD Menu Messages
* Please note these are limited to 17 characters!
*
*/
#ifndef LANGUAGE_CA_H
#define LANGUAGE_CA_H
// LCD Menu Messages
// Please note these are limited to 17 characters!
#define WELCOME_MSG MACHINE_NAME " preparada."
#define MSG_SD_INSERTED "SD detectada."
#define MSG_SD_REMOVED "SD expulsada."
@ -80,7 +84,6 @@
#define MSG_YSTEPS "Ypassos/mm"
#define MSG_ZSTEPS "Zpassos/mm"
#define MSG_ESTEPS "Epassos/mm"
#define MSG_RECTRACT "Retreure"
#define MSG_TEMPERATURE "Temperatura"
#define MSG_MOTION "Moviment"
#define MSG_CONTRAST "Contrast de LCD"
@ -122,4 +125,6 @@
#define MSG_BABYSTEP_Z "Babystep Z"
#define MSG_ENDSTOP_ABORT "Endstop abort"
#define MSG_RECTRACT "Retreure"
#endif // LANGUAGE_CA_H

View File

@ -1,9 +1,13 @@
/**
* German
*
* LCD Menu Messages
* Please note these are limited to 17 characters!
*
*/
#ifndef LANGUAGE_DE_H
#define LANGUAGE_DE_H
// LCD Menu Messages
// Please note these are limited to 17 characters!
#define WELCOME_MSG MACHINE_NAME " Bereit."
#define MSG_SD_INSERTED "SDKarte erkannt"
#define MSG_SD_REMOVED "SDKarte entfernt"
@ -80,8 +84,6 @@
#define MSG_YSTEPS "Ysteps/mm"
#define MSG_ZSTEPS "Zsteps/mm"
#define MSG_ESTEPS "Esteps/mm"
#define MSG_RECTRACT_WIDE "Rectract"
#define MSG_WATCH "Beobachten"
#define MSG_TEMPERATURE "Temperatur"
#define MSG_MOTION "Bewegung"
#define MSG_CONTRAST "LCD contrast"
@ -89,8 +91,8 @@
#define MSG_LOAD_EPROM "EPROM laden"
#define MSG_RESTORE_FAILSAFE "Standardkonfig."
#define MSG_REFRESH "Aktualisieren"
#define MSG_WATCH "Beobachten"
#define MSG_PREPARE "Vorbereitung"
#define MSG_CONTROL "Einstellungen"
#define MSG_TUNE "Justierung"
#define MSG_PAUSE_PRINT "Druck anhalten"
#define MSG_RESUME_PRINT "Druck fortsetz"
@ -104,7 +106,6 @@
#define MSG_NO_MOVE "Kein Zug."
#define MSG_KILLED "KILLED"
#define MSG_STOPPED "GESTOPPT"
#define MSG_STEPPER_RELEASED "Stepper frei"
#define MSG_CONTROL_RETRACT "Retract mm"
#define MSG_CONTROL_RETRACT_SWAP "Wechs. Retract mm"
#define MSG_CONTROL_RETRACTF "Retract V"
@ -123,6 +124,8 @@
#define MSG_BABYSTEP_Y "Babystep Y"
#define MSG_BABYSTEP_Z "Babystep Z"
#define MSG_ENDSTOP_ABORT "Endstop abort"
#define MSG_CONTRAST "Contrast"
#define MSG_STEPPER_RELEASED "Stepper frei"
#define MSG_RECTRACT_WIDE "Rectract"
#endif // LANGUAGE_DE_H

View File

@ -1,8 +1,12 @@
#ifndef LANGUAGE_CA_H
#define LANGUAGE_CA_H
// LCD Menu Messages
// Please note these are limited to 17 characters!
/**
* English
*
* LCD Menu Messages
* Please note these are limited to 17 characters!
*
*/
#ifndef LANGUAGE_EN_H
#define LANGUAGE_EN_H
#define WELCOME_MSG MACHINE_NAME " ready."
#define MSG_SD_INSERTED "Card inserted"
@ -80,7 +84,6 @@
#define MSG_YSTEPS "Ysteps/mm"
#define MSG_ZSTEPS "Zsteps/mm"
#define MSG_ESTEPS "Esteps/mm"
#define MSG_RECTRACT "Rectract"
#define MSG_TEMPERATURE "Temperature"
#define MSG_MOTION "Motion"
#define MSG_CONTRAST "LCD contrast"
@ -122,4 +125,6 @@
#define MSG_BABYSTEP_Z "Babystep Z"
#define MSG_ENDSTOP_ABORT "Endstop abort"
#endif // LANGUAGE_CA_H
#define MSG_RECTRACT "Rectract"
#endif // LANGUAGE_EN_H

View File

@ -1,9 +1,13 @@
/**
* Spanish
*
* LCD Menu Messages
* Please note these are limited to 17 characters!
*
*/
#ifndef LANGUAGE_ES_H
#define LANGUAGE_ES_H
// LCD Menu Messages
// Please note these are limited to 17 characters!
#define WELCOME_MSG MACHINE_NAME " lista."
#define MSG_SD_INSERTED "Tarjeta colocada"
#define MSG_SD_REMOVED "Tarjeta retirada"
@ -80,9 +84,9 @@
#define MSG_YSTEPS "Y pasos/mm"
#define MSG_ZSTEPS "Z pasos/mm"
#define MSG_ESTEPS "E pasos/mm"
#define MSG_RECTRACT "Retraer"
#define MSG_TEMPERATURE "Temperatura"
#define MSG_MOTION "Movimiento"
#define MSG_CONTRAST "Contraste"
#define MSG_STORE_EPROM "Guardar memoria"
#define MSG_LOAD_EPROM "Cargar memoria"
#define MSG_RESTORE_FAILSAFE "Rest. de emergen."
@ -113,15 +117,6 @@
#define MSG_FILAMENTCHANGE "Cambiar filamento"
#define MSG_INIT_SDCARD "Iniciando tarjeta"
#define MSG_CNG_SDCARD "Cambiar tarjeta"
#define MSG_RECTRACT_WIDE "Retraer"
#define MSG_TEMPERATURE_WIDE "Temperatura"
#define MSG_TEMPERATURE_RTN "Temperatura"
#define MSG_MAIN_WIDE "Menu principal"
#define MSG_MOTION_WIDE "Movimiento"
#define MSG_PREPARE_ALT "Preparar"
#define MSG_CONTROL_ARROW "Control"
#define MSG_RETRACT_ARROW "Retraer"
#define MSG_STEPPER_RELEASED "Desacoplada."
#define MSG_ZPROBE_OUT "sonda Z fuera"
#define MSG_POSITION_UNKNOWN "Reiniciar X/Y y Z"
#define MSG_ZPROBE_ZOFFSET "Offset Z"
@ -129,6 +124,16 @@
#define MSG_BABYSTEP_Y "Babystep Y"
#define MSG_BABYSTEP_Z "Babystep Z"
#define MSG_ENDSTOP_ABORT "Endstop abort"
#define MSG_CONTRAST "Contraste"
#define MSG_RECTRACT "Retraer"
#define MSG_RECTRACT_WIDE "Retraer"
#define MSG_TEMPERATURE_WIDE "Temperatura"
#define MSG_TEMPERATURE_RTN "Temperatura"
#define MSG_MAIN_WIDE "Menu principal"
#define MSG_MOTION_WIDE "Movimiento"
#define MSG_PREPARE_ALT "Preparar"
#define MSG_CONTROL_ARROW "Control \x7E"
#define MSG_RETRACT_ARROW "Retraer \x7E"
#define MSG_STEPPER_RELEASED "Desacoplada."
#endif // LANGUAGE_ES_H

View File

@ -1,9 +1,13 @@
/**
* Basque-Euskera
*
* LCD Menu Messages
* Please note these are limited to 17 characters!
*
*/
#ifndef LANGUAGE_EU_H
#define LANGUAGE_EU_H
// LCD Menu Messages
// Please note these are limited to 17 characters!
#define WELCOME_MSG MACHINE_NAME " prest."
#define MSG_SD_INSERTED "Txartela sartuta"
#define MSG_SD_REMOVED "Txartela kenduta"
@ -80,7 +84,6 @@
#define MSG_YSTEPS "Y pausoak/mm"
#define MSG_ZSTEPS "Z pausoak/mm"
#define MSG_ESTEPS "E pausoak/mm"
#define MSG_RECTRACT "Atzera eragin"
#define MSG_TEMPERATURE "Tenperatura"
#define MSG_MOTION "Mugimendua"
#define MSG_CONTRAST "LCD kontrastea"
@ -122,4 +125,6 @@
#define MSG_BABYSTEP_Z "Babystep Z"
#define MSG_ENDSTOP_ABORT "Endstop deuseztat"
#define MSG_RECTRACT "Atzera eragin"
#endif // LANGUAGE_EU_H

View File

@ -1,9 +1,13 @@
/**
* Finnish
*
* LCD Menu Messages
* Please note these are limited to 17 characters!
*
*/
#ifndef LANGUAGE_FI_H
#define LANGUAGE_FI_H
// LCD Menu Messages
// Please note these are limited to 17 characters!
#define WELCOME_MSG MACHINE_NAME " valmis."
#define MSG_SD_INSERTED "Kortti asetettu"
#define MSG_SD_REMOVED "Kortti poistettu"
@ -80,7 +84,6 @@
#define MSG_YSTEPS "Ysteps/mm"
#define MSG_ZSTEPS "Zsteps/mm"
#define MSG_ESTEPS "Esteps/mm"
#define MSG_RECTRACT "Veda takaisin"
#define MSG_TEMPERATURE "Lampotila"
#define MSG_MOTION "Liike"
#define MSG_CONTRAST "LCD contrast"
@ -122,4 +125,6 @@
#define MSG_BABYSTEP_Z "Babystep Z"
#define MSG_ENDSTOP_ABORT "Endstop abort"
#define MSG_RECTRACT "Veda takaisin"
#endif // LANGUAGE_FI_H

View File

@ -1,9 +1,13 @@
/**
* French
*
* LCD Menu Messages
* Please note these are limited to 17 characters!
*
*/
#ifndef LANGUAGE_FR_H
#define LANGUAGE_FR_H
// LCD Menu Messages
// Please note these are limited to 17 characters!
#define WELCOME_MSG MACHINE_NAME " prete."
#define MSG_SD_INSERTED "Carte inseree"
#define MSG_SD_REMOVED "Carte retiree"
@ -13,7 +17,7 @@
#define MSG_AUTO_HOME "Home auto."
#define MSG_SET_HOME_OFFSETS "Set home offsets"
#define MSG_SET_ORIGIN "Regler origine"
#define MSG_PREHEAT_PLA " Prechauffage PLA"
#define MSG_PREHEAT_PLA "Prechauffage PLA"
#define MSG_PREHEAT_PLA0 "Prechauff. PLA 1"
#define MSG_PREHEAT_PLA1 "Prechauff. PLA 2"
#define MSG_PREHEAT_PLA2 "Prechauff. PLA 3"
@ -32,8 +36,6 @@
#define MSG_SWITCH_PS_OFF "Eteindre alim."
#define MSG_EXTRUDE "Extrusion"
#define MSG_RETRACT "Retraction"
#define MSG_PREHEAT_PLA "Prechauffage PLA"
#define MSG_PREHEAT_ABS "Prechauffage ABS"
#define MSG_MOVE_AXIS "Deplacer un axe"
#define MSG_MOVE_X "Move X"
#define MSG_MOVE_Y "Move Y"
@ -104,7 +106,6 @@
#define MSG_NO_MOVE "Aucun mouvement."
#define MSG_KILLED "MORT."
#define MSG_STOPPED "STOPPE."
#define MSG_STEPPER_RELEASED "RELACHE."
#define MSG_CONTROL_RETRACT "Retraction mm"
#define MSG_CONTROL_RETRACT_SWAP "Ech. Retr. mm"
#define MSG_CONTROL_RETRACTF "Retraction V"
@ -123,6 +124,8 @@
#define MSG_BABYSTEP_Y "Babystep Y"
#define MSG_BABYSTEP_Z "Babystep Z"
#define MSG_ENDSTOP_ABORT "Butee abandon"
#define MSG_CONTRAST "Contrast"
#define MSG_RECTRACT "Rectract"
#define MSG_STEPPER_RELEASED "RELACHE."
#endif // LANGUAGE_FR_H

View File

@ -1,9 +1,13 @@
/**
* Italian
*
* LCD Menu Messages
* Please note these are limited to 17 characters!
*
*/
#ifndef LANGUAGE_IT_H
#define LANGUAGE_IT_H
// LCD Menu Messages
// Please note these are limited to 17 characters!
#define WELCOME_MSG MACHINE_NAME " pronto."
#define MSG_SD_INSERTED "SD Card inserita"
#define MSG_SD_REMOVED "SD Card rimossa"
@ -80,7 +84,6 @@
#define MSG_YSTEPS "Ypassi/mm"
#define MSG_ZSTEPS "Zpassi/mm"
#define MSG_ESTEPS "Epassi/mm"
#define MSG_RECTRACT "Ritrai"
#define MSG_TEMPERATURE "Temperatura"
#define MSG_MOTION "Movimento"
#define MSG_CONTRAST "LCD contrast"
@ -121,6 +124,7 @@
#define MSG_BABYSTEP_Y "Babystep Y"
#define MSG_BABYSTEP_Z "Babystep Z"
#define MSG_ENDSTOP_ABORT "Endstop abort"
#define MSG_CONTRAST "Contrast"
#define MSG_RECTRACT "Ritrai"
#endif // LANGUAGE_IT_H

View File

@ -1,9 +1,13 @@
/**
* Dutch
*
* LCD Menu Messages
* Please note these are limited to 17 characters!
*
*/
#ifndef LANGUAGE_NL_H
#define LANGUAGE_NL_H
// LCD Menu Messages
// Please note these are limited to 17 characters!
#define WELCOME_MSG MACHINE_NAME " gereed."
#define MSG_SD_INSERTED "Kaart ingestoken"
#define MSG_SD_REMOVED "Kaart verwijderd"
@ -80,7 +84,6 @@
#define MSG_YSTEPS "Ysteps/mm"
#define MSG_ZSTEPS "Zsteps/mm"
#define MSG_ESTEPS "Esteps/mm"
#define MSG_RECTRACT "Terugtrekken"
#define MSG_TEMPERATURE "Temperatuur"
#define MSG_MOTION "Beweging"
#define MSG_CONTRAST "LCD contrast"
@ -122,4 +125,6 @@
#define MSG_BABYSTEP_Z "Babystap Z"
#define MSG_ENDSTOP_ABORT "Endstop afbr."
#define MSG_RECTRACT "Terugtrekken"
#endif // LANGUAGE_NL_H

View File

@ -1,9 +1,13 @@
/**
* Polish
*
* LCD Menu Messages
* Please note these are limited to 17 characters!
*
*/
#ifndef LANGUAGE_PL_H
#define LANGUAGE_PL_H
// LCD Menu Messages
// Please note these are limited to 17 characters!
#define WELCOME_MSG MACHINE_NAME " gotowy."
#define MSG_SD_INSERTED "Karta wlozona"
#define MSG_SD_REMOVED "Karta usunieta"
@ -52,7 +56,7 @@
#define MSG_FLOW0 "Przeplyw 0"
#define MSG_FLOW1 "Przeplyw 1"
#define MSG_FLOW2 "Przeplyw 2"
#define MSG_CONTROL "Kontrola"
#define MSG_CONTROL "Ustawienia"
#define MSG_MIN " \002 Min"
#define MSG_MAX " \002 Max"
#define MSG_FACTOR " \002 Mnoznik"
@ -80,7 +84,6 @@
#define MSG_YSTEPS "krokiY/mm"
#define MSG_ZSTEPS "krokiZ/mm"
#define MSG_ESTEPS "krokiE/mm"
#define MSG_RECTRACT "Wycofanie"
#define MSG_TEMPERATURE "Temperatura"
#define MSG_MOTION "Ruch"
#define MSG_CONTRAST "Kontrast LCD"
@ -90,7 +93,6 @@
#define MSG_REFRESH "\004Odswiez"
#define MSG_WATCH "Ekran glowny"
#define MSG_PREPARE "Przygotuj"
#define MSG_CONTROL "Ustawienia"
#define MSG_TUNE "Strojenie"
#define MSG_PAUSE_PRINT "Pauza"
#define MSG_RESUME_PRINT "Wznowienie"
@ -104,7 +106,6 @@
#define MSG_NO_MOVE "Brak ruchu"
#define MSG_KILLED "Ubity. "
#define MSG_STOPPED "Zatrzymany. "
#define MSG_STEPPER_RELEASED "Zwolniony."
#define MSG_CONTROL_RETRACT "Wycofaj mm"
#define MSG_CONTROL_RETRACT_SWAP "Z Wycof. mm"
#define MSG_CONTROL_RETRACTF "Wycofaj V"
@ -123,6 +124,8 @@
#define MSG_BABYSTEP_Y "Babystep Y"
#define MSG_BABYSTEP_Z "Babystep Z"
#define MSG_ENDSTOP_ABORT "Blad wyl. kranc."
#define MSG_CONTRAST "Kontrast"
#define MSG_RECTRACT "Wycofanie"
#define MSG_STEPPER_RELEASED "Zwolniony."
#endif // LANGUAGE_PL_H

View File

@ -1,9 +1,13 @@
/**
* Portuguese
*
* LCD Menu Messages
* Please note these are limited to 17 characters!
*
*/
#ifndef LANGUAGE_PT_H
#define LANGUAGE_PT_H
// LCD Menu Messages
// Please note these are limited to 17 characters!
#define WELCOME_MSG MACHINE_NAME " pronto."
#define MSG_SD_INSERTED "Cartao inserido"
#define MSG_SD_REMOVED "Cartao removido"
@ -80,7 +84,6 @@
#define MSG_YSTEPS "Ypasso/mm:"
#define MSG_ZSTEPS "Zpasso/mm:"
#define MSG_ESTEPS "Epasso/mm:"
#define MSG_RECTRACT "Retrair"
#define MSG_TEMPERATURE "Temperatura"
#define MSG_MOTION "Movimento"
#define MSG_CONTRAST "Contrast"
@ -122,10 +125,11 @@
#define MSG_BABYSTEP_Z "Babystep Z"
#define MSG_ENDSTOP_ABORT "Endstop abort"
#define MSG_RECTRACT "Retrair"
#define MSG_MAIN_WIDE "Menu Principal \003"
#define MSG_PREPARE_ALT "Preparar \003"
#define MSG_CONTROL_ARROW "Controle \x7E"
#define MSG_RETRACT_ARROW "Retrair \x7E"
#define MSG_MAIN_WIDE "Menu Principal \003"
#define MSG_STEPPER_RELEASED "Lancado."
#endif // LANGUAGE_PT_H

View File

@ -1,9 +1,13 @@
/**
* Russian
*
* LCD Menu Messages
* Please note these are limited to 17 characters!
*
*/
#ifndef LANGUAGE_RU_H
#define LANGUAGE_RU_H
// LCD Menu Messages
// Please note these are limited to 17 characters!
#define WELCOME_MSG MACHINE_NAME "Готов."
#define MSG_SD_INSERTED "Карта вставлена"
#define MSG_SD_REMOVED "Карта извлечена"
@ -80,7 +84,6 @@
#define MSG_YSTEPS "Y шаг/mm:"
#define MSG_ZSTEPS "Z шаг/mm:"
#define MSG_ESTEPS "E шаг/mm:"
#define MSG_RECTRACT "Откат подачи \x7E"
#define MSG_TEMPERATURE "Температура \x7E"
#define MSG_MOTION "Скорости \x7E"
#define MSG_CONTRAST "LCD contrast"
@ -121,6 +124,7 @@
#define MSG_BABYSTEP_Y "Babystep Y"
#define MSG_BABYSTEP_Z "Babystep Z"
#define MSG_ENDSTOP_ABORT "Endstop abort"
#define MSG_CONTRAST "Contrast"
#define MSG_RECTRACT "Откат подачи \x7E"
#endif // LANGUAGE_RU_H