Skip to content

Commit

Permalink
Fix setting current nozzle logic in Heat.c, Fix text display in Popup…
Browse files Browse the repository at this point in the history
… window (#710)

* Fix setting current nozzle does not updates

* Fix celsius symbol

* Fix popup window text display
  • Loading branch information
guruathwal committed May 25, 2020
1 parent 54594e6 commit 5b92d89
Show file tree
Hide file tree
Showing 22 changed files with 70 additions and 71 deletions.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
8 changes: 4 additions & 4 deletions TFT/src/User/API/Language/language_am.h
Original file line number Diff line number Diff line change
Expand Up @@ -129,15 +129,15 @@
#define AM_FILAMENT_RUNOUT "Filament runout!"
#define AM_PREHEAT "Preheat"
#define AM_PREHEAT_BOTH "Both"
#define AM_IS_PAUSE "Unable to extrude when printing, Pause printing?"
#define AM_IS_PAUSE "Unable to extrude when\nprinting.\nPause printing?"
#define AM_AUTO_SHUT_DOWN "Auto Power"
#define AM_UNIFIEDMOVE "Movement"
#define AM_UNIFIEDHEAT "Heat&Fan"
#define AM_COOLDOWN "Cool Down"
#define AM_EMERGENCYSTOP "EM. STOP"
#define AM_TOUCH_TO_EXIT "Touch anywhere to exit"
#define AM_MAINMENU "Menu"
#define AM_WAIT_TEMP_SHUT_DOWN "Wait for the temperature of hotend to be lower than %d℃" // Wait for the temperature of hotend to be lower than 50℃
#define AM_WAIT_TEMP_SHUT_DOWN "Wait for the temperature\nof hotend to be\nlower than %d℃" // Wait for the temperature of hotend to be lower than 50℃
#define AM_FORCE_SHUT_DOWN "Force"
#define AM_SHUTTING_DOWN "Shutting down..."
#define AM_PARAMETER_SETTING "Պարամետր"
Expand Down Expand Up @@ -166,8 +166,8 @@
#define AM_TRAVEL_ACCELERATION "Travel Acceleration"
#define AM_BUMP_SENSITIVITY "TMC bump sensitivity"
#define AM_RESET "Reset"
#define AM_RESET_SETTINGS "All settings will be reset to it's default values. Continue?"
#define AM_RESET_SETTINGS_DONE "Resetting all settings successfully done. To take full effect, please restart the device."
#define AM_RESET_SETTINGS "All settings will be\nreset to it's default\nvalues. Continue?"
#define AM_RESET_SETTINGS_DONE "Resetting all settings\nsuccessfully done.\nTo take full effect,\nplease restart the device."
#define AM_INFO "Info"
#define AM_LCD_BRIGHTNESS "LCD Brightness"
#define AM_LCD_BRIGHTNESS_DIM "LCD Brightness dim"
Expand Down
14 changes: 7 additions & 7 deletions TFT/src/User/API/Language/language_cz.h
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,9 @@
#define CZ_PERCENTAGE_SPEED "Rychlost"
#define CZ_PERCENTAGE_FLOW "Průtok"
#define CZ_VALUE_ZERO "Vynulovat"
#define CZ_1_DEGREE "1°C"
#define CZ_5_DEGREE "5°C"
#define CZ_10_DEGREE "10°C"
#define CZ_1_DEGREE "1"
#define CZ_5_DEGREE "5"
#define CZ_10_DEGREE "10"
#define CZ_X_INC "X+"
#define CZ_Y_INC "Y+"
#define CZ_Z_INC "Z+"
Expand Down Expand Up @@ -129,15 +129,15 @@
#define CZ_FILAMENT_RUNOUT "Došel filament!"
#define CZ_PREHEAT "Zahřát"
#define CZ_PREHEAT_BOTH "Vše"
#define CZ_IS_PAUSE "Během tisku nelze extrudovat, mám pozastavit tisk?"
#define CZ_IS_PAUSE "Během tisku nelze\nextrudovat,\nmám pozastavit tisk?"
#define CZ_AUTO_SHUT_DOWN "Automat"
#define CZ_UNIFIEDMOVE "Pohyb"
#define CZ_UNIFIEDHEAT "Teplota"
#define CZ_COOLDOWN "Zchladit"
#define CZ_EMERGENCYSTOP "!!STOP!!"
#define CZ_TOUCH_TO_EXIT "Pro návrat se dotkněte obrazovky..."
#define CZ_MAINMENU "Menu"
#define CZ_WAIT_TEMP_SHUT_DOWN "Čekám na zchladnutí extruderu pod %d℃" // Wait for the temperature of hotend to be lower than 50℃
#define CZ_WAIT_TEMP_SHUT_DOWN "Čekám na zchladnutí\nextruderu pod %d℃" // Wait for the temperature of hotend to be lower than 50℃
#define CZ_FORCE_SHUT_DOWN "Vynutit"
#define CZ_SHUTTING_DOWN "Vypínám se..."
#define CZ_PARAMETER_SETTING "Parametr"
Expand Down Expand Up @@ -166,8 +166,8 @@
#define CZ_TRAVEL_ACCELERATION "Zrychlení při přesunu"
#define CZ_BUMP_SENSITIVITY "Citlivost TMC na náraz"
#define CZ_RESET "Reset"
#define CZ_RESET_SETTINGS "Všechna nastavení budou obnovena na výchozí hodnoty. Pokračovat?"
#define CZ_RESET_SETTINGS_DONE "Resetování všech nastavení bylo úspěšně provedeno. Restartujte zařízení."
#define CZ_RESET_SETTINGS "Všechna nastavení budou\nobnovena na výchozí\nhodnoty. Pokračovat?"
#define CZ_RESET_SETTINGS_DONE "Resetování všech nastavení\nbylo úspěšně provedeno.\nRestartujte zařízení."
#define CZ_INFO "Info"
#define CZ_LCD_BRIGHTNESS "LCD Jas"
#define CZ_LCD_BRIGHTNESS_DIM "LCD snížení jasu"
Expand Down
8 changes: 4 additions & 4 deletions TFT/src/User/API/Language/language_de.h
Original file line number Diff line number Diff line change
Expand Up @@ -129,15 +129,15 @@
#define DE_FILAMENT_RUNOUT "Filament runout!"
#define DE_PREHEAT "Vorheizen"
#define DE_PREHEAT_BOTH "Beide"
#define DE_IS_PAUSE "Extrudierung während Druckvorgangs nicht möglich, Druck Pausieren?"
#define DE_IS_PAUSE "Extrudierung während\nDruckvorgangs nicht\nmöglich,\nDruck Pausieren?"
#define DE_AUTO_SHUT_DOWN "Automatisch AUS (PS_ON)"
#define DE_UNIFIEDMOVE "Bewegung"
#define DE_UNIFIEDHEAT "Heiz.Lüft."
#define DE_COOLDOWN "Abkühlen"
#define DE_EMERGENCYSTOP "NOT STOP!"
#define DE_TOUCH_TO_EXIT "Zum verlassen, Bildschirm berühren."
#define DE_MAINMENU "Menü"
#define DE_WAIT_TEMP_SHUT_DOWN "Warte bis Hotend-Temperatur unter %d℃ fällt." // Wait for the temperature of hotend to be lower than 50℃
#define DE_WAIT_TEMP_SHUT_DOWN "Warte bis Hotend-\nTemperatur unter\n %d℃ fällt." // Wait for the temperature of hotend to be lower than 50℃
#define DE_FORCE_SHUT_DOWN "Erzwinge"
#define DE_SHUTTING_DOWN "Fahre herunter..."
#define DE_PARAMETER_SETTING "Parameter"
Expand Down Expand Up @@ -166,8 +166,8 @@
#define DE_TRAVEL_ACCELERATION "Travel Acceleration"
#define DE_BUMP_SENSITIVITY "TMC bump sensitivity"
#define DE_RESET "Resetten"
#define DE_RESET_SETTINGS "Hiermit werden alle Einstellungen auf Werkseinstellungen zurückgesetzt. Fortfahren?"
#define DE_RESET_SETTINGS_DONE "Einstellungen wurden erfolgreich zurückgesetzt. Bitte starten Sie das Gerät neu."
#define DE_RESET_SETTINGS "Hiermit werden alle\nEinstellungen auf Werkseinstellungen\nzurückgesetzt. Fortfahren?"
#define DE_RESET_SETTINGS_DONE "Einstellungen wurden\nerfolgreich zurückgesetzt.\nBitte starten Sie das Gerät neu."
#define DE_INFO "\u0884 Info" //Info Sign
#define DE_LCD_BRIGHTNESS "LCD Helligkeit"
#define DE_LCD_BRIGHTNESS_DIM "LCD Abdunkel Helligkeit"
Expand Down
8 changes: 4 additions & 4 deletions TFT/src/User/API/Language/language_du.h
Original file line number Diff line number Diff line change
Expand Up @@ -129,15 +129,15 @@
#define DU_FILAMENT_RUNOUT "filament op!"
#define DU_PREHEAT "Voorverwarmen"
#define DU_PREHEAT_BOTH "Beide"
#define DU_IS_PAUSE "Kan niet extruderen tijdens printen, Pauzeer printen?"
#define DU_IS_PAUSE "Kan niet extruderen\ntijdens printen,\nPauzeer printen?"
#define DU_AUTO_SHUT_DOWN "Auto Power"
#define DU_UNIFIEDMOVE "Beweging"
#define DU_UNIFIEDHEAT "Verwarm/Ventilator"
#define DU_COOLDOWN "Afkoelen"
#define DU_EMERGENCYSTOP "NOODSTOP"
#define DU_TOUCH_TO_EXIT "Aanraken om te verlaten"
#define DU_MAINMENU "Menu"
#define DU_WAIT_TEMP_SHUT_DOWN "Wacht tot de temperatuur van de spuitkop lager dan %d℃ is" // Wait for the temperature of hotend to be lower than 50℃
#define DU_WAIT_TEMP_SHUT_DOWN "Wacht tot de temperatuur\nvan de spuitkop\nlager dan %d℃ is" // Wait for the temperature of hotend to be lower than 50℃
#define DU_FORCE_SHUT_DOWN "Forceer Afsluiten"
#define DU_SHUTTING_DOWN "Afsluiten..."
#define DU_PARAMETER_SETTING "Parameter"
Expand Down Expand Up @@ -166,8 +166,8 @@
#define DU_TRAVEL_ACCELERATION "Travel Acceleration"
#define DU_BUMP_SENSITIVITY "TMC bump sensitivity"
#define DU_RESET "Reset"
#define DU_RESET_SETTINGS "All settings will be reset to it's default values. Continue?"
#define DU_RESET_SETTINGS_DONE "Resetting all settings successfully done. To take full effect, please restart the device."
#define DU_RESET_SETTINGS "All settings will be\nreset to it's default\nvalues. Continue?"
#define DU_RESET_SETTINGS_DONE "Resetting all settings\nsuccessfully done.\nTo take full effect,\nplease restart the device."
#define DU_INFO "Info"
#define DU_LCD_BRIGHTNESS "LCD Brightness"
#define DU_LCD_BRIGHTNESS_DIM "LCD Brightness dim"
Expand Down
14 changes: 7 additions & 7 deletions TFT/src/User/API/Language/language_en.h
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,9 @@
#define EN_PERCENTAGE_SPEED "Speed"
#define EN_PERCENTAGE_FLOW "Flow"
#define EN_VALUE_ZERO "Zero"
#define EN_1_DEGREE "1°C"
#define EN_5_DEGREE "5°C"
#define EN_10_DEGREE "10°C"
#define EN_1_DEGREE "1℃"
#define EN_5_DEGREE "5℃"
#define EN_10_DEGREE "10℃"
#define EN_X_INC "X+"
#define EN_Y_INC "Y+"
#define EN_Z_INC "Z+"
Expand Down Expand Up @@ -129,15 +129,15 @@
#define EN_FILAMENT_RUNOUT "filament runout!"
#define EN_PREHEAT "Preheat"
#define EN_PREHEAT_BOTH "Both"
#define EN_IS_PAUSE "Unable to extrude when printing, Pause printing?"
#define EN_IS_PAUSE "Unable to extrude when\nprinting.\nPause printing?"
#define EN_AUTO_SHUT_DOWN "Auto Power"
#define EN_UNIFIEDMOVE "Movement"
#define EN_UNIFIEDHEAT "Heat/Fan"
#define EN_COOLDOWN "Cool Down"
#define EN_EMERGENCYSTOP "EM. STOP"
#define EN_TOUCH_TO_EXIT "Touch anywhere to exit"
#define EN_MAINMENU "Menu"
#define EN_WAIT_TEMP_SHUT_DOWN "Wait for the temperatureof hotend to be lower than %d ¡É" // The length of the info line is 24 characters, so the "temperatureof" will automatically be divided into "temperature of..."
#define EN_WAIT_TEMP_SHUT_DOWN "Wait for the hotend\ntemperature to be\nlower than %d " // The length of the info line is 24 characters, so the "temperatureof" will automatically be divided into "temperature of..."
#define EN_FORCE_SHUT_DOWN "Force"
#define EN_SHUTTING_DOWN "Shutting down..."
#define EN_PARAMETER_SETTING "Parameter Settings"
Expand Down Expand Up @@ -166,8 +166,8 @@
#define EN_TRAVEL_ACCELERATION "Travel Acceleration"
#define EN_BUMP_SENSITIVITY "TMC bump sensitivity"
#define EN_RESET "Reset"
#define EN_RESET_SETTINGS "All settings will be reset to it's default values. Continue?"
#define EN_RESET_SETTINGS_DONE "Resetting all settings successfully done. To take full effect, please restart the device."
#define EN_RESET_SETTINGS "All settings will be\nreset to it's default\nvalues. Continue?"
#define EN_RESET_SETTINGS_DONE "Resetting all settings\nsuccessfully done.\nTo take full effect,\nplease restart the device."
#define EN_INFO "\u0884 Info" //Info Sign
#define EN_LCD_BRIGHTNESS "LCD Brightness"
#define EN_LCD_BRIGHTNESS_DIM "LCD Brightness dim"
Expand Down
8 changes: 4 additions & 4 deletions TFT/src/User/API/Language/language_es.h
Original file line number Diff line number Diff line change
Expand Up @@ -129,15 +129,15 @@
#define ES_FILAMENT_RUNOUT "¡Filamento agotado!"
#define ES_PREHEAT "Precalentar"
#define ES_PREHEAT_BOTH "Ambos"
#define ES_IS_PAUSE "No se puede extruir al imprimir,¿Pausar la impresión?"
#define ES_IS_PAUSE "No se puede extruir\nal imprimir,¿\nPausar la impresión?"
#define ES_AUTO_SHUT_DOWN "Apag. aut."
#define ES_UNIFIEDMOVE "Movimiento"
#define ES_UNIFIEDHEAT "Calor/Ventilador"
#define ES_COOLDOWN "Enfriarse"
#define ES_EMERGENCYSTOP "PARADA EMERGENCIA"
#define ES_TOUCH_TO_EXIT "Toca cualquier lugar para salir"
#define ES_MAINMENU "Menu"
#define ES_WAIT_TEMP_SHUT_DOWN "Espere a que la temperatura del hotend sea inferior a %d℃" // Wait for the temperature of hotend to be lower than 50℃
#define ES_WAIT_TEMP_SHUT_DOWN "Espere a que la\ntemperatura del hotend\nsea inferior a %d℃" // Wait for the temperature of hotend to be lower than 50℃
#define ES_FORCE_SHUT_DOWN "Forzar Apagado"
#define ES_SHUTTING_DOWN "Apagando..."
#define ES_PARAMETER_SETTING "Parámetro"
Expand Down Expand Up @@ -166,8 +166,8 @@
#define ES_TRAVEL_ACCELERATION "Travel Acceleration"
#define ES_BUMP_SENSITIVITY "TMC bump sensitivity"
#define ES_RESET "Reset"
#define ES_RESET_SETTINGS "All settings will be reset to it's default values. Continue?"
#define ES_RESET_SETTINGS_DONE "Resetting all settings successfully done. To take full effect, please restart the device."
#define ES_RESET_SETTINGS "All settings will be\nreset to it's default\nvalues. Continue?"
#define ES_RESET_SETTINGS_DONE "Resetting all settings\nsuccessfully done.\nTo take full effect,\nplease restart the device."
#define ES_INFO "Info"
#define ES_LCD_BRIGHTNESS "LCD Brightness"
#define ES_LCD_BRIGHTNESS_DIM "LCD Brightness dim"
Expand Down
8 changes: 4 additions & 4 deletions TFT/src/User/API/Language/language_fr.h
Original file line number Diff line number Diff line change
Expand Up @@ -129,15 +129,15 @@
#define FR_FILAMENT_RUNOUT "Fin de Filament !"
#define FR_PREHEAT "Préparer"
#define FR_PREHEAT_BOTH "Global"
#define FR_IS_PAUSE "Extrusion impossible quand l’impression est en cours, mettre impression en pause ?"
#define FR_IS_PAUSE "Extrusion impossible quand\nl’impression est en cours,\nmettre impression en pause ?"
#define FR_AUTO_SHUT_DOWN "Auto Power"
#define FR_UNIFIEDMOVE "Mouvement"
#define FR_UNIFIEDHEAT "Chauffer / Ventiler"
#define FR_COOLDOWN "Refroidissement"
#define FR_EMERGENCYSTOP "Arrêt d'urgence"
#define FR_TOUCH_TO_EXIT "Toucher n'importe où pour sortir"
#define FR_MAINMENU "Menu"
#define FR_WAIT_TEMP_SHUT_DOWN "Veuillez, patientez que la température de la buse soit inférieure à%d℃" // Wait for the temperature of hotend to be lower than 50℃
#define FR_WAIT_TEMP_SHUT_DOWN "Veuillez, patientez que\nla température de la buse\nsoit inférieure à%d℃" // Wait for the temperature of hotend to be lower than 50℃
#define FR_FORCE_SHUT_DOWN "Forcer Extinction"
#define FR_SHUTTING_DOWN "Extinction en cours..."
#define FR_PARAMETER_SETTING "Paramètre"
Expand Down Expand Up @@ -166,8 +166,8 @@
#define FR_TRAVEL_ACCELERATION "Travel Acceleration"
#define FR_BUMP_SENSITIVITY "TMC bump sensitivity"
#define FR_RESET "Reset"
#define FR_RESET_SETTINGS "All settings will be reset to it's default values. Continue?"
#define FR_RESET_SETTINGS_DONE "Resetting all settings successfully done. To take full effect, please restart the device."
#define FR_RESET_SETTINGS "All settings will be\nreset to it's default\nvalues. Continue?"
#define FR_RESET_SETTINGS_DONE "Resetting all settings\nsuccessfully done.\nTo take full effect,\nplease restart the device."
#define FR_INFO "Info"
#define FR_LCD_BRIGHTNESS "LCD Brightness"
#define FR_LCD_BRIGHTNESS_DIM "LCD Brightness dim"
Expand Down
9 changes: 4 additions & 5 deletions TFT/src/User/API/Language/language_hu.h
Original file line number Diff line number Diff line change
Expand Up @@ -129,15 +129,15 @@
#define HU_FILAMENT_RUNOUT "Filament kifutás!"
#define HU_PREHEAT "Előfűtés"
#define HU_PREHEAT_BOTH "Mindkettő"
#define HU_IS_PAUSE "Nem sikerül adagolni a nyomtatás alatt. Szüneteli a nyomtatást?"
#define HU_IS_PAUSE "Nem sikerül adagolni\na nyomtatás alatt.\nSzüneteli a nyomtatást?"
#define HU_AUTO_SHUT_DOWN "Automata kikapcsolás"
#define HU_UNIFIEDMOVE "Mozgás"
#define HU_UNIFIEDHEAT "Fűt/Hűt"
#define HU_COOLDOWN "Lehűtés"
#define HU_EMERGENCYSTOP "VészSTOP"
#define HU_TOUCH_TO_EXIT "Érintse meg a kilépéshez."
#define HU_MAINMENU "Főmenü"
#define HU_WAIT_TEMP_SHUT_DOWN "Várja meg a fej visszahűlését.%d℃" // Várjon, amíg a meleg fej a megadott ℃ alá hűl.
#define HU_WAIT_TEMP_SHUT_DOWN "Várja meg a fej\nvisszahűlését.%d℃" // Várjon, amíg a meleg fej a megadott ℃ alá hűl.
#define HU_FORCE_SHUT_DOWN "Kényszerítés"
#define HU_SHUTTING_DOWN "Leállítás..."
#define HU_PARAMETER_SETTING "Tényezők"
Expand Down Expand Up @@ -166,11 +166,10 @@
#define HU_TRAVEL_ACCELERATION "Utazási Gyorsulás"
#define HU_BUMP_SENSITIVITY "TMC ütközés érzékenység"
#define HU_RESET "Alap"
#define HU_RESET_SETTINGS "Minden beállítás vissza fog állni alapértelmezett értékre. Folytatja?"
#define HU_RESET_SETTINGS_DONE "A beállítások visszaállítása sikeresen megtörtént. Az érvénybelépéshez indítsa újra az eszközt."
#define HU_RESET_SETTINGS "Minden beállítás vissza\nfog állni alapértelmezett\nértékre. Folytatja?"
#define HU_RESET_SETTINGS_DONE "A beállítások visszaállítása\nsikeresen megtörtént. Az\nérvénybelépéshez indítsa\nújra az eszközt."
#define HU_INFO "Infó"
#define HU_LCD_BRIGHTNESS "LCD Fényerősség"
#define HU_EMERGENCYPARSER "EMERGENCY_PARSER nincs engedélyezve a nyomtató firmware-ben."
#define HU_LCD_BRIGHTNESS_DIM "LCD Halványítás"
#define HU_LCD_DIM_IDLE_TIMER "LCD Halványítási idő"
#define HU_5_SECONDS "5 Mp."
Expand Down
8 changes: 4 additions & 4 deletions TFT/src/User/API/Language/language_it.h
Original file line number Diff line number Diff line change
Expand Up @@ -129,15 +129,15 @@
#define IT_FILAMENT_RUNOUT "Filamento finito!"
#define IT_PREHEAT "Prepara"
#define IT_PREHEAT_BOTH "Both"
#define IT_IS_PAUSE "Impossibile estrudere durante la stampa, vuoi sospendere?"
#define IT_IS_PAUSE "Impossibile estrudere\ndurante la stampa,\nvuoi sospendere?"
#define IT_AUTO_SHUT_DOWN "Auto Spegnimento"
#define IT_UNIFIEDMOVE "Movimento"
#define IT_UNIFIEDHEAT "Caldo/Fan"
#define IT_COOLDOWN "Blocco Freddo"
#define IT_EMERGENCYSTOP "EM. STOP"
#define IT_TOUCH_TO_EXIT "Premi ovunque per uscire"
#define IT_MAINMENU "Menu"
#define IT_WAIT_TEMP_SHUT_DOWN "Wait for the temperature of hotend to be lower than %d℃" // Wait for the temperature of hotend to be lower than 50℃
#define IT_WAIT_TEMP_SHUT_DOWN "Wait for the hotend\ntemperature to be lower\nthan %d℃" // Wait for the temperature of hotend to be lower than 50℃
#define IT_FORCE_SHUT_DOWN "Force"
#define IT_SHUTTING_DOWN "Shutting down..."
#define IT_PARAMETER_SETTING "Parametri"
Expand Down Expand Up @@ -166,8 +166,8 @@
#define IT_TRAVEL_ACCELERATION "Travel Acceleration"
#define IT_BUMP_SENSITIVITY "TMC bump sensitivity"
#define IT_RESET "Reset"
#define IT_RESET_SETTINGS "All settings will be reset to it's default values. Continue?"
#define IT_RESET_SETTINGS_DONE "Resetting all settings successfully done. To take full effect, please restart the device."
#define IT_RESET_SETTINGS "All settings will be\nreset to it's default\nvalues. Continue?"
#define IT_RESET_SETTINGS_DONE "Resetting all settings\nsuccessfully done.\nTo take full effect,\nplease restart the device."
#define IT_INFO "Info"
#define IT_LCD_BRIGHTNESS "LCD Brightness"
#define IT_LCD_BRIGHTNESS_DIM "LCD Brightness dim"
Expand Down
Loading

0 comments on commit 5b92d89

Please sign in to comment.