Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

improved robustness of Printing menu during a dialog with Marlin #1898

Closed
wants to merge 14 commits into from
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified Copy to SD Card root directory to update/BIQU_TFT28_V1.0.27.x.bin
Binary file not shown.
Binary file not shown.
Binary file modified Copy to SD Card root directory to update/BIQU_TFT35_V1.0.27.x.bin
Binary file not shown.
Binary file modified Copy to SD Card root directory to update/BIQU_TFT35_V1.1.27.x.bin
Binary file not shown.
Binary file modified Copy to SD Card root directory to update/BIQU_TFT35_V1.2.27.x.bin
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#### Language Code:AM
## Language Version:20210417
## Language Version:20210509
## Maximum byte per keyword is 250 Bytes.
## Escape characters are not supported except newline '\n'

Expand All @@ -10,6 +10,7 @@ label_rotate_ui:Rotate UI
label_terminal_ack:Show ACK in Terminal
label_persistent_info:Persistent Status Info
label_file_list_mode:Files viewer List Mode
label_file_sort_by:Sort files by
label_ack_notification:ACK notification style
label_emulate_m600:Emulate M600
label_serial_always_on:Serial Always ON
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#### Language Code:CA
## Language Version:20210417
## Language Version:20210509
## Maximum byte per keyword is 250 Bytes.
## Escape characters are not supported except newline '\n'

Expand All @@ -10,6 +10,7 @@ label_rotate_ui:Rotar
label_terminal_ack:Mostra ACK a la terminal
label_persistent_info:Informació d'estat persistent
label_file_list_mode:Mode de visualització de fitxers
label_file_sort_by:Sort files by
label_ack_notification:ACK notification style
label_emulate_m600:Emulate M600
label_serial_always_on:Serial Always ON
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#### Language Code:CN
## Language Version:20210417
## Language Version:20210509
## Maximum byte per keyword is 250 Bytes.
## Escape characters are not supported except newline '\n'

Expand All @@ -10,6 +10,7 @@ label_rotate_ui:旋转界面
label_terminal_ack:在G-code终端中显示温度信息
label_persistent_info:顶部温度信息
label_file_list_mode:文件浏览列表模式
label_file_sort_by:Sort files by
label_ack_notification:ACK 弹窗类型
label_emulate_m600:模拟M600
label_serial_always_on:串口常开
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#### Language Code:CZ
## Language Version:20210417
## Language Version:20210509
## Maximum byte per keyword is 250 Bytes.
## Escape characters are not supported except newline '\n'

Expand All @@ -10,6 +10,7 @@ label_rotate_ui:Otočit UI
label_terminal_ack:zobrazit ACK Terminálu
label_persistent_info:Zobrazení stavových ikon
label_file_list_mode:Soubory jako seznam
label_file_sort_by:Sort files by
label_ack_notification:Styl oznámení ACK
label_emulate_m600:Emulace M600
label_serial_always_on:Seriový port vždy ON
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#### Language Code:DE
## Language Version:20210417
## Language Version:20210509
## Maximum byte per keyword is 250 Bytes.
## Escape characters are not supported except newline '\n'

Expand All @@ -10,6 +10,7 @@ label_rotate_ui:UI drehen
label_terminal_ack:Zeige ACK im Terminal
label_persistent_info:Speicherungs-Status
label_file_list_mode:Dateien als Liste
label_file_sort_by:Sort files by
label_ack_notification:ACK - Stil
label_emulate_m600:Emulate M600
label_serial_always_on:Seriell Verbind. immer an
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#### Language Code:DU
## Language Version:20210417
## Language Version:20210509
## Maximum byte per keyword is 250 Bytes.
## Escape characters are not supported except newline '\n'

Expand All @@ -10,6 +10,7 @@ label_rotate_ui:Draai UI
label_terminal_ack:Laat ACK in Terminal zien
label_persistent_info:Aanhoudende statusinfo
label_file_list_mode:Files viewer List Mode
label_file_sort_by:Sort files by
label_ack_notification:ACK notification style
label_emulate_m600:Emulate M600
label_serial_always_on:Serial Always ON
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#### Language Code:EN
## Language Version:20210417
## Language Version:20210509
## Maximum byte per keyword is 250 Bytes.
## Escape characters are not supported except newline '\n'

Expand All @@ -10,6 +10,7 @@ label_rotate_ui:Rotate UI
label_terminal_ack:Show ACK in Terminal
label_persistent_info:Persistent Status Info
label_file_list_mode:Files viewer List Mode
label_file_sort_by:Sort files by
label_ack_notification:ACK notification style
label_emulate_m600:Emulate M600
label_serial_always_on:Serial Always ON
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#### Language Code:ES
## Language Version:20210417
## Language Version:20210509
## Maximum byte per keyword is 250 Bytes.
## Escape characters are not supported except newline '\n'

Expand All @@ -10,6 +10,7 @@ label_rotate_ui:Rotar
label_terminal_ack:Show ACK in Terminal
label_persistent_info:Persistent Status Info
label_file_list_mode:Files viewer List Mode
label_file_sort_by:Sort files by
label_ack_notification:ACK notification style
label_emulate_m600:Emulate M600
label_serial_always_on:Serial Always ON
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#### Language Code:FR
## Language Version:20210417
## Language Version:20210509
## Maximum byte per keyword is 250 Bytes.
## Escape characters are not supported except newline '\n'

Expand All @@ -10,6 +10,7 @@ label_rotate_ui:Rotation
label_terminal_ack:Afficher ACK sur Terminal
label_persistent_info:Temp. toujours affichées
label_file_list_mode:Fichiers en mode liste
label_file_sort_by:Sort files by
label_ack_notification:Style de notification ACK
label_emulate_m600:Emuler M600
label_serial_always_on:Serial toujours actif
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#### Language Code:GR
## Language Version:20210417
## Language Version:20210509
## Maximum byte per keyword is 250 Bytes.
## Escape characters are not supported except newline '\n'

Expand All @@ -10,6 +10,7 @@ label_rotate_ui:Περιστροφή UI
label_terminal_ack:Εμφάνιση ACK στο τερματικό
label_persistent_info:Πληροφορίες μόνιμης κατάστασης
label_file_list_mode:Λειτουργία λίστας προβολής αρχείων
label_file_sort_by:Sort files by
label_ack_notification:ACK notification style
label_emulate_m600:Emulate M600
label_serial_always_on:Serial Always ON
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#### Language Code:HU
## Language Version:20210417
## Language Version:20210509
## Maximum byte per keyword is 250 Bytes.
## Escape characters are not supported except newline '\n'

Expand All @@ -10,6 +10,7 @@ label_rotate_ui:Forgatás
label_terminal_ack:ACK Megjelenítése
label_persistent_info:Állandó állapotinfó
label_file_list_mode:Fájlnéző listamód
label_file_sort_by:Sort files by
label_ack_notification:ACK Értesítési stílus
label_emulate_m600:Emulált M600
label_serial_always_on:Soros port folytonos
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#### Language Code:IT
## Language Version:20210417
## Language Version:20210509
## Maximum byte per keyword is 250 Bytes.
## Escape characters are not supported except newline '\n'

Expand All @@ -10,6 +10,7 @@ label_rotate_ui:Ruota
label_terminal_ack:Mostra ACK in console
label_persistent_info:Mostra barra di stato
label_file_list_mode:File in modalità lista
label_file_sort_by:Sort files by
label_ack_notification:Tipo di popup
label_emulate_m600:Emula M600
label_serial_always_on:Seriale sempre accesa
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#### Language Code:JP
## Language Version:20210417
## Language Version:20210509
## Maximum byte per keyword is 250 Bytes.
## Escape characters are not supported except newline '\n'

Expand All @@ -10,6 +10,7 @@ label_rotate_ui:回転UI
label_terminal_ack:端末でACKを表示する
label_persistent_info:永続的なステータス情報
label_file_list_mode:ファイルビューアリストモード
label_file_sort_by:Sort files by
label_ack_notification:ACK notification style
label_emulate_m600:Emulate M600
label_serial_always_on:Serial Always ON
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#### Language Code:PL
## Language Version:20210417
## Language Version:20210509
## Maximum byte per keyword is 250 Bytes.
## Escape characters are not supported except newline '\n'

Expand All @@ -10,6 +10,7 @@ label_rotate_ui:Obrót
label_terminal_ack:Show ACK in Terminal
label_persistent_info:Persistent Status Info
label_file_list_mode:Files viewer List Mode
label_file_sort_by:Sort files by
label_ack_notification:ACK notification style
label_emulate_m600:Emulate M600
label_serial_always_on:Serial Always ON
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#### Language Code:PT
## Language Version:20210417
## Language Version:20210509
## Maximum byte per keyword is 250 Bytes.
## Escape characters are not supported except newline '\n'

Expand All @@ -10,6 +10,7 @@ label_rotate_ui:Rodar
label_terminal_ack:Show ACK in Terminal
label_persistent_info:Persistent Status Info
label_file_list_mode:Files viewer List Mode
label_file_sort_by:Sort files by
label_ack_notification:ACK notification style
label_emulate_m600:Emulate M600
label_serial_always_on:Serial Always ON
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#### Language Code:RU
## Language Version:20210417
## Language Version:20210509
## Maximum byte per keyword is 250 Bytes.
## Escape characters are not supported except newline '\n'

Expand All @@ -10,6 +10,7 @@ label_rotate_ui:Переворот
label_terminal_ack:ACK терминала (C°)
label_persistent_info:Нагрев в инфостроке
label_file_list_mode:Файлы в режиме строк
label_file_sort_by:Sort files by
label_ack_notification:ACK стиль уведомления
label_emulate_m600:Эмуляция M600
label_serial_always_on:Serial Always ON
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#### Language Code:SK
## Language Version:20210417
## Language Version:20210509
## Maximum byte per keyword is 250 Bytes.
## Escape characters are not supported except newline '\n'

Expand All @@ -10,6 +10,7 @@ label_rotate_ui:Otočiť
label_terminal_ack:Show ACK in Terminal
label_persistent_info:Trvalé info o stave
label_file_list_mode:Zobraziť súbory ako zoznam
label_file_sort_by:Sort files by
label_ack_notification:ACK notification style
label_emulate_m600:Emulate M600
label_serial_always_on:Serial Always ON
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#### Language Code:SL
## Language Version:20210417
## Language Version:20210509
## Maximum byte per keyword is 250 Bytes.
## Escape characters are not supported except newline '\n'

Expand All @@ -10,6 +10,7 @@ label_rotate_ui:Obrni UI
label_terminal_ack:Pokaži ACK v terminalu
label_persistent_info:Stalno prikazuj status
label_file_list_mode:Prikaz datotek v seznamu
label_file_sort_by:Sort files by
label_ack_notification:ACK notification style
label_emulate_m600:Emulate M600
label_serial_always_on:Serial Always ON
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#### Language Code:TC
## Language Version:20210417
## Language Version:20210509
## Maximum byte per keyword is 250 Bytes.
## Escape characters are not supported except newline '\n'

Expand All @@ -10,6 +10,7 @@ label_rotate_ui:顯示方向
label_terminal_ack:在G-code終端顯示溫度
label_persistent_info:頂部溫度訊息
label_file_list_mode:文件預覽列表模式
label_file_sort_by:Sort files by
label_ack_notification:ACK 弹窗类型
label_emulate_m600:Emulate M600
label_serial_always_on:Serial Always ON
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#### Language Code:TR
## Language Version:20210417
## Language Version:20210509
## Maximum byte per keyword is 250 Bytes.
## Escape characters are not supported except newline '\n'

Expand All @@ -10,6 +10,7 @@ label_rotate_ui:Döndür
label_terminal_ack:Terminalde onay mesajları
label_persistent_info:Kalıcı Durum Mesajı
label_file_list_mode:Liste Görünümü
label_file_sort_by:Sort files by
label_ack_notification:Onay mesajı stili
label_emulate_m600:Emulate M600
label_serial_always_on:Seri Bağ. Sürekli Açık
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#### Language Code:UK
## Language Version:20210417
## Language Version:20210509
## Maximum byte per keyword is 250 Bytes.
## Escape characters are not supported except newline '\n'

Expand All @@ -10,6 +10,7 @@ label_rotate_ui:Повернути інтерфейс
label_terminal_ack:ACK терміналу (°С)
label_persistent_info:Нагрівання в інфостроці
label_file_list_mode:Файли в режимі рядків
label_file_sort_by:Sort files by
label_ack_notification:ACK стиль повідомлення
label_emulate_m600:Emulate M600
label_serial_always_on:Serial Always ON
Expand Down
Binary file modified Copy to SD Card root directory to update/MKS_TFT28_V3.0.27.x.bin
Binary file not shown.
Binary file modified Copy to SD Card root directory to update/MKS_TFT28_V4.0.27.x.bin
Binary file not shown.
Binary file modified Copy to SD Card root directory to update/MKS_TFT32_V1.3.27.x.bin
Binary file not shown.
Binary file modified Copy to SD Card root directory to update/MKS_TFT32_V1.4.27.x.bin
Binary file not shown.
18 changes: 13 additions & 5 deletions Copy to SD Card root directory to update/config.ini
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
# Supported Marlin Firmware Versions
#--------------------------------------------------------------------
#
# Minimum Marlin firmware version: 2.0.5.4
# Distribution date: 2020-05-12
# Minimum Marlin firmware version: 2.0.8.1
# Distribution date: 2021-05-15
# Firmware source: https://github.com/MarlinFirmware/Marlin/releases
#
# In order the TFT firmware is able to provide all of its functionalities/features,
Expand Down Expand Up @@ -156,11 +156,19 @@ invert_axis:X0 Y0 Z0 LY0
# Options: [enable: 1, disable: 0]
persistent_info:0

#### File List Mode
#### Files List Mode
# Display files in list mode instead of icon mode.
# Options: [enable: 1, disable: 0]
files_list_mode:1

#### Files Sorting
# Sort files and folders based on the selected option.
#
# NOTE: Only applicable for files in TFT SD Card and TFT USB Stick.
#
# Options: [Date Newest First: 0, Date Oldest First: 1, Name Ascending: 2, Name Descending: 3]
files_sort_by:0

#### Notification Style For ACK Messages
# Set the notification style to use for displaying the ACK messages which start with 'echo:'.
#
Expand Down Expand Up @@ -455,7 +463,7 @@ z_raise_probing:20
# Enable this setting to show icon on ABL menu which allows to run G34 command (it requires
# Z_STEPPER_AUTO_ALIGN enabled in Configuration_adv.h in Marlin firmware).
#
# NOTE: Only for Marlin printers with one stepper driver per Z stepper motor and no Z timing belt. Also requires a BLTouch.
# NOTE: Only for Marlin printers with one stepper driver per Z stepper motor and no Z timing belt.
#
# Options: [enable: 1, disable: 0]
z_steppers_alignment:0
Expand Down Expand Up @@ -536,7 +544,7 @@ fil_runout_distance:7


#--------------------------------------------------------------------
# Power Loss Recovery & BTT UPS Settings (if connected to TFT controller)
# Power Loss Recovery & BTT UPS Settings
#--------------------------------------------------------------------

#### Default Power Loss Recovery Mode
Expand Down
Loading