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

Add new settings categories and clean up #1633

Merged
merged 41 commits into from
Feb 26, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
fb1b1f6
remove unnecessary global variables
guruathwal Jan 24, 2021
6d12b58
fix busy wait bug in load unload
guruathwal Jan 24, 2021
f0c631a
Merge remote-tracking branch 'upstream/master' into dev
guruathwal Jan 24, 2021
dded776
Merge remote-tracking branch 'upstream/master' into dev
guruathwal Jan 27, 2021
a5d3d7d
Update Print.c
guruathwal Jan 27, 2021
060392c
stringToDouble ignore tab character
guruathwal Jan 27, 2021
bedd622
Merge remote-tracking branch 'upstream/master' into dev
guruathwal Feb 1, 2021
7dfa91f
Update Fan.c
guruathwal Feb 6, 2021
556f650
Update Fan.c
guruathwal Feb 6, 2021
b99c89b
Add new settings categories and clean up
guruathwal Feb 17, 2021
129ca96
Merge remote-tracking branch 'upstream/master' into dev
guruathwal Feb 17, 2021
2f19978
Update ScreenSettings.c
guruathwal Feb 18, 2021
9620050
Update pin_TFT24_V1_1.h
guruathwal Feb 18, 2021
037dcee
Update pin_MKS_TFT32_V1_4.h
guruathwal Feb 18, 2021
7d11545
Update ScreenSettings.c
guruathwal Feb 18, 2021
785795d
Merge branch 'dev' of https://github.com/guruathwal/BIGTREETECH-Touch…
guruathwal Feb 18, 2021
f01160e
replace u8, u16, u32 with uint8_t, uint16_t, uint32_t
guruathwal Feb 18, 2021
2c67c7b
Update Babystep.c
guruathwal Feb 18, 2021
dde824f
fix typo
guruathwal Feb 18, 2021
6e0db2a
fix case
guruathwal Feb 18, 2021
07175d6
update icons
guruathwal Feb 20, 2021
eaa7927
Update language_keywords.h
guruathwal Feb 20, 2021
3bbf84b
fix wrong values in parameter settings
guruathwal Feb 20, 2021
39e22be
update banner text
guruathwal Feb 20, 2021
0d5c8ec
fix M92 E and M218
guruathwal Feb 21, 2021
7d53477
Update ScreenSettings.c
guruathwal Feb 21, 2021
10ca841
update round miracle icons
guruathwal Feb 21, 2021
c9d8786
Update interfaceCmd.c
guruathwal Feb 21, 2021
4e36c08
Update Parametersetting.c
guruathwal Feb 21, 2021
e90576a
fix main board not booting if serial is disabled on booting in marlin…
guruathwal Feb 21, 2021
cc30818
fix main board not booting if serial is disabled on booting in marlin…
guruathwal Feb 21, 2021
1e2aee5
Update interfaceCmd.c
guruathwal Feb 21, 2021
fd7bace
Update MarlinMode.c
guruathwal Feb 21, 2021
6a12928
Update Selectmode.c
guruathwal Feb 21, 2021
87c0442
Update Selectmode.c
guruathwal Feb 21, 2021
cc75b9a
Update MachineParameters.c
guruathwal Feb 22, 2021
16ca121
enable post-processor for SSD1963
guruathwal Feb 23, 2021
690e42a
move frequently polled commands to top in parseACK.c
guruathwal Feb 23, 2021
da621b0
Update utf8_decode.c
guruathwal Feb 23, 2021
711437c
sync language_hu.h
Msq001 Feb 25, 2021
5d038c4
Merge branch 'dev' of https://github.com/guruathwal/BIGTREETECH-Touch…
guruathwal Feb 25, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#### Language Code:AM
## Language Version:20210130
## Language Version:20210217
## Maximum byte per keyword is 250 Bytes.
## Escape characters are not supported except newline '\n'

Expand All @@ -8,30 +8,20 @@ label_baudrate:BaudRate
label_language:Հայերեն
label_rotate_ui:Rotate UI
label_terminal_ack:Show ACK in Terminal
label_invert_x_axis:Invert X Axis
label_invert_y_axis:Invert Y Axis
label_invert_z_axis:Invert Z Axis
label_persistent_info:Persistent Status Info
label_file_list_mode:Files viewer List Mode
label_ack_notification:ACK notification style
label_default_mode:Default Mode
label_serial_always_on:Serial Always ON
label_marlin_show_title:Marlin Mode Title Support
label_marlin_fullscreen:Marlin mode in fullscreen
label_marlin_type:Marlin Mode Type
label_move_speed:Move speed(X Y Z)
label_auto_load_leveling:Auto Save Load Leveling
label_touchmi_sensor:TouchMI
label_onboard_sd_support:Onboard SD Card Support
label_m27_always_active:M27 Always Active
label_long_filename_support:Long File Names Support
label_fan_speed_percent:Fan Speed As Percentage
label_xy_offset_probing:XY Offset Probing Support
label_z_steppers_alignment:Z Steppers Auto-Alignment
label_ps_on:Auto Power
label_ps_on_active_high:Power Supply Active HIGH
label_fil_runout:Filament sensor
label_fil_runout_inverting:Inverted Filament Runout Logic
label_pl_recovery_en:Power loss recovery
label_pl_recovery_home:Power Loss Recovery Homing
label_btt_mini_ups:BTT UPS Support
Expand All @@ -41,9 +31,9 @@ label_alert_sound:Popups and Alerts
label_heater_sound:Heater notification
label_knob_led_color:Rotary Knob LED
label_knob_led_idle:Rotary Knob LED idle
label_lcd_brightness:LCD Brightness
label_lcd_idle_brightness:LCD Brightness dim
label_lcd_idle_delay:LCD dim idle timer
label_lcd_brightness:Brightness
label_lcd_idle_brightness:Idle brightness
label_lcd_idle_delay:Idle timeout
label_start_gcode_enabled:Start Gcode before print
label_end_gcode_enabled:End Gcode after print
label_cancel_gcode_enabled:Cancel Gcode
Expand All @@ -57,7 +47,7 @@ label_home_offset:Home Offset
label_fwretract:FW Retraction
label_fwrecover:FW Retraction Recover
label_retract_auto:Auto Firmware Retract
label_offset_tool:Offset 2nd Nozzle
label_hotend_offset:Offset 2nd Nozzle
label_probe_offset:Probe Offset
label_lin_advance:Linear Advance
label_current_setting:Driver Current (mA)
Expand Down Expand Up @@ -214,6 +204,7 @@ label_extrude:Հալել
label_settings:Կարգավորումներ
label_screen_settings:Screen
label_machine_settings:Machine
label_marlin_mode_settings:MarlinMode
label_feature_settings:Feature
label_sound:Sound
label_rgb_settings:LED Color
Expand Down Expand Up @@ -254,8 +245,8 @@ label_load_unload_short:(Un)Load
label_touchscreen_adjust:TSC Adjust
label_more:More
label_screen_info:Info
label_simulator_bg_color:Marlin simulator background color
label_simulator_font_color:Marlin simulator font color
label_bg_color:Background color
label_font_color:Font color
label_percentage:Percentage
label_percentage_speed:Արագություն
label_percentage_flow:Flow
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#### Language Code:CA
## Language Version:20210130
## Language Version:20210217
## Maximum byte per keyword is 250 Bytes.
## Escape characters are not supported except newline '\n'

Expand All @@ -8,30 +8,20 @@ label_baudrate:Velocitat de transmissió
label_language:Català
label_rotate_ui:Rotar
label_terminal_ack:Mostra ACK a la terminal
label_invert_x_axis:Invertir eix X
label_invert_y_axis:Invertir eix Y
label_invert_z_axis:Invertir eix Z
label_persistent_info:Informació d'estat persistent
label_file_list_mode:Mode de visualització de fitxers
label_ack_notification:ACK notification style
label_default_mode:Default Mode
label_serial_always_on:Serial Always ON
label_marlin_show_title:Marlin Mode Title Support
label_marlin_fullscreen:Mode Marlin a pantalla completa
label_marlin_type:Marlin Mode Type
label_move_speed:Velocitat de moviment(X Y Z)
label_auto_load_leveling:Auto Save Load Leveling
label_touchmi_sensor:TouchMI
label_onboard_sd_support:Onboard SD Card Support
label_m27_always_active:M27 Always Active
label_long_filename_support:Long File Names Support
label_fan_speed_percent:Fan Speed As Percentage
label_xy_offset_probing:XY Offset Probing Support
label_z_steppers_alignment:Z Steppers Auto-Alignment
label_ps_on:Apag. aut.
label_ps_on_active_high:Power Supply Active HIGH
label_fil_runout:Sensor de filament
label_fil_runout_inverting:Inverted Filament Runout Logic
label_pl_recovery_en:Recuperació de pèrdua d’energia
label_pl_recovery_home:Power Loss Recovery Homing
label_btt_mini_ups:BTT UPS Support
Expand All @@ -41,7 +31,7 @@ label_alert_sound:Popups and Alerts
label_heater_sound:Heater notification
label_knob_led_color:Perilla rotativa LED
label_knob_led_idle:Rotary Knob LED idle
label_lcd_brightness:Lluminositat LCD
label_lcd_brightness:Lluminositat
label_lcd_idle_brightness:Dim Lluminositat LCD
label_lcd_idle_delay:Temporitzador inactiu LCD
label_start_gcode_enabled:Enviar Gcode inicial
Expand All @@ -57,7 +47,7 @@ label_home_offset:Home Offset
label_fwretract:Retracció de FW
label_fwrecover:Recuperació de Retracció de FW
label_retract_auto:Auto Firmware Retract
label_offset_tool:Offset 2nd Nozzle
label_hotend_offset:Offset 2nd Nozzle
label_probe_offset:Sonda Compensar
label_lin_advance:Avanç Lineal
label_current_setting:Corrent del Driver (mA)
Expand Down Expand Up @@ -214,6 +204,7 @@ label_extrude:Extruir
label_settings:Configura
label_screen_settings:Pantalla
label_machine_settings:Màquina
label_marlin_mode_settings:MarlinMode
label_feature_settings:Afegits
label_sound:Sound
label_rgb_settings:Color LED
Expand Down Expand Up @@ -254,8 +245,8 @@ label_load_unload_short:(Un)Load
label_touchscreen_adjust:Calibrar
label_more:Més
label_screen_info:Informar
label_simulator_bg_color:Color de fons del simulador Marlin
label_simulator_font_color:Color de lletra de simulador Marlin
label_bg_color:Color de fons
label_font_color:Color de lletra
label_percentage:Percentatge
label_percentage_speed:Velocitat
label_percentage_flow:Flux
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#### Language Code:CN
## Language Version:20210130
## Language Version:20210217
## Maximum byte per keyword is 250 Bytes.
## Escape characters are not supported except newline '\n'

Expand All @@ -8,30 +8,20 @@ label_baudrate:波特率
label_language:简体中文
label_rotate_ui:旋转界面
label_terminal_ack:在G-code终端中显示温度信息
label_invert_x_axis:翻转X轴
label_invert_y_axis:翻转Y轴
label_invert_z_axis:翻转Z轴
label_persistent_info:顶部温度信息
label_file_list_mode:文件浏览列表模式
label_ack_notification:ACK 弹窗类型
label_default_mode:默认的模式
label_serial_always_on:串口常开
label_marlin_show_title:Marlin模式显示标题
label_marlin_fullscreen:全屏显示Marlin模式
label_marlin_type:Marlin模式类型
label_move_speed:移动速度(X Y Z)
label_auto_load_leveling:自动保存/加载调平数据
label_touchmi_sensor:TouchMI
label_onboard_sd_support:Marlin存储卡支持
label_m27_always_active:持续发送M27
label_long_filename_support:Marlin长文件名支持
label_fan_speed_percent:百分比显示风扇速度
label_xy_offset_probing:XY Offset Probing Support
label_z_steppers_alignment:Z轴多电机自动对齐
label_ps_on:自动关机
label_ps_on_active_high:低电平关机
label_fil_runout:耗材检测传感器
label_fil_runout_inverting:翻转耗材检测逻辑
label_pl_recovery_en:断电续打
label_pl_recovery_home:断电续打前归零
label_btt_mini_ups:启用BTT UPS
Expand All @@ -57,7 +47,7 @@ label_home_offset:原点偏移量
label_fwretract:FW Retraction
label_fwrecover:FW Retraction Recover
label_retract_auto:FW自动回抽
label_offset_tool:第2个喷头的偏移量
label_hotend_offset:第2个喷头的偏移量
label_probe_offset:探针偏移量
label_lin_advance:Linear Advance
label_current_setting:TMC驱动电流设置
Expand Down Expand Up @@ -214,6 +204,7 @@ label_extrude:挤出
label_settings:设置
label_screen_settings:屏幕设置
label_machine_settings:机器设置
label_marlin_mode_settings:MarlinMode
label_feature_settings:功能设置
label_sound:声音
label_rgb_settings:灯光颜色
Expand Down Expand Up @@ -254,8 +245,8 @@ label_load_unload_short:进/退料
label_touchscreen_adjust:触屏校准
label_more:更多
label_screen_info:关于
label_simulator_bg_color:Marlin模式背景颜色
label_simulator_font_color:Marlin模式字体颜色
label_bg_color:背景颜色
label_font_color:字体颜色
label_percentage:百分比
label_percentage_speed:速度百分比
label_percentage_flow:流量百分比
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#### Language Code:CZ
## Language Version:20210130
## Language Version:20210217
## Maximum byte per keyword is 250 Bytes.
## Escape characters are not supported except newline '\n'

Expand All @@ -8,30 +8,20 @@ label_baudrate:Serial Port
label_language:Čeština
label_rotate_ui:Otočit UI
label_terminal_ack:zobrazit ACK Terminálu
label_invert_x_axis:Otočit osu X
label_invert_y_axis:Otočit osu Y
label_invert_z_axis:Otočit osu Z
label_persistent_info:Zobrazení stavových ikon
label_file_list_mode:Soubory jako seznam
label_ack_notification:Styl oznámení ACK
label_default_mode:Defaultní mód
label_serial_always_on:Seriový port vždy ON
label_marlin_show_title:Zobrazit tytulek Marlin
label_marlin_fullscreen:Fullscreen režim Marlin
label_marlin_type:Typ Marlin Modu
label_move_speed:Rychlost pohybu X Y Z
label_auto_load_leveling:Automaticky Leveling
label_touchmi_sensor:TouchMI
label_onboard_sd_support:Podpora onboard SD
label_m27_always_active:M27 Vždy aktivní
label_long_filename_support:Podpora dlouhých názvů
label_fan_speed_percent:Rychlost ventilátoru v %
label_xy_offset_probing:Podpora XY Offset sondy
label_z_steppers_alignment:Z Motor Auto-Alignment
label_ps_on:Auto.vypnutí
label_ps_on_active_high:Napájení aktivní HIGH
label_fil_runout:Senzor filamentu
label_fil_runout_inverting:Otoč logiku senzoru filam.
label_pl_recovery_en:Obnova po ztrátě napájení
label_pl_recovery_home:Spuštění obnovení napájení
label_btt_mini_ups:Podpora BTT UPS
Expand All @@ -57,7 +47,7 @@ label_home_offset:Home Offset
label_fwretract:FW Zatažení
label_fwrecover:FW Obnovení
label_retract_auto:Auto Firmware Retract
label_offset_tool:Offset 2.trysky
label_hotend_offset:Offset 2.trysky
label_probe_offset:Offset sondy
label_lin_advance:Linear Advance
label_current_setting:Proud motorů (mA)
Expand Down Expand Up @@ -214,6 +204,7 @@ label_extrude:Filament
label_settings:Nastavení
label_screen_settings:Displej
label_machine_settings:Tiskárna
label_marlin_mode_settings:MarlinMode
label_feature_settings:Vlastnosti
label_sound:Zvuk
label_rgb_settings:Barva LED
Expand Down Expand Up @@ -254,8 +245,8 @@ label_load_unload_short:Vysunout
label_touchscreen_adjust:Kalibrovat
label_more:Více
label_screen_info:Info
label_simulator_bg_color:Marlin - Barva pozadí
label_simulator_font_color:Marlin - Barva písma
label_bg_color:Barva pozadí
label_font_color:Barva písma
label_percentage:Procenta
label_percentage_speed:Rychlost
label_percentage_flow:Průtok
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#### Language Code:DE
## Language Version:20210130
## Language Version:20210217
## Maximum byte per keyword is 250 Bytes.
## Escape characters are not supported except newline '\n'

Expand All @@ -8,30 +8,20 @@ label_baudrate:Baudrate
label_language:Deutsch
label_rotate_ui:UI drehen
label_terminal_ack:Zeige ACK im Terminal
label_invert_x_axis:Invertiere X-Achse
label_invert_y_axis:Invertiere Y-Achse
label_invert_z_axis:Invertiere Z-Achse
label_persistent_info:Speicherungs-Status
label_file_list_mode:Dateien als Liste
label_ack_notification:ACK - Stil
label_default_mode:Standard Modus
label_serial_always_on:Seriell Verbind. immer an
label_marlin_show_title:Marlin Modus Titel anz.
label_marlin_fullscreen:Marlin Modus im Vollbild
label_marlin_type:Marlin Modus Typ
label_move_speed:Geschwindigkeit (XYZ)
label_auto_load_leveling:Auto Save Load Leveling
label_touchmi_sensor:TouchMI
label_onboard_sd_support:Onboard SD aktivieren
label_m27_always_active:M27 immer aktiv
label_long_filename_support:lange Dateinamen anzeigen
label_fan_speed_percent:Lüft. Geschw. in Prozent
label_xy_offset_probing:XY Offset Probing Support
label_z_steppers_alignment:Z Stepper Auto-Justierung
label_ps_on:Auto-aus (PS_ON)
label_ps_on_active_high:Spannungsvers. Active HIGH
label_fil_runout:Filament Sensor
label_fil_runout_inverting:Filament Sensor umkehren
label_pl_recovery_en:Weitermachen (Stromausfall)
label_pl_recovery_home:Achsen nullen (Stromausfall)
label_btt_mini_ups:BTT UPS Support
Expand All @@ -41,7 +31,7 @@ label_alert_sound:Popups & Alarme
label_heater_sound:Ton bei erreichter Temp.
label_knob_led_color:Drehknopf LED Farbe
label_knob_led_idle:Drehknopf LED idle Farbe
label_lcd_brightness:LCD Helligkeit
label_lcd_brightness:Helligkeit
label_lcd_idle_brightness:LCD Helligkeit (Standby)
label_lcd_idle_delay:LCD Timer Standby
label_start_gcode_enabled:Gcode vor Druck
Expand All @@ -57,7 +47,7 @@ label_home_offset:Nullpunkt Versatz
label_fwretract:FW Rückzug
label_fwrecover:FW Rückeinschub
label_retract_auto:Auto-Rückzug (Firmware)
label_offset_tool:Abstand 2te Düse
label_hotend_offset:Abstand 2te Düse
label_probe_offset:Sensor Versatz
label_lin_advance:Linear Advance
label_current_setting:Treiber Strom (mA)
Expand Down Expand Up @@ -214,6 +204,7 @@ label_extrude:Extruder
label_settings:Parameter
label_screen_settings:Bildschirm
label_machine_settings:Drucker
label_marlin_mode_settings:MarlinMode
label_feature_settings:Andere
label_sound:Töne
label_rgb_settings:LED Farbe
Expand Down Expand Up @@ -254,8 +245,8 @@ label_load_unload_short:(ent)laden
label_touchscreen_adjust:TSC kalib.
label_more:Mehr
label_screen_info:Info
label_simulator_bg_color:Hintergrundfarbe Marlin
label_simulator_font_color:Schriftfarbe Marlin
label_bg_color:Hintergrundfarbe
label_font_color:Schriftfarbe
label_percentage:Prozent
label_percentage_speed:Geschw.
label_percentage_flow:Fluss
Expand Down
Loading