Skip to content

Commit

Permalink
Add non-blocking toast notifications, Add a separate sound control me…
Browse files Browse the repository at this point in the history
…nu, Add SPI flash usage detail in info screen (bigtreetech#961)
  • Loading branch information
guruathwal authored Aug 13, 2020
1 parent c75f9f3 commit 44088a8
Show file tree
Hide file tree
Showing 96 changed files with 1,033 additions and 1,273 deletions.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -88,33 +88,17 @@ persistent_info:0
# Options: [enable: 1, disable: 0]
files_list_mode:1

#### Popup message type for ACK messages
# Set the popup message type to be used for displaying the following ACK message types:
# error ACK: an error ACK message
# unknown echo ACK: an echo ACK message not recognized (not requiring a specific handling) by the TFT
#
# Three popup message types are available:
# OFF: no popup. The message is silently discarded
# ON: A reminder popup is displayed. A user interaction is needed
# SMART: A notification popup is displayed for few seconds. No user interaction is needed
#### Notification style for ACK messages
# Set the notification style to use for displaying the ACK messages which start with 'echo:'
#
# NOTE: The OFF value is applied to any ACK message type (e.g. even to known echo ACK).
# It means that any kind of ACK message is silently discard
#
# Options: [OFF: 0, ON: 1, SMART: 2]
ack_popup_type:1

#### Buzzer/sound for ACK messages
# Enable or disable the buzzer for the following ACK message types:
# error ACK: an error ACK message
# unknown echo ACK: an echo ACK message not recognized (not requiring a specific handling) by the TFT
#
# NOTE: The "disable" value is applied to any ACK message type (e.g. even to known echo ACK).
# It means that any kind of ACK message is silenced
#
# Options: [enable: 1, disable: 0]
ack_buzzer:1

# Options: [OFF: 0, POPUP: 1, TOAST: 2]
# OFF: No notification. The message is ignored.
# POPUP: Display a popup window for user confirmation.
# TOAST: A non-blocking Toast notification is displayed for few seconds. No user interaction is needed
ack_notification:1

#--------------------------------------------------------------------
# Marlin Mode Settings (Only for TFT24_V1.1 & TFT28/TFT35/TFT43/TFT50/TFT70_V3.0)
Expand Down Expand Up @@ -334,9 +318,17 @@ btt_mini_ups:0
# Other device-specific settings
#--------------------------------------------------------------------

#### Buzzer / sound
#### Sounds / Buzzer
# set sounds ON or OFF
# touch_sound: enable/disable this to control touch feedback sound
# toast_sound: enable/disable this to control all toast notification sounds
# alert_sound: enable/disable this to control all popup and alert sounds
# like print finish alert, dialog sound etc.
# NOTE: Error messages from printer will always play the error sound.
# Options: [enable: 1, disable: 0]
buzzer:1
touch_sound:1
toast_sound:1
alert_sound:1

#### Knob Led Color (only for TFT35 E3.0)
# Options: [LED_OFF: 0, LED_WHITE: 1, LED_RED: 2, LED_ORANGE: 3, LED_YELLOW: 4, LED_GREEN: 5, LED_BLUE: 6, LED_INDIGO: 7, LED_VIOLET: 8]
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
44 changes: 18 additions & 26 deletions Copy to SD Card root directory to update/config.ini
Original file line number Diff line number Diff line change
Expand Up @@ -88,33 +88,17 @@ persistent_info:0
# Options: [enable: 1, disable: 0]
files_list_mode:1

#### Popup message type for ACK messages
# Set the popup message type to be used for displaying the following ACK message types:
# error ACK: an error ACK message
# unknown echo ACK: an echo ACK message not recognized (not requiring a specific handling) by the TFT
#
# Three popup message types are available:
# OFF: no popup. The message is silently discarded
# ON: A reminder popup is displayed. A user interaction is needed
# SMART: A notification popup is displayed for few seconds. No user interaction is needed
#### Notification style for ACK messages
# Set the notification style to use for displaying the ACK messages which start with 'echo:'
#
# NOTE: The OFF value is applied to any ACK message type (e.g. even to known echo ACK).
# It means that any kind of ACK message is silently discard
#
# Options: [OFF: 0, ON: 1, SMART: 2]
ack_popup_type:1

#### Buzzer/sound for ACK messages
# Enable or disable the buzzer for the following ACK message types:
# error ACK: an error ACK message
# unknown echo ACK: an echo ACK message not recognized (not requiring a specific handling) by the TFT
#
# NOTE: The "disable" value is applied to any ACK message type (e.g. even to known echo ACK).
# It means that any kind of ACK message is silenced
#
# Options: [enable: 1, disable: 0]
ack_buzzer:1

# Options: [OFF: 0, POPUP: 1, TOAST: 2]
# OFF: No notification. The message is ignored.
# POPUP: Display a popup window for user confirmation.
# TOAST: A non-blocking Toast notification is displayed for few seconds. No user interaction is needed
ack_notification:1

#--------------------------------------------------------------------
# Marlin Mode Settings (Only for TFT24_V1.1 & TFT28/TFT35/TFT43/TFT50/TFT70_V3.0)
Expand Down Expand Up @@ -334,9 +318,17 @@ btt_mini_ups:0
# Other device-specific settings
#--------------------------------------------------------------------

#### Buzzer / sound
#### Sounds / Buzzer
# set sounds ON or OFF
# touch_sound: enable/disable this to control touch feedback sound
# toast_sound: enable/disable this to control all toast notification sounds
# alert_sound: enable/disable this to control all popup and alert sounds
# like print finish alert, dialog sound etc.
# NOTE: Error messages from printer will always play the error sound.
# Options: [enable: 1, disable: 0]
buzzer:1
touch_sound:1
toast_sound:1
alert_sound:1

#### Knob Led Color (only for TFT35 E3.0)
# Options: [LED_OFF: 0, LED_WHITE: 1, LED_RED: 2, LED_ORANGE: 3, LED_YELLOW: 4, LED_GREEN: 5, LED_BLUE: 6, LED_INDIGO: 7, LED_VIOLET: 8]
Expand All @@ -347,7 +339,7 @@ knob_led_color:0
knob_led_idle:1

#### Default LCD Brightness levels (only for TFT35v3.0 & TFT28v3.0)
# Options: [(Off) 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 (full)]
# Options: [(off) 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 (full)]
lcd_brightness:11
lcd_idle_brightness:5

Expand Down
9 changes: 5 additions & 4 deletions TFT/src/User/API/Language/Language.inc
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,10 @@ X_WORD (SETTINGS)
X_WORD (SCREEN_SETTINGS)
X_WORD (MACHINE_SETTINGS)
X_WORD (FEATURE_SETTINGS)
X_WORD (SILENT_ON)
X_WORD (SILENT_OFF)
X_WORD (SOUND)
X_WORD (TOUCH_SOUND)
X_WORD (ALERT_SOUND)
X_WORD (TOAST_SOUND)
X_WORD (SHUT_DOWN)
X_WORD (RGB_SETTINGS)
X_WORD (RGB_OFF)
Expand Down Expand Up @@ -242,8 +244,7 @@ X_WORD (SWAP_RECOVER_FEEDRATE)
X_WORD (RECOVER_LENGTH)
X_WORD (SWAP_RECOVER_LENGTH)
X_WORD (START_PRINT)
X_WORD (ACK_POPUP_TYPE)
X_WORD (ACK_BUZZER)
X_WORD (ACK_NOTIFICATION)
X_WORD (LEVELING_EDGE_DISTANCE)
X_WORD (XY_UNLOCK)
X_WORD (TUNING)
Expand Down
17 changes: 9 additions & 8 deletions TFT/src/User/API/Language/language_am.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,10 @@
#define AM_SCREEN_SETTINGS "Screen"
#define AM_MACHINE_SETTINGS "Machine"
#define AM_FEATURE_SETTINGS "Feature"
#define AM_SILENT_ON "Silent On"
#define AM_SILENT_OFF "Silent Off"
#define AM_SOUND "Sound"
#define AM_TOUCH_SOUND "Touch sounds"
#define AM_TOAST_SOUND "Toast Notifications"
#define AM_ALERT_SOUND "Popups and Alerts"
#define AM_SHUT_DOWN "Shut Down"
#define AM_RGB_SETTINGS "LED Color"
#define AM_RGB_OFF "LED Off"
Expand Down Expand Up @@ -57,9 +59,9 @@
#define AM_DEFAULT "Default"
#define AM_NEXT "Next"
#define AM_DISTANCE "Distance"
#define AM_INVALID_VALUE "No valid value/s provided!"
#define AM_INVALID_VALUE "Invalid value(s)"
#define AM_TIMEOUT_REACHED "Timeout reached!"
#define AM_PROCESS_RUNNING "Process running! Wait completion"
#define AM_PROCESS_RUNNING "Process already running!"
#define AM_PROCESS_COMPLETED "Process completed!"
#define AM_PROCESS_ABORTED "Process aborted!"
#define AM_APPLY "Apply"
Expand Down Expand Up @@ -237,16 +239,15 @@
#define AM_RECOVER_LENGTH "Extra recover length"
#define AM_SWAP_RECOVER_LENGTH "Extra recover swap length"
#define AM_START_PRINT "Start Printing:\n %s?"
#define AM_ACK_POPUP_TYPE "ACK popup type"
#define AM_ACK_BUZZER "ACK buzzer"
#define AM_ACK_NOTIFICATION "ACK notification style"
#define AM_LEVELING_EDGE_DISTANCE "Bed edge distance"
#define AM_XY_UNLOCK "Unlock XY"
#define AM_TUNING "Tuning"
#define AM_PID "PID"
#define AM_PID_TITLE "PID autotune"
#define AM_PID_START_INFO "PID autotune will be started. It can take minutes. Continue?"
#define AM_PID_START_INFO "PID autotune may take\nsome time to complete.\nContinue?"
#define AM_PID_START_INFO_2 "PID autotune in progress!"
#define AM_PID_START_INFO_3 "DO NOT touch the screen until completed (green LED on)!"
#define AM_PID_START_INFO_3 "Do not touch the screen until completed (green LED ON)!"
#define AM_EXTRUDE_100 "Ext. 100mm"
#define AM_CONNECTION_SETTINGS "Connection"

Expand Down
17 changes: 9 additions & 8 deletions TFT/src/User/API/Language/language_ca.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,10 @@
#define CA_SCREEN_SETTINGS "Pantalla"
#define CA_MACHINE_SETTINGS "Màquina"
#define CA_FEATURE_SETTINGS "Afegits"
#define CA_SILENT_ON "Sense so"
#define CA_SILENT_OFF "So"
#define CA_SOUND "Sound"
#define CA_TOUCH_SOUND "Touch sounds"
#define CA_TOAST_SOUND "Toast Notifications"
#define CA_ALERT_SOUND "Popups and Alerts"
#define CA_SHUT_DOWN "Apagar"
#define CA_RGB_SETTINGS "Color LED"
#define CA_RGB_OFF "Apagar LED"
Expand Down Expand Up @@ -57,9 +59,9 @@
#define CA_DEFAULT "Default"
#define CA_NEXT "Next"
#define CA_DISTANCE "Distance"
#define CA_INVALID_VALUE "No valid value/s provided!"
#define CA_INVALID_VALUE "Invalid value(s)"
#define CA_TIMEOUT_REACHED "Timeout reached!"
#define CA_PROCESS_RUNNING "Process running! Wait completion"
#define CA_PROCESS_RUNNING "Process already running!"
#define CA_PROCESS_COMPLETED "Process completed!"
#define CA_PROCESS_ABORTED "Process aborted!"
#define CA_APPLY "Aplicar"
Expand Down Expand Up @@ -237,16 +239,15 @@
#define CA_RECOVER_LENGTH "Distancia recuperació extra"
#define CA_SWAP_RECOVER_LENGTH "Distancia recuperació intercanvi extra"
#define CA_START_PRINT "Comenceu a imprimir:\n %s?"
#define CA_ACK_POPUP_TYPE "ACK popup type"
#define CA_ACK_BUZZER "ACK buzzer"
#define CA_ACK_NOTIFICATION "ACK notification style"
#define CA_LEVELING_EDGE_DISTANCE "Bed edge distance"
#define CA_XY_UNLOCK "Unlock XY"
#define CA_TUNING "Tuning"
#define CA_PID "PID"
#define CA_PID_TITLE "PID autotune"
#define CA_PID_START_INFO "PID autotune will be started. It can take minutes. Continue?"
#define CA_PID_START_INFO "PID autotune may take\nsome time to complete.\nContinue?"
#define CA_PID_START_INFO_2 "PID autotune in progress!"
#define CA_PID_START_INFO_3 "DO NOT touch the screen until completed (green LED on)!"
#define CA_PID_START_INFO_3 "Do not touch the screen until completed (green LED ON)!"
#define CA_EXTRUDE_100 "Ext. 100mm"
#define CA_CONNECTION_SETTINGS "Connection"

Expand Down
9 changes: 5 additions & 4 deletions TFT/src/User/API/Language/language_cn.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,10 @@
#define CN_SCREEN_SETTINGS "屏幕设置"
#define CN_MACHINE_SETTINGS "机器设置"
#define CN_FEATURE_SETTINGS "功能设置"
#define CN_SILENT_ON "静音模式"
#define CN_SILENT_OFF "响铃模式"
#define CN_SOUND "Sound"
#define CN_TOUCH_SOUND "Touch sounds"
#define CN_TOAST_SOUND "Toast Notifications"
#define CN_ALERT_SOUND "Popups and Alerts"
#define CN_SHUT_DOWN "关闭电源"
#define CN_RGB_SETTINGS "灯光颜色"
#define CN_RGB_OFF "熄灭灯光"
Expand Down Expand Up @@ -237,8 +239,7 @@
#define CN_RECOVER_LENGTH "额外挤出的长度"
#define CN_SWAP_RECOVER_LENGTH "换料时额外挤出的长度"
#define CN_START_PRINT "是否开始打印:\n %s?"
#define CN_ACK_POPUP_TYPE "ACK 弹窗类型"
#define CN_ACK_BUZZER "ACK 声音"
#define CN_ACK_NOTIFICATION "ACK 弹窗类型"
#define CN_LEVELING_EDGE_DISTANCE "手动调平边沿距离"
#define CN_XY_UNLOCK "解锁XY"
#define CN_TUNING "调整"
Expand Down
11 changes: 6 additions & 5 deletions TFT/src/User/API/Language/language_cz.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,10 @@
#define CZ_SCREEN_SETTINGS "Vzhled"
#define CZ_MACHINE_SETTINGS "Tiskárna"
#define CZ_FEATURE_SETTINGS "Vlastnosti"
#define CZ_SILENT_ON "Tichý"
#define CZ_SILENT_OFF "Pípání"
#define CZ_SOUND "Sound"
#define CZ_TOUCH_SOUND "Touch sounds"
#define CZ_TOAST_SOUND "Toast Notifications"
#define CZ_ALERT_SOUND "Popups and Alerts"
#define CZ_SHUT_DOWN "Vypnout"
#define CZ_RGB_SETTINGS "Barva LED"
#define CZ_RGB_OFF "LED vyp."
Expand Down Expand Up @@ -59,7 +61,7 @@
#define CZ_DISTANCE "Vzdálenost"
#define CZ_INVALID_VALUE "Neplatná hodnota/y!"
#define CZ_TIMEOUT_REACHED "Časový limit vypršel!"
#define CZ_PROCESS_RUNNING "Probíhá proces! Počkejte na dokončení"
#define CZ_PROCESS_RUNNING "Probíhá proces!"
#define CZ_PROCESS_COMPLETED "Proces dokončen!"
#define CZ_PROCESS_ABORTED "Proces přerušen!"
#define CZ_APPLY "Použít"
Expand Down Expand Up @@ -237,8 +239,7 @@
#define CZ_RECOVER_LENGTH "Délka obnovení"
#define CZ_SWAP_RECOVER_LENGTH "Délka obnovení Swap"
#define CZ_START_PRINT "Spustit tisk:\n %s?"
#define CZ_ACK_POPUP_TYPE "ACK typ vyskakovacího okna"
#define CZ_ACK_BUZZER "ACK Bzučák"
#define CZ_ACK_NOTIFICATION "Styl oznámení ACK"
#define CZ_LEVELING_EDGE_DISTANCE "Vzdálenost nivelačních bodů\n stolku od kraje"
#define CZ_XY_UNLOCK "Uvolnit XY"
#define CZ_TUNING "Kalibrace"
Expand Down
17 changes: 9 additions & 8 deletions TFT/src/User/API/Language/language_de.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,10 @@
#define DE_SCREEN_SETTINGS "Bildschirm"
#define DE_MACHINE_SETTINGS "Drucker"
#define DE_FEATURE_SETTINGS "Feature"
#define DE_SILENT_ON "Ton An"
#define DE_SILENT_OFF "Ton Aus"
#define DE_SOUND "Sound"
#define DE_TOUCH_SOUND "Touch sounds"
#define DE_TOAST_SOUND "Toast Notifications"
#define DE_ALERT_SOUND "Popups and Alerts"
#define DE_SHUT_DOWN "Auschalten (PS_ON)"
#define DE_RGB_SETTINGS "LED Farbe"
#define DE_RGB_OFF "LED Aus"
Expand Down Expand Up @@ -57,9 +59,9 @@
#define DE_DEFAULT "Default"
#define DE_NEXT "Next"
#define DE_DISTANCE "Distance"
#define DE_INVALID_VALUE "No valid value/s provided!"
#define DE_INVALID_VALUE "Invalid value(s)"
#define DE_TIMEOUT_REACHED "Timeout reached!"
#define DE_PROCESS_RUNNING "Process running! Wait completion"
#define DE_PROCESS_RUNNING "Process already running!"
#define DE_PROCESS_COMPLETED "Process completed!"
#define DE_PROCESS_ABORTED "Process aborted!"
#define DE_APPLY "Apply"
Expand Down Expand Up @@ -237,16 +239,15 @@
#define DE_RECOVER_LENGTH "Extra recover length"
#define DE_SWAP_RECOVER_LENGTH "Extra recover swap length"
#define DE_START_PRINT "Start Printing:\n %s?"
#define DE_ACK_POPUP_TYPE "ACK popup type"
#define DE_ACK_BUZZER "ACK buzzer"
#define DE_ACK_NOTIFICATION "ACK notification style"
#define DE_LEVELING_EDGE_DISTANCE "Bed edge distance"
#define DE_XY_UNLOCK "Schalte XY frei"
#define DE_TUNING "Tuning"
#define DE_PID "PID"
#define DE_PID_TITLE "PID autotune"
#define DE_PID_START_INFO "PID autotune will be started. It can take minutes. Continue?"
#define DE_PID_START_INFO "PID autotune may take\nsome time to complete.\nContinue?"
#define DE_PID_START_INFO_2 "PID autotune in progress!"
#define DE_PID_START_INFO_3 "DO NOT touch the screen until completed (green LED on)!"
#define DE_PID_START_INFO_3 "Do not touch the screen until completed (green LED ON)!"
#define DE_EXTRUDE_100 "Ext. 100mm"
#define DE_CONNECTION_SETTINGS "Connection"

Expand Down
13 changes: 7 additions & 6 deletions TFT/src/User/API/Language/language_du.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,10 @@
#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_SOUND "Sound"
#define DU_TOUCH_SOUND "Touch sounds"
#define DU_TOAST_SOUND "Toast Notifications"
#define DU_ALERT_SOUND "Popups and Alerts"
#define DU_SHUT_DOWN "Uitschakelen"
#define DU_RGB_SETTINGS "LED Kleur"
#define DU_RGB_OFF "LED Uit"
Expand Down Expand Up @@ -59,7 +61,7 @@
#define DU_DISTANCE "Afstand"
#define DU_INVALID_VALUE "Geen correcte waarde/s voorzien!"
#define DU_TIMEOUT_REACHED "Time-out bereikt!"
#define DU_PROCESS_RUNNING "Process bezig! Wacht op voltooiing"
#define DU_PROCESS_RUNNING "Process bezig!"
#define DU_PROCESS_COMPLETED "Process voltooid!"
#define DU_PROCESS_ABORTED "Process geannuleerd!"
#define DU_APPLY "Pas toe"
Expand Down Expand Up @@ -237,14 +239,13 @@
#define DU_RECOVER_LENGTH "Extra recover length"
#define DU_SWAP_RECOVER_LENGTH "Extra recover swap length"
#define DU_START_PRINT "Start afdruk:\n %s?"
#define DU_ACK_POPUP_TYPE "ACK popup type"
#define DU_ACK_BUZZER "ACK buzzer"
#define DU_ACK_NOTIFICATION "ACK notification style"
#define DU_LEVELING_EDGE_DISTANCE "Bed edge distance"
#define DU_XY_UNLOCK "Ontgrendel XY"
#define DU_TUNING "Tuning"
#define DU_PID "PID"
#define DU_PID_TITLE "PID autotune"
#define DU_PID_START_INFO "PID autotune zal starten. Dit kan een paar minuten duren. Doorgaan?"
#define DU_PID_START_INFO "PID autotune zal starten.\nDit kan een paar minuten duren.\nDoorgaan?"
#define DU_PID_START_INFO_2 "PID autotune is bezig!"
#define DU_PID_START_INFO_3 "Raak het scherm NIET aan totdat deze klaar is (groene LED aan)!"
#define DU_EXTRUDE_100 "Ext. 100mm"
Expand Down
Loading

0 comments on commit 44088a8

Please sign in to comment.