diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md old mode 100755 new mode 100644 index 2526752987..aae58f8854 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -2,7 +2,7 @@ name: Bug report about: Create a report to help us improve title: '[BUG] (short description)' -labels: '' +labels: 'bug' assignees: '' --- @@ -25,6 +25,11 @@ Do you want to ask a question? Are you looking for support? Please don't post he **Actual behavior** +### Hardware Variant + +### TFT Firmware Version & Main Board Firmware details + + ### Additional Information * Include a ZIP file containing your `Configuration.h` or use [Pastebin](https://pastebin.com/) and paste a link in this issue. * Provide pictures or links to videos that clearly demonstrate the issue. diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md index 4e7e92aaa4..c040a4cbd4 100755 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -2,7 +2,7 @@ name: Feature request about: Suggest an idea for this project title: '[FR] (feature request title)' -labels: '' +labels: 'enhancement' assignees: '' --- diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md new file mode 100644 index 0000000000..0aaa523e50 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/question.md @@ -0,0 +1,16 @@ +--- +name: Ask a question +about: Ask a question or request details +title: '[Q] (Your Question?)' +labels: 'question' +assignees: '' + +--- + +**Your question or details you need. Please describe.** +A clear and concise question or detail you would like to ask. Like Hardware related or firmware related. + +**specify the device variant related to your question.** + +**Additional context** +Add any other context or screenshots about the question here. diff --git a/Copy to SD Card root directory to update - Unified Menu Material theme/TFT35/bmp/InfoBox_part1.bmp b/Copy to SD Card root directory to update - Unified Menu Material theme/TFT24/bmp/InfoBox.bmp similarity index 80% rename from Copy to SD Card root directory to update - Unified Menu Material theme/TFT35/bmp/InfoBox_part1.bmp rename to Copy to SD Card root directory to update - Unified Menu Material theme/TFT24/bmp/InfoBox.bmp index 2244edb2b8..703de802cf 100644 Binary files a/Copy to SD Card root directory to update - Unified Menu Material theme/TFT35/bmp/InfoBox_part1.bmp and b/Copy to SD Card root directory to update - Unified Menu Material theme/TFT24/bmp/InfoBox.bmp differ diff --git a/Copy to SD Card root directory to update - Unified Menu Material theme/TFT24/bmp/InfoBox_part1.bmp b/Copy to SD Card root directory to update - Unified Menu Material theme/TFT24/bmp/InfoBox_part1.bmp deleted file mode 100644 index 0f543252e0..0000000000 Binary files a/Copy to SD Card root directory to update - Unified Menu Material theme/TFT24/bmp/InfoBox_part1.bmp and /dev/null differ diff --git a/Copy to SD Card root directory to update - Unified Menu Material theme/TFT24/bmp/InfoBox_part2.bmp b/Copy to SD Card root directory to update - Unified Menu Material theme/TFT24/bmp/InfoBox_part2.bmp deleted file mode 100644 index 0f543252e0..0000000000 Binary files a/Copy to SD Card root directory to update - Unified Menu Material theme/TFT24/bmp/InfoBox_part2.bmp and /dev/null differ diff --git a/Copy to SD Card root directory to update - Unified Menu Material theme/TFT24/bmp/global_bed.bmp b/Copy to SD Card root directory to update - Unified Menu Material theme/TFT24/bmp/global_bed.bmp index b4aa17c335..c3d2c8462d 100644 Binary files a/Copy to SD Card root directory to update - Unified Menu Material theme/TFT24/bmp/global_bed.bmp and b/Copy to SD Card root directory to update - Unified Menu Material theme/TFT24/bmp/global_bed.bmp differ diff --git a/Copy to SD Card root directory to update - Unified Menu Material theme/TFT24/bmp/global_nozzle.bmp b/Copy to SD Card root directory to update - Unified Menu Material theme/TFT24/bmp/global_nozzle.bmp index df8b410856..db2d675196 100644 Binary files a/Copy to SD Card root directory to update - Unified Menu Material theme/TFT24/bmp/global_nozzle.bmp and b/Copy to SD Card root directory to update - Unified Menu Material theme/TFT24/bmp/global_nozzle.bmp differ diff --git a/Copy to SD Card root directory to update - Unified Menu Material theme/TFT35/bmp/InfoBox_part2.bmp b/Copy to SD Card root directory to update - Unified Menu Material theme/TFT28/bmp/InfoBox.bmp similarity index 77% rename from Copy to SD Card root directory to update - Unified Menu Material theme/TFT35/bmp/InfoBox_part2.bmp rename to Copy to SD Card root directory to update - Unified Menu Material theme/TFT28/bmp/InfoBox.bmp index 847dba5390..703de802cf 100644 Binary files a/Copy to SD Card root directory to update - Unified Menu Material theme/TFT35/bmp/InfoBox_part2.bmp and b/Copy to SD Card root directory to update - Unified Menu Material theme/TFT28/bmp/InfoBox.bmp differ diff --git a/Copy to SD Card root directory to update - Unified Menu Material theme/TFT28/bmp/InfoBox_part1.bmp b/Copy to SD Card root directory to update - Unified Menu Material theme/TFT28/bmp/InfoBox_part1.bmp deleted file mode 100644 index 0f543252e0..0000000000 Binary files a/Copy to SD Card root directory to update - Unified Menu Material theme/TFT28/bmp/InfoBox_part1.bmp and /dev/null differ diff --git a/Copy to SD Card root directory to update - Unified Menu Material theme/TFT28/bmp/InfoBox_part2.bmp b/Copy to SD Card root directory to update - Unified Menu Material theme/TFT28/bmp/InfoBox_part2.bmp deleted file mode 100644 index 0f543252e0..0000000000 Binary files a/Copy to SD Card root directory to update - Unified Menu Material theme/TFT28/bmp/InfoBox_part2.bmp and /dev/null differ diff --git a/Copy to SD Card root directory to update - Unified Menu Material theme/TFT28/bmp/global_bed.bmp b/Copy to SD Card root directory to update - Unified Menu Material theme/TFT28/bmp/global_bed.bmp index b4aa17c335..c3d2c8462d 100644 Binary files a/Copy to SD Card root directory to update - Unified Menu Material theme/TFT28/bmp/global_bed.bmp and b/Copy to SD Card root directory to update - Unified Menu Material theme/TFT28/bmp/global_bed.bmp differ diff --git a/Copy to SD Card root directory to update - Unified Menu Material theme/TFT28/bmp/global_nozzle.bmp b/Copy to SD Card root directory to update - Unified Menu Material theme/TFT28/bmp/global_nozzle.bmp index df8b410856..db2d675196 100644 Binary files a/Copy to SD Card root directory to update - Unified Menu Material theme/TFT28/bmp/global_nozzle.bmp and b/Copy to SD Card root directory to update - Unified Menu Material theme/TFT28/bmp/global_nozzle.bmp differ diff --git a/Copy to SD Card root directory to update - Unified Menu Material theme/TFT28/bmp/parametersetting.bmp b/Copy to SD Card root directory to update - Unified Menu Material theme/TFT28/bmp/parametersetting.bmp index 974311f48b..48bae0f941 100644 Binary files a/Copy to SD Card root directory to update - Unified Menu Material theme/TFT28/bmp/parametersetting.bmp and b/Copy to SD Card root directory to update - Unified Menu Material theme/TFT28/bmp/parametersetting.bmp differ diff --git a/Copy to SD Card root directory to update - Unified Menu Material theme/TFT35/bmp/InfoBox.bmp b/Copy to SD Card root directory to update - Unified Menu Material theme/TFT35/bmp/InfoBox.bmp new file mode 100644 index 0000000000..517723659b Binary files /dev/null and b/Copy to SD Card root directory to update - Unified Menu Material theme/TFT35/bmp/InfoBox.bmp differ diff --git a/Copy to SD Card root directory to update - Unified Menu Material theme/TFT35/bmp/global_bed.bmp b/Copy to SD Card root directory to update - Unified Menu Material theme/TFT35/bmp/global_bed.bmp index 141e4f6f9b..2b11c39df4 100644 Binary files a/Copy to SD Card root directory to update - Unified Menu Material theme/TFT35/bmp/global_bed.bmp and b/Copy to SD Card root directory to update - Unified Menu Material theme/TFT35/bmp/global_bed.bmp differ diff --git a/Copy to SD Card root directory to update - Unified Menu Material theme/TFT35/bmp/global_nozzle.bmp b/Copy to SD Card root directory to update - Unified Menu Material theme/TFT35/bmp/global_nozzle.bmp index 6dc26735ee..ed0c31c35d 100644 Binary files a/Copy to SD Card root directory to update - Unified Menu Material theme/TFT35/bmp/global_nozzle.bmp and b/Copy to SD Card root directory to update - Unified Menu Material theme/TFT35/bmp/global_nozzle.bmp differ diff --git a/Copy to SD Card root directory to update - Unified Menu Material theme/TFT35/bmp/parametersetting.bmp b/Copy to SD Card root directory to update - Unified Menu Material theme/TFT35/bmp/parametersetting.bmp index 39a0c9bbf6..48bae0f941 100644 Binary files a/Copy to SD Card root directory to update - Unified Menu Material theme/TFT35/bmp/parametersetting.bmp and b/Copy to SD Card root directory to update - Unified Menu Material theme/TFT35/bmp/parametersetting.bmp differ diff --git a/Copy to SD Card root directory to update - Unified Menu Material theme/TFT35/font/word_unicode.fon b/Copy to SD Card root directory to update - Unified Menu Material theme/TFT35/font/word_unicode.fon index e2ee0979c0..dcb0e7b074 100644 Binary files a/Copy to SD Card root directory to update - Unified Menu Material theme/TFT35/font/word_unicode.fon and b/Copy to SD Card root directory to update - Unified Menu Material theme/TFT35/font/word_unicode.fon differ diff --git a/TFT/src/User/API/Language/Language.c b/TFT/src/User/API/Language/Language.c index 87d6b75cb8..1a2c539b7e 100644 --- a/TFT/src/User/API/Language/Language.c +++ b/TFT/src/User/API/Language/Language.c @@ -13,6 +13,7 @@ #include "language_it.h" #include "language_pl.h" #include "language_sk.h" +#include "language_du.h" const char *const en_pack[LABEL_NUM]={ EN_LANGUAGE, @@ -30,10 +31,6 @@ const char *const en_pack[LABEL_NUM]={ EN_SILENT_OFF, EN_SHUT_DOWN, EN_RGB_SETTINGS, - EN_RGB_RED, - EN_RGB_GREEN, - EN_RGB_BLUE, - EN_RGB_WHITE, EN_RGB_OFF, EN_GCODE, EN_CUSTOM, @@ -80,6 +77,9 @@ const char *const en_pack[LABEL_NUM]={ EN_YELLOW, EN_BROWN, EN_GRAY, + EN_ORANGE, + EN_INDIGO, + EN_VIOLET, EN_DISCONNECT, EN_BAUDRATE_115200, EN_BAUDRATE_250000, @@ -156,15 +156,6 @@ const char *const en_pack[LABEL_NUM]={ EN_WAIT_TEMP_SHUT_DOWN, EN_FORCE_SHUT_DOWN, EN_SHUTTING_DOWN, - EN_LEDOFF, - EN_LEDWHITE, - EN_LEDRED, - EN_LEDORANGE, - EN_LEDYELLOW, - EN_LEDGREEN, - EN_LEDBLUE, - EN_LEDINDIGO, - EN_LEDVIOLET, EN_PARAMETER_SETTING, EN_ON, EN_OFF, @@ -174,6 +165,7 @@ const char *const en_pack[LABEL_NUM]={ EN_INVERT_YAXIS, EN_INVERT_ZAXIS, EN_MOVE_SPEED, + EN_KNOB_LED, }; const char *const cn_pack[LABEL_NUM]={ @@ -192,10 +184,6 @@ const char *const cn_pack[LABEL_NUM]={ CN_SILENT_OFF, CN_SHUT_DOWN, CN_RGB_SETTINGS, - CN_RGB_RED, - CN_RGB_GREEN, - CN_RGB_BLUE, - CN_RGB_WHITE, CN_RGB_OFF, CN_GCODE, CN_CUSTOM, @@ -242,6 +230,9 @@ const char *const cn_pack[LABEL_NUM]={ CN_YELLOW, CN_BROWN, CN_GRAY, + CN_ORANGE, + CN_INDIGO, + CN_VIOLET, CN_DISCONNECT, CN_BAUDRATE_115200, CN_BAUDRATE_250000, @@ -318,15 +309,6 @@ const char *const cn_pack[LABEL_NUM]={ CN_WAIT_TEMP_SHUT_DOWN, CN_FORCE_SHUT_DOWN, CN_SHUTTING_DOWN, - CN_LEDOFF, - CN_LEDWHITE, - CN_LEDRED, - CN_LEDORANGE, - CN_LEDYELLOW, - CN_LEDGREEN, - CN_LEDBLUE, - CN_LEDINDIGO, - CN_LEDVIOLET, CN_PARAMETER_SETTING, CN_ON, CN_OFF, @@ -336,6 +318,7 @@ const char *const cn_pack[LABEL_NUM]={ CN_INVERT_YAXIS, CN_INVERT_ZAXIS, CN_MOVE_SPEED, + CN_KNOB_LED, }; const char *const ru_pack[LABEL_NUM]={ @@ -354,10 +337,6 @@ const char *const ru_pack[LABEL_NUM]={ RU_SILENT_OFF, RU_SHUT_DOWN, RU_RGB_SETTINGS, - RU_RGB_RED, - RU_RGB_GREEN, - RU_RGB_BLUE, - RU_RGB_WHITE, RU_RGB_OFF, RU_GCODE, RU_CUSTOM, @@ -404,6 +383,9 @@ const char *const ru_pack[LABEL_NUM]={ RU_YELLOW, RU_BROWN, RU_GRAY, + RU_ORANGE, + RU_INDIGO, + RU_VIOLET, RU_DISCONNECT, RU_BAUDRATE_115200, RU_BAUDRATE_250000, @@ -480,15 +462,6 @@ const char *const ru_pack[LABEL_NUM]={ RU_WAIT_TEMP_SHUT_DOWN, RU_FORCE_SHUT_DOWN, RU_SHUTTING_DOWN, - RU_LEDOFF, - RU_LEDWHITE, - RU_LEDRED, - RU_LEDORANGE, - RU_LEDYELLOW, - RU_LEDGREEN, - RU_LEDBLUE, - RU_LEDINDIGO, - RU_LEDVIOLET, RU_PARAMETER_SETTING, RU_ON, RU_OFF, @@ -498,6 +471,7 @@ const char *const ru_pack[LABEL_NUM]={ RU_INVERT_YAXIS, RU_INVERT_ZAXIS, RU_MOVE_SPEED, + RU_KNOB_LED, }; const char *const jp_pack[LABEL_NUM]={ @@ -516,10 +490,6 @@ const char *const jp_pack[LABEL_NUM]={ JP_SILENT_OFF, JP_SHUT_DOWN, JP_RGB_SETTINGS, - JP_RGB_RED, - JP_RGB_GREEN, - JP_RGB_BLUE, - JP_RGB_WHITE, JP_RGB_OFF, JP_GCODE, JP_CUSTOM, @@ -566,6 +536,9 @@ const char *const jp_pack[LABEL_NUM]={ JP_YELLOW, JP_BROWN, JP_GRAY, + JP_ORANGE, + JP_INDIGO, + JP_VIOLET, JP_DISCONNECT, JP_BAUDRATE_115200, JP_BAUDRATE_250000, @@ -642,15 +615,6 @@ const char *const jp_pack[LABEL_NUM]={ JP_WAIT_TEMP_SHUT_DOWN, JP_FORCE_SHUT_DOWN, JP_SHUTTING_DOWN, - JP_LEDOFF, - JP_LEDWHITE, - JP_LEDRED, - JP_LEDORANGE, - JP_LEDYELLOW, - JP_LEDGREEN, - JP_LEDBLUE, - JP_LEDINDIGO, - JP_LEDVIOLET, JP_PARAMETER_SETTING, JP_ON, JP_OFF, @@ -660,6 +624,7 @@ const char *const jp_pack[LABEL_NUM]={ JP_INVERT_YAXIS, JP_INVERT_ZAXIS, JP_MOVE_SPEED, + JP_KNOB_LED, }; const char *const am_pack[LABEL_NUM]={ @@ -678,10 +643,6 @@ const char *const am_pack[LABEL_NUM]={ AM_SILENT_OFF, AM_SHUT_DOWN, AM_RGB_SETTINGS, - AM_RGB_RED, - AM_RGB_GREEN, - AM_RGB_BLUE, - AM_RGB_WHITE, AM_RGB_OFF, AM_GCODE, AM_CUSTOM, @@ -728,6 +689,9 @@ const char *const am_pack[LABEL_NUM]={ AM_YELLOW, AM_BROWN, AM_GRAY, + AM_ORANGE, + AM_INDIGO, + AM_VIOLET, AM_DISCONNECT, AM_BAUDRATE_115200, AM_BAUDRATE_250000, @@ -804,15 +768,6 @@ const char *const am_pack[LABEL_NUM]={ AM_WAIT_TEMP_SHUT_DOWN, AM_FORCE_SHUT_DOWN, AM_SHUTTING_DOWN, - AM_LEDOFF, - AM_LEDWHITE, - AM_LEDRED, - AM_LEDORANGE, - AM_LEDYELLOW, - AM_LEDGREEN, - AM_LEDBLUE, - AM_LEDINDIGO, - AM_LEDVIOLET, AM_PARAMETER_SETTING, AM_ON, AM_OFF, @@ -822,6 +777,7 @@ const char *const am_pack[LABEL_NUM]={ AM_INVERT_YAXIS, AM_INVERT_ZAXIS, AM_MOVE_SPEED, + AM_KNOB_LED, }; const char *const de_pack[LABEL_NUM]={ @@ -840,10 +796,6 @@ const char *const de_pack[LABEL_NUM]={ DE_SILENT_OFF, DE_SHUT_DOWN, DE_RGB_SETTINGS, - DE_RGB_RED, - DE_RGB_GREEN, - DE_RGB_BLUE, - DE_RGB_WHITE, DE_RGB_OFF, DE_GCODE, DE_CUSTOM, @@ -890,6 +842,9 @@ const char *const de_pack[LABEL_NUM]={ DE_YELLOW, DE_BROWN, DE_GRAY, + DE_ORANGE, + DE_INDIGO, + DE_VIOLET, DE_DISCONNECT, DE_BAUDRATE_115200, DE_BAUDRATE_250000, @@ -966,15 +921,6 @@ const char *const de_pack[LABEL_NUM]={ DE_WAIT_TEMP_SHUT_DOWN, DE_FORCE_SHUT_DOWN, DE_SHUTTING_DOWN, - DE_LEDOFF, - DE_LEDWHITE, - DE_LEDRED, - DE_LEDORANGE, - DE_LEDYELLOW, - DE_LEDGREEN, - DE_LEDBLUE, - DE_LEDINDIGO, - DE_LEDVIOLET, DE_PARAMETER_SETTING, DE_ON, DE_OFF, @@ -984,6 +930,7 @@ const char *const de_pack[LABEL_NUM]={ DE_INVERT_YAXIS, DE_INVERT_ZAXIS, DE_MOVE_SPEED, + DE_KNOB_LED, }; const char *const cz_pack[LABEL_NUM]={ @@ -1002,10 +949,6 @@ const char *const cz_pack[LABEL_NUM]={ CZ_SILENT_OFF, CZ_SHUT_DOWN, CZ_RGB_SETTINGS, - CZ_RGB_RED, - CZ_RGB_GREEN, - CZ_RGB_BLUE, - CZ_RGB_WHITE, CZ_RGB_OFF, CZ_GCODE, CZ_CUSTOM, @@ -1052,6 +995,9 @@ const char *const cz_pack[LABEL_NUM]={ CZ_YELLOW, CZ_BROWN, CZ_GRAY, + CZ_ORANGE, + CZ_INDIGO, + CZ_VIOLET, CZ_DISCONNECT, CZ_BAUDRATE_115200, CZ_BAUDRATE_250000, @@ -1128,15 +1074,6 @@ const char *const cz_pack[LABEL_NUM]={ CZ_WAIT_TEMP_SHUT_DOWN, CZ_FORCE_SHUT_DOWN, CZ_SHUTTING_DOWN, - CZ_LEDOFF, - CZ_LEDWHITE, - CZ_LEDRED, - CZ_LEDORANGE, - CZ_LEDYELLOW, - CZ_LEDGREEN, - CZ_LEDBLUE, - CZ_LEDINDIGO, - CZ_LEDVIOLET, CZ_PARAMETER_SETTING, CZ_ON, CZ_OFF, @@ -1146,6 +1083,7 @@ const char *const cz_pack[LABEL_NUM]={ CZ_INVERT_YAXIS, CZ_INVERT_ZAXIS, CZ_MOVE_SPEED, + CZ_KNOB_LED, }; const char *const es_pack[LABEL_NUM]={ @@ -1164,10 +1102,6 @@ const char *const es_pack[LABEL_NUM]={ ES_SILENT_OFF, ES_SHUT_DOWN, ES_RGB_SETTINGS, - ES_RGB_RED, - ES_RGB_GREEN, - ES_RGB_BLUE, - ES_RGB_WHITE, ES_RGB_OFF, ES_GCODE, ES_CUSTOM, @@ -1214,6 +1148,9 @@ const char *const es_pack[LABEL_NUM]={ ES_YELLOW, ES_BROWN, ES_GRAY, + ES_ORANGE, + ES_INDIGO, + ES_VIOLET, ES_DISCONNECT, ES_BAUDRATE_115200, ES_BAUDRATE_250000, @@ -1290,15 +1227,6 @@ const char *const es_pack[LABEL_NUM]={ ES_WAIT_TEMP_SHUT_DOWN, ES_FORCE_SHUT_DOWN, ES_SHUTTING_DOWN, - ES_LEDOFF, - ES_LEDWHITE, - ES_LEDRED, - ES_LEDORANGE, - ES_LEDYELLOW, - ES_LEDGREEN, - ES_LEDBLUE, - ES_LEDINDIGO, - ES_LEDVIOLET, ES_PARAMETER_SETTING, ES_ON, ES_OFF, @@ -1308,6 +1236,7 @@ const char *const es_pack[LABEL_NUM]={ ES_INVERT_YAXIS, ES_INVERT_ZAXIS, ES_MOVE_SPEED, + ES_KNOB_LED, }; const char *const fr_pack[LABEL_NUM]={ @@ -1326,10 +1255,6 @@ const char *const fr_pack[LABEL_NUM]={ FR_SILENT_OFF, FR_SHUT_DOWN, FR_RGB_SETTINGS, - FR_RGB_RED, - FR_RGB_GREEN, - FR_RGB_BLUE, - FR_RGB_WHITE, FR_RGB_OFF, FR_GCODE, FR_CUSTOM, @@ -1376,6 +1301,9 @@ const char *const fr_pack[LABEL_NUM]={ FR_YELLOW, FR_BROWN, FR_GRAY, + FR_ORANGE, + FR_INDIGO, + FR_VIOLET, FR_DISCONNECT, FR_BAUDRATE_115200, FR_BAUDRATE_250000, @@ -1452,15 +1380,6 @@ const char *const fr_pack[LABEL_NUM]={ FR_WAIT_TEMP_SHUT_DOWN, FR_FORCE_SHUT_DOWN, FR_SHUTTING_DOWN, - FR_LEDOFF, - FR_LEDWHITE, - FR_LEDRED, - FR_LEDORANGE, - FR_LEDYELLOW, - FR_LEDGREEN, - FR_LEDBLUE, - FR_LEDINDIGO, - FR_LEDVIOLET, FR_PARAMETER_SETTING, FR_ON, FR_OFF, @@ -1470,6 +1389,7 @@ const char *const fr_pack[LABEL_NUM]={ FR_INVERT_YAXIS, FR_INVERT_ZAXIS, FR_MOVE_SPEED, + FR_KNOB_LED, }; const char *const pt_pack[LABEL_NUM]={ @@ -1488,10 +1408,6 @@ const char *const pt_pack[LABEL_NUM]={ PT_SILENT_OFF, PT_SHUT_DOWN, PT_RGB_SETTINGS, - PT_RGB_RED, - PT_RGB_GREEN, - PT_RGB_BLUE, - PT_RGB_WHITE, PT_RGB_OFF, PT_GCODE, PT_CUSTOM, @@ -1538,6 +1454,9 @@ const char *const pt_pack[LABEL_NUM]={ PT_YELLOW, PT_BROWN, PT_GRAY, + PT_ORANGE, + PT_INDIGO, + PT_VIOLET, PT_DISCONNECT, PT_BAUDRATE_115200, PT_BAUDRATE_250000, @@ -1614,15 +1533,6 @@ const char *const pt_pack[LABEL_NUM]={ PT_WAIT_TEMP_SHUT_DOWN, PT_FORCE_SHUT_DOWN, PT_SHUTTING_DOWN, - PT_LEDOFF, - PT_LEDWHITE, - PT_LEDRED, - PT_LEDORANGE, - PT_LEDYELLOW, - PT_LEDGREEN, - PT_LEDBLUE, - PT_LEDINDIGO, - PT_LEDVIOLET, PT_PARAMETER_SETTING, PT_ON, PT_OFF, @@ -1632,6 +1542,7 @@ const char *const pt_pack[LABEL_NUM]={ PT_INVERT_YAXIS, PT_INVERT_ZAXIS, PT_MOVE_SPEED, + PT_KNOB_LED, }; const char *const it_pack[LABEL_NUM]={ @@ -1650,10 +1561,6 @@ const char *const it_pack[LABEL_NUM]={ IT_SILENT_OFF, IT_SHUT_DOWN, IT_RGB_SETTINGS, - IT_RGB_RED, - IT_RGB_GREEN, - IT_RGB_BLUE, - IT_RGB_WHITE, IT_RGB_OFF, IT_GCODE, IT_CUSTOM, @@ -1700,6 +1607,9 @@ const char *const it_pack[LABEL_NUM]={ IT_YELLOW, IT_BROWN, IT_GRAY, + IT_ORANGE, + IT_INDIGO, + IT_VIOLET, IT_DISCONNECT, IT_BAUDRATE_115200, IT_BAUDRATE_250000, @@ -1776,15 +1686,6 @@ const char *const it_pack[LABEL_NUM]={ IT_WAIT_TEMP_SHUT_DOWN, IT_FORCE_SHUT_DOWN, IT_SHUTTING_DOWN, - IT_LEDOFF, - IT_LEDWHITE, - IT_LEDRED, - IT_LEDORANGE, - IT_LEDYELLOW, - IT_LEDGREEN, - IT_LEDBLUE, - IT_LEDINDIGO, - IT_LEDVIOLET, IT_PARAMETER_SETTING, IT_ON, IT_OFF, @@ -1794,6 +1695,7 @@ const char *const it_pack[LABEL_NUM]={ IT_INVERT_YAXIS, IT_INVERT_ZAXIS, IT_MOVE_SPEED, + IT_KNOB_LED, }; const char *const pl_pack[LABEL_NUM]={ @@ -1812,10 +1714,6 @@ const char *const pl_pack[LABEL_NUM]={ PL_SILENT_OFF, PL_SHUT_DOWN, PL_RGB_SETTINGS, - PL_RGB_RED, - PL_RGB_GREEN, - PL_RGB_BLUE, - PL_RGB_WHITE, PL_RGB_OFF, PL_GCODE, PL_CUSTOM, @@ -1862,6 +1760,9 @@ const char *const pl_pack[LABEL_NUM]={ PL_YELLOW, PL_BROWN, PL_GRAY, + PL_ORANGE, + PL_INDIGO, + PL_VIOLET, PL_DISCONNECT, PL_BAUDRATE_115200, PL_BAUDRATE_250000, @@ -1938,15 +1839,6 @@ const char *const pl_pack[LABEL_NUM]={ PL_WAIT_TEMP_SHUT_DOWN, PL_FORCE_SHUT_DOWN, PL_SHUTTING_DOWN, - PL_LEDOFF, - PL_LEDWHITE, - PL_LEDRED, - PL_LEDORANGE, - PL_LEDYELLOW, - PL_LEDGREEN, - PL_LEDBLUE, - PL_LEDINDIGO, - PL_LEDVIOLET, PL_PARAMETER_SETTING, PL_ON, PL_OFF, @@ -1956,6 +1848,7 @@ const char *const pl_pack[LABEL_NUM]={ PL_INVERT_YAXIS, PL_INVERT_ZAXIS, PL_MOVE_SPEED, + PL_KNOB_LED, }; const char *const sk_pack[LABEL_NUM]={ @@ -1974,10 +1867,6 @@ const char *const sk_pack[LABEL_NUM]={ SK_SILENT_OFF, SK_SHUT_DOWN, SK_RGB_SETTINGS, - SK_RGB_RED, - SK_RGB_GREEN, - SK_RGB_BLUE, - SK_RGB_WHITE, SK_RGB_OFF, SK_GCODE, SK_CUSTOM, @@ -2024,6 +1913,9 @@ const char *const sk_pack[LABEL_NUM]={ SK_YELLOW, SK_BROWN, SK_GRAY, + SK_ORANGE, + SK_INDIGO, + SK_VIOLET, SK_DISCONNECT, SK_BAUDRATE_115200, SK_BAUDRATE_250000, @@ -2099,16 +1991,8 @@ const char *const sk_pack[LABEL_NUM]={ SK_MAINMENU, SK_WAIT_TEMP_SHUT_DOWN, SK_FORCE_SHUT_DOWN, - SK_LEDOFF, - SK_LEDWHITE, - SK_LEDRED, - SK_LEDORANGE, - SK_LEDYELLOW, - SK_LEDGREEN, - SK_LEDBLUE, - SK_LEDINDIGO, - SK_LEDVIOLET, SK_SHUTTING_DOWN, + SK_PARAMETER_SETTING, SK_ON, SK_OFF, SK_AUTO, @@ -2117,10 +2001,164 @@ const char *const sk_pack[LABEL_NUM]={ SK_INVERT_YAXIS, SK_INVERT_ZAXIS, SK_MOVE_SPEED, + SK_KNOB_LED, +}; + +const char *const du_pack[LABEL_NUM]={ + DU_LANGUAGE, + DU_HEAT, + DU_MOVE, + DU_HOME, + DU_PRINT, + DU_EXTRUDE, + DU_FAN, + DU_SETTINGS, + DU_SCREEN_SETTINGS, + DU_MACHINE_SETTINGS, + DU_FEATURE_SETTINGS, + DU_SILENT_ON, + DU_SILENT_OFF, + DU_SHUT_DOWN, + DU_RGB_SETTINGS, + DU_RGB_OFF, + DU_GCODE, + DU_CUSTOM, + DU_LEVELING, + DU_POINT_1, + DU_POINT_2, + DU_POINT_3, + DU_POINT_4, + DU_ABL, + DU_BLTOUCH, + DU_BLTOUCH_TEST, + DU_BLTOUCH_DEPLOY, + DU_BLTOUCH_STOW, + DU_BLTOUCH_REPEAT, + DU_PROBE_OFFSET, + DU_EEPROM_SAVE, + DU_INC, + DU_DEC, + DU_NOZZLE, + DU_BED, + DU_STOP, + DU_BACK, + DU_PAGE_UP, + DU_PAGE_DOWN, + DU_PAUSE, + DU_RESUME, + DU_LOAD, + DU_UNLOAD, + DU_SLOW_SPEED, + DU_NORMAL_SPEED, + DU_FAST_SPEED, + DU_FAN_FULL_SPEED, + DU_FAN_HALF_SPEED, + DU_ROTATE_UI, + DU_TOUCHSCREEN_ADJUST, + DU_MORE, + DU_SCREEN_INFO, + DU_WHITE, + DU_BLACK, + DU_BLUE, + DU_RED, + DU_GREEN, + DU_CYAN, + DU_YELLOW, + DU_BROWN, + DU_GRAY, + DU_ORANGE, + DU_INDIGO, + DU_VIOLET, + DU_DISCONNECT, + DU_BAUDRATE_115200, + DU_BAUDRATE_250000, + DU_RUNOUT_OFF, + DU_RUNOUT_ON, + DU_SMART_RUNOUT_ON, + DU_PERCENTAGE, + DU_BABYSTEP, + DU_PERCENTAGE_SPEED, + DU_PERCENTAGE_FLOW, + DU_VALUE_ZERO, + DU_1_DEGREE, + DU_5_DEGREE, + DU_10_DEGREE, + DU_X_INC, + DU_Y_INC, + DU_Z_INC, + DU_X_DEC, + DU_Y_DEC, + DU_Z_DEC, + DU_X_HOME, + DU_Y_HOME, + DU_Z_HOME, + DU_001_MM, + DU_01_MM, + DU_1_MM, + DU_5_MM, + DU_10_MM, + DU_1_PERCENT, + DU_5_PERCENT, + DU_10_PERCENT, + DU_READY, + DU_BUSY, + DU_UNCONNECTED, + DU_DISCONNECT_INFO, + DU_LOADING, + DU_POWER_FAILED, + DU_CONTINUE, + DU_CANNEL, + DU_ADJUST_TITLE, + DU_ADJUST_INFO, + DU_ADJUST_OK, + DU_ADJUST_FAILED, + DU_WARNING, + DU_STOP_PRINT, + DU_CONFIRM, + DU_TFTSD, + DU_READ_TFTSD_ERROR, + DU_TFTSD_INSERTED, + DU_TFTSD_REMOVED, + DU_U_DISK, + DU_READ_U_DISK_ERROR, + DU_U_DISK_INSERTED, + DU_U_DISK_REMOVED, + DU_ONBOARDSD, + DU_READ_ONBOARDSD_ERROR, + DU_FILAMENT_RUNOUT, + DU_PREHEAT, + DU_PREHEAT_BOTH, + DU_PREHEAT_PLA, + DU_PREHEAT_PETG, + DU_PREHEAT_ABS, + DU_PREHEAT_CUSTOM1, + DU_PREHEAT_CUSTOM2, + DU_IS_PAUSE, + DU_AUTO_SHUT_DOWN, + DU_MANUAL_SHUT_DOWN, + DU_UNIFIEDMOVE, + DU_UNIFIEDHEAT, + DU_COOLDOWN, + DU_EMERGENCYSTOP, + DU_TOUCH_TO_EXIT, + DU_MAINMENU, + DU_WAIT_TEMP_SHUT_DOWN, + DU_FORCE_SHUT_DOWN, + DU_SHUTTING_DOWN, + DU_PARAMETER_SETTING, + DU_ON, + DU_OFF, + DU_AUTO, + DU_SMART, + DU_TERMINAL_ACK, + DU_INVERT_YAXIS, + DU_INVERT_ZAXIS, + DU_MOVE_SPEED, + DU_KNOB_LED, }; u8 * textSelect(u8 sel) -{ +{ switch(infoSettings.language) { case ENGLISH: return (u8 *)en_pack[sel]; @@ -2132,10 +2170,11 @@ u8 * textSelect(u8 sel) case CZECH: return (u8 *)cz_pack[sel]; case SPAIN: return (u8 *)es_pack[sel]; case FRENCH: return (u8 *)fr_pack[sel]; - case PORTUGUESE: return (u8 *)pt_pack[sel]; + case PORTUGUESE: return (u8 *)pt_pack[sel]; case ITALIAN: return (u8 *)it_pack[sel]; case POLISH: return (u8 *)pl_pack[sel]; case SLOVAK: return (u8 *)sk_pack[sel]; + case DUTCH: return (u8 *)du_pack[sel]; default: return NULL; } diff --git a/TFT/src/User/API/Language/Language.h b/TFT/src/User/API/Language/Language.h index 3cd7d16650..cdef6b3d57 100644 --- a/TFT/src/User/API/Language/Language.h +++ b/TFT/src/User/API/Language/Language.h @@ -20,6 +20,7 @@ enum ITALIAN, POLISH, SLOVAK, + DUTCH, LANGUAGE_NUM, }; @@ -41,10 +42,6 @@ enum LABEL_SILENT_OFF, LABEL_SHUT_DOWN, LABEL_RGB_SETTINGS, - LABEL_RGB_RED, - LABEL_RGB_GREEN, - LABEL_RGB_BLUE, - LABEL_RGB_WHITE, LABEL_RGB_OFF, LABEL_GCODE, LABEL_CUSTOM, @@ -91,6 +88,9 @@ enum LABEL_YELLOW, LABEL_BROWN, LABEL_GRAY, + LABEL_ORANGE, + LABEL_INDIGO, + LABEL_VIOLET, LABEL_DISCONNECT, LABEL_BAUDRATE_115200, LABEL_BAUDRATE_250000, @@ -147,7 +147,7 @@ enum LABEL_U_DISK_REMOVED, LABEL_ONBOARDSD, LABEL_READ_ONBOARDSD_ERROR, - LABEL_FILAMENT_RUNOUT, + LABEL_FILAMENT_RUNOUT, LABEL_PREHEAT, LABEL_PREHEAT_BOTH, LABEL_PREHEAT_PLA, @@ -157,7 +157,7 @@ enum LABEL_PREHEAT_CUSTOM2, LABEL_IS_PAUSE, LABEL_AUTO_SHUT_DOWN, - LABEL_MANUAL_SHUT_DOWN, + LABEL_MANUAL_SHUT_DOWN, LABEL_UNIFIEDMOVE, lABEL_UNIFIEDHEAT, LABEL_COOLDOWN, @@ -167,15 +167,6 @@ enum LABEL_WAIT_TEMP_SHUT_DOWN, LABEL_FORCE_SHUT_DOWN, LABEL_SHUTTING_DOWN, - LABEL_LEDOFF, - LABEL_LEDWHITE, - LABEL_LEDRED, - LABEL_LEDORANGE, - LABEL_LEDYELLOW, - LABEL_LEDGREEN, - LABEL_LEDBLUE, - LABEL_LEDINDIGO, - LABEL_LEDVIOLET, LABEL_SETTING_PARAMETER, LABEL_ON, LABEL_OFF, @@ -185,6 +176,7 @@ enum LABEL_INVERT_YAXIS, LABEL_INVERT_ZAXIS, LABEL_MOVE_SPEED, + LABEL_KNOB_LED, //add new keywords above this line only //keep the following always at the end of this list diff --git a/TFT/src/User/API/Language/language_am.h b/TFT/src/User/API/Language/language_am.h index 13503f8b89..f187f36b33 100644 --- a/TFT/src/User/API/Language/language_am.h +++ b/TFT/src/User/API/Language/language_am.h @@ -16,10 +16,6 @@ #define AM_SILENT_OFF "Silent Off" #define AM_SHUT_DOWN "Shut Down" #define AM_RGB_SETTINGS "LED Color" - #define AM_RGB_RED "Red" - #define AM_RGB_GREEN "Green" - #define AM_RGB_BLUE "Blue" - #define AM_RGB_WHITE "White" #define AM_RGB_OFF "LED Off" #define AM_GCODE "Gcode" #define AM_CUSTOM "Custom" @@ -66,6 +62,9 @@ #define AM_YELLOW "Yellow" #define AM_BROWN "Brown" #define AM_GRAY "Gray" + #define AM_ORANGE "Orange" + #define AM_INDIGO "Indigo" + #define AM_VIOLET "Violet" #define AM_DISCONNECT "Անջատել" #define AM_BAUDRATE_115200 "115200" #define AM_BAUDRATE_250000 "250000" @@ -142,15 +141,6 @@ #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..." - #define AM_LEDOFF "OFF" - #define AM_LEDWHITE "White" - #define AM_LEDRED "Red" - #define AM_LEDORANGE "Orange" - #define AM_LEDYELLOW "Yellow" - #define AM_LEDGREEN "Green" - #define AM_LEDBLUE "Blue" - #define AM_LEDINDIGO "Indigo" - #define AM_LEDVIOLET "Violet" #define AM_PARAMETER_SETTING "Պարամետր" #define AM_ON "ON" #define AM_OFF "OFF" @@ -160,5 +150,6 @@ #define AM_INVERT_YAXIS "Invert Y Axis" #define AM_INVERT_ZAXIS "Invert Z Axis" #define AM_MOVE_SPEED "Move speed(X Y Z)" + #define AM_KNOB_LED "Rotary Knob LED" #endif diff --git a/TFT/src/User/API/Language/language_cn.h b/TFT/src/User/API/Language/language_cn.h index 995d4f9dbc..4d5f1a00d0 100644 --- a/TFT/src/User/API/Language/language_cn.h +++ b/TFT/src/User/API/Language/language_cn.h @@ -16,20 +16,16 @@ #define CN_SILENT_OFF "响铃模式" #define CN_SHUT_DOWN "关闭电源" #define CN_RGB_SETTINGS "灯光颜色" + #define CN_RGB_OFF "熄灭灯光" #define CN_GCODE "Gcode" #define CN_CUSTOM "自定义" - #define CN_RGB_RED "红色" - #define CN_RGB_GREEN "绿色" - #define CN_RGB_BLUE "蓝色" - #define CN_RGB_WHITE "白色" - #define CN_RGB_OFF "熄灭灯光" #define CN_LEVELING "调平" #define CN_POINT_1 "第一点" #define CN_POINT_2 "第二点" #define CN_POINT_3 "第三点" #define CN_POINT_4 "第四点" - #define CN_BLTOUCH "Bltouch" #define CN_ABL "自动调平" + #define CN_BLTOUCH "Bltouch" #define CN_BLTOUCH_TEST "BL自检" #define CN_BLTOUCH_DEPLOY "探针弹出" #define CN_BLTOUCH_STOW "探针收回" @@ -66,6 +62,9 @@ #define CN_YELLOW "黄色" #define CN_BROWN "棕色" #define CN_GRAY "灰色" + #define CN_ORANGE "橙色" + #define CN_INDIGO "靛" + #define CN_VIOLET "紫色" #define CN_DISCONNECT "断开连接" #define CN_BAUDRATE_115200 "115200" #define CN_BAUDRATE_250000 "250000" @@ -142,23 +141,15 @@ #define CN_WAIT_TEMP_SHUT_DOWN "喷头温度正在降温，等待低于"STRINGIFY(AUTO_SHUT_DOWN_MAXTEMP)"℃后自动关机" // 喷头温度正在降温，等待低于50℃后自动关机 #define CN_FORCE_SHUT_DOWN "强制关机" #define CN_SHUTTING_DOWN "正在关机..." - #define CN_LEDOFF "关闭" - #define CN_LEDWHITE "白色" - #define CN_LEDRED "红色" - #define CN_LEDORANGE "橙色" - #define CN_LEDYELLOW "黄色" - #define CN_LEDGREEN "绿色" - #define CN_LEDBLUE "蓝色" - #define CN_LEDINDIGO "靛" - #define CN_LEDVIOLET "紫色" #define CN_PARAMETER_SETTING "参数设置" - #define CN_ON "ON" - #define CN_OFF "OFF" - #define CN_AUTO "AUTO" - #define CN_SMART "SMART" + #define CN_ON "开" + #define CN_OFF "关闭" + #define CN_AUTO "自动" + #define CN_SMART "聪明" #define CN_TERMINAL_ACK "Hide Terminal ACK" #define CN_INVERT_YAXIS "Invert Y Axis" #define CN_INVERT_ZAXIS "Invert Z Axis" #define CN_MOVE_SPEED "Move speed(X Y Z)" + #define CN_KNOB_LED "Rotary Knob LED" #endif diff --git a/TFT/src/User/API/Language/language_cz.h b/TFT/src/User/API/Language/language_cz.h index 1662fd1384..b0ae7ed682 100644 --- a/TFT/src/User/API/Language/language_cz.h +++ b/TFT/src/User/API/Language/language_cz.h @@ -16,10 +16,6 @@ #define CZ_SILENT_OFF "Pípání" #define CZ_SHUT_DOWN "Vypnout" #define CZ_RGB_SETTINGS "Barva LED" - #define CZ_RGB_RED "Červená" - #define CZ_RGB_GREEN "Zelená" - #define CZ_RGB_BLUE "Modrá" - #define CZ_RGB_WHITE "Bílá" #define CZ_RGB_OFF "LED vyp." #define CZ_GCODE "Gcode" #define CZ_CUSTOM "Vlastní" @@ -66,6 +62,9 @@ #define CZ_YELLOW "Žlutá" #define CZ_BROWN "Hnědá" #define CZ_GRAY "Šedá" + #define CZ_ORANGE "Orange" + #define CZ_INDIGO "Indigo" + #define CZ_VIOLET "Violet" #define CZ_DISCONNECT "Odpojit" #define CZ_BAUDRATE_115200 "115200" #define CZ_BAUDRATE_250000 "250000" @@ -98,7 +97,6 @@ #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!" @@ -143,15 +141,6 @@ #define CZ_WAIT_TEMP_SHUT_DOWN "Čekám na zchladnutí extruderu pod " STRINGIFY(AUTO_SHUT_DOWN_MAXTEMP) "℃" // 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_LEDOFF "OFF" - #define CZ_LEDWHITE "White" - #define CZ_LEDRED "Red" - #define CZ_LEDORANGE "Orange" - #define CZ_LEDYELLOW "Yellow" - #define CZ_LEDGREEN "Green" - #define CZ_LEDBLUE "Blue" - #define CZ_LEDINDIGO "Indigo" - #define CZ_LEDVIOLET "Violet" #define CZ_PARAMETER_SETTING "Parametr" #define CZ_ON "ON" #define CZ_OFF "OFF" @@ -161,5 +150,6 @@ #define CZ_INVERT_YAXIS "Invert Y Axis" #define CZ_INVERT_ZAXIS "Invert Z Axis" #define CZ_MOVE_SPEED "Move speed(X Y Z)" + #define CZ_KNOB_LED "Rotary Knob LED" #endif diff --git a/TFT/src/User/API/Language/language_de.h b/TFT/src/User/API/Language/language_de.h index 3d22a0abc6..3ecdfa9a14 100644 --- a/TFT/src/User/API/Language/language_de.h +++ b/TFT/src/User/API/Language/language_de.h @@ -16,10 +16,6 @@ #define DE_SILENT_OFF "Silent Off" #define DE_SHUT_DOWN "Shut Down" #define DE_RGB_SETTINGS "LED Color" - #define DE_RGB_RED "Rot" - #define DE_RGB_GREEN "Grün" - #define DE_RGB_BLUE "Blau" - #define DE_RGB_WHITE "Weiß" #define DE_RGB_OFF "LED Aus" #define DE_GCODE "Gcode" #define DE_CUSTOM "Custom" @@ -66,6 +62,9 @@ #define DE_YELLOW "Gelb" #define DE_BROWN "Braun" #define DE_GRAY "Grau" + #define DE_ORANGE "Orange" + #define DE_INDIGO "Indigo" + #define DE_VIOLET "Violet" #define DE_DISCONNECT "Trennen" #define DE_BAUDRATE_115200 "115200" #define DE_BAUDRATE_250000 "250000" @@ -142,15 +141,6 @@ #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..." - #define DE_LEDOFF "OFF" - #define DE_LEDWHITE "White" - #define DE_LEDRED "Red" - #define DE_LEDORANGE "Orange" - #define DE_LEDYELLOW "Yellow" - #define DE_LEDGREEN "Green" - #define DE_LEDBLUE "Blue" - #define DE_LEDINDIGO "Indigo" - #define DE_LEDVIOLET "Violet" #define DE_PARAMETER_SETTING "Parameter" #define DE_ON "ON" #define DE_OFF "OFF" @@ -160,5 +150,6 @@ #define DE_INVERT_YAXIS "Invert Y Axis" #define DE_INVERT_ZAXIS "Invert Z Axis" #define DE_MOVE_SPEED "Move speed(X Y Z)" + #define DE_KNOB_LED "Rotary Knob LED" #endif diff --git a/TFT/src/User/API/Language/language_du.h b/TFT/src/User/API/Language/language_du.h new file mode 100644 index 0000000000..40a947756d --- /dev/null +++ b/TFT/src/User/API/Language/language_du.h @@ -0,0 +1,155 @@ +#ifndef _LANGUAGE_DU_H_ +#define _LANGUAGE_DU_H_ + + #define DU_LANGUAGE "Dutch" + #define DU_HEAT "Verwarm" + #define DU_MOVE "Verplaats" + #define DU_HOME "Thuis" + #define DU_PRINT "Print" + #define DU_EXTRUDE "Extrudeer" + #define DU_FAN "Ventilator" + #define DU_SETTINGS "Instellingen" + #define DU_SCREEN_SETTINGS "Scherm" + #define DU_MACHINE_SETTINGS "Machine" + #define DU_FEATURE_SETTINGS "Kenmerk" + #define DU_SILENT_ON "Stil Aan" + #define DU_SILENT_OFF "Stil Uit" + #define DU_SHUT_DOWN "Uitschakelen" + #define DU_RGB_SETTINGS "LED Kleur" + #define DU_RGB_OFF "LED Uit" + #define DU_GCODE "Gcode" + #define DU_CUSTOM "Aangepast" + #define DU_LEVELING "Nivelleren" + #define DU_POINT_1 "Punt 1" + #define DU_POINT_2 "Punt 2" + #define DU_POINT_3 "Punt 3" + #define DU_POINT_4 "Punt 4" + #define DU_ABL "ABL" + #define DU_BLTOUCH "Bltouch" + #define DU_BLTOUCH_TEST "Test" + #define DU_BLTOUCH_DEPLOY "Gebruiken" + #define DU_BLTOUCH_STOW "Inzetten" + #define DU_BLTOUCH_REPEAT "Herhaal" + #define DU_PROBE_OFFSET "Offset" + #define DU_EEPROM_SAVE "Bewaren" + #define DU_INC "Verhogen" + #define DU_DEC "Verlagen" + #define DU_NOZZLE "Spuitneus" + #define DU_BED "Verwarmd bed" + #define DU_STOP "Stop" + #define DU_BACK "Terug" + #define DU_PAGE_UP "Blz omhoog" + #define DU_PAGE_DOWN "Blz omlaag" + #define DU_PAUSE "Pauze" + #define DU_RESUME "Hervatten" + #define DU_LOAD "Laden" + #define DU_UNLOAD "Lossen" + #define DU_SLOW_SPEED "Traag" + #define DU_NORMAL_SPEED "Normaal" + #define DU_FAST_SPEED "Snel" + #define DU_FAN_FULL_SPEED "Volledig" + #define DU_FAN_HALF_SPEED "Half" + #define DU_ROTATE_UI "Draai UI" + #define DU_TOUCHSCREEN_ADJUST "TSC Aanpassen" + #define DU_MORE "Meer" + #define DU_SCREEN_INFO "Info" + #define DU_WHITE "Wit" + #define DU_BLACK "Zwart" + #define DU_BLUE "Blauw" + #define DU_RED "Rood" + #define DU_GREEN "Groen" + #define DU_CYAN "Cyaan" + #define DU_YELLOW "Geel" + #define DU_BROWN "Bruin" + #define DU_GRAY "Grijs" + #define DU_ORANGE "Oranje" + #define DU_INDIGO "Indigo" + #define DU_VIOLET "Violet" + #define DU_DISCONNECT "Loskoppelen" + #define DU_BAUDRATE_115200 "115200" + #define DU_BAUDRATE_250000 "250000" + #define DU_RUNOUT_OFF "Uitloop AF" + #define DU_RUNOUT_ON "Uitloop AAN" + #define DU_SMART_RUNOUT_ON "Smart AAN" + #define DU_PERCENTAGE "Percentage" + #define DU_BABYSTEP "BabyStap" + #define DU_PERCENTAGE_SPEED "Snelheid" + #define DU_PERCENTAGE_FLOW "Stroom" + #define DU_VALUE_ZERO "Zero" + #define DU_1_DEGREE "1℃" + #define DU_5_DEGREE "5℃" + #define DU_10_DEGREE "10℃" + #define DU_X_INC "X+" + #define DU_Y_INC "Y+" + #define DU_Z_INC "Z+" + #define DU_X_DEC "X-" + #define DU_Y_DEC "Y-" + #define DU_Z_DEC "Z-" + #define DU_X_HOME "X" + #define DU_Y_HOME "Y" + #define DU_Z_HOME "Z" + #define DU_001_MM "0.01mm" + #define DU_01_MM "0.1mm" + #define DU_1_MM "1mm" + #define DU_5_MM "5mm" + #define DU_10_MM "10mm" + #define DU_1_PERCENT "1%" + #define DU_5_PERCENT "5%" + #define DU_10_PERCENT "10%" + #define DU_READY "Gereed" + #define DU_BUSY "In verwerking ,wacht aub..." + #define DU_UNCONNECTED "Geen printer gekoppeld!" + #define DU_DISCONNECT_INFO "De printer kan nu door de computer gestuurd worden!" + #define DU_LOADING "Opladen..." + #define DU_POWER_FAILED "Verder met printen?" + #define DU_CONTINUE "Verder" + #define DU_CANNEL "Afbreken" + #define DU_ADJUST_TITLE "Touch Screen Calibratie" + #define DU_ADJUST_INFO "Klik op de rode punt" + #define DU_ADJUST_OK "Calibratie Gelukt" + #define DU_ADJUST_FAILED "Calibratie Mislukt, Probeer Opnieuw aub" + #define DU_WARNING "Waarschuwing" + #define DU_STOP_PRINT "Stop printen?" + #define DU_CONFIRM "Bevestig" + #define DU_TFTSD "TFT SD" + #define DU_READ_TFTSD_ERROR "TFT SD leesfout!" + #define DU_TFTSD_INSERTED "Kaart geplaatst!" + #define DU_TFTSD_REMOVED "Kaart verwijdert!" + #define DU_U_DISK "U Disk" + #define DU_READ_U_DISK_ERROR "U Disk Leesfout!" + #define DU_U_DISK_INSERTED "U Disk geplaatst!" + #define DU_U_DISK_REMOVED "U Disk verwijdert!" + #define DU_ONBOARDSD "OnboardSD" + #define DU_READ_ONBOARDSD_ERROR "Onboard SD card leesfout!" + #define DU_FILAMENT_RUNOUT "filament op!" + #define DU_PREHEAT "Voorverwarmen" + #define DU_PREHEAT_BOTH "Beide" + #define DU_PREHEAT_PLA "PLA" + #define DU_PREHEAT_PETG "PETG" + #define DU_PREHEAT_ABS "ABS" + #define DU_PREHEAT_CUSTOM1 "CUSTOM1" + #define DU_PREHEAT_CUSTOM2 "CUSTOM2" + #define DU_IS_PAUSE "Kan niet extruderen tijdens printen, Pauzeer printen?" + #define DU_AUTO_SHUT_DOWN "Auto Power" + #define DU_MANUAL_SHUT_DOWN "Manueel" + #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 " STRINGIFY(AUTO_SHUT_DOWN_MAXTEMP) "℃ 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" + #define DU_ON "AAN" + #define DU_OFF "UIT" + #define DU_AUTO "AUTO" + #define DU_SMART "SMART" + #define DU_TERMINAL_ACK "Verberg Terminal ACK" + #define DU_INVERT_YAXIS "Inverteer Y Axis" + #define DU_INVERT_ZAXIS "Inverteer Z Axis" + #define DU_MOVE_SPEED "Bewegingssnelheid(X Y Z)" + #define DU_KNOB_LED "Rotary Knob LED" + +#endif diff --git a/TFT/src/User/API/Language/language_en.h b/TFT/src/User/API/Language/language_en.h index acd8619147..5ed6699850 100644 --- a/TFT/src/User/API/Language/language_en.h +++ b/TFT/src/User/API/Language/language_en.h @@ -16,10 +16,6 @@ #define EN_SILENT_OFF "Silent Off" #define EN_SHUT_DOWN "Shut Down" #define EN_RGB_SETTINGS "LED Color" - #define EN_RGB_RED "Red" - #define EN_RGB_GREEN "Green" - #define EN_RGB_BLUE "Blue" - #define EN_RGB_WHITE "White" #define EN_RGB_OFF "LED Off" #define EN_GCODE "Gcode" #define EN_CUSTOM "Custom" @@ -66,6 +62,9 @@ #define EN_YELLOW "Yellow" #define EN_BROWN "Brown" #define EN_GRAY "Gray" + #define EN_ORANGE "Orange" + #define EN_INDIGO "Indigo" + #define EN_VIOLET "Violet" #define EN_DISCONNECT "Disconnect" #define EN_BAUDRATE_115200 "115200" #define EN_BAUDRATE_250000 "250000" @@ -142,15 +141,6 @@ #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..." - #define EN_LEDOFF "OFF" - #define EN_LEDWHITE "White" - #define EN_LEDRED "Red" - #define EN_LEDORANGE "Orange" - #define EN_LEDYELLOW "Yellow" - #define EN_LEDGREEN "Green" - #define EN_LEDBLUE "Blue" - #define EN_LEDINDIGO "Indigo" - #define EN_LEDVIOLET "Violet" #define EN_PARAMETER_SETTING "Parameter" #define EN_ON "ON" #define EN_OFF "OFF" @@ -160,5 +150,6 @@ #define EN_INVERT_YAXIS "Invert Y Axis" #define EN_INVERT_ZAXIS "Invert Z Axis" #define EN_MOVE_SPEED "Move speed(X Y Z)" + #define EN_KNOB_LED "Rotary Knob LED" #endif diff --git a/TFT/src/User/API/Language/language_es.h b/TFT/src/User/API/Language/language_es.h index 815022b1b8..0eef1c8ee4 100644 --- a/TFT/src/User/API/Language/language_es.h +++ b/TFT/src/User/API/Language/language_es.h @@ -16,10 +16,6 @@ #define ES_SILENT_OFF "Sonido" #define ES_SHUT_DOWN "Apagar" #define ES_RGB_SETTINGS "Color LED" - #define ES_RGB_RED "Rojo" - #define ES_RGB_GREEN "Verde" - #define ES_RGB_BLUE "Azul" - #define ES_RGB_WHITE "Blanco" #define ES_RGB_OFF "Apagar LED" #define ES_GCODE "Gcode" #define ES_CUSTOM "Personalizar" @@ -66,6 +62,9 @@ #define ES_YELLOW "Amarillo" #define ES_BROWN "Marrón" #define ES_GRAY "Gris" + #define ES_ORANGE "Orange" + #define ES_INDIGO "Indigo" + #define ES_VIOLET "Violet" #define ES_DISCONNECT "Desconectar" #define ES_BAUDRATE_115200 "115200" #define ES_BAUDRATE_250000 "250000" @@ -142,15 +141,6 @@ #define ES_WAIT_TEMP_SHUT_DOWN "Espere a que la temperatura del hotend sea inferior a " STRINGIFY(AUTO_SHUT_DOWN_MAXTEMP) "℃" // 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_LEDOFF "OFF" - #define ES_LEDWHITE "White" - #define ES_LEDRED "Red" - #define ES_LEDORANGE "Orange" - #define ES_LEDYELLOW "Yellow" - #define ES_LEDGREEN "Green" - #define ES_LEDBLUE "Blue" - #define ES_LEDINDIGO "Indigo" - #define ES_LEDVIOLET "Violet" #define ES_PARAMETER_SETTING "Parámetro" #define ES_ON "ON" #define ES_OFF "OFF" @@ -160,5 +150,6 @@ #define ES_INVERT_YAXIS "Invert Y Axis" #define ES_INVERT_ZAXIS "Invert Z Axis" #define ES_MOVE_SPEED "Move speed(X Y Z)" + #define ES_KNOB_LED "Rotary Knob LED" #endif diff --git a/TFT/src/User/API/Language/language_fr.h b/TFT/src/User/API/Language/language_fr.h index 7ba9b9fb55..f5836cd283 100644 --- a/TFT/src/User/API/Language/language_fr.h +++ b/TFT/src/User/API/Language/language_fr.h @@ -16,10 +16,6 @@ #define FR_SILENT_OFF "Silent Off" #define FR_SHUT_DOWN "Eteindre" #define FR_RGB_SETTINGS "Couleur LED" - #define FR_RGB_RED "Rouge" - #define FR_RGB_GREEN "Vert" - #define FR_RGB_BLUE "Bleu" - #define FR_RGB_WHITE "Blanc" #define FR_RGB_OFF "LED Off" #define FR_GCODE "Gcode" #define FR_CUSTOM "Custom" @@ -66,6 +62,9 @@ #define FR_YELLOW "jaune" #define FR_BROWN "marron" #define FR_GRAY "gris" + #define FR_ORANGE "Orange" + #define FR_INDIGO "Indigo" + #define FR_VIOLET "Violet" #define FR_DISCONNECT "Déconnexion" #define FR_BAUDRATE_115200 "115200" #define FR_BAUDRATE_250000 "250000" @@ -133,7 +132,6 @@ #define FR_IS_PAUSE "Extrusion impossible quand l’impression est en cours, mettre impression en pause ?" #define FR_AUTO_SHUT_DOWN "Auto Power" #define FR_MANUAL_SHUT_DOWN "Manual" - #define FR_MAINMENU "Menu" #define FR_UNIFIEDMOVE "Mouvement" #define FR_UNIFIEDHEAT "Chauffer / Ventiler" #define FR_COOLDOWN "Refroidissement" @@ -143,15 +141,6 @@ #define FR_WAIT_TEMP_SHUT_DOWN "Veuillez, patientez que la température de la buse soit inférieure à" STRINGIFY(AUTO_SHUT_DOWN_MAXTEMP) "℃" // 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_LEDOFF "OFF" - #define FR_LEDWHITE "White" - #define FR_LEDRED "Red" - #define FR_LEDORANGE "Orange" - #define FR_LEDYELLOW "Yellow" - #define FR_LEDGREEN "Green" - #define FR_LEDBLUE "Blue" - #define FR_LEDINDIGO "Indigo" - #define FR_LEDVIOLET "Violet" #define FR_PARAMETER_SETTING "Paramètre" #define FR_ON "ON" #define FR_OFF "OFF" @@ -161,5 +150,6 @@ #define FR_INVERT_YAXIS "Inverser Axe Y" #define FR_INVERT_ZAXIS "Inverser Axe Z" #define FR_MOVE_SPEED "Vitesse de déplacement (X Y Z)" + #define FR_KNOB_LED "Rotary Knob LED" #endif diff --git a/TFT/src/User/API/Language/language_it.h b/TFT/src/User/API/Language/language_it.h index 59ffcb7a48..212fcb0bd9 100644 --- a/TFT/src/User/API/Language/language_it.h +++ b/TFT/src/User/API/Language/language_it.h @@ -16,10 +16,6 @@ #define IT_SILENT_OFF "Bip OFF" #define IT_SHUT_DOWN "Spegni" #define IT_RGB_SETTINGS "RGB LED" - #define IT_RGB_RED "Rosso" - #define IT_RGB_GREEN "Verde" - #define IT_RGB_BLUE "Blu" - #define IT_RGB_WHITE "Bianco" #define IT_RGB_OFF "Spegni" #define IT_GCODE "Gcode" #define IT_CUSTOM "Custom" @@ -66,6 +62,9 @@ #define IT_YELLOW "Giallo" #define IT_BROWN "Marrone" #define IT_GRAY "Grigio" + #define IT_ORANGE "Orange" + #define IT_INDIGO "Indigo" + #define IT_VIOLET "Violet" #define IT_DISCONNECT "Scollega" #define IT_BAUDRATE_115200 "115200" #define IT_BAUDRATE_250000 "250000" @@ -142,15 +141,6 @@ #define IT_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 IT_FORCE_SHUT_DOWN "Force" #define IT_SHUTTING_DOWN "Shutting down..." - #define IT_LEDOFF "OFF" - #define IT_LEDWHITE "White" - #define IT_LEDRED "Red" - #define IT_LEDORANGE "Orange" - #define IT_LEDYELLOW "Yellow" - #define IT_LEDGREEN "Green" - #define IT_LEDBLUE "Blue" - #define IT_LEDINDIGO "Indigo" - #define IT_LEDVIOLET "Violet" #define IT_PARAMETER_SETTING "Parametri" #define IT_ON "ON" #define IT_OFF "OFF" @@ -160,5 +150,6 @@ #define IT_INVERT_YAXIS "Invert Y Axis" #define IT_INVERT_ZAXIS "Invert Z Axis" #define IT_MOVE_SPEED "Move speed(X Y Z)" + #define IT_KNOB_LED "Rotary Knob LED" #endif diff --git a/TFT/src/User/API/Language/language_jp.h b/TFT/src/User/API/Language/language_jp.h index 2729570416..44e8b6ff22 100644 --- a/TFT/src/User/API/Language/language_jp.h +++ b/TFT/src/User/API/Language/language_jp.h @@ -16,10 +16,6 @@ #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" @@ -66,6 +62,9 @@ #define JP_YELLOW "黄色" #define JP_BROWN "茶色" #define JP_GRAY "灰色" + #define JP_ORANGE "Orange" + #define JP_INDIGO "Indigo" + #define JP_VIOLET "Violet" #define JP_DISCONNECT "データ接続" #define JP_BAUDRATE_115200 "115200" #define JP_BAUDRATE_250000 "250000" @@ -142,15 +141,6 @@ #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..." - #define JP_LEDOFF "OFF" - #define JP_LEDWHITE "White" - #define JP_LEDRED "Red" - #define JP_LEDORANGE "Orange" - #define JP_LEDYELLOW "Yellow" - #define JP_LEDGREEN "Green" - #define JP_LEDBLUE "Blue" - #define JP_LEDINDIGO "Indigo" - #define JP_LEDVIOLET "Violet" #define JP_PARAMETER_SETTING "パラメータ" #define JP_ON "ON" #define JP_OFF "OFF" @@ -160,5 +150,6 @@ #define JP_INVERT_YAXIS "Invert Y Axis" #define JP_INVERT_ZAXIS "Invert Z Axis" #define JP_MOVE_SPEED "Move speed(X Y Z)" + #define JP_KNOB_LED "Rotary Knob LED" #endif diff --git a/TFT/src/User/API/Language/language_pl.h b/TFT/src/User/API/Language/language_pl.h index 1efe6c9245..559c1ef5f1 100644 --- a/TFT/src/User/API/Language/language_pl.h +++ b/TFT/src/User/API/Language/language_pl.h @@ -16,10 +16,6 @@ #define PL_SILENT_OFF "Ciche Wył." #define PL_SHUT_DOWN "Wyłącz" #define PL_RGB_SETTINGS "Kolor LED" - #define PL_RGB_RED "Czerwony" - #define PL_RGB_GREEN "Zielony" - #define PL_RGB_BLUE "Niebieski" - #define PL_RGB_WHITE "Biały" #define PL_RGB_OFF "Wyłącz LED" #define PL_GCODE "Gcode" #define PL_CUSTOM "Własne" @@ -66,6 +62,9 @@ #define PL_YELLOW "Żółty" #define PL_BROWN "Brązowy" #define PL_GRAY "Szary" + #define PL_ORANGE "Orange" + #define PL_INDIGO "Indigo" + #define PL_VIOLET "Violet" #define PL_DISCONNECT "Odłącz" #define PL_BAUDRATE_115200 "115200" #define PL_BAUDRATE_250000 "250000" @@ -142,15 +141,6 @@ #define PL_WAIT_TEMP_SHUT_DOWN "Czekam na schłodzenie do " STRINGIFY(AUTO_SHUT_DOWN_MAXTEMP) "℃" // Wait for the temperature of hotend to be lower than 50℃ #define PL_FORCE_SHUT_DOWN "Wymuś" #define PL_SHUTTING_DOWN "Wyłączanie..." - #define PL_LEDOFF "OFF" - #define PL_LEDWHITE "White" - #define PL_LEDRED "Red" - #define PL_LEDORANGE "Orange" - #define PL_LEDYELLOW "Yellow" - #define PL_LEDGREEN "Green" - #define PL_LEDBLUE "Blue" - #define PL_LEDINDIGO "Indigo" - #define PL_LEDVIOLET "Violet" #define PL_PARAMETER_SETTING "Parametr" #define PL_ON "ON" #define PL_OFF "OFF" @@ -160,5 +150,6 @@ #define PL_INVERT_YAXIS "Invert Y Axis" #define PL_INVERT_ZAXIS "Invert Z Axis" #define PL_MOVE_SPEED "Move speed(X Y Z)" + #define PL_KNOB_LED "Rotary Knob LED" #endif diff --git a/TFT/src/User/API/Language/language_pt.h b/TFT/src/User/API/Language/language_pt.h index acf7b6bc6b..9fccb157b5 100644 --- a/TFT/src/User/API/Language/language_pt.h +++ b/TFT/src/User/API/Language/language_pt.h @@ -16,10 +16,6 @@ #define PT_SILENT_OFF "Som OFF" #define PT_SHUT_DOWN "Desligar" #define PT_RGB_SETTINGS "LED cor" - #define PT_RGB_RED "Vermelho" - #define PT_RGB_GREEN "Verde" - #define PT_RGB_BLUE "Azul" - #define PT_RGB_WHITE "Branco" #define PT_RGB_OFF "Desligar" #define PT_GCODE "Gcode" #define PT_CUSTOM "Custom" @@ -66,6 +62,9 @@ #define PT_YELLOW "Amarelo" #define PT_BROWN "Castanho" #define PT_GRAY "Cinzento" + #define PT_ORANGE "Orange" + #define PT_INDIGO "Indigo" + #define PT_VIOLET "Violet" #define PT_DISCONNECT "Desconectar" #define PT_BAUDRATE_115200 "115200" #define PT_BAUDRATE_250000 "250000" @@ -142,15 +141,6 @@ #define PT_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 PT_FORCE_SHUT_DOWN "Force" #define PT_SHUTTING_DOWN "Shutting down..." - #define PT_LEDOFF "OFF" - #define PT_LEDWHITE "White" - #define PT_LEDRED "Red" - #define PT_LEDORANGE "Orange" - #define PT_LEDYELLOW "Yellow" - #define PT_LEDGREEN "Green" - #define PT_LEDBLUE "Blue" - #define PT_LEDINDIGO "Indigo" - #define PT_LEDVIOLET "Violet" #define PT_PARAMETER_SETTING "Parâmetro" #define PT_ON "ON" #define PT_OFF "OFF" @@ -160,5 +150,6 @@ #define PT_INVERT_YAXIS "Invert Y Axis" #define PT_INVERT_ZAXIS "Invert Z Axis" #define PT_MOVE_SPEED "Move speed(X Y Z)" + #define PT_KNOB_LED "Rotary Knob LED" #endif diff --git a/TFT/src/User/API/Language/language_ru.h b/TFT/src/User/API/Language/language_ru.h index c4eecfb849..40b2465c41 100644 --- a/TFT/src/User/API/Language/language_ru.h +++ b/TFT/src/User/API/Language/language_ru.h @@ -16,24 +16,20 @@ #define RU_SILENT_OFF "Звук вкл" #define RU_SHUT_DOWN "Выключить" #define RU_RGB_SETTINGS "Цвет LED" - #define RU_RGB_RED "Красный" - #define RU_RGB_GREEN "Зелёный" - #define RU_RGB_BLUE "Синий" - #define RU_RGB_WHITE "Белый" #define RU_RGB_OFF "LED выкл" #define RU_GCODE "G-коды" #define RU_CUSTOM "Свои" - #define RU_LEVELING "Калиб.стола" + #define RU_LEVELING "Калибровки" #define RU_POINT_1 "Точка 1" #define RU_POINT_2 "Точка 2" #define RU_POINT_3 "Точка 3" #define RU_POINT_4 "Точка 4" - #define RU_ABL "ABL" + #define RU_ABL "Калиб.стол" #define RU_BLTOUCH "Bltouch" #define RU_BLTOUCH_TEST "Тест" #define RU_BLTOUCH_DEPLOY "Опустить" #define RU_BLTOUCH_STOW "Поднять" - #define RU_BLTOUCH_REPEAT "Повторить" + #define RU_BLTOUCH_REPEAT "Точность Z" #define RU_PROBE_OFFSET "Отступ" #define RU_EEPROM_SAVE "Сохранить" #define RU_INC "Увеличить" @@ -66,6 +62,9 @@ #define RU_YELLOW "Жёлтый" #define RU_BROWN "Коричневый" #define RU_GRAY "Серый" + #define RU_ORANGE "Оранжевый" + #define RU_INDIGO "Индиго" + #define RU_VIOLET "Фиолетовый" #define RU_DISCONNECT "Отключить" #define RU_BAUDRATE_115200 "115200" #define RU_BAUDRATE_250000 "250000" @@ -142,15 +141,6 @@ #define RU_WAIT_TEMP_SHUT_DOWN "Дождитесь температуры сопла не ниже чем " STRINGIFY(AUTO_SHUT_DOWN_MAXTEMP) "°C" // Wait for the temperature of hotend to be lower than 50°C #define RU_FORCE_SHUT_DOWN "Принудительно выкл" #define RU_SHUTTING_DOWN "Выключаю..." - #define RU_LEDOFF "Выкл" - #define RU_LEDWHITE "Белый" - #define RU_LEDRED "Красный" - #define RU_LEDORANGE "Оранжевый" - #define RU_LEDYELLOW "Жёлтый" - #define RU_LEDGREEN "Зелёный" - #define RU_LEDBLUE "Синий" - #define RU_LEDINDIGO "Индиго" - #define RU_LEDVIOLET "Фиолетовый" #define RU_PARAMETER_SETTING "Параметры" #define RU_ON "Вкл" #define RU_OFF "Выкл" @@ -160,5 +150,6 @@ #define RU_INVERT_YAXIS "Инверсия оси Y" #define RU_INVERT_ZAXIS "Инверсия оси Z" #define RU_MOVE_SPEED "Скорость (X Y Z)" + #define RU_KNOB_LED "Rotary Knob LED" #endif diff --git a/TFT/src/User/API/Language/language_sk.h b/TFT/src/User/API/Language/language_sk.h index 122243d114..80736131e7 100644 --- a/TFT/src/User/API/Language/language_sk.h +++ b/TFT/src/User/API/Language/language_sk.h @@ -16,10 +16,6 @@ #define SK_SILENT_OFF "Stíšiť" #define SK_SHUT_DOWN "Vypnúť" #define SK_RGB_SETTINGS "Farba LED" - #define SK_RGB_RED "Červená" - #define SK_RGB_GREEN "Zelená" - #define SK_RGB_BLUE "Modrá" - #define SK_RGB_WHITE "Biela" #define SK_RGB_OFF "Vypnúť LED" #define SK_GCODE "Gcode" #define SK_CUSTOM "Vlastné" @@ -66,6 +62,9 @@ #define SK_YELLOW "Žltá" #define SK_BROWN "Hnedá" #define SK_GRAY "Šedá" + #define SK_ORANGE "Orange" + #define SK_INDIGO "Indigo" + #define SK_VIOLET "Violet" #define SK_DISCONNECT "Odpojiť" #define SK_BAUDRATE_115200 "115200" #define SK_BAUDRATE_250000 "250000" @@ -143,15 +142,7 @@ #define SK_WAIT_TEMP_SHUT_DOWN "Počkať na teplotu trysky menej ako"STRINGIFY(AUTO_SHUT_DOWN_MAXTEMP)"℃" // Wait for the temperature of hotend to be lower than 50℃ #define SK_FORCE_SHUT_DOWN "Vynútené vypnutie" #define SK_SHUTTING_DOWN "Vypínanie..." - #define SK_LEDOFF "OFF" - #define SK_LEDWHITE "White" - #define SK_LEDRED "Red" - #define SK_LEDORANGE "Orange" - #define SK_LEDYELLOW "Yellow" - #define SK_LEDGREEN "Green" - #define SK_LEDBLUE "Blue" - #define SK_LEDINDIGO "Indigo" - #define SK_LEDVIOLET "Violet" + #define SK_PARAMETER_SETTING "Parameters" #define SK_ON "ON" #define SK_OFF "OFF" #define SK_AUTO "AUTO" @@ -160,5 +151,6 @@ #define SK_INVERT_YAXIS "Invert Y Axis" #define SK_INVERT_ZAXIS "Invert Z Axis" #define SK_MOVE_SPEED "Move speed(X Y Z)" + #define SK_KNOB_LED "Rotary Knob LED" #endif diff --git a/TFT/src/User/API/UI/ui_draw.c b/TFT/src/User/API/UI/ui_draw.c index 5c8683fb37..3d23ed44cf 100644 --- a/TFT/src/User/API/UI/ui_draw.c +++ b/TFT/src/User/API/UI/ui_draw.c @@ -45,6 +45,12 @@ void ICON_ReadDisplay(u16 sx,u16 sy, u8 icon) lcd_frame_display(sx, sy, ICON_WIDTH, ICON_HEIGHT, ICON_ADDR(icon)); } +//draw icon with different length and width (sx & sy cordinates for top left of icon, w width, h height, addr flash byte address) +void ICON_CustomReadDisplay(u16 sx,u16 sy,u16 w, u16 h, u32 addr) +{ + lcd_frame_display(sx, sy, w, h, addr); +} + void SMALLICON_ReadDisplay(u16 sx,u16 sy, u8 icon) { lcd_frame_display(sx, sy, SMALLICON_WIDTH, SMALLICON_HEIGHT, SMALL_ICON_ADDR(icon)); diff --git a/TFT/src/User/API/UI/ui_draw.h b/TFT/src/User/API/UI/ui_draw.h index efa0a91c25..7c4c7b5dcc 100644 --- a/TFT/src/User/API/UI/ui_draw.h +++ b/TFT/src/User/API/UI/ui_draw.h @@ -23,6 +23,7 @@ void LCD_DMA_Config(void); void LOGO_ReadDisplay(void); void ICON_ReadDisplay(uint16_t sx, uint16_t sy, uint8_t icon); +void ICON_CustomReadDisplay(u16 sx,u16 sy,u16 w, u16 h, u32 addr); void ICON_PressedDisplay(uint16_t sx, uint16_t sy, uint8_t icon); #endif diff --git a/TFT/src/User/API/boot.c b/TFT/src/User/API/boot.c index 1d0fa8a406..d6ea367163 100644 --- a/TFT/src/User/API/boot.c +++ b/TFT/src/User/API/boot.c @@ -124,6 +124,7 @@ void updateIcon(void) { LOGO_ReadDisplay(); } + GUI_Clear(BACKGROUND_COLOR); for(int i=0; i