From 453b90126cae2266987b6df6e350212b9035703d Mon Sep 17 00:00:00 2001 From: guruathwal Date: Tue, 19 Nov 2019 13:01:06 +0530 Subject: [PATCH] =?UTF-8?q?New=20Feature=20Status=20Screen=20for=20Monitor?= =?UTF-8?q?ing=20Temperatues=20with=20live=20icons=20=E2=80=A6=20(#153)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Use Ubuntu Font for TFT35 * New Feature Status Screen for Monitoring Temperatues with live icons **need testing on TFT24/TFT28** New Feature Status Screen for Monitoring Temperatues with live icons. :heavy_exclamation_mark: **only tested on TFT35 V2, needs testing on TFT24/TFT28** :point_right: Currently Status Screen will only be visible if Unified Menu is activated as there was not empty position in regular homescreen for Back button. :point_right: may contain bugs so please be calm and open an issue. :+1: * New icons for Status Screen and some Icon imporvements * Improvements in Status Screen: added Fspeed and flow icon Improvements in Status Screen: added Fspeed and flow icon * Added Information box on Status Screen Added Information box on Status Screen and fixed some issues with previous PR Merge. The information box will now show Echo messages from the printer and M117 command message from ESP3D. * Added X Y Z Position in Status screen, status screen can be enabled for normal menu layout Reduced height of title bar while in status screen to accommodate X Y Z position in Status screen. Status screen can now be enabled for standard menu layout. Fixed stack size error. tested build for all variants successful. * Update parseACK.c --- TFT/src/User/API/Language/language_am.h | 3 +- TFT/src/User/API/Language/language_cz.h | 294 +++++------ TFT/src/User/API/Language/language_de.h | 4 +- TFT/src/User/API/Language/language_en.h | 2 +- TFT/src/User/API/Language/language_es.h | 292 +++++------ TFT/src/User/API/Language/language_fr.h | 1 + TFT/src/User/API/Language/language_jp.h | 292 +++++------ TFT/src/User/API/Language/language_ru.h | 292 +++++------ TFT/src/User/API/parseACK.c | 4 +- TFT/src/User/variants.h | 512 ++++++++++---------- buildroot/ldscripts/stm32f10x_0x6000_iap.ld | 340 ++++++------- 11 files changed, 1018 insertions(+), 1018 deletions(-) diff --git a/TFT/src/User/API/Language/language_am.h b/TFT/src/User/API/Language/language_am.h index 681c01b40b..d508b2a054 100644 --- a/TFT/src/User/API/Language/language_am.h +++ b/TFT/src/User/API/Language/language_am.h @@ -138,9 +138,8 @@ #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_MAINMENU "Menu" #define AM_WAIT_TEMP_SHUT_DOWN "Wait for the temperature of hotend to be lower than "STRINGIFY(AUTO_SHUT_DOWN_MAXTEMP)"℃" // Wait for the temperature of hotend to be lower than 50℃ #define AM_FORCE_SHUT_DOWN "Force" #define AM_SHUTTING_DOWN "Shutting down..." - #endif diff --git a/TFT/src/User/API/Language/language_cz.h b/TFT/src/User/API/Language/language_cz.h index d185fd75e0..e29a72203b 100644 --- a/TFT/src/User/API/Language/language_cz.h +++ b/TFT/src/User/API/Language/language_cz.h @@ -1,147 +1,147 @@ -#ifndef _LANGUAGE_CZ_H_ -#define _LANGUAGE_CZ_H_ - - #define CZ_LANGUAGE "Čeština" - #define CZ_HEAT "Teplota" - #define CZ_MOVE "Posunout" - #define CZ_HOME "Domů" - #define CZ_PRINT "Tisknout" - #define CZ_EXTRUDE "Filament" - #define CZ_FAN "Ofuk" - #define CZ_SETTINGS "Nastavení" - #define CZ_SCREEN_SETTINGS "Screen" - #define CZ_MACHINE_SETTINGS "Machine" - #define CZ_FEATURE_SETTINGS "Feature" - #define CZ_SILENT_ON "Silent On" - #define CZ_SILENT_OFF "Silent Off" - #define CZ_SHUT_DOWN "Shut Down" - #define CZ_RGB_SETTINGS "LED Color" - #define CZ_RGB_RED "Red" - #define CZ_RGB_GREEN "Green" - #define CZ_RGB_BLUE "Blue" - #define CZ_RGB_WHITE "White" - #define CZ_RGB_OFF "LED Off" - #define CZ_GCODE "Gcode" - #define CZ_CUSTOM "Custom" - #define CZ_LEVELING "Vyrovnání" - #define CZ_POINT_1 "Bod 1" - #define CZ_POINT_2 "Bod 2" - #define CZ_POINT_3 "Bod 3" - #define CZ_POINT_4 "Bod 4" - #define CZ_ABL "Automat" - #define CZ_BLTOUCH "Bltouch" - #define CZ_BLTOUCH_TEST "Test" - #define CZ_BLTOUCH_DEPLOY "Deploy" - #define CZ_BLTOUCH_STOW "Stow" - #define CZ_BLTOUCH_REPEAT "Repeat" - #define CZ_PROBE_OFFSET "Offset" - #define CZ_EEPROM_SAVE "Save" - #define CZ_INC "Přidat" - #define CZ_DEC "Ubrat" - #define CZ_NOZZLE "Tryska" - #define CZ_BED "Stolek" - #define CZ_STOP "Stop" - #define CZ_BACK "Zpět" - #define CZ_PAGE_UP "Další" - #define CZ_PAGE_DOWN "Předchozí" - #define CZ_PAUSE "Pauza" - #define CZ_RESUME "Obnovit" - #define CZ_LOAD "Zavést" - #define CZ_UNLOAD "Vysunout" - #define CZ_SLOW_SPEED "Pomalu" - #define CZ_NORMAL_SPEED "Normál" - #define CZ_FAST_SPEED "Rychle" - #define CZ_FAN_FULL_SPEED "Plný" - #define CZ_FAN_HALF_SPEED "Poloviční" - #define CZ_ROTATE_UI "Otočit UI" - #define CZ_TOUCHSCREEN_ADJUST "Kalibr.TFT" - #define CZ_MORE "More" - #define CZ_SCREEN_INFO "Info" - #define CZ_WHITE "bílá" - #define CZ_BLACK "černá" - #define CZ_BLUE "modrá" - #define CZ_RED "červená" - #define CZ_GREEN "zelená" - #define CZ_CYAN "cyan" - #define CZ_YELLOW "žlutá" - #define CZ_BROWN "hnědá" - #define CZ_GRAY "šedá" - #define CZ_DISCONNECT "Odpojit" - #define CZ_BAUDRATE_115200 "115200" - #define CZ_BAUDRATE_250000 "250000" - #define CZ_RUNOUT_OFF "Runout VYP" - #define CZ_RUNOUT_ON "Runout ZAP" - #define CZ_SMART_RUNOUT_ON "Smart ON" - #define CZ_PERCENTAGE "Procenta" - #define CZ_BABYSTEP "BabyStep" - #define CZ_PERCENTAGE_SPEED "Rychlost" - #define CZ_PERCENTAGE_FLOW "Průtok" - #define CZ_VALUE_ZERO "Vypnout" - #define CZ_1_DEGREE "1C" - #define CZ_5_DEGREE "5C" - #define CZ_10_DEGREE "10C" - #define CZ_X_INC "X+" - #define CZ_Y_INC "Y+" - #define CZ_Z_INC "Z+" - #define CZ_X_DEC "X-" - #define CZ_Y_DEC "Y-" - #define CZ_Z_DEC "Z-" - #define CZ_X_HOME "X" - #define CZ_Y_HOME "Y" - #define CZ_Z_HOME "Z" - #define CZ_001_MM "0.01mm" - #define CZ_01_MM "0.1mm" - #define CZ_1_MM "1mm" - #define CZ_5_MM "5mm" - #define CZ_10_MM "10mm" - #define CZ_1_PERCENT "1%" - #define CZ_5_PERCENT "5%" - #define CZ_10_PERCENT "10%" - #define CZ_READY "Ready" - #define CZ_PRINTING "Probíhá tisk" - #define CZ_BUSY "Zpracovávám, čekejte prosím..." - #define CZ_UNCONNECTED "Tiskárna není připojena!" - #define CZ_DISCONNECT_INFO "Nyní můžete tiskárnu ovládat z počítače!" - #define CZ_LOADING "Nahrávám..." - #define CZ_POWER_FAILED "Obnovit tisk?" - #define CZ_CONTINUE "Pokračovat" - #define CZ_CANNEL "Zrušit" - #define CZ_ADJUST_TITLE "Kalibrace dotykové obrazovky" - #define CZ_ADJUST_INFO "Dotkněte se postupně všech bodů" - #define CZ_ADJUST_OK "Kalibrace úspěšná" - #define CZ_ADJUST_FAILED "Kalibrace selhala, zopakujte znovu" - #define CZ_WARNING "Varování" - #define CZ_STOP_PRINT "Zastavit tisk?" - #define CZ_CONFIRM "Potvrdit" - #define CZ_TFTSD "TFT SD" - #define CZ_READ_TFTSD_ERROR "Chyba při čtení SD karty!" - #define CZ_TFTSD_INSERTED "SD karta vložena!" - #define CZ_TFTSD_REMOVED "SD karta vyjmuta!" - #define CZ_U_DISK "USB Disk" - #define CZ_READ_U_DISK_ERROR "Chyba při čtení USB disku!" - #define CZ_U_DISK_INSERTED "USB disk vložen!" - #define CZ_U_DISK_REMOVED "USB disk vyjmut!" - #define CZ_ONBOARDSD "OnboardSD" - #define CZ_READ_ONBOARDSD_ERROR "Chyba při čtení Onboard SD!" - #define CZ_FILAMENT_RUNOUT "Došel filament!" - #define CZ_PREHEAT "Preheat" - #define CZ_PREHEAT_BOTH "Both" - #define CZ_PREHEAT_PLA "PLA" - #define CZ_PREHEAT_PETG "PETG" - #define CZ_PREHEAT_ABS "ABS" - #define CZ_PREHEAT_CUSTOM1 "CUSTOM1" - #define CZ_PREHEAT_CUSTOM2 "CUSTOM2" - #define CZ_IS_PAUSE "Unable to extrude when printing, Pause printing?" - #define CZ_AUTO_SHUT_DOWN "Auto Power" - #define CZ_MANUAL_SHUT_DOWN "Manual" - #define CZ_UNIFIEDMOVE "Movement" - #define CZ_UNIFIEDHEAT "Heat&Fan" - #define CZ_COOLDOWN "Cool Down" - #define CZ_EMERGENCYSTOP "EM. STOP" - #define CZ_TOUCH_TO_EXIT "Touch anywhere to exit" - #define CZ_MAINMENU "Menu" - #define CZ_WAIT_TEMP_SHUT_DOWN "Wait for the temperature of hotend to be lower than "STRINGIFY(AUTO_SHUT_DOWN_MAXTEMP)"℃" // Wait for the temperature of hotend to be lower than 50℃ - #define CZ_FORCE_SHUT_DOWN "Force" - #define CZ_SHUTTING_DOWN "Shutting down..." - -#endif +#ifndef _LANGUAGE_CZ_H_ +#define _LANGUAGE_CZ_H_ + + #define CZ_LANGUAGE "Čeština" + #define CZ_HEAT "Teplota" + #define CZ_MOVE "Posunout" + #define CZ_HOME "Domů" + #define CZ_PRINT "Tisknout" + #define CZ_EXTRUDE "Filament" + #define CZ_FAN "Ofuk" + #define CZ_SETTINGS "Nastavení" + #define CZ_SCREEN_SETTINGS "Screen" + #define CZ_MACHINE_SETTINGS "Machine" + #define CZ_FEATURE_SETTINGS "Feature" + #define CZ_SILENT_ON "Silent On" + #define CZ_SILENT_OFF "Silent Off" + #define CZ_SHUT_DOWN "Shut Down" + #define CZ_RGB_SETTINGS "LED Color" + #define CZ_RGB_RED "Red" + #define CZ_RGB_GREEN "Green" + #define CZ_RGB_BLUE "Blue" + #define CZ_RGB_WHITE "White" + #define CZ_RGB_OFF "LED Off" + #define CZ_GCODE "Gcode" + #define CZ_CUSTOM "Custom" + #define CZ_LEVELING "Vyrovnání" + #define CZ_POINT_1 "Bod 1" + #define CZ_POINT_2 "Bod 2" + #define CZ_POINT_3 "Bod 3" + #define CZ_POINT_4 "Bod 4" + #define CZ_ABL "Automat" + #define CZ_BLTOUCH "Bltouch" + #define CZ_BLTOUCH_TEST "Test" + #define CZ_BLTOUCH_DEPLOY "Deploy" + #define CZ_BLTOUCH_STOW "Stow" + #define CZ_BLTOUCH_REPEAT "Repeat" + #define CZ_PROBE_OFFSET "Offset" + #define CZ_EEPROM_SAVE "Save" + #define CZ_INC "Přidat" + #define CZ_DEC "Ubrat" + #define CZ_NOZZLE "Tryska" + #define CZ_BED "Stolek" + #define CZ_STOP "Stop" + #define CZ_BACK "Zpět" + #define CZ_PAGE_UP "Další" + #define CZ_PAGE_DOWN "Předchozí" + #define CZ_PAUSE "Pauza" + #define CZ_RESUME "Obnovit" + #define CZ_LOAD "Zavést" + #define CZ_UNLOAD "Vysunout" + #define CZ_SLOW_SPEED "Pomalu" + #define CZ_NORMAL_SPEED "Normál" + #define CZ_FAST_SPEED "Rychle" + #define CZ_FAN_FULL_SPEED "Plný" + #define CZ_FAN_HALF_SPEED "Poloviční" + #define CZ_ROTATE_UI "Otočit UI" + #define CZ_TOUCHSCREEN_ADJUST "Kalibr.TFT" + #define CZ_MORE "More" + #define CZ_SCREEN_INFO "Info" + #define CZ_WHITE "bílá" + #define CZ_BLACK "černá" + #define CZ_BLUE "modrá" + #define CZ_RED "červená" + #define CZ_GREEN "zelená" + #define CZ_CYAN "cyan" + #define CZ_YELLOW "žlutá" + #define CZ_BROWN "hnědá" + #define CZ_GRAY "šedá" + #define CZ_DISCONNECT "Odpojit" + #define CZ_BAUDRATE_115200 "115200" + #define CZ_BAUDRATE_250000 "250000" + #define CZ_RUNOUT_OFF "Runout VYP" + #define CZ_RUNOUT_ON "Runout ZAP" + #define CZ_SMART_RUNOUT_ON "Smart ON" + #define CZ_PERCENTAGE "Procenta" + #define CZ_BABYSTEP "BabyStep" + #define CZ_PERCENTAGE_SPEED "Rychlost" + #define CZ_PERCENTAGE_FLOW "Průtok" + #define CZ_VALUE_ZERO "Vypnout" + #define CZ_1_DEGREE "1C" + #define CZ_5_DEGREE "5C" + #define CZ_10_DEGREE "10C" + #define CZ_X_INC "X+" + #define CZ_Y_INC "Y+" + #define CZ_Z_INC "Z+" + #define CZ_X_DEC "X-" + #define CZ_Y_DEC "Y-" + #define CZ_Z_DEC "Z-" + #define CZ_X_HOME "X" + #define CZ_Y_HOME "Y" + #define CZ_Z_HOME "Z" + #define CZ_001_MM "0.01mm" + #define CZ_01_MM "0.1mm" + #define CZ_1_MM "1mm" + #define CZ_5_MM "5mm" + #define CZ_10_MM "10mm" + #define CZ_1_PERCENT "1%" + #define CZ_5_PERCENT "5%" + #define CZ_10_PERCENT "10%" + #define CZ_READY "Ready" + #define CZ_PRINTING "Probíhá tisk" + #define CZ_BUSY "Zpracovávám, čekejte prosím..." + #define CZ_UNCONNECTED "Tiskárna není připojena!" + #define CZ_DISCONNECT_INFO "Nyní můžete tiskárnu ovládat z počítače!" + #define CZ_LOADING "Nahrávám..." + #define CZ_POWER_FAILED "Obnovit tisk?" + #define CZ_CONTINUE "Pokračovat" + #define CZ_CANNEL "Zrušit" + #define CZ_ADJUST_TITLE "Kalibrace dotykové obrazovky" + #define CZ_ADJUST_INFO "Dotkněte se postupně všech bodů" + #define CZ_ADJUST_OK "Kalibrace úspěšná" + #define CZ_ADJUST_FAILED "Kalibrace selhala, zopakujte znovu" + #define CZ_WARNING "Varování" + #define CZ_STOP_PRINT "Zastavit tisk?" + #define CZ_CONFIRM "Potvrdit" + #define CZ_TFTSD "TFT SD" + #define CZ_READ_TFTSD_ERROR "Chyba při čtení SD karty!" + #define CZ_TFTSD_INSERTED "SD karta vložena!" + #define CZ_TFTSD_REMOVED "SD karta vyjmuta!" + #define CZ_U_DISK "USB Disk" + #define CZ_READ_U_DISK_ERROR "Chyba při čtení USB disku!" + #define CZ_U_DISK_INSERTED "USB disk vložen!" + #define CZ_U_DISK_REMOVED "USB disk vyjmut!" + #define CZ_ONBOARDSD "OnboardSD" + #define CZ_READ_ONBOARDSD_ERROR "Chyba při čtení Onboard SD!" + #define CZ_FILAMENT_RUNOUT "Došel filament!" + #define CZ_PREHEAT "Preheat" + #define CZ_PREHEAT_BOTH "Both" + #define CZ_PREHEAT_PLA "PLA" + #define CZ_PREHEAT_PETG "PETG" + #define CZ_PREHEAT_ABS "ABS" + #define CZ_PREHEAT_CUSTOM1 "CUSTOM1" + #define CZ_PREHEAT_CUSTOM2 "CUSTOM2" + #define CZ_IS_PAUSE "Unable to extrude when printing, Pause printing?" + #define CZ_AUTO_SHUT_DOWN "Auto Power" + #define CZ_MANUAL_SHUT_DOWN "Manual" + #define CZ_UNIFIEDMOVE "Movement" + #define CZ_UNIFIEDHEAT "Heat&Fan" + #define CZ_COOLDOWN "Cool Down" + #define CZ_EMERGENCYSTOP "EM. STOP" + #define CZ_TOUCH_TO_EXIT "Touch anywhere to exit" + #define CZ_MAINMENU "Menu" + #define CZ_WAIT_TEMP_SHUT_DOWN "Wait for the temperature of hotend to be lower than "STRINGIFY(AUTO_SHUT_DOWN_MAXTEMP)"℃" // Wait for the temperature of hotend to be lower than 50℃ + #define CZ_FORCE_SHUT_DOWN "Force" + #define CZ_SHUTTING_DOWN "Shutting down..." + +#endif diff --git a/TFT/src/User/API/Language/language_de.h b/TFT/src/User/API/Language/language_de.h index 663f938527..eed4ce8926 100644 --- a/TFT/src/User/API/Language/language_de.h +++ b/TFT/src/User/API/Language/language_de.h @@ -138,9 +138,9 @@ #define DE_COOLDOWN "Cool Down" #define DE_EMERGENCYSTOP "EM. STOP" #define DE_TOUCH_TO_EXIT "Touch anywhere to exit" - #define DE_MAINMENU "Menu" + #define DE_MAINMENU "Menu" #define DE_WAIT_TEMP_SHUT_DOWN "Wait for the temperature of hotend to be lower than "STRINGIFY(AUTO_SHUT_DOWN_MAXTEMP)"℃" // Wait for the temperature of hotend to be lower than 50℃ #define DE_FORCE_SHUT_DOWN "Force" #define DE_SHUTTING_DOWN "Shutting down..." - + #endif diff --git a/TFT/src/User/API/Language/language_en.h b/TFT/src/User/API/Language/language_en.h index 9ed75a740e..7c4991039b 100644 --- a/TFT/src/User/API/Language/language_en.h +++ b/TFT/src/User/API/Language/language_en.h @@ -138,7 +138,7 @@ #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_MAINMENU "Menu" #define EN_WAIT_TEMP_SHUT_DOWN "Wait for the temperature of hotend to be lower than "STRINGIFY(AUTO_SHUT_DOWN_MAXTEMP)"℃" // Wait for the temperature of hotend to be lower than 50℃ #define EN_FORCE_SHUT_DOWN "Force" #define EN_SHUTTING_DOWN "Shutting down..." diff --git a/TFT/src/User/API/Language/language_es.h b/TFT/src/User/API/Language/language_es.h index 209214cc5e..d0b3324da0 100644 --- a/TFT/src/User/API/Language/language_es.h +++ b/TFT/src/User/API/Language/language_es.h @@ -1,146 +1,146 @@ -#ifndef _LANGUAGE_ES_H_ -#define _LANGUAGE_ES_H_ - - #define ES_LANGUAGE "Espanol" - #define ES_HEAT "Calentar" - #define ES_MOVE "Mover" - #define ES_HOME "Inicio" - #define ES_PRINT "Imprimir" - #define ES_EXTRUDE "Extruir" - #define ES_FAN "Ventilar" - #define ES_SETTINGS "Configurar" - #define ES_SCREEN_SETTINGS "Screen" - #define ES_MACHINE_SETTINGS "Machine" - #define ES_FEATURE_SETTINGS "Feature" - #define ES_SILENT_ON "Silent On" - #define ES_SILENT_OFF "Silent Off" - #define ES_SHUT_DOWN "Shut Down" - #define ES_RGB_SETTINGS "LED Color" - #define ES_RGB_RED "Red" - #define ES_RGB_GREEN "Green" - #define ES_RGB_BLUE "Blue" - #define ES_RGB_WHITE "White" - #define ES_RGB_OFF "LED Off" - #define ES_GCODE "Gcode" - #define ES_CUSTOM "Custom" - #define ES_LEVELING "Nivelar" - #define ES_POINT_1 "Punto 1" - #define ES_POINT_2 "Punto 2" - #define ES_POINT_3 "Punto 3" - #define ES_POINT_4 "Punto 4" - #define ES_ABL "ABL" - #define ES_BLTOUCH "Bltouch" - #define ES_BLTOUCH_TEST "Test" - #define ES_BLTOUCH_DEPLOY "Deploy" - #define ES_BLTOUCH_STOW "Stow" - #define ES_BLTOUCH_REPEAT "Repeat" - #define ES_PROBE_OFFSET "Offset" - #define ES_EEPROM_SAVE "Save" - #define ES_INC "Aumentar" - #define ES_DEC "Disminur" - #define ES_NOZZLE "Punta" - #define ES_BED "Cama" - #define ES_STOP "Parar" - #define ES_BACK "Volver" - #define ES_PAGE_UP "Arriba" - #define ES_PAGE_DOWN "Abajo" - #define ES_PAUSE "Pausar" - #define ES_RESUME "Continuar" - #define ES_LOAD "Cargar" - #define ES_UNLOAD "Descargar" - #define ES_SLOW_SPEED "Despacio" - #define ES_NORMAL_SPEED "Normal" - #define ES_FAST_SPEED "Rapido" - #define ES_FAN_FULL_SPEED "Todo" - #define ES_FAN_HALF_SPEED "Mitad" - #define ES_ROTATE_UI "Rotar" - #define ES_TOUCHSCREEN_ADJUST "Calibrar" - #define ES_MORE "More" - #define ES_SCREEN_INFO "Datos" - #define ES_WHITE "Blanco" - #define ES_BLACK "Negro" - #define ES_BLUE "Azul" - #define ES_RED "Rojo" - #define ES_GREEN "Verde" - #define ES_CYAN "Cyan" - #define ES_YELLOW "Amarillo" - #define ES_BROWN "Marron" - #define ES_GRAY "Gris" - #define ES_DISCONNECT "Desconectado" - #define ES_BAUDRATE_115200 "115200" - #define ES_BAUDRATE_250000 "250000" - #define ES_RUNOUT_OFF "S.Fil. Apagado" - #define ES_RUNOUT_ON "S.Fil. Encendido" - #define ES_SMART_RUNOUT_ON "Smart ON" - #define ES_PERCENTAGE "Porcentaje" - #define ES_BABYSTEP "BabyStep" - #define ES_PERCENTAGE_SPEED "Velocidad" - #define ES_PERCENTAGE_FLOW "Flujo" - #define ES_VALUE_ZERO "Cero" - #define ES_1_DEGREE "1℃" - #define ES_5_DEGREE "5℃" - #define ES_10_DEGREE "10℃" - #define ES_X_INC "+X" - #define ES_Y_INC "+Y" - #define ES_Z_INC "+Z" - #define ES_X_DEC "-X" - #define ES_Y_DEC "-Y" - #define ES_Z_DEC "-Z" - #define ES_X_HOME "X" - #define ES_Y_HOME "Y" - #define ES_Z_HOME "Z" - #define ES_001_MM "0.01mm" - #define ES_01_MM "0.1mm" - #define ES_1_MM "1mm" - #define ES_5_MM "5mm" - #define ES_10_MM "10mm" - #define ES_1_PERCENT "1%" - #define ES_5_PERCENT "5%" - #define ES_10_PERCENT "10%" - #define ES_READY "Listo" - #define ES_BUSY "Procesamiento ocupado, por favor espere ..." - #define ES_UNCONNECTED "No hay comunicacion con impresora!" - #define ES_DISCONNECT_INFO "Ahora puede controlar la impresora desde su ordenador!" - #define ES_LOADING "Cargando..." - #define ES_POWER_FAILED "Continua imprimiendo?" - #define ES_CONTINUE "Continuar" - #define ES_CANNEL "Cancelar" - #define ES_ADJUST_TITLE "Calibrar la pantalla tactil" - #define ES_ADJUST_INFO "Por favor haga clic en el punto rojo" - #define ES_ADJUST_OK "Ajuste exitoso" - #define ES_ADJUST_FAILED "Ajuste fallado, por favor intentelo de nuevo" - #define ES_WARNING "Advertencia" - #define ES_STOP_PRINT "Desea parar la impresion?" - #define ES_CONFIRM "Confirmar" - #define ES_TFTSD "SD TFT" - #define ES_READ_TFTSD_ERROR "Error en la tarjeta SD TFT!" - #define ES_TFTSD_INSERTED "Tarjeta insertada!" - #define ES_TFTSD_REMOVED "Tarjeta quitada!" - #define ES_U_DISK "Pendrive" - #define ES_READ_U_DISK_ERROR "Error en el Pendrive!" - #define ES_U_DISK_INSERTED "Pendrive insertado!" - #define ES_U_DISK_REMOVED "Pendrive quitado!" - #define ES_ONBOARDSD "SD Placa" - #define ES_READ_ONBOARDSD_ERROR "Error en la tarjeta SD de la placa!" - #define ES_FILAMENT_RUNOUT "Filamento agotado!" - #define ES_PREHEAT "Preheat" - #define ES_PREHEAT_BOTH "Both" - #define ES_PREHEAT_PLA "PLA" - #define ES_PREHEAT_PETG "PETG" - #define ES_PREHEAT_ABS "ABS" - #define ES_PREHEAT_CUSTOM1 "CUSTOM1" - #define ES_PREHEAT_CUSTOM2 "CUSTOM2" - #define ES_IS_PAUSE "Unable to extrude when printing, Pause printing?" - #define ES_AUTO_SHUT_DOWN "Auto Power" - #define ES_MANUAL_SHUT_DOWN "Manual" - #define ES_UNIFIEDMOVE "Movement" - #define ES_UNIFIEDHEAT "Heat/Fan" - #define ES_COOLDOWN "Cool Down" - #define ES_EMERGENCYSTOP "EM. STOP" - #define ES_TOUCH_TO_EXIT "Touch anywhere to exit" - #define ES_MAINMENU "Menu" - #define ES_WAIT_TEMP_SHUT_DOWN "Wait for the temperature of hotend to be lower than "STRINGIFY(AUTO_SHUT_DOWN_MAXTEMP)"℃" // Wait for the temperature of hotend to be lower than 50℃ - #define ES_FORCE_SHUT_DOWN "Force" - #define ES_SHUTTING_DOWN "Shutting down..." - -#endif +#ifndef _LANGUAGE_ES_H_ +#define _LANGUAGE_ES_H_ + + #define ES_LANGUAGE "Espanol" + #define ES_HEAT "Calentar" + #define ES_MOVE "Mover" + #define ES_HOME "Inicio" + #define ES_PRINT "Imprimir" + #define ES_EXTRUDE "Extruir" + #define ES_FAN "Ventilar" + #define ES_SETTINGS "Configurar" + #define ES_SCREEN_SETTINGS "Screen" + #define ES_MACHINE_SETTINGS "Machine" + #define ES_FEATURE_SETTINGS "Feature" + #define ES_SILENT_ON "Silent On" + #define ES_SILENT_OFF "Silent Off" + #define ES_SHUT_DOWN "Shut Down" + #define ES_RGB_SETTINGS "LED Color" + #define ES_RGB_RED "Red" + #define ES_RGB_GREEN "Green" + #define ES_RGB_BLUE "Blue" + #define ES_RGB_WHITE "White" + #define ES_RGB_OFF "LED Off" + #define ES_GCODE "Gcode" + #define ES_CUSTOM "Custom" + #define ES_LEVELING "Nivelar" + #define ES_POINT_1 "Punto 1" + #define ES_POINT_2 "Punto 2" + #define ES_POINT_3 "Punto 3" + #define ES_POINT_4 "Punto 4" + #define ES_ABL "ABL" + #define ES_BLTOUCH "Bltouch" + #define ES_BLTOUCH_TEST "Test" + #define ES_BLTOUCH_DEPLOY "Deploy" + #define ES_BLTOUCH_STOW "Stow" + #define ES_BLTOUCH_REPEAT "Repeat" + #define ES_PROBE_OFFSET "Offset" + #define ES_EEPROM_SAVE "Save" + #define ES_INC "Aumentar" + #define ES_DEC "Disminur" + #define ES_NOZZLE "Punta" + #define ES_BED "Cama" + #define ES_STOP "Parar" + #define ES_BACK "Volver" + #define ES_PAGE_UP "Arriba" + #define ES_PAGE_DOWN "Abajo" + #define ES_PAUSE "Pausar" + #define ES_RESUME "Continuar" + #define ES_LOAD "Cargar" + #define ES_UNLOAD "Descargar" + #define ES_SLOW_SPEED "Despacio" + #define ES_NORMAL_SPEED "Normal" + #define ES_FAST_SPEED "Rapido" + #define ES_FAN_FULL_SPEED "Todo" + #define ES_FAN_HALF_SPEED "Mitad" + #define ES_ROTATE_UI "Rotar" + #define ES_TOUCHSCREEN_ADJUST "Calibrar" + #define ES_MORE "More" + #define ES_SCREEN_INFO "Datos" + #define ES_WHITE "Blanco" + #define ES_BLACK "Negro" + #define ES_BLUE "Azul" + #define ES_RED "Rojo" + #define ES_GREEN "Verde" + #define ES_CYAN "Cyan" + #define ES_YELLOW "Amarillo" + #define ES_BROWN "Marron" + #define ES_GRAY "Gris" + #define ES_DISCONNECT "Desconectado" + #define ES_BAUDRATE_115200 "115200" + #define ES_BAUDRATE_250000 "250000" + #define ES_RUNOUT_OFF "S.Fil. Apagado" + #define ES_RUNOUT_ON "S.Fil. Encendido" + #define ES_SMART_RUNOUT_ON "Smart ON" + #define ES_PERCENTAGE "Porcentaje" + #define ES_BABYSTEP "BabyStep" + #define ES_PERCENTAGE_SPEED "Velocidad" + #define ES_PERCENTAGE_FLOW "Flujo" + #define ES_VALUE_ZERO "Cero" + #define ES_1_DEGREE "1℃" + #define ES_5_DEGREE "5℃" + #define ES_10_DEGREE "10℃" + #define ES_X_INC "+X" + #define ES_Y_INC "+Y" + #define ES_Z_INC "+Z" + #define ES_X_DEC "-X" + #define ES_Y_DEC "-Y" + #define ES_Z_DEC "-Z" + #define ES_X_HOME "X" + #define ES_Y_HOME "Y" + #define ES_Z_HOME "Z" + #define ES_001_MM "0.01mm" + #define ES_01_MM "0.1mm" + #define ES_1_MM "1mm" + #define ES_5_MM "5mm" + #define ES_10_MM "10mm" + #define ES_1_PERCENT "1%" + #define ES_5_PERCENT "5%" + #define ES_10_PERCENT "10%" + #define ES_READY "Listo" + #define ES_BUSY "Procesamiento ocupado, por favor espere ..." + #define ES_UNCONNECTED "No hay comunicacion con impresora!" + #define ES_DISCONNECT_INFO "Ahora puede controlar la impresora desde su ordenador!" + #define ES_LOADING "Cargando..." + #define ES_POWER_FAILED "Continua imprimiendo?" + #define ES_CONTINUE "Continuar" + #define ES_CANNEL "Cancelar" + #define ES_ADJUST_TITLE "Calibrar la pantalla tactil" + #define ES_ADJUST_INFO "Por favor haga clic en el punto rojo" + #define ES_ADJUST_OK "Ajuste exitoso" + #define ES_ADJUST_FAILED "Ajuste fallado, por favor intentelo de nuevo" + #define ES_WARNING "Advertencia" + #define ES_STOP_PRINT "Desea parar la impresion?" + #define ES_CONFIRM "Confirmar" + #define ES_TFTSD "SD TFT" + #define ES_READ_TFTSD_ERROR "Error en la tarjeta SD TFT!" + #define ES_TFTSD_INSERTED "Tarjeta insertada!" + #define ES_TFTSD_REMOVED "Tarjeta quitada!" + #define ES_U_DISK "Pendrive" + #define ES_READ_U_DISK_ERROR "Error en el Pendrive!" + #define ES_U_DISK_INSERTED "Pendrive insertado!" + #define ES_U_DISK_REMOVED "Pendrive quitado!" + #define ES_ONBOARDSD "SD Placa" + #define ES_READ_ONBOARDSD_ERROR "Error en la tarjeta SD de la placa!" + #define ES_FILAMENT_RUNOUT "Filamento agotado!" + #define ES_PREHEAT "Preheat" + #define ES_PREHEAT_BOTH "Both" + #define ES_PREHEAT_PLA "PLA" + #define ES_PREHEAT_PETG "PETG" + #define ES_PREHEAT_ABS "ABS" + #define ES_PREHEAT_CUSTOM1 "CUSTOM1" + #define ES_PREHEAT_CUSTOM2 "CUSTOM2" + #define ES_IS_PAUSE "Unable to extrude when printing, Pause printing?" + #define ES_AUTO_SHUT_DOWN "Auto Power" + #define ES_MANUAL_SHUT_DOWN "Manual" + #define ES_UNIFIEDMOVE "Movement" + #define ES_UNIFIEDHEAT "Heat/Fan" + #define ES_COOLDOWN "Cool Down" + #define ES_EMERGENCYSTOP "EM. STOP" + #define ES_TOUCH_TO_EXIT "Touch anywhere to exit" + #define ES_MAINMENU "Menu" + #define ES_WAIT_TEMP_SHUT_DOWN "Wait for the temperature of hotend to be lower than "STRINGIFY(AUTO_SHUT_DOWN_MAXTEMP)"℃" // Wait for the temperature of hotend to be lower than 50℃ + #define ES_FORCE_SHUT_DOWN "Force" + #define ES_SHUTTING_DOWN "Shutting down..." + +#endif diff --git a/TFT/src/User/API/Language/language_fr.h b/TFT/src/User/API/Language/language_fr.h index 58f975a409..102fd84903 100644 --- a/TFT/src/User/API/Language/language_fr.h +++ b/TFT/src/User/API/Language/language_fr.h @@ -139,6 +139,7 @@ #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 "Wait for the temperature of hotend to be lower than "STRINGIFY(AUTO_SHUT_DOWN_MAXTEMP)"℃" // Wait for the temperature of hotend to be lower than 50℃ #define FR_FORCE_SHUT_DOWN "Force" #define FR_SHUTTING_DOWN "Shutting down..." diff --git a/TFT/src/User/API/Language/language_jp.h b/TFT/src/User/API/Language/language_jp.h index 063a734fb6..4360b898c6 100644 --- a/TFT/src/User/API/Language/language_jp.h +++ b/TFT/src/User/API/Language/language_jp.h @@ -1,146 +1,146 @@ -#ifndef _LANGUAGE_JP_H_ -#define _LANGUAGE_JP_H_ - - #define JP_LANGUAGE "日本語" - #define JP_HEAT "あたため" - #define JP_MOVE "移動" - #define JP_HOME "ゼロにする" - #define JP_PRINT "プリント" - #define JP_EXTRUDE "押出" - #define JP_FAN "ファン" - #define JP_SETTINGS "設定" - #define JP_SCREEN_SETTINGS "Screen" - #define JP_MACHINE_SETTINGS "Machine" - #define JP_FEATURE_SETTINGS "Feature" - #define JP_SILENT_ON "Silent On" - #define JP_SILENT_OFF "Silent Off" - #define JP_SHUT_DOWN "Shut Down" - #define JP_RGB_SETTINGS "LED Color" - #define JP_RGB_RED "Red" - #define JP_RGB_GREEN "Green" - #define JP_RGB_BLUE "Blue" - #define JP_RGB_WHITE "White" - #define JP_RGB_OFF "LED Off" - #define JP_GCODE "Gcode" - #define JP_CUSTOM "Custom" - #define JP_LEVELING "Leveling" - #define JP_POINT_1 "Point 1" - #define JP_POINT_2 "Point 2" - #define JP_POINT_3 "Point 3" - #define JP_POINT_4 "Point 4" - #define JP_ABL "自動調整" - #define JP_BLTOUCH "Bltouch" - #define JP_BLTOUCH_TEST "Test" - #define JP_BLTOUCH_DEPLOY "Deploy" - #define JP_BLTOUCH_STOW "Stow" - #define JP_BLTOUCH_REPEAT "Repeat" - #define JP_PROBE_OFFSET "Offset" - #define JP_EEPROM_SAVE "Save" - #define JP_INC "増え" - #define JP_DEC "減る" - #define JP_NOZZLE "ノズル" - #define JP_BED "ベッド" - #define JP_STOP "停止" - #define JP_BACK "戻る" - #define JP_PAGE_UP "前ページ" - #define JP_PAGE_DOWN "次ページ" - #define JP_PAUSE "一時停止" - #define JP_RESUME "続ける" - #define JP_LOAD "増え" - #define JP_UNLOAD "減る" - #define JP_SLOW_SPEED "ゆっくり" - #define JP_NORMAL_SPEED "正常速度" - #define JP_FAST_SPEED "早め" - #define JP_FAN_FULL_SPEED "全速" - #define JP_FAN_HALF_SPEED "50%速さ" - #define JP_ROTATE_UI "Rotate UI" - #define JP_TOUCHSCREEN_ADJUST "校正する" - #define JP_MORE "詳細" - #define JP_SCREEN_INFO "ついて" - #define JP_WHITE "白色" - #define JP_BLACK "黒色" - #define JP_BLUE "青色" - #define JP_RED "赤色" - #define JP_GREEN "緑色" - #define JP_CYAN "シアン" - #define JP_YELLOW "黄色" - #define JP_BROWN "茶色" - #define JP_GRAY "灰色" - #define JP_DISCONNECT "データ接続" - #define JP_BAUDRATE_115200 "115200" - #define JP_BAUDRATE_250000 "250000" - #define JP_RUNOUT_OFF "Runout OFF" - #define JP_RUNOUT_ON "Runout ON" - #define JP_SMART_RUNOUT_ON "Smart ON" - #define JP_PERCENTAGE "パーセント" - #define JP_BABYSTEP "ベビーステップ" - #define JP_PERCENTAGE_SPEED "スビード" - #define JP_PERCENTAGE_FLOW "押出" - #define JP_VALUE_ZERO "ゼロ" - #define JP_1_DEGREE "1℃" - #define JP_5_DEGREE "5℃" - #define JP_10_DEGREE "10℃" - #define JP_X_INC "X+" - #define JP_Y_INC "Y+" - #define JP_Z_INC "Z+" - #define JP_X_DEC "X-" - #define JP_Y_DEC "Y-" - #define JP_Z_DEC "Z-" - #define JP_X_HOME "X" - #define JP_Y_HOME "Y" - #define JP_Z_HOME "Z" - #define JP_001_MM "0.01mm" - #define JP_01_MM "0.1mm" - #define JP_1_MM "1mm" - #define JP_5_MM "5mm" - #define JP_10_MM "10mm" - #define JP_1_PERCENT "1%" - #define JP_5_PERCENT "5%" - #define JP_10_PERCENT "10%" - #define JP_READY "準備中" - #define JP_BUSY "ビジー状態、しばらくお待ちください..." - #define JP_UNCONNECTED "プリンターに連続していない!" - #define JP_DISCONNECT_INFO "SDカード　PC両用" - #define JP_LOADING "ロッド中..." - #define JP_POWER_FAILED "プリントを継続しますか?" - #define JP_CONTINUE "継続" - #define JP_CANNEL "キャンセル" - #define JP_ADJUST_TITLE "タッチスクリーン較正" - #define JP_ADJUST_INFO "赤星をタッチ" - #define JP_ADJUST_OK "校正が成功しました" - #define JP_ADJUST_FAILED "校正が失敗しました、も一度お試して下さい" - #define JP_WARNING "注意" - #define JP_STOP_PRINT "プリントを中止しますか?" - #define JP_CONFIRM "OK" - #define JP_TFTSD "TFT SD" - #define JP_READ_TFTSD_ERROR "TFT SDカードの読み取りがエラー発生しました!" - #define JP_TFTSD_INSERTED "SDカード入りました!" - #define JP_TFTSD_REMOVED "SDカード出しました!" - #define JP_U_DISK "USBメモリー" - #define JP_READ_U_DISK_ERROR "USBメモリー読み込みエラー!" - #define JP_U_DISK_INSERTED "U Diskカード入りました!" - #define JP_U_DISK_REMOVED "U Diskカード出しました!" - #define JP_ONBOARDSD "内部 mSDカード" - #define JP_READ_ONBOARDSD_ERROR "内部 mSDカードの読み取りがエラー発生しました!" - #define JP_FILAMENT_RUNOUT "filament runout!" - #define JP_PREHEAT "Preheat" - #define JP_PREHEAT_BOTH "Both" - #define JP_PREHEAT_PLA "PLA" - #define JP_PREHEAT_PETG "PETG" - #define JP_PREHEAT_ABS "ABS" - #define JP_PREHEAT_CUSTOM1 "CUSTOM1" - #define JP_PREHEAT_CUSTOM2 "CUSTOM2" - #define JP_IS_PAUSE "Unable to extrude when printing, Pause printing?" - #define JP_AUTO_SHUT_DOWN "Auto Power" - #define JP_MANUAL_SHUT_DOWN "Manual" - #define JP_UNIFIEDMOVE "Movement" - #define JP_UNIFIEDHEAT "Heat&Fan" - #define JP_COOLDOWN "Cool Down" - #define JP_EMERGENCYSTOP "EM. STOP" - #define JP_TOUCH_TO_EXIT "Touch anywhere to exit" - #define JP_MAINMENU "Menu" - #define JP_WAIT_TEMP_SHUT_DOWN "Wait for the temperature of hotend to be lower than "STRINGIFY(AUTO_SHUT_DOWN_MAXTEMP)"℃" // Wait for the temperature of hotend to be lower than 50℃ - #define JP_FORCE_SHUT_DOWN "Force" - #define JP_SHUTTING_DOWN "Shutting down..." - -#endif +#ifndef _LANGUAGE_JP_H_ +#define _LANGUAGE_JP_H_ + + #define JP_LANGUAGE "日本語" + #define JP_HEAT "あたため" + #define JP_MOVE "移動" + #define JP_HOME "ゼロにする" + #define JP_PRINT "プリント" + #define JP_EXTRUDE "押出" + #define JP_FAN "ファン" + #define JP_SETTINGS "設定" + #define JP_SCREEN_SETTINGS "Screen" + #define JP_MACHINE_SETTINGS "Machine" + #define JP_FEATURE_SETTINGS "Feature" + #define JP_SILENT_ON "Silent On" + #define JP_SILENT_OFF "Silent Off" + #define JP_SHUT_DOWN "Shut Down" + #define JP_RGB_SETTINGS "LED Color" + #define JP_RGB_RED "Red" + #define JP_RGB_GREEN "Green" + #define JP_RGB_BLUE "Blue" + #define JP_RGB_WHITE "White" + #define JP_RGB_OFF "LED Off" + #define JP_GCODE "Gcode" + #define JP_CUSTOM "Custom" + #define JP_LEVELING "Leveling" + #define JP_POINT_1 "Point 1" + #define JP_POINT_2 "Point 2" + #define JP_POINT_3 "Point 3" + #define JP_POINT_4 "Point 4" + #define JP_ABL "自動調整" + #define JP_BLTOUCH "Bltouch" + #define JP_BLTOUCH_TEST "Test" + #define JP_BLTOUCH_DEPLOY "Deploy" + #define JP_BLTOUCH_STOW "Stow" + #define JP_BLTOUCH_REPEAT "Repeat" + #define JP_PROBE_OFFSET "Offset" + #define JP_EEPROM_SAVE "Save" + #define JP_INC "増え" + #define JP_DEC "減る" + #define JP_NOZZLE "ノズル" + #define JP_BED "ベッド" + #define JP_STOP "停止" + #define JP_BACK "戻る" + #define JP_PAGE_UP "前ページ" + #define JP_PAGE_DOWN "次ページ" + #define JP_PAUSE "一時停止" + #define JP_RESUME "続ける" + #define JP_LOAD "増え" + #define JP_UNLOAD "減る" + #define JP_SLOW_SPEED "ゆっくり" + #define JP_NORMAL_SPEED "正常速度" + #define JP_FAST_SPEED "早め" + #define JP_FAN_FULL_SPEED "全速" + #define JP_FAN_HALF_SPEED "50%速さ" + #define JP_ROTATE_UI "Rotate UI" + #define JP_TOUCHSCREEN_ADJUST "校正する" + #define JP_MORE "詳細" + #define JP_SCREEN_INFO "ついて" + #define JP_WHITE "白色" + #define JP_BLACK "黒色" + #define JP_BLUE "青色" + #define JP_RED "赤色" + #define JP_GREEN "緑色" + #define JP_CYAN "シアン" + #define JP_YELLOW "黄色" + #define JP_BROWN "茶色" + #define JP_GRAY "灰色" + #define JP_DISCONNECT "データ接続" + #define JP_BAUDRATE_115200 "115200" + #define JP_BAUDRATE_250000 "250000" + #define JP_RUNOUT_OFF "Runout OFF" + #define JP_RUNOUT_ON "Runout ON" + #define JP_SMART_RUNOUT_ON "Smart ON" + #define JP_PERCENTAGE "パーセント" + #define JP_BABYSTEP "ベビーステップ" + #define JP_PERCENTAGE_SPEED "スビード" + #define JP_PERCENTAGE_FLOW "押出" + #define JP_VALUE_ZERO "ゼロ" + #define JP_1_DEGREE "1℃" + #define JP_5_DEGREE "5℃" + #define JP_10_DEGREE "10℃" + #define JP_X_INC "X+" + #define JP_Y_INC "Y+" + #define JP_Z_INC "Z+" + #define JP_X_DEC "X-" + #define JP_Y_DEC "Y-" + #define JP_Z_DEC "Z-" + #define JP_X_HOME "X" + #define JP_Y_HOME "Y" + #define JP_Z_HOME "Z" + #define JP_001_MM "0.01mm" + #define JP_01_MM "0.1mm" + #define JP_1_MM "1mm" + #define JP_5_MM "5mm" + #define JP_10_MM "10mm" + #define JP_1_PERCENT "1%" + #define JP_5_PERCENT "5%" + #define JP_10_PERCENT "10%" + #define JP_READY "準備中" + #define JP_BUSY "ビジー状態、しばらくお待ちください..." + #define JP_UNCONNECTED "プリンターに連続していない!" + #define JP_DISCONNECT_INFO "SDカード　PC両用" + #define JP_LOADING "ロッド中..." + #define JP_POWER_FAILED "プリントを継続しますか?" + #define JP_CONTINUE "継続" + #define JP_CANNEL "キャンセル" + #define JP_ADJUST_TITLE "タッチスクリーン較正" + #define JP_ADJUST_INFO "赤星をタッチ" + #define JP_ADJUST_OK "校正が成功しました" + #define JP_ADJUST_FAILED "校正が失敗しました、も一度お試して下さい" + #define JP_WARNING "注意" + #define JP_STOP_PRINT "プリントを中止しますか?" + #define JP_CONFIRM "OK" + #define JP_TFTSD "TFT SD" + #define JP_READ_TFTSD_ERROR "TFT SDカードの読み取りがエラー発生しました!" + #define JP_TFTSD_INSERTED "SDカード入りました!" + #define JP_TFTSD_REMOVED "SDカード出しました!" + #define JP_U_DISK "USBメモリー" + #define JP_READ_U_DISK_ERROR "USBメモリー読み込みエラー!" + #define JP_U_DISK_INSERTED "U Diskカード入りました!" + #define JP_U_DISK_REMOVED "U Diskカード出しました!" + #define JP_ONBOARDSD "内部 mSDカード" + #define JP_READ_ONBOARDSD_ERROR "内部 mSDカードの読み取りがエラー発生しました!" + #define JP_FILAMENT_RUNOUT "filament runout!" + #define JP_PREHEAT "Preheat" + #define JP_PREHEAT_BOTH "Both" + #define JP_PREHEAT_PLA "PLA" + #define JP_PREHEAT_PETG "PETG" + #define JP_PREHEAT_ABS "ABS" + #define JP_PREHEAT_CUSTOM1 "CUSTOM1" + #define JP_PREHEAT_CUSTOM2 "CUSTOM2" + #define JP_IS_PAUSE "Unable to extrude when printing, Pause printing?" + #define JP_AUTO_SHUT_DOWN "Auto Power" + #define JP_MANUAL_SHUT_DOWN "Manual" + #define JP_UNIFIEDMOVE "Movement" + #define JP_UNIFIEDHEAT "Heat&Fan" + #define JP_COOLDOWN "Cool Down" + #define JP_EMERGENCYSTOP "EM. STOP" + #define JP_TOUCH_TO_EXIT "Touch anywhere to exit" + #define JP_MAINMENU "Menu" + #define JP_WAIT_TEMP_SHUT_DOWN "Wait for the temperature of hotend to be lower than "STRINGIFY(AUTO_SHUT_DOWN_MAXTEMP)"℃" // Wait for the temperature of hotend to be lower than 50℃ + #define JP_FORCE_SHUT_DOWN "Force" + #define JP_SHUTTING_DOWN "Shutting down..." + +#endif diff --git a/TFT/src/User/API/Language/language_ru.h b/TFT/src/User/API/Language/language_ru.h index 459ce41419..fa8c8ac952 100644 --- a/TFT/src/User/API/Language/language_ru.h +++ b/TFT/src/User/API/Language/language_ru.h @@ -1,146 +1,146 @@ -#ifndef _LANGUAGE_RU_H_ -#define _LANGUAGE_RU_H_ - - #define RU_LANGUAGE "русский" - #define RU_HEAT "Подогрев" - #define RU_MOVE "Движение" - #define RU_HOME "Очистка" - #define RU_PRINT "Печать" - #define RU_EXTRUDE "Экструзия" - #define RU_FAN "Вентилятор" - #define RU_SETTINGS "Установка" - #define RU_SCREEN_SETTINGS "Screen" - #define RU_MACHINE_SETTINGS "Machine" - #define RU_FEATURE_SETTINGS "Feature" - #define RU_SILENT_ON "Silent On" - #define RU_SILENT_OFF "Silent Off" - #define RU_SHUT_DOWN "Shut Down" - #define RU_RGB_SETTINGS "LED Color" - #define RU_RGB_RED "Red" - #define RU_RGB_GREEN "Green" - #define RU_RGB_BLUE "Blue" - #define RU_RGB_WHITE "White" - #define RU_RGB_OFF "LED Off" - #define RU_GCODE "Gcode" - #define RU_CUSTOM "Custom" - #define RU_LEVELING "Стоп" - #define RU_POINT_1 "Point 1" - #define RU_POINT_2 "Point 2" - #define RU_POINT_3 "Point 3" - #define RU_POINT_4 "Point 4" - #define RU_ABL "Стоп" - #define RU_BLTOUCH "Bltouch" - #define RU_BLTOUCH_TEST "Test" - #define RU_BLTOUCH_DEPLOY "Deploy" - #define RU_BLTOUCH_STOW "Stow" - #define RU_BLTOUCH_REPEAT "Repeat" - #define RU_PROBE_OFFSET "Offset" - #define RU_EEPROM_SAVE "Save" - #define RU_INC "Увеличить" - #define RU_DEC "Уменьшить" - #define RU_NOZZLE "Сопло" - #define RU_BED "Под.Стола" - #define RU_STOP "Калибр." - #define RU_BACK "Возврат" - #define RU_PAGE_UP "Назад" - #define RU_PAGE_DOWN "Вперед" - #define RU_PAUSE "Пауза" - #define RU_RESUME "Продолжить" - #define RU_LOAD "Загрузка" - #define RU_UNLOAD "Выгрузка" - #define RU_SLOW_SPEED "Медленно" - #define RU_NORMAL_SPEED "Нормально" - #define RU_FAST_SPEED "Быстро" - #define RU_FAN_FULL_SPEED "Максимум" - #define RU_FAN_HALF_SPEED "Средняя ск." - #define RU_ROTATE_UI "Rotate UI" - #define RU_TOUCHSCREEN_ADJUST "Калибровка" - #define RU_MORE "More" - #define RU_SCREEN_INFO "Инфо" - #define RU_WHITE "белый" - #define RU_BLACK "чёрный" - #define RU_BLUE "синий" - #define RU_RED "красный" - #define RU_GREEN "зеленый" - #define RU_CYAN "синий" - #define RU_YELLOW "жёлтый" - #define RU_BROWN "коричневый" - #define RU_GRAY "серый" - #define RU_DISCONNECT "Disconnect" - #define RU_BAUDRATE_115200 "115200" - #define RU_BAUDRATE_250000 "250000" - #define RU_RUNOUT_OFF "Runout OFF" - #define RU_RUNOUT_ON "Runout ON" - #define RU_SMART_RUNOUT_ON "Smart ON" - #define RU_PERCENTAGE "Percentage" - #define RU_BABYSTEP "Микрошаг Z" - #define RU_PERCENTAGE_SPEED "Скорость" - #define RU_PERCENTAGE_FLOW "Поток" - #define RU_VALUE_ZERO "Zero" - #define RU_1_DEGREE "1℃" - #define RU_5_DEGREE "5℃" - #define RU_10_DEGREE "10℃" - #define RU_X_INC "X+" - #define RU_Y_INC "Y+" - #define RU_Z_INC "Z+" - #define RU_X_DEC "X-" - #define RU_Y_DEC "Y-" - #define RU_Z_DEC "Z-" - #define RU_X_HOME "X" - #define RU_Y_HOME "Y" - #define RU_Z_HOME "Z" - #define RU_001_MM "0.01mm" - #define RU_01_MM "0.1mm" - #define RU_1_MM "1mm" - #define RU_5_MM "5mm" - #define RU_10_MM "10mm" - #define RU_1_PERCENT "1%" - #define RU_5_PERCENT "5%" - #define RU_10_PERCENT "10%" - #define RU_READY "Готов" - #define RU_BUSY "Система занята..." - #define RU_UNCONNECTED "Нет подкл.!" - #define RU_DISCONNECT_INFO "Now you can control the printer by your computer!" - #define RU_LOADING "Загрузка..." - #define RU_POWER_FAILED "Continue printing?" - #define RU_CONTINUE "Continue" - #define RU_CANNEL "Cancel" - #define RU_ADJUST_TITLE "Touch Screen Calibration" - #define RU_ADJUST_INFO "Please click on the red dot" - #define RU_ADJUST_OK "Adjustment Success" - #define RU_ADJUST_FAILED "Adjustment failed, Please Try Again" - #define RU_WARNING "Warning" - #define RU_STOP_PRINT "Stop printing?" - #define RU_CONFIRM "Confirm" - #define RU_TFTSD "TFT SD" - #define RU_READ_TFTSD_ERROR "Read TFT SD card error!" - #define RU_TFTSD_INSERTED "Card inserted!" - #define RU_TFTSD_REMOVED "Card removed!" - #define RU_U_DISK "U Disk" - #define RU_READ_U_DISK_ERROR "Read U Disk error!" - #define RU_U_DISK_INSERTED "U Disk inserted!" - #define RU_U_DISK_REMOVED "U Disk removed!" - #define RU_ONBOARDSD "OnboardSD" - #define RU_READ_ONBOARDSD_ERROR "Read Onboard SD card error!" - #define RU_FILAMENT_RUNOUT "filament runout!" - #define RU_PREHEAT "Preheat" - #define RU_PREHEAT_BOTH "Both" - #define RU_PREHEAT_PLA "PLA" - #define RU_PREHEAT_PETG "PETG" - #define RU_PREHEAT_ABS "ABS" - #define RU_PREHEAT_CUSTOM1 "CUSTOM1" - #define RU_PREHEAT_CUSTOM2 "CUSTOM2" - #define RU_IS_PAUSE "Unable to extrude when printing, Pause printing?" - #define RU_AUTO_SHUT_DOWN "Auto Power" - #define RU_MANUAL_SHUT_DOWN "Manual" - #define RU_UNIFIEDMOVE "Movement" - #define RU_UNIFIEDHEAT "Heat&Fan" - #define RU_COOLDOWN "Cool Down" - #define RU_EMERGENCYSTOP "EM. STOP" - #define RU_TOUCH_TO_EXIT "Touch anywhere to exit" - #define RU_MAINMENU "Menu" - #define RU_WAIT_TEMP_SHUT_DOWN "Wait for the temperature of hotend to be lower than "STRINGIFY(AUTO_SHUT_DOWN_MAXTEMP)"℃" // Wait for the temperature of hotend to be lower than 50℃ - #define RU_FORCE_SHUT_DOWN "Force" - #define RU_SHUTTING_DOWN "Shutting down..." - -#endif +#ifndef _LANGUAGE_RU_H_ +#define _LANGUAGE_RU_H_ + + #define RU_LANGUAGE "русский" + #define RU_HEAT "Подогрев" + #define RU_MOVE "Движение" + #define RU_HOME "Очистка" + #define RU_PRINT "Печать" + #define RU_EXTRUDE "Экструзия" + #define RU_FAN "Вентилятор" + #define RU_SETTINGS "Установка" + #define RU_SCREEN_SETTINGS "Screen" + #define RU_MACHINE_SETTINGS "Machine" + #define RU_FEATURE_SETTINGS "Feature" + #define RU_SILENT_ON "Silent On" + #define RU_SILENT_OFF "Silent Off" + #define RU_SHUT_DOWN "Shut Down" + #define RU_RGB_SETTINGS "LED Color" + #define RU_RGB_RED "Red" + #define RU_RGB_GREEN "Green" + #define RU_RGB_BLUE "Blue" + #define RU_RGB_WHITE "White" + #define RU_RGB_OFF "LED Off" + #define RU_GCODE "Gcode" + #define RU_CUSTOM "Custom" + #define RU_LEVELING "Стоп" + #define RU_POINT_1 "Point 1" + #define RU_POINT_2 "Point 2" + #define RU_POINT_3 "Point 3" + #define RU_POINT_4 "Point 4" + #define RU_ABL "Стоп" + #define RU_BLTOUCH "Bltouch" + #define RU_BLTOUCH_TEST "Test" + #define RU_BLTOUCH_DEPLOY "Deploy" + #define RU_BLTOUCH_STOW "Stow" + #define RU_BLTOUCH_REPEAT "Repeat" + #define RU_PROBE_OFFSET "Offset" + #define RU_EEPROM_SAVE "Save" + #define RU_INC "Увеличить" + #define RU_DEC "Уменьшить" + #define RU_NOZZLE "Сопло" + #define RU_BED "Под.Стола" + #define RU_STOP "Калибр." + #define RU_BACK "Возврат" + #define RU_PAGE_UP "Назад" + #define RU_PAGE_DOWN "Вперед" + #define RU_PAUSE "Пауза" + #define RU_RESUME "Продолжить" + #define RU_LOAD "Загрузка" + #define RU_UNLOAD "Выгрузка" + #define RU_SLOW_SPEED "Медленно" + #define RU_NORMAL_SPEED "Нормально" + #define RU_FAST_SPEED "Быстро" + #define RU_FAN_FULL_SPEED "Максимум" + #define RU_FAN_HALF_SPEED "Средняя ск." + #define RU_ROTATE_UI "Rotate UI" + #define RU_TOUCHSCREEN_ADJUST "Калибровка" + #define RU_MORE "More" + #define RU_SCREEN_INFO "Инфо" + #define RU_WHITE "белый" + #define RU_BLACK "чёрный" + #define RU_BLUE "синий" + #define RU_RED "красный" + #define RU_GREEN "зеленый" + #define RU_CYAN "синий" + #define RU_YELLOW "жёлтый" + #define RU_BROWN "коричневый" + #define RU_GRAY "серый" + #define RU_DISCONNECT "Disconnect" + #define RU_BAUDRATE_115200 "115200" + #define RU_BAUDRATE_250000 "250000" + #define RU_RUNOUT_OFF "Runout OFF" + #define RU_RUNOUT_ON "Runout ON" + #define RU_SMART_RUNOUT_ON "Smart ON" + #define RU_PERCENTAGE "Percentage" + #define RU_BABYSTEP "Микрошаг Z" + #define RU_PERCENTAGE_SPEED "Скорость" + #define RU_PERCENTAGE_FLOW "Поток" + #define RU_VALUE_ZERO "Zero" + #define RU_1_DEGREE "1℃" + #define RU_5_DEGREE "5℃" + #define RU_10_DEGREE "10℃" + #define RU_X_INC "X+" + #define RU_Y_INC "Y+" + #define RU_Z_INC "Z+" + #define RU_X_DEC "X-" + #define RU_Y_DEC "Y-" + #define RU_Z_DEC "Z-" + #define RU_X_HOME "X" + #define RU_Y_HOME "Y" + #define RU_Z_HOME "Z" + #define RU_001_MM "0.01mm" + #define RU_01_MM "0.1mm" + #define RU_1_MM "1mm" + #define RU_5_MM "5mm" + #define RU_10_MM "10mm" + #define RU_1_PERCENT "1%" + #define RU_5_PERCENT "5%" + #define RU_10_PERCENT "10%" + #define RU_READY "Готов" + #define RU_BUSY "Система занята..." + #define RU_UNCONNECTED "Нет подкл.!" + #define RU_DISCONNECT_INFO "Now you can control the printer by your computer!" + #define RU_LOADING "Загрузка..." + #define RU_POWER_FAILED "Continue printing?" + #define RU_CONTINUE "Continue" + #define RU_CANNEL "Cancel" + #define RU_ADJUST_TITLE "Touch Screen Calibration" + #define RU_ADJUST_INFO "Please click on the red dot" + #define RU_ADJUST_OK "Adjustment Success" + #define RU_ADJUST_FAILED "Adjustment failed, Please Try Again" + #define RU_WARNING "Warning" + #define RU_STOP_PRINT "Stop printing?" + #define RU_CONFIRM "Confirm" + #define RU_TFTSD "TFT SD" + #define RU_READ_TFTSD_ERROR "Read TFT SD card error!" + #define RU_TFTSD_INSERTED "Card inserted!" + #define RU_TFTSD_REMOVED "Card removed!" + #define RU_U_DISK "U Disk" + #define RU_READ_U_DISK_ERROR "Read U Disk error!" + #define RU_U_DISK_INSERTED "U Disk inserted!" + #define RU_U_DISK_REMOVED "U Disk removed!" + #define RU_ONBOARDSD "OnboardSD" + #define RU_READ_ONBOARDSD_ERROR "Read Onboard SD card error!" + #define RU_FILAMENT_RUNOUT "filament runout!" + #define RU_PREHEAT "Preheat" + #define RU_PREHEAT_BOTH "Both" + #define RU_PREHEAT_PLA "PLA" + #define RU_PREHEAT_PETG "PETG" + #define RU_PREHEAT_ABS "ABS" + #define RU_PREHEAT_CUSTOM1 "CUSTOM1" + #define RU_PREHEAT_CUSTOM2 "CUSTOM2" + #define RU_IS_PAUSE "Unable to extrude when printing, Pause printing?" + #define RU_AUTO_SHUT_DOWN "Auto Power" + #define RU_MANUAL_SHUT_DOWN "Manual" + #define RU_UNIFIEDMOVE "Movement" + #define RU_UNIFIEDHEAT "Heat&Fan" + #define RU_COOLDOWN "Cool Down" + #define RU_EMERGENCYSTOP "EM. STOP" + #define RU_MAINMENU "Menu" + #define RU_TOUCH_TO_EXIT "Touch anywhere to exit" + #define RU_WAIT_TEMP_SHUT_DOWN "Wait for the temperature of hotend to be lower than "STRINGIFY(AUTO_SHUT_DOWN_MAXTEMP)"℃" // Wait for the temperature of hotend to be lower than 50℃ + #define RU_FORCE_SHUT_DOWN "Force" + #define RU_SHUTTING_DOWN "Shutting down..." + +#endif diff --git a/TFT/src/User/API/parseACK.c b/TFT/src/User/API/parseACK.c index 2f4ecddc0a..99416c746b 100644 --- a/TFT/src/User/API/parseACK.c +++ b/TFT/src/User/API/parseACK.c @@ -71,8 +71,8 @@ void ackPopupInfo(const char *info) } if (infoMenu.menu[infoMenu.cur] == menuTerminal) return; if (infoMenu.menu[infoMenu.cur] == menuStatus && info == echomagic) return; - - popupReminder((u8 *)info, (u8 *)dmaL2Cache + ack_index); + + popupReminder((u8* )info, (u8 *)dmaL2Cache + ack_index); } void syncL2CacheFromL1(uint8_t port) diff --git a/TFT/src/User/variants.h b/TFT/src/User/variants.h index b18a442101..027b12e56e 100644 --- a/TFT/src/User/variants.h +++ b/TFT/src/User/variants.h @@ -1,256 +1,256 @@ -#ifndef _VARIANTS_H_ -#define _VARIANTS_H_ - -#define USE_STDPERIPH_DRIVER -/* -* hardware source -* TIM4 for os timer -* TIM3 for buzzer timer -*/ - -//MCU type (STM32F103VC - HD, STM32F105 - CL, STM32F207VC) -//HSE crystal frequency -#if defined(TFT35_V1_0) || defined(TFT35_V1_1) || defined(TFT35_V1_2)|| defined(TFT28_V1_0) - #define VECT_TAB_FLASH 0x08006000 - #define HSE_VALUE ((uint32_t)16000000) //16Mhz - #define F_CPUM 72 - #define STM32F10X_HD - #include "stm32f10x.h" -#elif defined(TFT35_V2_0) - #define VECT_TAB_FLASH 0x08003000 - #define HSE_VALUE ((uint32_t)16000000) //16Mhz - #define F_CPUM 72 - #define STM32F10X_HD - #include "stm32f10x.h" -#elif defined(TFT24_V1_1) - #define VECT_TAB_FLASH 0x08006000 - #define HSE_VALUE ((uint32_t)8000000) //8Mhz - #define F_CPUM 72 - #define STM32F10X_CL - #include "stm32f10x.h" -#elif defined(TFT35_V3_0) - #define VECT_TAB_FLASH 0x08008000 - #define HSE_VALUE ((uint32_t)8000000) //8Mhz - #define F_CPUM 120 - #define STM32F2XX - #include "stm32f2xx.h" -#endif - -//LCD interface -#if defined(TFT35_V1_0) || defined(TFT35_V1_1) - #define RM68042 - #define STM32_HAS_FSMC - #define LCD_DATA_16BIT 0 -#elif defined(TFT35_V1_2) || defined(TFT35_V2_0) || defined(TFT35_V3_0) - #define ILI9488 - #define STM32_HAS_FSMC - #define LCD_DATA_16BIT 1 -#elif defined(TFT28_V1_0) - #define ILI9341 - #define STM32_HAS_FSMC - #define LCD_DATA_16BIT 1 -#elif defined(TFT24_V1_1) - #define ILI9341 - #define LCD_DATA_16BIT 1 -#endif - -//LCD Backlight pin (PWM can adjust brightness) -#if defined(TFT24_V1_1) - #define LCD_LED_PIN PA8 -#elif defined(TFT35_V3_0) - #define LCD_LED_PIN PD12 -#endif - -#if defined(TFT35_V1_0) || defined(TFT35_V1_1) || defined(TFT35_V1_2) || defined(TFT28_V1_0) || defined(TFT24_V1_1) - #define SERIAL_PORT _USART1 //default usart port -#elif defined(TFT35_V2_0) - #define SERIAL_PORT _USART1 //default usart port - #define SERIAL_PORT_2 _USART2 - #define SERIAL_PORT_3 _USART3 -#elif defined(TFT35_V3_0) - #define SERIAL_PORT _USART2 //default usart port - #define SERIAL_PORT_2 _USART1 - #define SERIAL_PORT_3 _USART3 - #define SERIAL_PORT_4 _UART4 -#endif - -//XPT2046 Software SPI Pins (touch screen ic) -//need CS/SCK/MISO/MOSI for Software SPI, and TPEN for pen interrupt -#if defined(TFT35_V1_0) || defined(TFT35_V1_1) || defined(TFT35_V1_2) || defined(TFT28_V1_0) - #define XPT2046_CS PC0 - #define XPT2046_SCK PC1 - #define XPT2046_MISO PC2 - #define XPT2046_MOSI PC3 - #define XPT2046_TPEN PC4 -#elif defined(TFT24_V1_1) - #define XPT2046_CS PA3 - #define XPT2046_SCK PA2 - #define XPT2046_MISO PA1 - #define XPT2046_MOSI PA0 - #define XPT2046_TPEN PA15 -#elif defined(TFT35_V2_0) - #define XPT2046_CS PC0 - #define XPT2046_SCK PB3 - #define XPT2046_MISO PB4 - #define XPT2046_MOSI PB5 - #define XPT2046_TPEN PC1 -#elif defined(TFT35_V3_0) - #define XPT2046_CS PE6 - #define XPT2046_SCK PE5 - #define XPT2046_MISO PE4 - #define XPT2046_MOSI PE3 - #define XPT2046_TPEN PC13 -#else - #error "xpt2046 need to Implement here by yourself." -#endif - -//SD Card SPI pins -#if defined(TFT35_V1_0) || defined(TFT35_V1_1) || defined(TFT35_V1_2) || defined(TFT28_V1_0) - #define SD_SPI_SUPPORT - #define SD_LOW_SPEED 7 - #define SD_HIGH_SPEED 0 - #define SD_SPI _SPI2 - #define SPI2_CS_PIN PB12 -#elif defined(TFT24_V1_1) || defined(TFT35_V3_0) - #define SD_SPI_SUPPORT - #define SD_LOW_SPEED 7 - #define SD_HIGH_SPEED 1 - #define SD_SPI _SPI1 - #define SPI1_CS_PIN PA4 -#elif defined(TFT35_V2_0) - #define SD_SDIO_SUPPORT -#endif - -//SD Card CD detect pin -#if defined(TFT28_V1_0) - #define SD_CD_PIN PB0 -#elif defined(TFT24_V1_1) - #define SD_CD_PIN PA13 -#elif defined(TFT35_V2_0) - #define SD_CD_PIN PC6 -#elif defined(TFT35_V3_0) - #define SD_CD_PIN PC4 -#endif - -//W25Qxx SPI pins -#if defined(TFT35_V1_0) || defined(TFT35_V1_1) || defined(TFT35_V1_2) || defined(TFT28_V1_0) || defined(TFT35_V2_0) - #define W25Qxx_SPEED 1 - #define W25Qxx_SPI _SPI1 - #define SPI1_CS_PIN PA4 -#elif defined(TFT24_V1_1) - #define W25Qxx_SPEED 0 - #define W25Qxx_SPI _SPI3 - #define SPI3_CS_PIN PD2 -#elif defined(TFT35_V3_0) - #define W25Qxx_SPEED 1 - #define W25Qxx_SPI _SPI3 - #define SPI3_CS_PIN PB6 -#endif - -//ST7920 Simulator SPI pins -#if defined(TFT24_V1_1) || defined(TFT35_V3_0) - #define ST7920_SPI _SPI2 -#endif - -//buzzer support -#if defined(TFT24_V1_1) - #define BUZZER_PIN PA14 -#elif defined(TFT35_V2_0) - #define BUZZER_PIN PB2 -#elif defined(TFT35_V3_0) - #define BUZZER_PIN PD13 -#endif - -//LCD Encoder support -#if defined(TFT24_V1_1) - //PB0:ENC-A PB1:ENC-B PB2:BTN - #define LCD_ENCA_PIN PB0 - #define LCD_ENCB_PIN PB1 - #define LCD_BTN_PIN PB2 -#elif defined(TFT35_V3_0) - //PA8:ENC-A PC9:ENC-B PC8:BTN - #define LCD_ENCA_PIN PA8 - #define LCD_ENCB_PIN PC9 - #define LCD_BTN_PIN PC8 -#endif -#define LCD_ENCODER_SUPPORT (defined(LCD_ENCA_PIN) && defined(LCD_ENCB_PIN) && defined(LCD_BTN_PIN)) - -//U disk support -#if defined(TFT24_V1_1) || defined(TFT35_V3_0) - #define U_DISK_SUPPROT - #define USE_USB_OTG_FS -#endif - -//extend function(PS_ON, filament_detect) -#if defined(TFT35_V2_0) - #define PS_ON_PIN PD12 - #define FIL_RUNOUT_PIN PD11 -#elif defined(TFT35_V3_0) - #define PS_ON_PIN PA12 - #define FIL_RUNOUT_PIN PA15 -#endif - -//Debug disable, free pins for other function -#if defined(TFT35_V1_0) || defined(TFT35_V1_1) || defined(TFT35_V1_2) || defined(TFT28_V1_0) || defined(TFT35_V2_0) - #define DISABLE_JTAG //free JTAG(PB3/PB4) for SPI3 -#elif defined(TFT24_V1_1) - #define DISABLE_DEBUG // -#elif defined(TFT35_V3_0) - //stm32f207 needn't this -#endif - -//LCD resolution, font and icon size -#if defined(TFT35_V1_0) || defined(TFT35_V1_1) || defined(TFT35_V1_2) || defined(TFT35_V2_0) || defined(TFT35_V3_0) - #define LCD_WIDTH 480 - #define LCD_HEIGHT 320 - - #define BYTE_HEIGHT 24 - #define BYTE_WIDTH (BYTE_HEIGHT/2) - - #define ICON_WIDTH 95 - #define ICON_HEIGHT 95 - #define TITLE_END_Y 60 - - #define selecticonw 95 -#elif defined(TFT28_V1_0) || defined(TFT24_V1_1) - #define LCD_WIDTH 320 - #define LCD_HEIGHT 240 - - #define BYTE_HEIGHT 16 - #define BYTE_WIDTH (BYTE_HEIGHT/2) - - #define ICON_WIDTH 70 - #define ICON_HEIGHT 70 - #define TITLE_END_Y 40 - - #define selecticonw 70 -#endif - -#if defined(TFT35_V1_0) || defined(TFT35_V1_1) || defined(TFT35_V1_2)|| defined(TFT35_V2_0) || defined(TFT35_V3_0) - #define ROOT_DIR "TFT35" -#elif defined(TFT28_V1_0) - #define ROOT_DIR "TFT28" -#elif defined(TFT24_V1_1) - #define ROOT_DIR "TFT24" -#endif - -//hardware version config -#ifndef HARDWARE_VERSION - #if defined(TFT35_V1_0) - #define HARDWARE_VERSION "TFT35_V1.0" - #elif defined(TFT35_V1_1) - #define HARDWARE_VERSION "TFT35_V1.1" - #elif defined(TFT35_V1_2) - #define HARDWARE_VERSION "TFT35_V1.2" - #elif defined(TFT28_V1_0) - #define HARDWARE_VERSION "TFT28_V1_0" - #elif defined(TFT24_V1_1) - #define HARDWARE_VERSION "TFT24_V1.1" - #elif defined(TFT35_V2_0) - #define HARDWARE_VERSION "TFT35_V2.0" - #elif defined(TFT35_V3_0) - #define HARDWARE_VERSION "TFT35_V3.0" - #endif -#endif - -#endif +#ifndef _VARIANTS_H_ +#define _VARIANTS_H_ + +#define USE_STDPERIPH_DRIVER +/* +* hardware source +* TIM4 for os timer +* TIM3 for buzzer timer +*/ + +//MCU type (STM32F103VC - HD, STM32F105 - CL, STM32F207VC) +//HSE crystal frequency +#if defined(TFT35_V1_0) || defined(TFT35_V1_1) || defined(TFT35_V1_2)|| defined(TFT28_V1_0) + #define VECT_TAB_FLASH 0x08006000 + #define HSE_VALUE ((uint32_t)16000000) //16Mhz + #define F_CPUM 72 + #define STM32F10X_HD + #include "stm32f10x.h" +#elif defined(TFT35_V2_0) + #define VECT_TAB_FLASH 0x08003000 + #define HSE_VALUE ((uint32_t)16000000) //16Mhz + #define F_CPUM 72 + #define STM32F10X_HD + #include "stm32f10x.h" +#elif defined(TFT24_V1_1) + #define VECT_TAB_FLASH 0x08006000 + #define HSE_VALUE ((uint32_t)8000000) //8Mhz + #define F_CPUM 72 + #define STM32F10X_CL + #include "stm32f10x.h" +#elif defined(TFT35_V3_0) + #define VECT_TAB_FLASH 0x08008000 + #define HSE_VALUE ((uint32_t)8000000) //8Mhz + #define F_CPUM 120 + #define STM32F2XX + #include "stm32f2xx.h" +#endif + +//LCD interface +#if defined(TFT35_V1_0) || defined(TFT35_V1_1) + #define RM68042 + #define STM32_HAS_FSMC + #define LCD_DATA_16BIT 0 +#elif defined(TFT35_V1_2) || defined(TFT35_V2_0) || defined(TFT35_V3_0) + #define ILI9488 + #define STM32_HAS_FSMC + #define LCD_DATA_16BIT 1 +#elif defined(TFT28_V1_0) + #define ILI9341 + #define STM32_HAS_FSMC + #define LCD_DATA_16BIT 1 +#elif defined(TFT24_V1_1) + #define ILI9341 + #define LCD_DATA_16BIT 1 +#endif + +//LCD Backlight pin (PWM can adjust brightness) +#if defined(TFT24_V1_1) + #define LCD_LED_PIN PA8 +#elif defined(TFT35_V3_0) + #define LCD_LED_PIN PD12 +#endif + +#if defined(TFT35_V1_0) || defined(TFT35_V1_1) || defined(TFT35_V1_2) || defined(TFT28_V1_0) || defined(TFT24_V1_1) + #define SERIAL_PORT _USART1 //default usart port +#elif defined(TFT35_V2_0) + #define SERIAL_PORT _USART1 //default usart port + #define SERIAL_PORT_2 _USART2 + #define SERIAL_PORT_3 _USART3 +#elif defined(TFT35_V3_0) + #define SERIAL_PORT _USART2 //default usart port + #define SERIAL_PORT_2 _USART1 + #define SERIAL_PORT_3 _USART3 + #define SERIAL_PORT_4 _UART4 +#endif + +//XPT2046 Software SPI Pins (touch screen ic) +//need CS/SCK/MISO/MOSI for Software SPI, and TPEN for pen interrupt +#if defined(TFT35_V1_0) || defined(TFT35_V1_1) || defined(TFT35_V1_2) || defined(TFT28_V1_0) + #define XPT2046_CS PC0 + #define XPT2046_SCK PC1 + #define XPT2046_MISO PC2 + #define XPT2046_MOSI PC3 + #define XPT2046_TPEN PC4 +#elif defined(TFT24_V1_1) + #define XPT2046_CS PA3 + #define XPT2046_SCK PA2 + #define XPT2046_MISO PA1 + #define XPT2046_MOSI PA0 + #define XPT2046_TPEN PA15 +#elif defined(TFT35_V2_0) + #define XPT2046_CS PC0 + #define XPT2046_SCK PB3 + #define XPT2046_MISO PB4 + #define XPT2046_MOSI PB5 + #define XPT2046_TPEN PC1 +#elif defined(TFT35_V3_0) + #define XPT2046_CS PE6 + #define XPT2046_SCK PE5 + #define XPT2046_MISO PE4 + #define XPT2046_MOSI PE3 + #define XPT2046_TPEN PC13 +#else + #error "xpt2046 need to Implement here by yourself." +#endif + +//SD Card SPI pins +#if defined(TFT35_V1_0) || defined(TFT35_V1_1) || defined(TFT35_V1_2) || defined(TFT28_V1_0) + #define SD_SPI_SUPPORT + #define SD_LOW_SPEED 7 + #define SD_HIGH_SPEED 0 + #define SD_SPI _SPI2 + #define SPI2_CS_PIN PB12 +#elif defined(TFT24_V1_1) || defined(TFT35_V3_0) + #define SD_SPI_SUPPORT + #define SD_LOW_SPEED 7 + #define SD_HIGH_SPEED 1 + #define SD_SPI _SPI1 + #define SPI1_CS_PIN PA4 +#elif defined(TFT35_V2_0) + #define SD_SDIO_SUPPORT +#endif + +//SD Card CD detect pin +#if defined(TFT28_V1_0) + #define SD_CD_PIN PB0 +#elif defined(TFT24_V1_1) + #define SD_CD_PIN PA13 +#elif defined(TFT35_V2_0) + #define SD_CD_PIN PC6 +#elif defined(TFT35_V3_0) + #define SD_CD_PIN PC4 +#endif + +//W25Qxx SPI pins +#if defined(TFT35_V1_0) || defined(TFT35_V1_1) || defined(TFT35_V1_2) || defined(TFT28_V1_0) || defined(TFT35_V2_0) + #define W25Qxx_SPEED 1 + #define W25Qxx_SPI _SPI1 + #define SPI1_CS_PIN PA4 +#elif defined(TFT24_V1_1) + #define W25Qxx_SPEED 0 + #define W25Qxx_SPI _SPI3 + #define SPI3_CS_PIN PD2 +#elif defined(TFT35_V3_0) + #define W25Qxx_SPEED 1 + #define W25Qxx_SPI _SPI3 + #define SPI3_CS_PIN PB6 +#endif + +//ST7920 Simulator SPI pins +#if defined(TFT24_V1_1) || defined(TFT35_V3_0) + #define ST7920_SPI _SPI2 +#endif + +//buzzer support +#if defined(TFT24_V1_1) + #define BUZZER_PIN PA14 +#elif defined(TFT35_V2_0) + #define BUZZER_PIN PB2 +#elif defined(TFT35_V3_0) + #define BUZZER_PIN PD13 +#endif + +//LCD Encoder support +#if defined(TFT24_V1_1) + //PB0:ENC-A PB1:ENC-B PB2:BTN + #define LCD_ENCA_PIN PB0 + #define LCD_ENCB_PIN PB1 + #define LCD_BTN_PIN PB2 +#elif defined(TFT35_V3_0) + //PA8:ENC-A PC9:ENC-B PC8:BTN + #define LCD_ENCA_PIN PA8 + #define LCD_ENCB_PIN PC9 + #define LCD_BTN_PIN PC8 +#endif +#define LCD_ENCODER_SUPPORT (defined(LCD_ENCA_PIN) && defined(LCD_ENCB_PIN) && defined(LCD_BTN_PIN)) + +//U disk support +#if defined(TFT24_V1_1) || defined(TFT35_V3_0) + #define U_DISK_SUPPROT + #define USE_USB_OTG_FS +#endif + +//extend function(PS_ON, filament_detect) +#if defined(TFT35_V2_0) + #define PS_ON_PIN PD12 + #define FIL_RUNOUT_PIN PD11 +#elif defined(TFT35_V3_0) + #define PS_ON_PIN PA12 + #define FIL_RUNOUT_PIN PA15 +#endif + +//Debug disable, free pins for other function +#if defined(TFT35_V1_0) || defined(TFT35_V1_1) || defined(TFT35_V1_2) || defined(TFT28_V1_0) || defined(TFT35_V2_0) + #define DISABLE_JTAG //free JTAG(PB3/PB4) for SPI3 +#elif defined(TFT24_V1_1) + #define DISABLE_DEBUG // +#elif defined(TFT35_V3_0) + //stm32f207 needn't this +#endif + +//LCD resolution, font and icon size +#if defined(TFT35_V1_0) || defined(TFT35_V1_1) || defined(TFT35_V1_2) || defined(TFT35_V2_0) || defined(TFT35_V3_0) + #define LCD_WIDTH 480 + #define LCD_HEIGHT 320 + + #define BYTE_HEIGHT 24 + #define BYTE_WIDTH (BYTE_HEIGHT/2) + + #define ICON_WIDTH 95 + #define ICON_HEIGHT 95 + #define TITLE_END_Y 60 + + #define selecticonw 95 +#elif defined(TFT28_V1_0) || defined(TFT24_V1_1) + #define LCD_WIDTH 320 + #define LCD_HEIGHT 240 + + #define BYTE_HEIGHT 16 + #define BYTE_WIDTH (BYTE_HEIGHT/2) + + #define ICON_WIDTH 70 + #define ICON_HEIGHT 70 + #define TITLE_END_Y 40 + + #define selecticonw 70 +#endif + +#if defined(TFT35_V1_0) || defined(TFT35_V1_1) || defined(TFT35_V1_2)|| defined(TFT35_V2_0) || defined(TFT35_V3_0) + #define ROOT_DIR "TFT35" +#elif defined(TFT28_V1_0) + #define ROOT_DIR "TFT28" +#elif defined(TFT24_V1_1) + #define ROOT_DIR "TFT24" +#endif + +//hardware version config +#ifndef HARDWARE_VERSION + #if defined(TFT35_V1_0) + #define HARDWARE_VERSION "TFT35_V1.0" + #elif defined(TFT35_V1_1) + #define HARDWARE_VERSION "TFT35_V1.1" + #elif defined(TFT35_V1_2) + #define HARDWARE_VERSION "TFT35_V1.2" + #elif defined(TFT28_V1_0) + #define HARDWARE_VERSION "TFT28_V1_0" + #elif defined(TFT24_V1_1) + #define HARDWARE_VERSION "TFT24_V1.1" + #elif defined(TFT35_V2_0) + #define HARDWARE_VERSION "TFT35_V2.0" + #elif defined(TFT35_V3_0) + #define HARDWARE_VERSION "TFT35_V3.0" + #endif +#endif + +#endif diff --git a/buildroot/ldscripts/stm32f10x_0x6000_iap.ld b/buildroot/ldscripts/stm32f10x_0x6000_iap.ld index 4ec3197e48..0497823bb5 100644 --- a/buildroot/ldscripts/stm32f10x_0x6000_iap.ld +++ b/buildroot/ldscripts/stm32f10x_0x6000_iap.ld @@ -1,170 +1,170 @@ -/* -***************************************************************************** -** -** File : stm32_flash.ld -** -** Abstract : Linker script for STM32F103VC Device with -** 256KByte FLASH, 48KByte RAM -** -** Set heap size, stack size and stack location according -** to application requirements. -** -** Set memory bank area and size if external memory is used. -** -** Target : STMicroelectronics STM32 -** -** Environment : Atollic TrueSTUDIO(R) -** -** Distribution: The file is distributed �as is,� without any warranty -** of any kind. -** -** (c)Copyright Atollic AB. -** You may use this file as-is or modify it according to the needs of your -** project. Distribution of this file (unmodified or modified) is not -** permitted. Atollic AB permit registered Atollic TrueSTUDIO(R) users the -** rights to distribute the assembled, compiled & linked contents of this -** file as part of an application binary file, provided that it is built -** using the Atollic TrueSTUDIO(R) toolchain. -** -***************************************************************************** -*/ - -/* Entry Point */ -ENTRY(Reset_Handler) - -/* Highest address of the user mode stack */ -_estack = 0x2000C000; /* end of 48K RAM */ - -/* Generate a link error if heap and stack don't fit into RAM */ -_Min_Heap_Size = 0x5000; /* required amount of heap */ -_Min_Stack_Size = 0x1000; /* required amount of stack */ - -/* Specify the memory areas */ -MEMORY -{ - FLASH (rx) : ORIGIN = 0x08006000, LENGTH = 256K - 24K - RAM (xrw) : ORIGIN = 0x20000000, LENGTH = 48K - MEMORY_B1 (rx) : ORIGIN = 0x60000000, LENGTH = 0K -} - -/* Define output sections */ -SECTIONS -{ - /* The startup code goes first into FLASH */ - .isr_vector : - { - . = ALIGN(4); - KEEP(*(.isr_vector)) /* Startup code */ - . = ALIGN(4); - } >FLASH - - /* The program code and other data goes into FLASH */ - .text : - { - . = ALIGN(4); - *(.text) /* .text sections (code) */ - *(.text*) /* .text* sections (code) */ - *(.rodata) /* .rodata sections (constants, strings, etc.) */ - *(.rodata*) /* .rodata* sections (constants, strings, etc.) */ - *(.glue_7) /* glue arm to thumb code */ - *(.glue_7t) /* glue thumb to arm code */ - - KEEP (*(.init)) - KEEP (*(.fini)) - - . = ALIGN(4); - _etext = .; /* define a global symbols at end of code */ - } >FLASH - - - .ARM.extab : { *(.ARM.extab* .gnu.linkonce.armextab.*) } >FLASH - .ARM : { - __exidx_start = .; - *(.ARM.exidx*) - __exidx_end = .; - } >FLASH - - .ARM.attributes : { *(.ARM.attributes) } > FLASH - - .preinit_array : - { - PROVIDE_HIDDEN (__preinit_array_start = .); - KEEP (*(.preinit_array*)) - PROVIDE_HIDDEN (__preinit_array_end = .); - } >FLASH - .init_array : - { - PROVIDE_HIDDEN (__init_array_start = .); - KEEP (*(SORT(.init_array.*))) - KEEP (*(.init_array*)) - PROVIDE_HIDDEN (__init_array_end = .); - } >FLASH - .fini_array : - { - PROVIDE_HIDDEN (__fini_array_start = .); - KEEP (*(.fini_array*)) - KEEP (*(SORT(.fini_array.*))) - PROVIDE_HIDDEN (__fini_array_end = .); - } >FLASH - - /* used by the startup to initialize data */ - _sidata = .; - - /* Initialized data sections goes into RAM, load LMA copy after code */ - .data : AT ( _sidata ) - { - . = ALIGN(4); - _sdata = .; /* create a global symbol at data start */ - *(.data) /* .data sections */ - *(.data*) /* .data* sections */ - - . = ALIGN(4); - _edata = .; /* define a global symbol at data end */ - } >RAM - - /* Uninitialized data section */ - . = ALIGN(4); - .bss : - { - /* This is used by the startup in order to initialize the .bss secion */ - _sbss = .; /* define a global symbol at bss start */ - __bss_start__ = _sbss; - *(.bss) - *(.bss*) - *(COMMON) - - . = ALIGN(4); - _ebss = .; /* define a global symbol at bss end */ - __bss_end__ = _ebss; - } >RAM - - PROVIDE ( end = _ebss ); - PROVIDE ( _end = _ebss ); - - /* User_heap_stack section, used to check that there is enough RAM left */ - ._user_heap_stack : - { - . = ALIGN(4); - . = . + _Min_Heap_Size; - . = . + _Min_Stack_Size; - . = ALIGN(4); - } >RAM - - /* MEMORY_bank1 section, code must be located here explicitly */ - /* Example: extern int foo(void) __attribute__ ((section (".mb1text"))); */ - .memory_b1_text : - { - *(.mb1text) /* .mb1text sections (code) */ - *(.mb1text*) /* .mb1text* sections (code) */ - *(.mb1rodata) /* read-only data (constants) */ - *(.mb1rodata*) - } >MEMORY_B1 - - /* Remove information from the standard libraries */ - /DISCARD/ : - { - libc.a ( * ) - libm.a ( * ) - libgcc.a ( * ) - } -} +/* +***************************************************************************** +** +** File : stm32_flash.ld +** +** Abstract : Linker script for STM32F103VC Device with +** 256KByte FLASH, 48KByte RAM +** +** Set heap size, stack size and stack location according +** to application requirements. +** +** Set memory bank area and size if external memory is used. +** +** Target : STMicroelectronics STM32 +** +** Environment : Atollic TrueSTUDIO(R) +** +** Distribution: The file is distributed �as is,� without any warranty +** of any kind. +** +** (c)Copyright Atollic AB. +** You may use this file as-is or modify it according to the needs of your +** project. Distribution of this file (unmodified or modified) is not +** permitted. Atollic AB permit registered Atollic TrueSTUDIO(R) users the +** rights to distribute the assembled, compiled & linked contents of this +** file as part of an application binary file, provided that it is built +** using the Atollic TrueSTUDIO(R) toolchain. +** +***************************************************************************** +*/ + +/* Entry Point */ +ENTRY(Reset_Handler) + +/* Highest address of the user mode stack */ +_estack = 0x2000C000; /* end of 48K RAM */ + +/* Generate a link error if heap and stack don't fit into RAM */ +_Min_Heap_Size = 0x5000; /* required amount of heap */ +_Min_Stack_Size = 0x1000; /* required amount of stack */ + +/* Specify the memory areas */ +MEMORY +{ + FLASH (rx) : ORIGIN = 0x08006000, LENGTH = 256K - 24K + RAM (xrw) : ORIGIN = 0x20000000, LENGTH = 48K + MEMORY_B1 (rx) : ORIGIN = 0x60000000, LENGTH = 0K +} + +/* Define output sections */ +SECTIONS +{ + /* The startup code goes first into FLASH */ + .isr_vector : + { + . = ALIGN(4); + KEEP(*(.isr_vector)) /* Startup code */ + . = ALIGN(4); + } >FLASH + + /* The program code and other data goes into FLASH */ + .text : + { + . = ALIGN(4); + *(.text) /* .text sections (code) */ + *(.text*) /* .text* sections (code) */ + *(.rodata) /* .rodata sections (constants, strings, etc.) */ + *(.rodata*) /* .rodata* sections (constants, strings, etc.) */ + *(.glue_7) /* glue arm to thumb code */ + *(.glue_7t) /* glue thumb to arm code */ + + KEEP (*(.init)) + KEEP (*(.fini)) + + . = ALIGN(4); + _etext = .; /* define a global symbols at end of code */ + } >FLASH + + + .ARM.extab : { *(.ARM.extab* .gnu.linkonce.armextab.*) } >FLASH + .ARM : { + __exidx_start = .; + *(.ARM.exidx*) + __exidx_end = .; + } >FLASH + + .ARM.attributes : { *(.ARM.attributes) } > FLASH + + .preinit_array : + { + PROVIDE_HIDDEN (__preinit_array_start = .); + KEEP (*(.preinit_array*)) + PROVIDE_HIDDEN (__preinit_array_end = .); + } >FLASH + .init_array : + { + PROVIDE_HIDDEN (__init_array_start = .); + KEEP (*(SORT(.init_array.*))) + KEEP (*(.init_array*)) + PROVIDE_HIDDEN (__init_array_end = .); + } >FLASH + .fini_array : + { + PROVIDE_HIDDEN (__fini_array_start = .); + KEEP (*(.fini_array*)) + KEEP (*(SORT(.fini_array.*))) + PROVIDE_HIDDEN (__fini_array_end = .); + } >FLASH + + /* used by the startup to initialize data */ + _sidata = .; + + /* Initialized data sections goes into RAM, load LMA copy after code */ + .data : AT ( _sidata ) + { + . = ALIGN(4); + _sdata = .; /* create a global symbol at data start */ + *(.data) /* .data sections */ + *(.data*) /* .data* sections */ + + . = ALIGN(4); + _edata = .; /* define a global symbol at data end */ + } >RAM + + /* Uninitialized data section */ + . = ALIGN(4); + .bss : + { + /* This is used by the startup in order to initialize the .bss secion */ + _sbss = .; /* define a global symbol at bss start */ + __bss_start__ = _sbss; + *(.bss) + *(.bss*) + *(COMMON) + + . = ALIGN(4); + _ebss = .; /* define a global symbol at bss end */ + __bss_end__ = _ebss; + } >RAM + + PROVIDE ( end = _ebss ); + PROVIDE ( _end = _ebss ); + + /* User_heap_stack section, used to check that there is enough RAM left */ + ._user_heap_stack : + { + . = ALIGN(4); + . = . + _Min_Heap_Size; + . = . + _Min_Stack_Size; + . = ALIGN(4); + } >RAM + + /* MEMORY_bank1 section, code must be located here explicitly */ + /* Example: extern int foo(void) __attribute__ ((section (".mb1text"))); */ + .memory_b1_text : + { + *(.mb1text) /* .mb1text sections (code) */ + *(.mb1text*) /* .mb1text* sections (code) */ + *(.mb1rodata) /* read-only data (constants) */ + *(.mb1rodata*) + } >MEMORY_B1 + + /* Remove information from the standard libraries */ + /DISCARD/ : + { + libc.a ( * ) + libm.a ( * ) + libgcc.a ( * ) + } +}