The big LCD code update. This splits the display and menu implementation. Paving the way for future different displays. It also makes it easier to modify the menu structures while keeping everything consistant. Note that this most likely breaks the translations, which need to be updated.
This commit is contained in:
daid303
@ -39,88 +39,80 @@
|
||||
#define WELCOME_MSG MACHINE_NAME " Ready."
|
||||
#define MSG_SD_INSERTED "Card inserted"
|
||||
#define MSG_SD_REMOVED "Card removed"
|
||||
#define MSG_MAIN " Main \003"
|
||||
#define MSG_AUTOSTART " Autostart"
|
||||
#define MSG_DISABLE_STEPPERS " Disable Steppers"
|
||||
#define MSG_AUTO_HOME " Auto Home"
|
||||
#define MSG_SET_ORIGIN " Set Origin"
|
||||
#define MSG_PREHEAT_PLA " Preheat PLA"
|
||||
#define MSG_PREHEAT_PLA_SETTINGS " Preheat PLA Setting"
|
||||
#define MSG_PREHEAT_ABS " Preheat ABS"
|
||||
#define MSG_PREHEAT_ABS_SETTINGS " Preheat ABS Setting"
|
||||
#define MSG_COOLDOWN " Cooldown"
|
||||
#define MSG_EXTRUDE " Extrude"
|
||||
#define MSG_RETRACT " Retract"
|
||||
#define MSG_PREHEAT_PLA " Preheat PLA"
|
||||
#define MSG_PREHEAT_ABS " Preheat ABS"
|
||||
#define MSG_MOVE_AXIS " Move Axis \x7E"
|
||||
#define MSG_SPEED " Speed:"
|
||||
#define MSG_NOZZLE " \002Nozzle:"
|
||||
#define MSG_NOZZLE1 " \002Nozzle2:"
|
||||
#define MSG_NOZZLE2 " \002Nozzle3:"
|
||||
#define MSG_BED " \002Bed:"
|
||||
#define MSG_FAN_SPEED " Fan speed:"
|
||||
#define MSG_FLOW " Flow:"
|
||||
#define MSG_CONTROL " Control \003"
|
||||
#define MSG_MIN " \002 Min:"
|
||||
#define MSG_MAX " \002 Max:"
|
||||
#define MSG_FACTOR " \002 Fact:"
|
||||
#define MSG_AUTOTEMP " Autotemp:"
|
||||
#define MSG_MAIN "Main"
|
||||
#define MSG_AUTOSTART "Autostart"
|
||||
#define MSG_DISABLE_STEPPERS "Disable Steppers"
|
||||
#define MSG_AUTO_HOME "Auto Home"
|
||||
#define MSG_SET_ORIGIN "Set Origin"
|
||||
#define MSG_PREHEAT_PLA "Preheat PLA"
|
||||
#define MSG_PREHEAT_PLA_SETTINGS "Preheat PLA Conf"
|
||||
#define MSG_PREHEAT_ABS "Preheat ABS"
|
||||
#define MSG_PREHEAT_ABS_SETTINGS "Preheat ABS Conf"
|
||||
#define MSG_COOLDOWN "Cooldown"
|
||||
#define MSG_EXTRUDE "Extrude"
|
||||
#define MSG_RETRACT "Retract"
|
||||
#define MSG_PREHEAT_PLA "Preheat PLA"
|
||||
#define MSG_PREHEAT_ABS "Preheat ABS"
|
||||
#define MSG_MOVE_AXIS "Move Axis"
|
||||
#define MSG_SPEED "Speed"
|
||||
#define MSG_NOZZLE "Nozzle"
|
||||
#define MSG_NOZZLE1 "Nozzle2"
|
||||
#define MSG_NOZZLE2 "Nozzle3"
|
||||
#define MSG_BED "Bed"
|
||||
#define MSG_FAN_SPEED "Fan speed"
|
||||
#define MSG_FLOW "Flow"
|
||||
#define MSG_CONTROL "Control"
|
||||
#define MSG_MIN " \002 Min"
|
||||
#define MSG_MAX " \002 Max"
|
||||
#define MSG_FACTOR " \002 Fact"
|
||||
#define MSG_AUTOTEMP "Autotemp"
|
||||
#define MSG_ON "On "
|
||||
#define MSG_OFF "Off"
|
||||
#define MSG_PID_P " PID-P: "
|
||||
#define MSG_PID_I " PID-I: "
|
||||
#define MSG_PID_D " PID-D: "
|
||||
#define MSG_PID_C " PID-C: "
|
||||
#define MSG_ACC " Acc:"
|
||||
#define MSG_VXY_JERK " Vxy-jerk: "
|
||||
#define MSG_VMAX " Vmax "
|
||||
#define MSG_X "x:"
|
||||
#define MSG_Y "y:"
|
||||
#define MSG_Z "z:"
|
||||
#define MSG_E "e:"
|
||||
#define MSG_VMIN " Vmin:"
|
||||
#define MSG_VTRAV_MIN " VTrav min:"
|
||||
#define MSG_AMAX " Amax "
|
||||
#define MSG_A_RETRACT " A-retract:"
|
||||
#define MSG_XSTEPS " Xsteps/mm:"
|
||||
#define MSG_YSTEPS " Ysteps/mm:"
|
||||
#define MSG_ZSTEPS " Zsteps/mm:"
|
||||
#define MSG_ESTEPS " Esteps/mm:"
|
||||
#define MSG_MAIN_WIDE " Main \003"
|
||||
#define MSG_RECTRACT_WIDE " Rectract \x7E"
|
||||
#define MSG_TEMPERATURE_WIDE " Temperature \x7E"
|
||||
#define MSG_TEMPERATURE_RTN " Temperature \003"
|
||||
#define MSG_MOTION_WIDE " Motion \x7E"
|
||||
#define MSG_STORE_EPROM " Store memory"
|
||||
#define MSG_LOAD_EPROM " Load memory"
|
||||
#define MSG_RESTORE_FAILSAFE " Restore Failsafe"
|
||||
#define MSG_REFRESH "\004Refresh"
|
||||
#define MSG_WATCH " Watch \003"
|
||||
#define MSG_PREPARE " Prepare \x7E"
|
||||
#define MSG_PREPARE_ALT " Prepare \003"
|
||||
#define MSG_CONTROL_ARROW " Control \x7E"
|
||||
#define MSG_RETRACT_ARROW " Retract \x7E"
|
||||
#define MSG_TUNE " Tune \x7E"
|
||||
#define MSG_PAUSE_PRINT " Pause Print \x7E"
|
||||
#define MSG_RESUME_PRINT " Resume Print \x7E"
|
||||
#define MSG_STOP_PRINT " Stop Print \x7E"
|
||||
#define MSG_CARD_MENU " Card Menu \x7E"
|
||||
#define MSG_NO_CARD " No Card"
|
||||
#define MSG_PID_P "PID-P"
|
||||
#define MSG_PID_I "PID-I"
|
||||
#define MSG_PID_D "PID-D"
|
||||
#define MSG_PID_C "PID-C"
|
||||
#define MSG_ACC "Accel"
|
||||
#define MSG_VXY_JERK "Vxy-jerk"
|
||||
#define MSG_VMAX "Vmax "
|
||||
#define MSG_X "x"
|
||||
#define MSG_Y "y"
|
||||
#define MSG_Z "z"
|
||||
#define MSG_E "e"
|
||||
#define MSG_VMIN "Vmin"
|
||||
#define MSG_VTRAV_MIN "VTrav min"
|
||||
#define MSG_AMAX "Amax "
|
||||
#define MSG_A_RETRACT "A-retract"
|
||||
#define MSG_XSTEPS "Xsteps/mm"
|
||||
#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_STORE_EPROM "Store memory"
|
||||
#define MSG_LOAD_EPROM "Load memory"
|
||||
#define MSG_RESTORE_FAILSAFE "Restore Failsafe"
|
||||
#define MSG_REFRESH "Refresh"
|
||||
#define MSG_WATCH "Watch"
|
||||
#define MSG_PREPARE "Prepare"
|
||||
#define MSG_TUNE "Tune"
|
||||
#define MSG_PAUSE_PRINT "Pause Print"
|
||||
#define MSG_RESUME_PRINT "Resume Print"
|
||||
#define MSG_STOP_PRINT "Stop Print"
|
||||
#define MSG_CARD_MENU "Card Menu"
|
||||
#define MSG_NO_CARD "No Card"
|
||||
#define MSG_DWELL "Sleep..."
|
||||
#define MSG_USERWAIT "Wait for user..."
|
||||
#define MSG_NO_MOVE "No move."
|
||||
#define MSG_PART_RELEASE "Partial Release"
|
||||
#define MSG_KILLED "KILLED. "
|
||||
#define MSG_STOPPED "STOPPED. "
|
||||
#define MSG_STEPPER_RELEASED "Released."
|
||||
#define MSG_CONTROL_RETRACT " Retract mm:"
|
||||
#define MSG_CONTROL_RETRACTF " Retract F:"
|
||||
#define MSG_CONTROL_RETRACT_ZLIFT " Hop mm:"
|
||||
#define MSG_CONTROL_RETRACT_RECOVER " UnRet +mm:"
|
||||
#define MSG_CONTROL_RETRACT_RECOVERF " UnRet F:"
|
||||
#define MSG_AUTORETRACT " AutoRetr.:"
|
||||
#define MSG_SERIAL_ERROR_MENU_STRUCTURE "Something is wrong in the MenuStructure."
|
||||
#define MSG_CONTROL_RETRACT "Retract mm"
|
||||
#define MSG_CONTROL_RETRACTF "Retract F"
|
||||
#define MSG_CONTROL_RETRACT_ZLIFT "Hop mm"
|
||||
#define MSG_CONTROL_RETRACT_RECOVER "UnRet +mm"
|
||||
#define MSG_CONTROL_RETRACT_RECOVERF "UnRet F"
|
||||
#define MSG_AUTORETRACT "AutoRetr."
|
||||
|
||||
// Serial Console Messages
|
||||
|
||||
@ -200,72 +192,68 @@
|
||||
#define WELCOME_MSG MACHINE_NAME " Gotowe."
|
||||
#define MSG_SD_INSERTED "Karta wlozona"
|
||||
#define MSG_SD_REMOVED "Karta usunieta"
|
||||
#define MSG_MAIN " Menu \003"
|
||||
#define MSG_AUTOSTART " Autostart"
|
||||
#define MSG_DISABLE_STEPPERS " Wylacz silniki"
|
||||
#define MSG_AUTO_HOME " Auto. poz. zerowa"
|
||||
#define MSG_SET_ORIGIN " Ustaw punkt zerowy"
|
||||
#define MSG_PREHEAT_PLA " Rozgrzej PLA"
|
||||
#define MSG_PREHEAT_PLA_SETTINGS " Ustawienia roz. PLA"
|
||||
#define MSG_PREHEAT_ABS " Rozgrzej ABS"
|
||||
#define MSG_PREHEAT_ABS_SETTINGS " Ustawienia roz. ABS"
|
||||
#define MSG_COOLDOWN " Chlodzenie"
|
||||
#define MSG_EXTRUDE " Ekstruzja"
|
||||
#define MSG_RETRACT " Cofanie"
|
||||
#define MSG_MOVE_AXIS " Ruch osi \x7E"
|
||||
#define MSG_SPEED " Predkosc:"
|
||||
#define MSG_NOZZLE " \002Dysza:"
|
||||
#define MSG_NOZZLE1 " \002Dysza2:"
|
||||
#define MSG_NOZZLE2 " \002Dysza3:"
|
||||
#define MSG_BED " \002Loze:"
|
||||
#define MSG_FAN_SPEED " Obroty wiatraka:"
|
||||
#define MSG_FLOW " Przeplyw:"
|
||||
#define MSG_CONTROL " Kontrola \003"
|
||||
#define MSG_MIN " \002 Min:"
|
||||
#define MSG_MAX " \002 Max:"
|
||||
#define MSG_FACTOR " \002 Mnoznik:"
|
||||
#define MSG_AUTOTEMP " Auto. temp.:"
|
||||
#define MSG_MAIN "Main"
|
||||
#define MSG_AUTOSTART "Autostart"
|
||||
#define MSG_DISABLE_STEPPERS "Wylacz silniki"
|
||||
#define MSG_AUTO_HOME "Auto. poz. zerowa"
|
||||
#define MSG_SET_ORIGIN "Ustaw punkt zerowy"
|
||||
#define MSG_PREHEAT_PLA "Rozgrzej PLA"
|
||||
#define MSG_PREHEAT_PLA_SETTINGS "Ustawienia roz. PLA"
|
||||
#define MSG_PREHEAT_ABS "Rozgrzej ABS"
|
||||
#define MSG_PREHEAT_ABS_SETTINGS "Ustawienia roz. ABS"
|
||||
#define MSG_COOLDOWN "Chlodzenie"
|
||||
#define MSG_EXTRUDE "Ekstruzja"
|
||||
#define MSG_RETRACT "Cofanie"
|
||||
#define MSG_MOVE_AXIS "Ruch osi"
|
||||
#define MSG_SPEED "Predkosc"
|
||||
#define MSG_NOZZLE "Dysza"
|
||||
#define MSG_NOZZLE1 "Dysza2"
|
||||
#define MSG_NOZZLE2 "Dysza3"
|
||||
#define MSG_BED "Loze"
|
||||
#define MSG_FAN_SPEED "Obroty wiatraka"
|
||||
#define MSG_FLOW "Przeplyw"
|
||||
#define MSG_CONTROL "Kontrola"
|
||||
#define MSG_MIN " \002 Min"
|
||||
#define MSG_MAX " \002 Max"
|
||||
#define MSG_FACTOR " \002 Mnoznik"
|
||||
#define MSG_AUTOTEMP "Auto. temp."
|
||||
#define MSG_ON "Wl. "
|
||||
#define MSG_OFF "Wyl."
|
||||
#define MSG_PID_P " PID-P: "
|
||||
#define MSG_PID_I " PID-I: "
|
||||
#define MSG_PID_D " PID-D: "
|
||||
#define MSG_PID_C " PID-C: "
|
||||
#define MSG_ACC " Acc:"
|
||||
#define MSG_VXY_JERK " Zryw Vxy: "
|
||||
#define MSG_VMAX " Vmax "
|
||||
#define MSG_X "x:"
|
||||
#define MSG_Y "y:"
|
||||
#define MSG_Z "z:"
|
||||
#define MSG_E "e:"
|
||||
#define MSG_VMIN " Vmin:"
|
||||
#define MSG_VTRAV_MIN " Vskok min:"
|
||||
#define MSG_AMAX " Amax "
|
||||
#define MSG_A_RETRACT " A-wycofanie:"
|
||||
#define MSG_XSTEPS " krokiX/mm:"
|
||||
#define MSG_YSTEPS " krokiY/mm:"
|
||||
#define MSG_ZSTEPS " krokiZ/mm:"
|
||||
#define MSG_ESTEPS " krokiE/mm:"
|
||||
#define MSG_MAIN_WIDE " Menu \003"
|
||||
#define MSG_RECTRACT_WIDE " Wycofanie \x7E"
|
||||
#define MSG_TEMPERATURE_WIDE " Temperatura \x7E"
|
||||
#define MSG_TEMPERATURE_RTN " Temperatura \003"
|
||||
#define MSG_MOTION_WIDE " Ruch \x7E"
|
||||
#define MSG_STORE_EPROM " Zapisz w pamieci"
|
||||
#define MSG_LOAD_EPROM " Wczytaj z pamieci"
|
||||
#define MSG_PID_P "PID-P"
|
||||
#define MSG_PID_I "PID-I"
|
||||
#define MSG_PID_D "PID-D"
|
||||
#define MSG_PID_C "PID-C"
|
||||
#define MSG_ACC "Acc"
|
||||
#define MSG_VXY_JERK "Zryw Vxy"
|
||||
#define MSG_VMAX "Vmax"
|
||||
#define MSG_X "x"
|
||||
#define MSG_Y "y"
|
||||
#define MSG_Z "z"
|
||||
#define MSG_E "e"
|
||||
#define MSG_VMIN "Vmin"
|
||||
#define MSG_VTRAV_MIN "Vskok min"
|
||||
#define MSG_AMAX "Amax"
|
||||
#define MSG_A_RETRACT "A-wycofanie"
|
||||
#define MSG_XSTEPS "krokiX/mm"
|
||||
#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_STORE_EPROM "Zapisz w pamieci"
|
||||
#define MSG_LOAD_EPROM "Wczytaj z pamieci"
|
||||
#define MSG_RESTORE_FAILSAFE " Ustawienia fabryczne"
|
||||
#define MSG_REFRESH "\004Odswiez"
|
||||
#define MSG_WATCH " Obserwuj \003"
|
||||
#define MSG_PREPARE " Przygotuj \x7E"
|
||||
#define MSG_PREPARE_ALT " Przygotuj \003"
|
||||
#define MSG_CONTROL_ARROW " Kontroluj \x7E"
|
||||
#define MSG_RETRACT_ARROW " Wycofaj \x7E"
|
||||
#define MSG_TUNE "Strojenie\x7E"
|
||||
#define MSG_PAUSE_PRINT " Pauza \x7E"
|
||||
#define MSG_RESUME_PRINT " Wznowienie \x7E"
|
||||
#define MSG_STOP_PRINT " Stop \x7E"
|
||||
#define MSG_CARD_MENU " Menu SDCard \x7E"
|
||||
#define MSG_NO_CARD " Brak karty"
|
||||
#define MSG_WATCH "Obserwuj"
|
||||
#define MSG_PREPARE "Przygotuj"
|
||||
#define MSG_CONTROL "Kontroluj"
|
||||
#define MSG_TUNE "Strojenie"
|
||||
#define MSG_PAUSE_PRINT "Pauza"
|
||||
#define MSG_RESUME_PRINT "Wznowienie"
|
||||
#define MSG_STOP_PRINT "Stop"
|
||||
#define MSG_CARD_MENU "Menu SDCard"
|
||||
#define MSG_NO_CARD "Brak karty"
|
||||
#define MSG_DWELL "Uspij..."
|
||||
#define MSG_USERWAIT "Czekaj na uzytkownika..."
|
||||
#define MSG_NO_MOVE "Brak ruchu."
|
||||
@ -273,13 +261,12 @@
|
||||
#define MSG_KILLED "Ubity. "
|
||||
#define MSG_STOPPED "Zatrzymany. "
|
||||
#define MSG_STEPPER_RELEASED "Zwolniony."
|
||||
#define MSG_CONTROL_RETRACT " Wycofaj mm:"
|
||||
#define MSG_CONTROL_RETRACTF " Wycofaj F:"
|
||||
#define MSG_CONTROL_RETRACT_ZLIFT " Skok Z mm:"
|
||||
#define MSG_CONTROL_RETRACT_RECOVER " Cof. wycof. +mm:"
|
||||
#define MSG_CONTROL_RETRACT_RECOVERF " Cof. wycof. F:"
|
||||
#define MSG_AUTORETRACT " Auto. wycofanie:"
|
||||
#define MSG_SERIAL_ERROR_MENU_STRUCTURE "Cos jest nie tak ze struktura menu."
|
||||
#define MSG_CONTROL_RETRACT "Wycofaj mm"
|
||||
#define MSG_CONTROL_RETRACTF "Wycofaj F"
|
||||
#define MSG_CONTROL_RETRACT_ZLIFT "Skok Z mm:"
|
||||
#define MSG_CONTROL_RETRACT_RECOVER "Cof. wycof. +mm"
|
||||
#define MSG_CONTROL_RETRACT_RECOVERF "Cof. wycof. F"
|
||||
#define MSG_AUTORETRACT "Auto. wycofanie"
|
||||
|
||||
// Serial Console Messages
|
||||
|
||||
@ -439,7 +426,6 @@
|
||||
#define MSG_CONTROL_RETRACT_RECOVER " UnRet +mm:"
|
||||
#define MSG_CONTROL_RETRACT_RECOVERF " UnRet F:"
|
||||
#define MSG_AUTORETRACT " Retract. Auto.:"
|
||||
#define MSG_SERIAL_ERROR_MENU_STRUCTURE "Erreur avec MenuStructure."
|
||||
|
||||
// Serial Console Messages
|
||||
|
||||
@ -593,13 +579,12 @@
|
||||
#define MSG_KILLED "KILLED"
|
||||
#define MSG_STOPPED "GESTOPPT"
|
||||
#define MSG_STEPPER_RELEASED "Stepper frei"
|
||||
#define MSG_CONTROL_RETRACT " Retract mm:"
|
||||
#define MSG_CONTROL_RETRACTF " Retract F:"
|
||||
#define MSG_CONTROL_RETRACT_ZLIFT " Hop mm:"
|
||||
#define MSG_CONTROL_RETRACT_RECOVER " UnRet +mm:"
|
||||
#define MSG_CONTROL_RETRACT_RECOVERF " UnRet F:"
|
||||
#define MSG_AUTORETRACT " AutoRetr.:"
|
||||
#define MSG_SERIAL_ERROR_MENU_STRUCTURE "Fehler in Menüstruktur."
|
||||
#define MSG_CONTROL_RETRACT " Retract mm:"
|
||||
#define MSG_CONTROL_RETRACTF " Retract F:"
|
||||
#define MSG_CONTROL_RETRACT_ZLIFT " Hop mm:"
|
||||
#define MSG_CONTROL_RETRACT_RECOVER " UnRet +mm:"
|
||||
#define MSG_CONTROL_RETRACT_RECOVERF " UnRet F:"
|
||||
#define MSG_AUTORETRACT " AutoRetr.:"
|
||||
|
||||
// Serial Console Messages
|
||||
|
||||
@ -758,7 +743,6 @@
|
||||
#define MSG_CONTROL_RETRACT_RECOVER " DesRet +mm:"
|
||||
#define MSG_CONTROL_RETRACT_RECOVERF " DesRet F:"
|
||||
#define MSG_AUTORETRACT " AutoRetr.:"
|
||||
#define MSG_SERIAL_ERROR_MENU_STRUCTURE "Hay un error en la estructura del menu"
|
||||
|
||||
// Serial Console Messages
|
||||
|
||||
@ -915,7 +899,6 @@
|
||||
#define MSG_CONTROL_RETRACT_RECOVER " Возврат +mm:"
|
||||
#define MSG_CONTROL_RETRACT_RECOVERF " Возврат F:"
|
||||
#define MSG_AUTORETRACT " АвтоОткат:"
|
||||
#define MSG_SERIAL_ERROR_MENU_STRUCTURE "Ошибка в структуре меню."
|
||||
|
||||
// Serial Console Messages
|
||||
|
||||
|
||||
Reference in New Issue
Block a user