diff --git a/Copy to SD Card root directory to update/Language Packs/language_am.ini b/Copy to SD Card root directory to update/Language Packs/language_am.ini index 528b4804d0..a98cb67dbb 100644 --- a/Copy to SD Card root directory to update/Language Packs/language_am.ini +++ b/Copy to SD Card root directory to update/Language Packs/language_am.ini @@ -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' @@ -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 @@ -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 @@ -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) @@ -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 @@ -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 diff --git a/Copy to SD Card root directory to update/Language Packs/language_ca.ini b/Copy to SD Card root directory to update/Language Packs/language_ca.ini index f4e5220c1b..c4f054a044 100644 --- a/Copy to SD Card root directory to update/Language Packs/language_ca.ini +++ b/Copy to SD Card root directory to update/Language Packs/language_ca.ini @@ -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' @@ -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 @@ -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 @@ -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) @@ -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 @@ -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 diff --git a/Copy to SD Card root directory to update/Language Packs/language_cn.ini b/Copy to SD Card root directory to update/Language Packs/language_cn.ini index 6d494312e6..d5081b42cb 100644 --- a/Copy to SD Card root directory to update/Language Packs/language_cn.ini +++ b/Copy to SD Card root directory to update/Language Packs/language_cn.ini @@ -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' @@ -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 @@ -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驱动电流设置 @@ -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:灯光颜色 @@ -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:流量百分比 diff --git a/Copy to SD Card root directory to update/Language Packs/language_cz.ini b/Copy to SD Card root directory to update/Language Packs/language_cz.ini index c36017b375..e9313f0c78 100644 --- a/Copy to SD Card root directory to update/Language Packs/language_cz.ini +++ b/Copy to SD Card root directory to update/Language Packs/language_cz.ini @@ -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' @@ -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 @@ -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) @@ -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 @@ -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 diff --git a/Copy to SD Card root directory to update/Language Packs/language_de.ini b/Copy to SD Card root directory to update/Language Packs/language_de.ini index 230d7bdf00..eb082de5a7 100644 --- a/Copy to SD Card root directory to update/Language Packs/language_de.ini +++ b/Copy to SD Card root directory to update/Language Packs/language_de.ini @@ -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' @@ -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 @@ -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 @@ -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) @@ -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 @@ -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 diff --git a/Copy to SD Card root directory to update/Language Packs/language_du.ini b/Copy to SD Card root directory to update/Language Packs/language_du.ini index a9f7d325af..9ef539d13a 100644 --- a/Copy to SD Card root directory to update/Language Packs/language_du.ini +++ b/Copy to SD Card root directory to update/Language Packs/language_du.ini @@ -1,5 +1,5 @@ #### Language Code:DU -## Language Version:20210130 +## Language Version:20210217 ## Maximum byte per keyword is 250 Bytes. ## Escape characters are not supported except newline '\n' @@ -8,30 +8,20 @@ label_baudrate:Baudsnelheid label_language:Dutch label_rotate_ui:Draai UI label_terminal_ack:Laat ACK in Terminal zien -label_invert_x_axis:Inverteer X Axis -label_invert_y_axis:Inverteer Y Axis -label_invert_z_axis:Inverteer Z Axis label_persistent_info:Aanhoudende statusinfo 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:Bewegingssnelheid(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 @@ -41,9 +31,9 @@ label_alert_sound:Popups and Alerts label_heater_sound:Heater notification label_knob_led_color:Draaiknop LED label_knob_led_idle:Draaiknop LED inactief -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 @@ -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 stroom (mA) @@ -214,6 +204,7 @@ label_extrude:Extrudeer label_settings:Instellingen label_screen_settings:Scherm label_machine_settings:Machine +label_marlin_mode_settings:MarlinMode label_feature_settings:Kenmerk label_sound:Sound label_rgb_settings:LED Kleur @@ -254,8 +245,8 @@ label_load_unload_short:(Un)Load label_touchscreen_adjust:TSC Aanpassen label_more:Meer label_screen_info:Info -label_simulator_bg_color:Marlin simulator achtergrond kleur -label_simulator_font_color:Marlin simulator tekst kleur +label_bg_color:achtergrond kleur +label_font_color:tekst kleur label_percentage:Percentage label_percentage_speed:Snelheid label_percentage_flow:Stromen diff --git a/Copy to SD Card root directory to update/Language Packs/language_en.ini b/Copy to SD Card root directory to update/Language Packs/language_en.ini index 4c9f9c4e9e..b14b0036b9 100644 --- a/Copy to SD Card root directory to update/Language Packs/language_en.ini +++ b/Copy to SD Card root directory to update/Language Packs/language_en.ini @@ -1,5 +1,5 @@ #### Language Code:EN -## Language Version:20210130 +## Language Version:20210217 ## Maximum byte per keyword is 250 Bytes. ## Escape characters are not supported except newline '\n' @@ -8,32 +8,22 @@ label_baudrate:BaudRate label_language:English 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_show_title:Show Title +label_marlin_fullscreen:Fullscreen Mode 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_fan_speed_percent:Fan Speed in Percent 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_pl_recovery_home:Home after power loss label_btt_mini_ups:BTT UPS Support label_touch_sound:Touch sounds label_toast_sound:Toast Notifications @@ -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 @@ -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) @@ -115,12 +105,12 @@ label_pause:Pause label_resume:Resume label_init:Init label_disconnect:Disconnect -label_shut_down:Shut Down +label_shut_down:Shut down label_force_shut_down:Force label_emergencystop:EM. STOP label_preheat:Preheat label_preheat_both:Both -label_cooldown:Cool Down +label_cooldown:Cool down label_confirm:OK label_cancel:Cancel label_warning:Warning @@ -214,6 +204,7 @@ label_extrude:Extrude label_settings: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 @@ -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:Speed label_percentage_flow:Flow diff --git a/Copy to SD Card root directory to update/Language Packs/language_es.ini b/Copy to SD Card root directory to update/Language Packs/language_es.ini index 5a2267f3ee..07e389494a 100644 --- a/Copy to SD Card root directory to update/Language Packs/language_es.ini +++ b/Copy to SD Card root directory to update/Language Packs/language_es.ini @@ -1,5 +1,5 @@ #### Language Code:ES -## Language Version:20210130 +## Language Version:20210217 ## Maximum byte per keyword is 250 Bytes. ## Escape characters are not supported except newline '\n' @@ -8,30 +8,20 @@ label_baudrate:BaudRate label_language:Español label_rotate_ui:Rotar 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:Apag. aut. -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 @@ -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 @@ -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:Sonda Compensar label_lin_advance:Linear Advance label_current_setting:Driver Current (mA) @@ -214,6 +204,7 @@ label_extrude:Extruir label_settings:Configurar label_screen_settings:Pantalla label_machine_settings:Máquina +label_marlin_mode_settings:MarlinMode label_feature_settings:Añadidos label_sound:Sound label_rgb_settings:Color LED @@ -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:Marlin simulator background color -label_simulator_font_color:Marlin simulator font color +label_bg_color:Background color +label_font_color:Font color label_percentage:Porcentaje label_percentage_speed:Velocidad label_percentage_flow:Flujo diff --git a/Copy to SD Card root directory to update/Language Packs/language_fr.ini b/Copy to SD Card root directory to update/Language Packs/language_fr.ini index 463ecd998f..3e971b28bb 100644 --- a/Copy to SD Card root directory to update/Language Packs/language_fr.ini +++ b/Copy to SD Card root directory to update/Language Packs/language_fr.ini @@ -1,5 +1,5 @@ #### Language Code:FR -## Language Version:20210130 +## Language Version:20210217 ## Maximum byte per keyword is 250 Bytes. ## Escape characters are not supported except newline '\n' @@ -8,30 +8,20 @@ label_baudrate:Vitesse label_language:Français label_rotate_ui:Rotation label_terminal_ack:Afficher ACK sur Terminal -label_invert_x_axis:Inverser l'axe X -label_invert_y_axis:Inverser l'axe Y -label_invert_z_axis:Inverser l'axe Z label_persistent_info:Temp. toujours affichées label_file_list_mode:Fichiers en mode liste label_ack_notification:Style de notification ACK -label_default_mode:Mode par défaut label_serial_always_on:Serial toujours actif label_marlin_show_title:Titre en Mode Marlin label_marlin_fullscreen:Mode Marlin plein écran label_marlin_type:Type du Mode Marlin label_move_speed:Vitesse de déplacement (X Y Z) label_auto_load_leveling:Auto-Sauvegarde Leveling -label_touchmi_sensor:TouchMI -label_onboard_sd_support:Support SD interne -label_m27_always_active:M27 toujours actif -label_long_filename_support:Noms de fichiers longs label_fan_speed_percent:Vitesse ventilateur en % label_xy_offset_probing:Support XY Offset label_z_steppers_alignment:Auto-Alignement moteurs Z label_ps_on:Extinction automatique -label_ps_on_active_high:Alimentation active HIGH label_fil_runout:Capteur de filament -label_fil_runout_inverting:Inversion logique capteur label_pl_recovery_en:Reprise après coupure label_pl_recovery_home:Home avant reprise label_btt_mini_ups:Support BTT UPS @@ -41,7 +31,7 @@ label_alert_sound:Popups et alertes label_heater_sound:Notification de chauffe label_knob_led_color:LED du bouton rotatif label_knob_led_idle:Veille du bouton rotatif -label_lcd_brightness:Luminosité LCD +label_lcd_brightness:Luminosité label_lcd_idle_brightness:Diminution luminosité label_lcd_idle_delay:Durée avant diminution label_start_gcode_enabled:Gcode avant l'impression @@ -57,7 +47,7 @@ label_home_offset:Décalage Home label_fwretract:Rétraction firmware label_fwrecover:Récupération firmware label_retract_auto:Rétraction firmware auto -label_offset_tool:Offset 2ème Buse +label_hotend_offset:Offset 2ème Buse label_probe_offset:Décalage Palpeur label_lin_advance:Linear Advance label_current_setting:Courant drivers (mA) @@ -214,6 +204,7 @@ label_extrude:Extruder label_settings:Options label_screen_settings:Écran label_machine_settings:Machine +label_marlin_mode_settings:MarlinMode label_feature_settings:Paramètres label_sound:Son label_rgb_settings:LED @@ -254,8 +245,8 @@ label_load_unload_short:Dé/Charger label_touchscreen_adjust:Ajuster label_more:Plus label_screen_info:Infos -label_simulator_bg_color:Couleur de l'arrière-plan Marlin -label_simulator_font_color:Couleur de la police Marlin +label_bg_color:Couleur de l'arrière-plan +label_font_color:Couleur de la police label_percentage:Avancement label_percentage_speed:Vitesse label_percentage_flow:Débit diff --git a/Copy to SD Card root directory to update/Language Packs/language_gr.ini b/Copy to SD Card root directory to update/Language Packs/language_gr.ini index b0148395e7..e348f1117e 100644 --- a/Copy to SD Card root directory to update/Language Packs/language_gr.ini +++ b/Copy to SD Card root directory to update/Language Packs/language_gr.ini @@ -1,5 +1,5 @@ #### Language Code:GR -## Language Version:20210130 +## Language Version:20210217 ## Maximum byte per keyword is 250 Bytes. ## Escape characters are not supported except newline '\n' @@ -8,30 +8,20 @@ label_baudrate:BaudRate label_language:Ελληνικά label_rotate_ui:Περιστροφή UI label_terminal_ack:Εμφάνιση ACK στο τερματικό -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 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 σε πλήρη οθόνη label_marlin_type:Marlin Mode Type label_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:Αυτόματη απενεργοποίηση -label_ps_on_active_high:Power Supply Active HIGH label_fil_runout:Αισθητήρας νήματος -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 @@ -41,7 +31,7 @@ label_alert_sound:Popups and Alerts label_heater_sound:Heater notification label_knob_led_color:LED περιστροφικού κουμπιού label_knob_led_idle:Rotary Knob LED idle -label_lcd_brightness:Φωτεινότητα οθόνης +label_lcd_brightness:Φωτεινότητα label_lcd_idle_brightness:Φωτεινότητα LCD σκοτεινή label_lcd_idle_delay:Xρονομετρητής αδράνειας οθόνης label_start_gcode_enabled:Αρχικό Gcode προ εκτύπωσης @@ -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:Αντιστάθμιση Καθετήρας label_lin_advance:Linear Advance label_current_setting:Ένταση η. ρεύ. οδηγού(mA) @@ -214,6 +204,7 @@ label_extrude:Εκβολή label_settings:Ρυθμίσεις label_screen_settings:Οθόνη label_machine_settings:Μηχανήματος +label_marlin_mode_settings:MarlinMode label_feature_settings:Χαρακτηριστικών label_sound:Sound label_rgb_settings:Χρώμα LED @@ -254,8 +245,8 @@ label_load_unload_short:(Un)Load label_touchscreen_adjust:Προσαρμογή TOUCH label_more:Περισσότερα label_screen_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:Ποσοστό label_percentage_speed:Ταχύτητα label_percentage_flow:Ροή diff --git a/Copy to SD Card root directory to update/Language Packs/language_hu.ini b/Copy to SD Card root directory to update/Language Packs/language_hu.ini index d2d70fca38..bddb686df4 100644 --- a/Copy to SD Card root directory to update/Language Packs/language_hu.ini +++ b/Copy to SD Card root directory to update/Language Packs/language_hu.ini @@ -1,5 +1,5 @@ #### Language Code:HU -## Language Version:20210130 +## Language Version:20210217 ## Maximum byte per keyword is 250 Bytes. ## Escape characters are not supported except newline '\n' @@ -8,30 +8,20 @@ label_baudrate:Kapcsolat label_language:Magyar label_rotate_ui:Forgatás label_terminal_ack:ACK Megjelenítése -label_invert_x_axis:X megfordítása -label_invert_y_axis:Y megfordítása -label_invert_z_axis:Z megfordítása label_persistent_info:Állandó állapotinfó label_file_list_mode:Fájlnéző listamód label_ack_notification:ACK Értesítési stílus -label_default_mode:Alapértelmezett mód label_serial_always_on:Soros port folytonos label_marlin_show_title:Marlin mód cím támogatás label_marlin_fullscreen:Nagyképernyős Marlin mód label_marlin_type:Marlin mód típusa label_move_speed:Mozgás seb. (X-Y-Z) label_auto_load_leveling:Szint. auto-mentés/töltés -label_touchmi_sensor:TouchMI -label_onboard_sd_support:Alaplapi SD támogatás -label_m27_always_active:M27 Mindig aktív -label_long_filename_support:Hosszú fájlnevek tám. label_fan_speed_percent:Ventilátor sebesség %-ban label_xy_offset_probing:X-Y Végpont tapintás tám. label_z_steppers_alignment:Z Motorok automata igazí. label_ps_on:Automata kikapcsolás -label_ps_on_active_high:Tápegység aktív MAGAS label_fil_runout:Szál érzékelő -label_fil_runout_inverting:Szál érzékelő fordítva label_pl_recovery_en:Energiavesztés helyreáll. label_pl_recovery_home:Áramkimaradás helyreáll. label_btt_mini_ups:BTT UPS Támogatás @@ -41,7 +31,7 @@ label_alert_sound:Riasztás hang label_heater_sound:Fűtés hang label_knob_led_color:Forgatógomb LED label_knob_led_idle:Forgatógomb tétlen -label_lcd_brightness:LCD Fényerősség +label_lcd_brightness:Fényerősség label_lcd_idle_brightness:LCD Halványítás label_lcd_idle_delay:LCD Halványítási idő label_start_gcode_enabled:Kezdő G-Kód @@ -57,7 +47,7 @@ label_home_offset:Kezdőpont eltolás label_fwretract:FW Visszahúzás label_fwrecover:FW Visszanyomás label_retract_auto:Automata visszahúz. -label_offset_tool:Második fej eltolása +label_hotend_offset:Második fej eltolása label_probe_offset:Szonda eltolás label_lin_advance:Lineáris haladás label_current_setting:Motoráramok beállítása @@ -214,6 +204,7 @@ label_extrude:Adagolás label_settings:Opciók label_screen_settings:Kijelző label_machine_settings:Gép +label_marlin_mode_settings:MarlinMode label_feature_settings:Funkciók label_sound:Hangok label_rgb_settings:LED Szín @@ -254,8 +245,8 @@ label_load_unload_short:Be/Ki label_touchscreen_adjust:Igazítás label_more:Több label_screen_info:Infó -label_simulator_bg_color:Marlin mód háttérszín -label_simulator_font_color:Marlin mód betűszín +label_bg_color:háttérszín +label_font_color:betűszín label_percentage:Százalék label_percentage_speed:Sebesség label_percentage_flow:Hozam diff --git a/Copy to SD Card root directory to update/Language Packs/language_it.ini b/Copy to SD Card root directory to update/Language Packs/language_it.ini index de63f1be67..f4fc9c790d 100644 --- a/Copy to SD Card root directory to update/Language Packs/language_it.ini +++ b/Copy to SD Card root directory to update/Language Packs/language_it.ini @@ -1,5 +1,5 @@ #### Language Code:IT -## Language Version:20210130 +## Language Version:20210217 ## Maximum byte per keyword is 250 Bytes. ## Escape characters are not supported except newline '\n' @@ -8,30 +8,20 @@ label_baudrate:Baudrate label_language:Italiano label_rotate_ui:Ruota label_terminal_ack:Mostra ACK in console -label_invert_x_axis:Inverti asse X -label_invert_y_axis:Inverti asse Y -label_invert_z_axis:Inverti asse Z label_persistent_info:Mostra barra di stato label_file_list_mode:File in modalità lista label_ack_notification:Tipo di popup -label_default_mode:Modalità default label_serial_always_on:Seriale sempre accesa label_marlin_show_title:Mostra titolo in Marlin label_marlin_fullscreen:Marlin a schermo intero label_marlin_type:Modalità Marlin label_move_speed:Vel. movimenti(X Y Z) label_auto_load_leveling:Auto salva/carica liv. -label_touchmi_sensor:TouchMI -label_onboard_sd_support:Supporto SD onboard -label_m27_always_active:M27 sempre attivo -label_long_filename_support:Supporto nomi lunghi label_fan_speed_percent:Ventola in percentuale label_xy_offset_probing:Supp. probing offset XY label_z_steppers_alignment:Auto allineamento asse Z label_ps_on:Auto spegnimento -label_ps_on_active_high:Alimentatore attivo HIGH label_fil_runout:Sensore filamento -label_fil_runout_inverting:Inv. logica sens. filamento label_pl_recovery_en:Power loss recovery label_pl_recovery_home:Power loss rec. homing label_btt_mini_ups:Supporto a BTT UPS @@ -41,7 +31,7 @@ label_alert_sound:Popup e avvisi label_heater_sound:Notifica temperatura label_knob_led_color:LED manopola label_knob_led_idle:LED manopola spento -label_lcd_brightness:Luminosità schermo +label_lcd_brightness:Luminosità label_lcd_idle_brightness:Luminosità in idle label_lcd_idle_delay:Timer luminosità label_start_gcode_enabled:Inserisci start gcode @@ -57,7 +47,7 @@ label_home_offset:Home offset label_fwretract:Retrazione firmware label_fwrecover:Retrazione firmware rec. label_retract_auto:Retrazione firmware -label_offset_tool:Offset secondo hotend +label_hotend_offset:Offset secondo hotend label_probe_offset:Probe offset label_lin_advance:Linear advance label_current_setting:Corrente driver (mA) @@ -214,6 +204,7 @@ label_extrude:Estrudi label_settings:Opzioni label_screen_settings:Schermo label_machine_settings:Stampante +label_marlin_mode_settings:MarlinMode label_feature_settings:Configura label_sound:Suono label_rgb_settings:LED RGB @@ -254,8 +245,8 @@ label_load_unload_short:Scarica label_touchscreen_adjust:Calibra label_more:Altro label_screen_info:Info -label_simulator_bg_color:Colore sfondo modalità Marlin -label_simulator_font_color:Colore font modalità Marlin +label_bg_color:Colore sfondo +label_font_color:Colore font label_percentage:Percentuale label_percentage_speed:Velocità label_percentage_flow:Flusso diff --git a/Copy to SD Card root directory to update/Language Packs/language_jp.ini b/Copy to SD Card root directory to update/Language Packs/language_jp.ini index 1328226f16..2ba6b218d5 100644 --- a/Copy to SD Card root directory to update/Language Packs/language_jp.ini +++ b/Copy to SD Card root directory to update/Language Packs/language_jp.ini @@ -1,5 +1,5 @@ #### Language Code:JP -## Language Version:20210130 +## Language Version:20210217 ## Maximum byte per keyword is 250 Bytes. ## Escape characters are not supported except newline '\n' @@ -8,30 +8,20 @@ label_baudrate:ポートレート label_language:日本語 label_rotate_ui:回転UI label_terminal_ack:端末でACKを表示する -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 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:フルスクリーンでマーリンモード label_marlin_type:Marlin Mode Type label_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:オートパワー -label_ps_on_active_high:Power Supply Active HIGH label_fil_runout:フィラメントセンサ -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 @@ -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:プローブオフセット label_lin_advance:Linear Advance label_current_setting:ドライバー電流 (mA) @@ -214,6 +204,7 @@ label_extrude:押出 label_settings:設定 label_screen_settings:画面 label_machine_settings:マシン +label_marlin_mode_settings:MarlinMode label_feature_settings:機能 label_sound:Sound label_rgb_settings:LED カラー @@ -254,8 +245,8 @@ label_load_unload_short:(Un)Load 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:押出 diff --git a/Copy to SD Card root directory to update/Language Packs/language_pl.ini b/Copy to SD Card root directory to update/Language Packs/language_pl.ini index 35a2441d20..17d75664c8 100644 --- a/Copy to SD Card root directory to update/Language Packs/language_pl.ini +++ b/Copy to SD Card root directory to update/Language Packs/language_pl.ini @@ -1,5 +1,5 @@ #### Language Code:PL -## Language Version:20210130 +## Language Version:20210217 ## Maximum byte per keyword is 250 Bytes. ## Escape characters are not supported except newline '\n' @@ -8,30 +8,20 @@ label_baudrate:BaudRate label_language:Polski label_rotate_ui:Obrót 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 @@ -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 @@ -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:Przesunięcie label_lin_advance:Linear Advance label_current_setting:Driver Current (mA) @@ -214,6 +204,7 @@ label_extrude:Extrude label_settings:Ustawienia label_screen_settings:Ekran label_machine_settings:Drukarka +label_marlin_mode_settings:MarlinMode label_feature_settings:Opcje label_sound:Sound label_rgb_settings:Kolor LED @@ -254,8 +245,8 @@ label_load_unload_short:(Un)Load label_touchscreen_adjust:Kalibracja label_more:Więcej 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:Procent label_percentage_speed:Prędkość label_percentage_flow:Flow diff --git a/Copy to SD Card root directory to update/Language Packs/language_pt.ini b/Copy to SD Card root directory to update/Language Packs/language_pt.ini index 18dce01338..960f48112a 100644 --- a/Copy to SD Card root directory to update/Language Packs/language_pt.ini +++ b/Copy to SD Card root directory to update/Language Packs/language_pt.ini @@ -1,5 +1,5 @@ #### Language Code:PT -## Language Version:20210130 +## Language Version:20210217 ## Maximum byte per keyword is 250 Bytes. ## Escape characters are not supported except newline '\n' @@ -8,30 +8,20 @@ label_baudrate:BaudRate label_language:Portugues label_rotate_ui:Rodar 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 @@ -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 @@ -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) @@ -214,6 +204,7 @@ label_extrude:Extrudir label_settings:Configurar label_screen_settings:Ecra label_machine_settings:Impressora +label_marlin_mode_settings:MarlinMode label_feature_settings:Extras label_sound:Sound label_rgb_settings:LED cor @@ -254,8 +245,8 @@ label_load_unload_short:(Un)Load label_touchscreen_adjust:Ajustar label_more:Mais 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:Percentagem label_percentage_speed:Rapidez label_percentage_flow:Fluxo diff --git a/Copy to SD Card root directory to update/Language Packs/language_ru.ini b/Copy to SD Card root directory to update/Language Packs/language_ru.ini index 97346685bf..91c19f9a0a 100644 --- a/Copy to SD Card root directory to update/Language Packs/language_ru.ini +++ b/Copy to SD Card root directory to update/Language Packs/language_ru.ini @@ -1,5 +1,5 @@ #### Language Code:RU -## Language Version:20210130 +## Language Version:20210217 ## Maximum byte per keyword is 250 Bytes. ## Escape characters are not supported except newline '\n' @@ -8,30 +8,20 @@ label_baudrate:Скорость label_language:Русский label_rotate_ui:Переворот label_terminal_ack:ACK терминала (C°) -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:Default Mode label_serial_always_on:Serial Always ON label_marlin_show_title:Marlin Mode Title Support label_marlin_fullscreen:Marlin на весь экран label_marlin_type:Marlin Mode Type label_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:Автовыключение -label_ps_on_active_high:Power Supply Active HIGH label_fil_runout:Сенсор прутка -label_fil_runout_inverting:Inverted Filament Runout Logic label_pl_recovery_en:Работа после потери питания label_pl_recovery_home:Power Loss Recovery Homing label_btt_mini_ups:BTT UPS Support @@ -41,7 +31,7 @@ label_alert_sound:Предупреждения label_heater_sound:Heater notification label_knob_led_color:Подсветка энкодера label_knob_led_idle:Простой подсветки энкодера -label_lcd_brightness:Яркость LCD +label_lcd_brightness:Яркость label_lcd_idle_brightness:Регулировка яркости LCD label_lcd_idle_delay:Время до гашения LCD label_start_gcode_enabled:G-код перед печатью @@ -57,7 +47,7 @@ label_home_offset:Дом - отступы label_fwretract:M207 ретракт label_fwrecover:M208 восстановление ретракта label_retract_auto:Авто FW ретракт -label_offset_tool:Смещение 2-го сопла +label_hotend_offset:Смещение 2-го сопла label_probe_offset:Смещение датчика label_lin_advance:К-фактор label_current_setting:Настройка TMC драйверов @@ -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:Цвет LED @@ -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:Поток diff --git a/Copy to SD Card root directory to update/Language Packs/language_sk.ini b/Copy to SD Card root directory to update/Language Packs/language_sk.ini index 95c8d21f21..ed314bd42e 100644 --- a/Copy to SD Card root directory to update/Language Packs/language_sk.ini +++ b/Copy to SD Card root directory to update/Language Packs/language_sk.ini @@ -1,5 +1,5 @@ #### Language Code:SK -## Language Version:20210130 +## Language Version:20210217 ## Maximum byte per keyword is 250 Bytes. ## Escape characters are not supported except newline '\n' @@ -8,30 +8,20 @@ label_baudrate:BaudRate label_language:Slovensky label_rotate_ui:Otočiť label_terminal_ack:Show ACK in Terminal -label_invert_x_axis:Invertovať os X -label_invert_y_axis:Invertovať os Y -label_invert_z_axis:Invertovať os Z label_persistent_info:Trvalé info o stave label_file_list_mode:Zobraziť súbory ako zoznam 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:Rýchlosť pohybu XYZ 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 vyp. -label_ps_on_active_high:Power Supply Active HIGH label_fil_runout:Filament senzor -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 @@ -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:Prúd ovládača (mA) @@ -214,6 +204,7 @@ label_extrude:Extrúder label_settings:Nastavenia label_screen_settings:Obrazovka label_machine_settings:Tlačiareň +label_marlin_mode_settings:MarlinMode label_feature_settings:Funkcie label_sound:Sound label_rgb_settings:Farba LED @@ -254,8 +245,8 @@ label_load_unload_short:(Un)Load label_touchscreen_adjust:Kalibrácia label_more:Viacej 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:Percentá label_percentage_speed:Rýchlosť label_percentage_flow:Prietok diff --git a/Copy to SD Card root directory to update/Language Packs/language_sl.ini b/Copy to SD Card root directory to update/Language Packs/language_sl.ini index e8df5d9df4..f424031776 100644 --- a/Copy to SD Card root directory to update/Language Packs/language_sl.ini +++ b/Copy to SD Card root directory to update/Language Packs/language_sl.ini @@ -1,5 +1,5 @@ #### Language Code:SL -## Language Version:20210130 +## Language Version:20210217 ## Maximum byte per keyword is 250 Bytes. ## Escape characters are not supported except newline '\n' @@ -8,30 +8,20 @@ label_baudrate:Baud hitr. label_language:Slovenski label_rotate_ui:Obrni UI label_terminal_ack:Pokaži ACK v terminalu -label_invert_x_axis:Invertiraj X os -label_invert_y_axis:Invertiraj Y os -label_invert_z_axis:Invertiraj Z os label_persistent_info:Stalno prikazuj status label_file_list_mode:Prikaz datotek v seznamu 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 čez cel zaslon label_marlin_type:Marlin Mode Type label_move_speed:Hitr. pomika (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:Samodejni izklop -label_ps_on_active_high:Power Supply Active HIGH label_fil_runout:Senzor filamenta -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 @@ -41,7 +31,7 @@ label_alert_sound:Popups and Alerts label_heater_sound:Heater notification label_knob_led_color:LED enkoder gumba label_knob_led_idle:Rotary Knob LED idle -label_lcd_brightness:Svetilnost LCD +label_lcd_brightness:Svetilnost label_lcd_idle_brightness:Zatemnitev LCD label_lcd_idle_delay:Zatemnitev po času label_start_gcode_enabled:Zaženi startno G-kodo @@ -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:Odmik sonde label_lin_advance:Linear Advance label_current_setting:Tok driverja mot. (mA) @@ -214,6 +204,7 @@ label_extrude:Filament label_settings:Nastavitve label_screen_settings:Zaslon label_machine_settings:Naprava +label_marlin_mode_settings:MarlinMode label_feature_settings:Funkcije label_sound:Sound label_rgb_settings:Barva LED @@ -254,8 +245,8 @@ label_load_unload_short:(Un)Load label_touchscreen_adjust:Umeri label_more:Več label_screen_info:Info -label_simulator_bg_color:Barva ozadja Marlin simulatorja -label_simulator_font_color:Barva pisave Marlin simulatorja +label_bg_color:Barva ozadja +label_font_color:Barva pisave label_percentage:Procent label_percentage_speed:Hitrost label_percentage_flow:Pretok diff --git a/Copy to SD Card root directory to update/Language Packs/language_tc.ini b/Copy to SD Card root directory to update/Language Packs/language_tc.ini index acfd3b98d8..0db0d7fe24 100644 --- a/Copy to SD Card root directory to update/Language Packs/language_tc.ini +++ b/Copy to SD Card root directory to update/Language Packs/language_tc.ini @@ -1,5 +1,5 @@ #### Language Code:TC -## Language Version:20210130 +## Language Version:20210217 ## Maximum byte per keyword is 250 Bytes. ## Escape characters are not supported except newline '\n' @@ -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:Default Mode label_serial_always_on:Serial Always ON label_marlin_show_title:Marlin Mode Title Support label_marlin_fullscreen:全螢幕Marlin模式 label_marlin_type:Marlin Mode Type label_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:自動關機 -label_ps_on_active_high:Power Supply Active HIGH label_fil_runout:耗材感應器 -label_fil_runout_inverting:Inverted Filament Runout Logic label_pl_recovery_en:断电续打 label_pl_recovery_home:Power Loss Recovery Homing label_btt_mini_ups:BTT UPS Support @@ -57,7 +47,7 @@ label_home_offset:Home Offset label_fwretract:FW Retraction label_fwrecover:FW Retraction Recover label_retract_auto:FW自动回抽 -label_offset_tool:Offset 2nd Nozzle +label_hotend_offset:Offset 2nd Nozzle label_probe_offset:探針偏移 label_lin_advance:Linear Advance label_current_setting:驅動晶片電流設定 (mA) @@ -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:燈光顏色 @@ -254,8 +245,8 @@ label_load_unload_short:(Un)Load 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:流量百分比 diff --git a/Copy to SD Card root directory to update/Language Packs/language_tr.ini b/Copy to SD Card root directory to update/Language Packs/language_tr.ini index ec32e8088c..b1751f70e5 100644 --- a/Copy to SD Card root directory to update/Language Packs/language_tr.ini +++ b/Copy to SD Card root directory to update/Language Packs/language_tr.ini @@ -1,5 +1,5 @@ #### Language Code:TR -## Language Version:20210130 +## Language Version:20210217 ## Maximum byte per keyword is 250 Bytes. ## Escape characters are not supported except newline '\n' @@ -8,30 +8,20 @@ label_baudrate:BaudRate label_language:Türkçe label_rotate_ui:Döndür label_terminal_ack:Terminalde onay mesajları -label_invert_x_axis:X Eksenini Tersine Çevir -label_invert_y_axis:Y Eksenini Tersine Çevir -label_invert_z_axis:Z Eksenini Tersine Çevir label_persistent_info:Kalıcı Durum Mesajı label_file_list_mode:Liste Görünümü label_ack_notification:Onay mesajı stili -label_default_mode:Varsayılan Mod label_serial_always_on:Seri Bağ. Sürekli Açık label_marlin_show_title:Marlin Modu Başlık Desteği label_marlin_fullscreen:Tam Ekran Marlin Modu label_marlin_type:Marlin Mode Type label_move_speed:Hareket Hızı(X Y Z) label_auto_load_leveling:Seviyelemeyi Oto Kaydet/Yükle -label_touchmi_sensor:TouchMI -label_onboard_sd_support:Dahili SD Desteği -label_m27_always_active:M27 Sürekli Aktif -label_long_filename_support:Uzun Dosya Adı Desteği label_fan_speed_percent:Yüzdesel Fan Hızı label_xy_offset_probing:XY Algılama Offset Desteği label_z_steppers_alignment:Z Motor Oto-Hizalama label_ps_on:Oto. Kapanma -label_ps_on_active_high:Power Supply Active HIGH label_fil_runout:Filaman Sensörü -label_fil_runout_inverting:Ters Filaman Algılama Sinyali label_pl_recovery_en:Güç Kesintisi Kurtarma label_pl_recovery_home:Güç Kesintisi Sıfırama label_btt_mini_ups:BTT UPS Desteği @@ -57,7 +47,7 @@ label_home_offset:Sıfır Offseti label_fwretract:Yazılım Geriçekmesi label_fwrecover:Yazılım Geriitmesi label_retract_auto:Oto. yazılım geriçekmesi -label_offset_tool:2. Nozül Mesafesi +label_hotend_offset:2. Nozül Mesafesi label_probe_offset:Prob Offseti label_lin_advance:Linear Advance label_current_setting:Sürücü Akımı (mA) @@ -214,6 +204,7 @@ label_extrude:Filament label_settings:Ayarlar label_screen_settings:Ekran label_machine_settings:Makine +label_marlin_mode_settings:MarlinMode label_feature_settings:Özellik label_sound:Ses label_rgb_settings:LED Rengi @@ -254,8 +245,8 @@ label_load_unload_short:Yük./Çık. label_touchscreen_adjust:Kalibre label_more:Ayar label_screen_info:Bilgi -label_simulator_bg_color:Marlin modu arkaplan renk -label_simulator_font_color:Marlin modu font renk +label_bg_color:arkaplan renk +label_font_color: label_percentage:Yüzde label_percentage_speed:Hız label_percentage_flow:Akış diff --git a/Copy to SD Card root directory to update/Language Packs/language_uk.ini b/Copy to SD Card root directory to update/Language Packs/language_uk.ini index ef2c91360b..b8e22915f4 100644 --- a/Copy to SD Card root directory to update/Language Packs/language_uk.ini +++ b/Copy to SD Card root directory to update/Language Packs/language_uk.ini @@ -1,5 +1,5 @@ #### Language Code:UK -## Language Version:20210130 +## Language Version:20210217 ## Maximum byte per keyword is 250 Bytes. ## Escape characters are not supported except newline '\n' @@ -8,30 +8,20 @@ label_baudrate:Baudrate label_language:Українська label_rotate_ui:Повернути інтерфейс label_terminal_ack:ACK терміналу (°С) -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:Default Mode label_serial_always_on:Serial Always ON label_marlin_show_title:Marlin Mode Title Support label_marlin_fullscreen:Marlin на весь екран label_marlin_type:Marlin Mode Type label_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:автовимкнення -label_ps_on_active_high:Power Supply Active HIGH label_fil_runout:Сенсор філаменту -label_fil_runout_inverting:Inverted Filament Runout Logic label_pl_recovery_en:Робота після втрати живлення label_pl_recovery_home:Power Loss Recovery Homing label_btt_mini_ups:BTT UPS Support @@ -41,7 +31,7 @@ label_alert_sound:Попередження label_heater_sound:Heater notification label_knob_led_color:Підсвічування енкодера label_knob_led_idle:Простій підсвічування енкодера -label_lcd_brightness:Яскравість LCD +label_lcd_brightness:Яскравість label_lcd_idle_brightness:Регулювання яскравості LCD label_lcd_idle_delay:Час до загасання LCD label_start_gcode_enabled:Розпочати G-код перед друком @@ -57,7 +47,7 @@ label_home_offset:Дім - відступи label_fwretract:M207 ретракт label_fwrecover:M208 відновлення ретракт label_retract_auto:Авто FW ретракт -label_offset_tool:Зсув 2-го сопла +label_hotend_offset:Зсув 2-го сопла label_probe_offset:Зміщення датчика label_lin_advance:К-фактор label_current_setting:Налаштування TMC драйверів @@ -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:Колір LED @@ -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:Потік diff --git a/Copy to SD Card root directory to update/THEME_The Round Miracle Menu Material theme/TFT24/bmp/BkColor.bmp b/Copy to SD Card root directory to update/THEME_The Round Miracle Menu Material theme/TFT24/bmp/BkColor.bmp deleted file mode 100644 index 1e7028fef0..0000000000 Binary files a/Copy to SD Card root directory to update/THEME_The Round Miracle Menu Material theme/TFT24/bmp/BkColor.bmp and /dev/null differ diff --git a/Copy to SD Card root directory to update/THEME_The Round Miracle Menu Material theme/TFT24/bmp/Brightness.bmp b/Copy to SD Card root directory to update/THEME_The Round Miracle Menu Material theme/TFT24/bmp/Brightness.bmp new file mode 100644 index 0000000000..e378eddb5a Binary files /dev/null and b/Copy to SD Card root directory to update/THEME_The Round Miracle Menu Material theme/TFT24/bmp/Brightness.bmp differ diff --git a/Copy to SD Card root directory to update/THEME_The Round Miracle Menu Material theme/TFT24/bmp/FontColor.bmp b/Copy to SD Card root directory to update/THEME_The Round Miracle Menu Material theme/TFT24/bmp/FontColor.bmp deleted file mode 100644 index 7f132f7945..0000000000 Binary files a/Copy to SD Card root directory to update/THEME_The Round Miracle Menu Material theme/TFT24/bmp/FontColor.bmp and /dev/null differ diff --git a/Copy to SD Card root directory to update/THEME_The Round Miracle Menu Material theme/TFT24/bmp/Marlin_mode.bmp b/Copy to SD Card root directory to update/THEME_The Round Miracle Menu Material theme/TFT24/bmp/Marlin_mode.bmp new file mode 100644 index 0000000000..e681932e6c Binary files /dev/null and b/Copy to SD Card root directory to update/THEME_The Round Miracle Menu Material theme/TFT24/bmp/Marlin_mode.bmp differ diff --git a/Copy to SD Card root directory to update/THEME_The Round Miracle Menu Material theme/TFT28/bmp/BkColor.bmp b/Copy to SD Card root directory to update/THEME_The Round Miracle Menu Material theme/TFT28/bmp/BkColor.bmp deleted file mode 100644 index 1e7028fef0..0000000000 Binary files a/Copy to SD Card root directory to update/THEME_The Round Miracle Menu Material theme/TFT28/bmp/BkColor.bmp and /dev/null differ diff --git a/Copy to SD Card root directory to update/THEME_The Round Miracle Menu Material theme/TFT28/bmp/Brightness.bmp b/Copy to SD Card root directory to update/THEME_The Round Miracle Menu Material theme/TFT28/bmp/Brightness.bmp new file mode 100644 index 0000000000..e378eddb5a Binary files /dev/null and b/Copy to SD Card root directory to update/THEME_The Round Miracle Menu Material theme/TFT28/bmp/Brightness.bmp differ diff --git a/Copy to SD Card root directory to update/THEME_The Round Miracle Menu Material theme/TFT28/bmp/FontColor.bmp b/Copy to SD Card root directory to update/THEME_The Round Miracle Menu Material theme/TFT28/bmp/FontColor.bmp deleted file mode 100644 index 7f132f7945..0000000000 Binary files a/Copy to SD Card root directory to update/THEME_The Round Miracle Menu Material theme/TFT28/bmp/FontColor.bmp and /dev/null differ diff --git a/Copy to SD Card root directory to update/THEME_The Round Miracle Menu Material theme/TFT28/bmp/Marlin_mode.bmp b/Copy to SD Card root directory to update/THEME_The Round Miracle Menu Material theme/TFT28/bmp/Marlin_mode.bmp new file mode 100644 index 0000000000..e681932e6c Binary files /dev/null and b/Copy to SD Card root directory to update/THEME_The Round Miracle Menu Material theme/TFT28/bmp/Marlin_mode.bmp differ diff --git a/Copy to SD Card root directory to update/THEME_The Round Miracle Menu Material theme/TFT35/bmp/BkColor.bmp b/Copy to SD Card root directory to update/THEME_The Round Miracle Menu Material theme/TFT35/bmp/BkColor.bmp deleted file mode 100644 index 0edf82e057..0000000000 Binary files a/Copy to SD Card root directory to update/THEME_The Round Miracle Menu Material theme/TFT35/bmp/BkColor.bmp and /dev/null differ diff --git a/Copy to SD Card root directory to update/THEME_The Round Miracle Menu Material theme/TFT35/bmp/Brightness.bmp b/Copy to SD Card root directory to update/THEME_The Round Miracle Menu Material theme/TFT35/bmp/Brightness.bmp new file mode 100644 index 0000000000..6702b69415 Binary files /dev/null and b/Copy to SD Card root directory to update/THEME_The Round Miracle Menu Material theme/TFT35/bmp/Brightness.bmp differ diff --git a/Copy to SD Card root directory to update/THEME_The Round Miracle Menu Material theme/TFT35/bmp/FontColor.bmp b/Copy to SD Card root directory to update/THEME_The Round Miracle Menu Material theme/TFT35/bmp/FontColor.bmp deleted file mode 100644 index a1cb29793c..0000000000 Binary files a/Copy to SD Card root directory to update/THEME_The Round Miracle Menu Material theme/TFT35/bmp/FontColor.bmp and /dev/null differ diff --git a/Copy to SD Card root directory to update/THEME_The Round Miracle Menu Material theme/TFT35/bmp/Marlin_mode.bmp b/Copy to SD Card root directory to update/THEME_The Round Miracle Menu Material theme/TFT35/bmp/Marlin_mode.bmp new file mode 100644 index 0000000000..4a44310667 Binary files /dev/null and b/Copy to SD Card root directory to update/THEME_The Round Miracle Menu Material theme/TFT35/bmp/Marlin_mode.bmp differ diff --git a/Copy to SD Card root directory to update/THEME_The Round Miracle Menu Material theme/TFT43/bmp/BkColor.bmp b/Copy to SD Card root directory to update/THEME_The Round Miracle Menu Material theme/TFT43/bmp/BkColor.bmp deleted file mode 100644 index f4691916ed..0000000000 Binary files a/Copy to SD Card root directory to update/THEME_The Round Miracle Menu Material theme/TFT43/bmp/BkColor.bmp and /dev/null differ diff --git a/Copy to SD Card root directory to update/THEME_The Round Miracle Menu Material theme/TFT43/bmp/Brightness.bmp b/Copy to SD Card root directory to update/THEME_The Round Miracle Menu Material theme/TFT43/bmp/Brightness.bmp new file mode 100644 index 0000000000..b08d20e952 Binary files /dev/null and b/Copy to SD Card root directory to update/THEME_The Round Miracle Menu Material theme/TFT43/bmp/Brightness.bmp differ diff --git a/Copy to SD Card root directory to update/THEME_The Round Miracle Menu Material theme/TFT43/bmp/FontColor.bmp b/Copy to SD Card root directory to update/THEME_The Round Miracle Menu Material theme/TFT43/bmp/FontColor.bmp deleted file mode 100644 index 0399503e29..0000000000 Binary files a/Copy to SD Card root directory to update/THEME_The Round Miracle Menu Material theme/TFT43/bmp/FontColor.bmp and /dev/null differ diff --git a/Copy to SD Card root directory to update/THEME_The Round Miracle Menu Material theme/TFT43/bmp/Marlin_mode.bmp b/Copy to SD Card root directory to update/THEME_The Round Miracle Menu Material theme/TFT43/bmp/Marlin_mode.bmp new file mode 100644 index 0000000000..947c4f9ead Binary files /dev/null and b/Copy to SD Card root directory to update/THEME_The Round Miracle Menu Material theme/TFT43/bmp/Marlin_mode.bmp differ diff --git a/Copy to SD Card root directory to update/THEME_The Round Miracle Menu Material theme/TFT50/bmp/BkColor.bmp b/Copy to SD Card root directory to update/THEME_The Round Miracle Menu Material theme/TFT50/bmp/BkColor.bmp deleted file mode 100644 index f4691916ed..0000000000 Binary files a/Copy to SD Card root directory to update/THEME_The Round Miracle Menu Material theme/TFT50/bmp/BkColor.bmp and /dev/null differ diff --git a/Copy to SD Card root directory to update/THEME_The Round Miracle Menu Material theme/TFT50/bmp/Brightness.bmp b/Copy to SD Card root directory to update/THEME_The Round Miracle Menu Material theme/TFT50/bmp/Brightness.bmp new file mode 100644 index 0000000000..b08d20e952 Binary files /dev/null and b/Copy to SD Card root directory to update/THEME_The Round Miracle Menu Material theme/TFT50/bmp/Brightness.bmp differ diff --git a/Copy to SD Card root directory to update/THEME_The Round Miracle Menu Material theme/TFT50/bmp/FontColor.bmp b/Copy to SD Card root directory to update/THEME_The Round Miracle Menu Material theme/TFT50/bmp/FontColor.bmp deleted file mode 100644 index 0399503e29..0000000000 Binary files a/Copy to SD Card root directory to update/THEME_The Round Miracle Menu Material theme/TFT50/bmp/FontColor.bmp and /dev/null differ diff --git a/Copy to SD Card root directory to update/THEME_The Round Miracle Menu Material theme/TFT50/bmp/Marlin_mode.bmp b/Copy to SD Card root directory to update/THEME_The Round Miracle Menu Material theme/TFT50/bmp/Marlin_mode.bmp new file mode 100644 index 0000000000..947c4f9ead Binary files /dev/null and b/Copy to SD Card root directory to update/THEME_The Round Miracle Menu Material theme/TFT50/bmp/Marlin_mode.bmp differ diff --git a/Copy to SD Card root directory to update/THEME_The Round Miracle Menu Material theme/TFT70/bmp/BkColor.bmp b/Copy to SD Card root directory to update/THEME_The Round Miracle Menu Material theme/TFT70/bmp/BkColor.bmp deleted file mode 100644 index 0af8876910..0000000000 Binary files a/Copy to SD Card root directory to update/THEME_The Round Miracle Menu Material theme/TFT70/bmp/BkColor.bmp and /dev/null differ diff --git a/Copy to SD Card root directory to update/THEME_The Round Miracle Menu Material theme/TFT70/bmp/Brightness.bmp b/Copy to SD Card root directory to update/THEME_The Round Miracle Menu Material theme/TFT70/bmp/Brightness.bmp new file mode 100644 index 0000000000..e92e882cd9 Binary files /dev/null and b/Copy to SD Card root directory to update/THEME_The Round Miracle Menu Material theme/TFT70/bmp/Brightness.bmp differ diff --git a/Copy to SD Card root directory to update/THEME_The Round Miracle Menu Material theme/TFT70/bmp/FontColor.bmp b/Copy to SD Card root directory to update/THEME_The Round Miracle Menu Material theme/TFT70/bmp/FontColor.bmp deleted file mode 100644 index 3e05715ed4..0000000000 Binary files a/Copy to SD Card root directory to update/THEME_The Round Miracle Menu Material theme/TFT70/bmp/FontColor.bmp and /dev/null differ diff --git a/Copy to SD Card root directory to update/THEME_The Round Miracle Menu Material theme/TFT70/bmp/Marlin_mode.bmp b/Copy to SD Card root directory to update/THEME_The Round Miracle Menu Material theme/TFT70/bmp/Marlin_mode.bmp new file mode 100644 index 0000000000..f21c9491f9 Binary files /dev/null and b/Copy to SD Card root directory to update/THEME_The Round Miracle Menu Material theme/TFT70/bmp/Marlin_mode.bmp differ diff --git a/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT24/bmp/bkcolor.bmp b/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT24/bmp/bkcolor.bmp deleted file mode 100644 index a8f489df38..0000000000 Binary files a/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT24/bmp/bkcolor.bmp and /dev/null differ diff --git a/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT24/bmp/brightness.bmp b/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT24/bmp/brightness.bmp new file mode 100644 index 0000000000..8e745927ad Binary files /dev/null and b/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT24/bmp/brightness.bmp differ diff --git a/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT24/bmp/case_light.bmp b/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT24/bmp/case_light.bmp index 5efd0bce0b..b0d5d76adc 100644 Binary files a/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT24/bmp/case_light.bmp and b/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT24/bmp/case_light.bmp differ diff --git a/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT24/bmp/fontcolor.bmp b/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT24/bmp/fontcolor.bmp deleted file mode 100644 index d5bd44975f..0000000000 Binary files a/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT24/bmp/fontcolor.bmp and /dev/null differ diff --git a/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT24/bmp/marlin_mode.bmp b/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT24/bmp/marlin_mode.bmp new file mode 100644 index 0000000000..557a5024bb Binary files /dev/null and b/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT24/bmp/marlin_mode.bmp differ diff --git a/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT24/bmp/mesh_editor.bmp b/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT24/bmp/mesh_editor.bmp index 1dcdb2814d..e4045c2ce2 100644 Binary files a/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT24/bmp/mesh_editor.bmp and b/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT24/bmp/mesh_editor.bmp differ diff --git a/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT24/bmp/z_align.bmp b/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT24/bmp/z_align.bmp index cadab0c1b0..137e9a4e0a 100644 Binary files a/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT24/bmp/z_align.bmp and b/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT24/bmp/z_align.bmp differ diff --git a/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT28/bmp/bkcolor.bmp b/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT28/bmp/bkcolor.bmp deleted file mode 100644 index a8f489df38..0000000000 Binary files a/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT28/bmp/bkcolor.bmp and /dev/null differ diff --git a/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT28/bmp/brightness.bmp b/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT28/bmp/brightness.bmp new file mode 100644 index 0000000000..8e745927ad Binary files /dev/null and b/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT28/bmp/brightness.bmp differ diff --git a/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT28/bmp/case_light.bmp b/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT28/bmp/case_light.bmp index 60b30eef6c..b0d5d76adc 100644 Binary files a/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT28/bmp/case_light.bmp and b/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT28/bmp/case_light.bmp differ diff --git a/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT28/bmp/fontcolor.bmp b/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT28/bmp/fontcolor.bmp deleted file mode 100644 index d5bd44975f..0000000000 Binary files a/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT28/bmp/fontcolor.bmp and /dev/null differ diff --git a/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT28/bmp/marlin_mode.bmp b/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT28/bmp/marlin_mode.bmp new file mode 100644 index 0000000000..557a5024bb Binary files /dev/null and b/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT28/bmp/marlin_mode.bmp differ diff --git a/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT28/bmp/mesh_editor.bmp b/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT28/bmp/mesh_editor.bmp index 1dcdb2814d..e4045c2ce2 100644 Binary files a/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT28/bmp/mesh_editor.bmp and b/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT28/bmp/mesh_editor.bmp differ diff --git a/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT28/bmp/z_align.bmp b/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT28/bmp/z_align.bmp index cadab0c1b0..137e9a4e0a 100644 Binary files a/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT28/bmp/z_align.bmp and b/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT28/bmp/z_align.bmp differ diff --git a/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT35/bmp/bkcolor.bmp b/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT35/bmp/bkcolor.bmp deleted file mode 100644 index 3f8b0c86bb..0000000000 Binary files a/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT35/bmp/bkcolor.bmp and /dev/null differ diff --git a/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT35/bmp/brightness.bmp b/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT35/bmp/brightness.bmp new file mode 100644 index 0000000000..3f4b8c9555 Binary files /dev/null and b/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT35/bmp/brightness.bmp differ diff --git a/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT35/bmp/case_light.bmp b/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT35/bmp/case_light.bmp index 1a197c04c2..b8c8b79e50 100644 Binary files a/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT35/bmp/case_light.bmp and b/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT35/bmp/case_light.bmp differ diff --git a/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT35/bmp/fontcolor.bmp b/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT35/bmp/fontcolor.bmp deleted file mode 100644 index c4f03174e0..0000000000 Binary files a/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT35/bmp/fontcolor.bmp and /dev/null differ diff --git a/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT35/bmp/marlin_mode.bmp b/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT35/bmp/marlin_mode.bmp new file mode 100644 index 0000000000..43cb8dbfde Binary files /dev/null and b/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT35/bmp/marlin_mode.bmp differ diff --git a/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT35/bmp/mesh_editor.bmp b/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT35/bmp/mesh_editor.bmp index 0719ad876c..21c4f83635 100644 Binary files a/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT35/bmp/mesh_editor.bmp and b/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT35/bmp/mesh_editor.bmp differ diff --git a/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT35/bmp/z_align.bmp b/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT35/bmp/z_align.bmp index 255f701688..863395629f 100644 Binary files a/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT35/bmp/z_align.bmp and b/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT35/bmp/z_align.bmp differ diff --git a/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT43/bmp/bkcolor.bmp b/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT43/bmp/bkcolor.bmp deleted file mode 100644 index bd06c8ff6f..0000000000 Binary files a/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT43/bmp/bkcolor.bmp and /dev/null differ diff --git a/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT43/bmp/brightness.bmp b/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT43/bmp/brightness.bmp new file mode 100644 index 0000000000..4061da46fd Binary files /dev/null and b/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT43/bmp/brightness.bmp differ diff --git a/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT43/bmp/case_light.bmp b/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT43/bmp/case_light.bmp index 26f4187cb2..aaddbc09d0 100644 Binary files a/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT43/bmp/case_light.bmp and b/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT43/bmp/case_light.bmp differ diff --git a/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT43/bmp/fontcolor.bmp b/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT43/bmp/fontcolor.bmp deleted file mode 100644 index 8b7914469a..0000000000 Binary files a/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT43/bmp/fontcolor.bmp and /dev/null differ diff --git a/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT43/bmp/marlin_mode.bmp b/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT43/bmp/marlin_mode.bmp new file mode 100644 index 0000000000..534e2d288c Binary files /dev/null and b/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT43/bmp/marlin_mode.bmp differ diff --git a/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT43/bmp/mesh_editor.bmp b/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT43/bmp/mesh_editor.bmp index 54d0fde44e..ec92b3aadf 100644 Binary files a/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT43/bmp/mesh_editor.bmp and b/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT43/bmp/mesh_editor.bmp differ diff --git a/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT43/bmp/z_align.bmp b/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT43/bmp/z_align.bmp index 1473b9cbb9..074959f423 100644 Binary files a/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT43/bmp/z_align.bmp and b/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT43/bmp/z_align.bmp differ diff --git a/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT50/bmp/bkcolor.bmp b/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT50/bmp/bkcolor.bmp deleted file mode 100644 index bd06c8ff6f..0000000000 Binary files a/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT50/bmp/bkcolor.bmp and /dev/null differ diff --git a/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT50/bmp/brightness.bmp b/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT50/bmp/brightness.bmp new file mode 100644 index 0000000000..4061da46fd Binary files /dev/null and b/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT50/bmp/brightness.bmp differ diff --git a/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT50/bmp/case_light.bmp b/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT50/bmp/case_light.bmp index 26f4187cb2..aaddbc09d0 100644 Binary files a/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT50/bmp/case_light.bmp and b/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT50/bmp/case_light.bmp differ diff --git a/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT50/bmp/fontcolor.bmp b/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT50/bmp/fontcolor.bmp deleted file mode 100644 index 8b7914469a..0000000000 Binary files a/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT50/bmp/fontcolor.bmp and /dev/null differ diff --git a/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT50/bmp/marlin_mode.bmp b/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT50/bmp/marlin_mode.bmp new file mode 100644 index 0000000000..534e2d288c Binary files /dev/null and b/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT50/bmp/marlin_mode.bmp differ diff --git a/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT50/bmp/mesh_editor.bmp b/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT50/bmp/mesh_editor.bmp index 54d0fde44e..ec92b3aadf 100644 Binary files a/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT50/bmp/mesh_editor.bmp and b/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT50/bmp/mesh_editor.bmp differ diff --git a/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT50/bmp/z_align.bmp b/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT50/bmp/z_align.bmp index 1473b9cbb9..074959f423 100644 Binary files a/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT50/bmp/z_align.bmp and b/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT50/bmp/z_align.bmp differ diff --git a/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT70/bmp/bkcolor.bmp b/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT70/bmp/bkcolor.bmp deleted file mode 100644 index d6f6b78ea3..0000000000 Binary files a/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT70/bmp/bkcolor.bmp and /dev/null differ diff --git a/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT70/bmp/brightness.bmp b/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT70/bmp/brightness.bmp new file mode 100644 index 0000000000..3819fc1d98 Binary files /dev/null and b/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT70/bmp/brightness.bmp differ diff --git a/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT70/bmp/case_light.bmp b/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT70/bmp/case_light.bmp index 0c47e0fa1a..00d4ac1048 100644 Binary files a/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT70/bmp/case_light.bmp and b/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT70/bmp/case_light.bmp differ diff --git a/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT70/bmp/fontcolor.bmp b/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT70/bmp/fontcolor.bmp deleted file mode 100644 index 922e70f6c2..0000000000 Binary files a/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT70/bmp/fontcolor.bmp and /dev/null differ diff --git a/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT70/bmp/marlin_mode.bmp b/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT70/bmp/marlin_mode.bmp new file mode 100644 index 0000000000..ffd7f3d465 Binary files /dev/null and b/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT70/bmp/marlin_mode.bmp differ diff --git a/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT70/bmp/mesh_editor.bmp b/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT70/bmp/mesh_editor.bmp index 63253d1e02..4e9716347e 100644 Binary files a/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT70/bmp/mesh_editor.bmp and b/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT70/bmp/mesh_editor.bmp differ diff --git a/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT70/bmp/z_align.bmp b/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT70/bmp/z_align.bmp index 458f07991d..d20fdab006 100644 Binary files a/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT70/bmp/z_align.bmp and b/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/TFT70/bmp/z_align.bmp differ diff --git a/Copy to SD Card root directory to update/config.ini b/Copy to SD Card root directory to update/config.ini index 976da36d69..11c2c4dc0e 100644 --- a/Copy to SD Card root directory to update/config.ini +++ b/Copy to SD Card root directory to update/config.ini @@ -203,12 +203,12 @@ marlin_fullscreen:0 #### Marlin Mode Type # Select Marlin Mode type. -# Options: [LCD2004: 0, LCD12864: 1] -marlin_type:1 +# Options: [128x64 Full Graphic LCD: 0, 20x4 Character LCD: 1] +marlin_type:0 #### Marlin Mode Title # Text displayed at the top of the TFT in Marlin Mode. -marlin_title:LCD12864 Simulator +marlin_title:Marlin Mode #-------------------------------------------------------------------- @@ -340,7 +340,7 @@ pause_pos:X10 Y10 pause_z_raise:10 ## Pause Feed Rate -# Feedrate to use when moving an axis whne printing is paused. +# Feedrate to use when moving an axis when printing is paused. # Format: [pause_feedrate: X Y Z E] # Unit: [feedrate in mm/min] pause_feedrate:XY6000 Z6000 E600 diff --git a/TFT/src/User/API/Colors.c b/TFT/src/User/API/Colors.c index a00b79f8ec..87a7dc1ec4 100644 --- a/TFT/src/User/API/Colors.c +++ b/TFT/src/User/API/Colors.c @@ -1,6 +1,6 @@ #include "Colors.h" -const u16 lcd_colors[LCD_COLOR_COUNT] = { +const uint16_t lcd_colors[LCD_COLOR_COUNT] = { WHITE, BLACK, RED, diff --git a/TFT/src/User/API/Colors.h b/TFT/src/User/API/Colors.h index f827505c0e..48cd04d69e 100644 --- a/TFT/src/User/API/Colors.h +++ b/TFT/src/User/API/Colors.h @@ -50,7 +50,7 @@ LCD_DARKGRAY, LCD_COLOR_COUNT }LCD_COLOR; -extern const u16 lcd_colors[LCD_COLOR_COUNT]; +extern const uint16_t lcd_colors[LCD_COLOR_COUNT]; extern const LABEL lcd_color_names[LCD_COLOR_COUNT]; #ifdef __cplusplus diff --git a/TFT/src/User/API/LCD_Encoder.c b/TFT/src/User/API/LCD_Encoder.c index a24ca8577e..9ca62c662f 100644 --- a/TFT/src/User/API/LCD_Encoder.c +++ b/TFT/src/User/API/LCD_Encoder.c @@ -14,7 +14,7 @@ void HW_EncoderInit(void) { uint16_t encPin[] = {LCD_ENCA_PIN, LCD_ENCB_PIN, LCD_BTN_PIN}; - for(u8 i = 0; i < COUNT(encPin); i++) + for(uint8_t i = 0; i < COUNT(encPin); i++) { GPIO_InitSet(encPin[i], MGPIO_MODE_IPU, 0); } @@ -24,12 +24,16 @@ void HW_EncoderInit(void) #if ENC_ACTIVE_SIGNAL void HW_EncActiveSignalInit(void) { + if(infoSettings.marlin_type != LCD12864) + return; GPIO_InitSet(LCD_ENC_EN_PIN, MGPIO_MODE_OUT_PP, 0); setEncActiveSignal(0); } void setEncActiveSignal(uint8_t status) { + if(infoSettings.marlin_type != LCD12864) + return; GPIO_SetLevel(LCD_ENC_EN_PIN, status); } #endif @@ -43,7 +47,7 @@ bool encoder_ReadStep(uint16_t io_pin) // read hardware encoder button for select btn press bool encoder_ReadBtn(uint16_t intervals) { - static u32 nowTime = 0; + static uint32_t nowTime = 0; if(!GPIO_GetLevel(LCD_BTN_PIN)) { @@ -62,8 +66,8 @@ bool encoder_ReadBtn(uint16_t intervals) //check touch to send select button bool LCD_BtnTouch(uint16_t intervals) { - static u32 BtnTime = 0; - u16 tx, ty; + static uint32_t BtnTime = 0; + uint16_t tx, ty; if (!XPT2046_Read_Pen()) { TS_Get_Coordinates(&tx, &ty); @@ -141,9 +145,9 @@ void loopCheckEncoderSteps(void) //Parse the touch to control encoder uint8_t LCD_ReadTouch(void) { - u16 ex=0,ey=0; - static u32 CTime = 0; - static u16 sy; + uint16_t ex=0,ey=0; + static uint32_t CTime = 0; + static uint16_t sy; static bool MOVE = false; if(!XPT2046_Read_Pen() && CTime < OS_GetTimeMs()) diff --git a/TFT/src/User/API/Language/Language.c b/TFT/src/User/API/Language/Language.c index 729a71fefd..7c52521dda 100644 --- a/TFT/src/User/API/Language/Language.c +++ b/TFT/src/User/API/Language/Language.c @@ -50,7 +50,7 @@ // // Add new Keywords in Language.inc file Only // -u8 tempLabelString[MAX_LANG_LABEL_LENGTH]; +uint8_t tempLabelString[MAX_LANG_LABEL_LENGTH]; const char *const default_pack[LABEL_NUM] = { #define X_WORD(NAME) STRING_##NAME , diff --git a/TFT/src/User/API/Language/Language.inc b/TFT/src/User/API/Language/Language.inc index 9079df2f11..4295973117 100644 --- a/TFT/src/User/API/Language/Language.inc +++ b/TFT/src/User/API/Language/Language.inc @@ -4,30 +4,20 @@ X_WORD (BAUDRATE) X_WORD (LANGUAGE) X_WORD (ROTATE_UI) X_WORD (TERMINAL_ACK) -X_WORD (INVERT_X_AXIS) -X_WORD (INVERT_Y_AXIS) -X_WORD (INVERT_Z_AXIS) X_WORD (PERSISTENT_INFO) X_WORD (FILE_LIST_MODE) X_WORD (ACK_NOTIFICATION) -X_WORD (DEFAULT_MODE) X_WORD (SERIAL_ALWAYS_ON) X_WORD (MARLIN_SHOW_TITLE) X_WORD (MARLIN_FULLSCREEN) X_WORD (MARLIN_TYPE) X_WORD (MOVE_SPEED) X_WORD (AUTO_LOAD_LEVELING) -X_WORD (TOUCHMI_SENSOR) -X_WORD (ONBOARD_SD_SUPPORT) -X_WORD (M27_ALWAYS_ACTIVE) -X_WORD (LONG_FILENAME_SUPPORT) X_WORD (FAN_SPEED_PERCENT) X_WORD (XY_OFFSET_PROBING) X_WORD (Z_STEPPERS_ALIGNMENT) X_WORD (PS_ON) -X_WORD (PS_ON_ACTIVE_HIGH) X_WORD (FIL_RUNOUT) -X_WORD (FIL_RUNOUT_INVERTING) X_WORD (PL_RECOVERY_EN) X_WORD (PL_RECOVERY_HOME) X_WORD (BTT_MINI_UPS) @@ -55,7 +45,7 @@ X_WORD (HOME_OFFSET) X_WORD (FWRETRACT) X_WORD (FWRECOVER) X_WORD (RETRACT_AUTO) -X_WORD (OFFSET_TOOL) +X_WORD (HOTEND_OFFSET) X_WORD (PROBE_OFFSET) X_WORD (LIN_ADVANCE) X_WORD (CURRENT_SETTING) @@ -244,6 +234,7 @@ X_WORD (EXTRUDE) X_WORD (SETTINGS) X_WORD (SCREEN_SETTINGS) X_WORD (MACHINE_SETTINGS) +X_WORD (MARLIN_MODE_SETTINGS) X_WORD (FEATURE_SETTINGS) X_WORD (SOUND) X_WORD (RGB_SETTINGS) @@ -284,8 +275,8 @@ X_WORD (LOAD_UNLOAD_SHORT) X_WORD (TOUCHSCREEN_ADJUST) X_WORD (MORE) X_WORD (SCREEN_INFO) -X_WORD (SIMULATOR_BG_COLOR) -X_WORD (SIMULATOR_FONT_COLOR) +X_WORD (BG_COLOR) +X_WORD (FONT_COLOR) X_WORD (PERCENTAGE) X_WORD (PERCENTAGE_SPEED) X_WORD (PERCENTAGE_FLOW) diff --git a/TFT/src/User/API/Language/language_am.h b/TFT/src/User/API/Language/language_am.h index 187d49ebc5..a60ea5f578 100644 --- a/TFT/src/User/API/Language/language_am.h +++ b/TFT/src/User/API/Language/language_am.h @@ -7,30 +7,20 @@ #define STRING_LANGUAGE "Հայերեն" #define STRING_ROTATE_UI "Rotate UI" #define STRING_TERMINAL_ACK "Show ACK in Terminal" - #define STRING_INVERT_X_AXIS "Invert X Axis" - #define STRING_INVERT_Y_AXIS "Invert Y Axis" - #define STRING_INVERT_Z_AXIS "Invert Z Axis" #define STRING_PERSISTENT_INFO "Persistent Status Info" #define STRING_FILE_LIST_MODE "Files viewer List Mode" #define STRING_ACK_NOTIFICATION "ACK notification style" - #define STRING_DEFAULT_MODE "Default Mode" #define STRING_SERIAL_ALWAYS_ON "Serial Always ON" #define STRING_MARLIN_SHOW_TITLE "Marlin Mode Title Support" #define STRING_MARLIN_FULLSCREEN "Marlin mode in fullscreen" #define STRING_MARLIN_TYPE "Marlin Mode Type" #define STRING_MOVE_SPEED "Move speed(X Y Z)" #define STRING_AUTO_LOAD_LEVELING "Auto Save Load Leveling" - #define STRING_TOUCHMI_SENSOR "TouchMI" - #define STRING_ONBOARD_SD_SUPPORT "Onboard SD Card Support" - #define STRING_M27_ALWAYS_ACTIVE "M27 Always Active" - #define STRING_LONG_FILENAME_SUPPORT "Long File Names Support" #define STRING_FAN_SPEED_PERCENT "Fan Speed As Percentage" #define STRING_XY_OFFSET_PROBING "XY Offset Probing Support" #define STRING_Z_STEPPERS_ALIGNMENT "Z Steppers Auto-Alignment" #define STRING_PS_ON "Auto Power" - #define STRING_PS_ON_ACTIVE_HIGH "Power Supply Active HIGH" #define STRING_FIL_RUNOUT "Filament sensor" - #define STRING_FIL_RUNOUT_INVERTING "Inverted Filament Runout Logic" #define STRING_PL_RECOVERY_EN "Power loss recovery" #define STRING_PL_RECOVERY_HOME "Power Loss Recovery Homing" #define STRING_BTT_MINI_UPS "BTT UPS Support" @@ -40,9 +30,9 @@ #define STRING_HEATER_SOUND "Heater notification" #define STRING_KNOB_LED_COLOR "Rotary Knob LED" #define STRING_KNOB_LED_IDLE "Rotary Knob LED idle" - #define STRING_LCD_BRIGHTNESS "LCD Brightness" - #define STRING_LCD_IDLE_BRIGHTNESS "LCD Brightness dim" - #define STRING_LCD_IDLE_DELAY "LCD dim idle timer" + #define STRING_LCD_BRIGHTNESS "Brightness" + #define STRING_LCD_IDLE_BRIGHTNESS "Idle brightness" + #define STRING_LCD_IDLE_DELAY "Idle timeout" #define STRING_START_GCODE_ENABLED "Start Gcode before print" #define STRING_END_GCODE_ENABLED "End Gcode after print" #define STRING_CANCEL_GCODE_ENABLED "Cancel Gcode" @@ -58,7 +48,7 @@ #define STRING_FWRETRACT "FW Retraction" #define STRING_FWRECOVER "FW Retraction Recover" #define STRING_RETRACT_AUTO "Auto Firmware Retract" - #define STRING_OFFSET_TOOL "Offset 2nd Nozzle" + #define STRING_HOTEND_OFFSET "Offset 2nd Nozzle" #define STRING_PROBE_OFFSET "Probe Offset" #define STRING_LIN_ADVANCE "Linear Advance" #define STRING_CURRENT_SETTING "Driver Current (mA)" @@ -247,6 +237,7 @@ #define STRING_SETTINGS "Կարգավորումներ" #define STRING_SCREEN_SETTINGS "Screen" #define STRING_MACHINE_SETTINGS "Machine" + #define STRING_MARLIN_MODE_SETTINGS "MarlinMode" #define STRING_FEATURE_SETTINGS "Feature" #define STRING_SOUND "Sound" #define STRING_RGB_SETTINGS "LED Color" @@ -287,8 +278,8 @@ #define STRING_TOUCHSCREEN_ADJUST "TSC Adjust" #define STRING_MORE "More" #define STRING_SCREEN_INFO "Info" - #define STRING_SIMULATOR_BG_COLOR "Marlin simulator background color" - #define STRING_SIMULATOR_FONT_COLOR "Marlin simulator font color" + #define STRING_BG_COLOR "Background color" + #define STRING_FONT_COLOR "Font color" #define STRING_PERCENTAGE "Percentage" #define STRING_PERCENTAGE_SPEED "Արագություն" #define STRING_PERCENTAGE_FLOW "Flow" diff --git a/TFT/src/User/API/Language/language_ca.h b/TFT/src/User/API/Language/language_ca.h index cd8c6f5d8f..8804f6a64e 100644 --- a/TFT/src/User/API/Language/language_ca.h +++ b/TFT/src/User/API/Language/language_ca.h @@ -7,30 +7,20 @@ #define STRING_LANGUAGE "Català" #define STRING_ROTATE_UI "Rotar" #define STRING_TERMINAL_ACK "Mostra ACK a la terminal" - #define STRING_INVERT_X_AXIS "Invertir eix X" - #define STRING_INVERT_Y_AXIS "Invertir eix Y" - #define STRING_INVERT_Z_AXIS "Invertir eix Z" #define STRING_PERSISTENT_INFO "Informació d'estat persistent" #define STRING_FILE_LIST_MODE "Mode de visualització de fitxers" #define STRING_ACK_NOTIFICATION "ACK notification style" - #define STRING_DEFAULT_MODE "Default Mode" #define STRING_SERIAL_ALWAYS_ON "Serial Always ON" #define STRING_MARLIN_SHOW_TITLE "Marlin Mode Title Support" #define STRING_MARLIN_FULLSCREEN "Mode Marlin a pantalla completa" #define STRING_MARLIN_TYPE "Marlin Mode Type" #define STRING_MOVE_SPEED "Velocitat de moviment(X Y Z)" #define STRING_AUTO_LOAD_LEVELING "Auto Save Load Leveling" - #define STRING_TOUCHMI_SENSOR "TouchMI" - #define STRING_ONBOARD_SD_SUPPORT "Onboard SD Card Support" - #define STRING_M27_ALWAYS_ACTIVE "M27 Always Active" - #define STRING_LONG_FILENAME_SUPPORT "Long File Names Support" #define STRING_FAN_SPEED_PERCENT "Fan Speed As Percentage" #define STRING_XY_OFFSET_PROBING "XY Offset Probing Support" #define STRING_Z_STEPPERS_ALIGNMENT "Z Steppers Auto-Alignment" #define STRING_PS_ON "Apag. aut." - #define STRING_PS_ON_ACTIVE_HIGH "Power Supply Active HIGH" #define STRING_FIL_RUNOUT "Sensor de filament" - #define STRING_FIL_RUNOUT_INVERTING "Inverted Filament Runout Logic" #define STRING_PL_RECOVERY_EN "Recuperació de pèrdua d’energia" #define STRING_PL_RECOVERY_HOME "Power Loss Recovery Homing" #define STRING_BTT_MINI_UPS "BTT UPS Support" @@ -40,7 +30,7 @@ #define STRING_HEATER_SOUND "Heater notification" #define STRING_KNOB_LED_COLOR "Perilla rotativa LED" #define STRING_KNOB_LED_IDLE "Rotary Knob LED idle" - #define STRING_LCD_BRIGHTNESS "Lluminositat LCD" + #define STRING_LCD_BRIGHTNESS "Lluminositat" #define STRING_LCD_IDLE_BRIGHTNESS "Dim Lluminositat LCD" #define STRING_LCD_IDLE_DELAY "Temporitzador inactiu LCD" #define STRING_START_GCODE_ENABLED "Enviar Gcode inicial" @@ -58,7 +48,7 @@ #define STRING_FWRETRACT "Retracció de FW" #define STRING_FWRECOVER "Recuperació de Retracció de FW" #define STRING_RETRACT_AUTO "Auto Firmware Retract" - #define STRING_OFFSET_TOOL "Offset 2nd Nozzle" + #define STRING_HOTEND_OFFSET "Offset 2nd Nozzle" #define STRING_PROBE_OFFSET "Sonda Compensar" #define STRING_LIN_ADVANCE "Avanç Lineal" #define STRING_CURRENT_SETTING "Corrent del Driver (mA)" @@ -247,6 +237,7 @@ #define STRING_SETTINGS "Configura" #define STRING_SCREEN_SETTINGS "Pantalla" #define STRING_MACHINE_SETTINGS "Màquina" + #define STRING_MARLIN_MODE_SETTINGS "MarlinMode" #define STRING_FEATURE_SETTINGS "Afegits" #define STRING_SOUND "Sound" #define STRING_RGB_SETTINGS "Color LED" @@ -287,8 +278,8 @@ #define STRING_TOUCHSCREEN_ADJUST "Calibrar" #define STRING_MORE "Més" #define STRING_SCREEN_INFO "Informar" - #define STRING_SIMULATOR_BG_COLOR "Color de fons del simulador Marlin" - #define STRING_SIMULATOR_FONT_COLOR "Color de lletra de simulador Marlin" + #define STRING_BG_COLOR "Color de fons" + #define STRING_FONT_COLOR "Color de lletra" #define STRING_PERCENTAGE "Percentatge" #define STRING_PERCENTAGE_SPEED "Velocitat" #define STRING_PERCENTAGE_FLOW "Flux" diff --git a/TFT/src/User/API/Language/language_cn.h b/TFT/src/User/API/Language/language_cn.h index 937cfcfbe0..96b8d075fd 100644 --- a/TFT/src/User/API/Language/language_cn.h +++ b/TFT/src/User/API/Language/language_cn.h @@ -7,30 +7,20 @@ #define STRING_LANGUAGE "简体中文" #define STRING_ROTATE_UI "旋转界面" #define STRING_TERMINAL_ACK "在G-code终端中显示温度信息" - #define STRING_INVERT_X_AXIS "翻转X轴" - #define STRING_INVERT_Y_AXIS "翻转Y轴" - #define STRING_INVERT_Z_AXIS "翻转Z轴" #define STRING_PERSISTENT_INFO "顶部温度信息" #define STRING_FILE_LIST_MODE "文件浏览列表模式" #define STRING_ACK_NOTIFICATION "ACK 弹窗类型" - #define STRING_DEFAULT_MODE "默认的模式" #define STRING_SERIAL_ALWAYS_ON "串口常开" #define STRING_MARLIN_SHOW_TITLE "Marlin模式显示标题" #define STRING_MARLIN_FULLSCREEN "全屏显示Marlin模式" #define STRING_MARLIN_TYPE "Marlin模式类型" #define STRING_MOVE_SPEED "移动速度(X Y Z)" #define STRING_AUTO_LOAD_LEVELING "自动保存/加载调平数据" - #define STRING_TOUCHMI_SENSOR "TouchMI" - #define STRING_ONBOARD_SD_SUPPORT "Marlin存储卡支持" - #define STRING_M27_ALWAYS_ACTIVE "持续发送M27" - #define STRING_LONG_FILENAME_SUPPORT "Marlin长文件名支持" #define STRING_FAN_SPEED_PERCENT "百分比显示风扇速度" #define STRING_XY_OFFSET_PROBING "XY Offset Probing Support" #define STRING_Z_STEPPERS_ALIGNMENT "Z轴多电机自动对齐" #define STRING_PS_ON "自动关机" - #define STRING_PS_ON_ACTIVE_HIGH "低电平关机" #define STRING_FIL_RUNOUT "耗材检测传感器" - #define STRING_FIL_RUNOUT_INVERTING "翻转耗材检测逻辑" #define STRING_PL_RECOVERY_EN "断电续打" #define STRING_PL_RECOVERY_HOME "断电续打前归零" #define STRING_BTT_MINI_UPS "启用BTT UPS" @@ -58,7 +48,7 @@ #define STRING_FWRETRACT "FW Retraction" #define STRING_FWRECOVER "FW Retraction Recover" #define STRING_RETRACT_AUTO "FW自动回抽" - #define STRING_OFFSET_TOOL "第2个喷头的偏移量" + #define STRING_HOTEND_OFFSET "第2个喷头的偏移量" #define STRING_PROBE_OFFSET "探针偏移量" #define STRING_LIN_ADVANCE "Linear Advance" #define STRING_CURRENT_SETTING "TMC驱动电流设置" @@ -247,6 +237,7 @@ #define STRING_SETTINGS "设置" #define STRING_SCREEN_SETTINGS "屏幕设置" #define STRING_MACHINE_SETTINGS "机器设置" + #define STRING_MARLIN_MODE_SETTINGS "MarlinMode" #define STRING_FEATURE_SETTINGS "功能设置" #define STRING_SOUND "声音" #define STRING_RGB_SETTINGS "灯光颜色" @@ -287,8 +278,8 @@ #define STRING_TOUCHSCREEN_ADJUST "触屏校准" #define STRING_MORE "更多" #define STRING_SCREEN_INFO "关于" - #define STRING_SIMULATOR_BG_COLOR "Marlin模式背景颜色" - #define STRING_SIMULATOR_FONT_COLOR "Marlin模式字体颜色" + #define STRING_BG_COLOR "背景颜色" + #define STRING_FONT_COLOR "字体颜色" #define STRING_PERCENTAGE "百分比" #define STRING_PERCENTAGE_SPEED "速度百分比" #define STRING_PERCENTAGE_FLOW "流量百分比" diff --git a/TFT/src/User/API/Language/language_cz.h b/TFT/src/User/API/Language/language_cz.h index 358fcf73be..5d92486fb6 100644 --- a/TFT/src/User/API/Language/language_cz.h +++ b/TFT/src/User/API/Language/language_cz.h @@ -7,30 +7,20 @@ #define STRING_LANGUAGE "Čeština" #define STRING_ROTATE_UI "Otočit UI" #define STRING_TERMINAL_ACK "zobrazit ACK Terminálu" - #define STRING_INVERT_X_AXIS "Otočit osu X" - #define STRING_INVERT_Y_AXIS "Otočit osu Y" - #define STRING_INVERT_Z_AXIS "Otočit osu Z" #define STRING_PERSISTENT_INFO "Zobrazení stavových ikon" #define STRING_FILE_LIST_MODE "Soubory jako seznam" #define STRING_ACK_NOTIFICATION "Styl oznámení ACK" - #define STRING_DEFAULT_MODE "Defaultní mód" #define STRING_SERIAL_ALWAYS_ON "Seriový port vždy ON" #define STRING_MARLIN_SHOW_TITLE "Zobrazit tytulek Marlin" #define STRING_MARLIN_FULLSCREEN "Fullscreen režim Marlin" #define STRING_MARLIN_TYPE "Typ Marlin Modu" #define STRING_MOVE_SPEED "Rychlost pohybu X Y Z" #define STRING_AUTO_LOAD_LEVELING "Automaticky Leveling" - #define STRING_TOUCHMI_SENSOR "TouchMI" - #define STRING_ONBOARD_SD_SUPPORT "Podpora onboard SD" - #define STRING_M27_ALWAYS_ACTIVE "M27 Vždy aktivní" - #define STRING_LONG_FILENAME_SUPPORT "Podpora dlouhých názvů" #define STRING_FAN_SPEED_PERCENT "Rychlost ventilátoru v %" #define STRING_XY_OFFSET_PROBING "Podpora XY Offset sondy" #define STRING_Z_STEPPERS_ALIGNMENT "Z Motor Auto-Alignment" #define STRING_PS_ON "Auto.vypnutí" - #define STRING_PS_ON_ACTIVE_HIGH "Napájení aktivní HIGH" #define STRING_FIL_RUNOUT "Senzor filamentu" - #define STRING_FIL_RUNOUT_INVERTING "Otoč logiku senzoru filam." #define STRING_PL_RECOVERY_EN "Obnova po ztrátě napájení" #define STRING_PL_RECOVERY_HOME "Spuštění obnovení napájení" #define STRING_BTT_MINI_UPS "Podpora BTT UPS" @@ -58,7 +48,7 @@ #define STRING_FWRETRACT "FW Zatažení" #define STRING_FWRECOVER "FW Obnovení" #define STRING_RETRACT_AUTO "Auto Firmware Retract" - #define STRING_OFFSET_TOOL "Offset 2.trysky" + #define STRING_HOTEND_OFFSET "Offset 2.trysky" #define STRING_PROBE_OFFSET "Offset sondy" #define STRING_LIN_ADVANCE "Linear Advance" #define STRING_CURRENT_SETTING "Proud motorů (mA)" @@ -247,6 +237,7 @@ #define STRING_SETTINGS "Nastavení" #define STRING_SCREEN_SETTINGS "Displej" #define STRING_MACHINE_SETTINGS "Tiskárna" + #define STRING_MARLIN_MODE_SETTINGS "MarlinMode" #define STRING_FEATURE_SETTINGS "Vlastnosti" #define STRING_SOUND "Zvuk" #define STRING_RGB_SETTINGS "Barva LED" @@ -287,8 +278,8 @@ #define STRING_TOUCHSCREEN_ADJUST "Kalibrovat" #define STRING_MORE "Více" #define STRING_SCREEN_INFO "Info" - #define STRING_SIMULATOR_BG_COLOR "Marlin - Barva pozadí" - #define STRING_SIMULATOR_FONT_COLOR "Marlin - Barva písma" + #define STRING_BG_COLOR "Barva pozadí" + #define STRING_FONT_COLOR "Barva písma" #define STRING_PERCENTAGE "Procenta" #define STRING_PERCENTAGE_SPEED "Rychlost" #define STRING_PERCENTAGE_FLOW "Průtok" diff --git a/TFT/src/User/API/Language/language_de.h b/TFT/src/User/API/Language/language_de.h index 624f6b42eb..dc777f7f7f 100644 --- a/TFT/src/User/API/Language/language_de.h +++ b/TFT/src/User/API/Language/language_de.h @@ -7,30 +7,20 @@ #define STRING_LANGUAGE "Deutsch" #define STRING_ROTATE_UI "UI drehen" #define STRING_TERMINAL_ACK "Zeige ACK im Terminal" - #define STRING_INVERT_X_AXIS "Invertiere X-Achse" - #define STRING_INVERT_Y_AXIS "Invertiere Y-Achse" - #define STRING_INVERT_Z_AXIS "Invertiere Z-Achse" #define STRING_PERSISTENT_INFO "Speicherungs-Status" #define STRING_FILE_LIST_MODE "Dateien als Liste" #define STRING_ACK_NOTIFICATION "ACK - Stil" - #define STRING_DEFAULT_MODE "Standard Modus" #define STRING_SERIAL_ALWAYS_ON "Seriell Verbind. immer an" #define STRING_MARLIN_SHOW_TITLE "Marlin Modus Titel anz." #define STRING_MARLIN_FULLSCREEN "Marlin Modus im Vollbild" #define STRING_MARLIN_TYPE "Marlin Modus Typ" #define STRING_MOVE_SPEED "Geschwindigkeit (XYZ)" #define STRING_AUTO_LOAD_LEVELING "Auto Save Load Leveling" - #define STRING_TOUCHMI_SENSOR "TouchMI" - #define STRING_ONBOARD_SD_SUPPORT "Onboard SD aktivieren" - #define STRING_M27_ALWAYS_ACTIVE "M27 immer aktiv" - #define STRING_LONG_FILENAME_SUPPORT "lange Dateinamen anzeigen" #define STRING_FAN_SPEED_PERCENT "Lüft. Geschw. in Prozent" #define STRING_XY_OFFSET_PROBING "XY Offset Probing Support" #define STRING_Z_STEPPERS_ALIGNMENT "Z Stepper Auto-Justierung" #define STRING_PS_ON "Auto-aus (PS_ON)" - #define STRING_PS_ON_ACTIVE_HIGH "Spannungsvers. Active HIGH" #define STRING_FIL_RUNOUT "Filament Sensor" - #define STRING_FIL_RUNOUT_INVERTING "Filament Sensor umkehren" #define STRING_PL_RECOVERY_EN "Weitermachen (Stromausfall)" #define STRING_PL_RECOVERY_HOME "Achsen nullen (Stromausfall)" #define STRING_BTT_MINI_UPS "BTT UPS Support" @@ -40,7 +30,7 @@ #define STRING_HEATER_SOUND "Ton bei erreichter Temp." #define STRING_KNOB_LED_COLOR "Drehknopf LED Farbe" #define STRING_KNOB_LED_IDLE "Drehknopf LED idle Farbe" - #define STRING_LCD_BRIGHTNESS "LCD Helligkeit" + #define STRING_LCD_BRIGHTNESS "Helligkeit" #define STRING_LCD_IDLE_BRIGHTNESS "LCD Helligkeit (Standby)" #define STRING_LCD_IDLE_DELAY "LCD Timer Standby" #define STRING_START_GCODE_ENABLED "Gcode vor Druck" @@ -58,7 +48,7 @@ #define STRING_FWRETRACT "FW Rückzug" #define STRING_FWRECOVER "FW Rückeinschub" #define STRING_RETRACT_AUTO "Auto-Rückzug (Firmware)" - #define STRING_OFFSET_TOOL "Abstand 2te Düse" + #define STRING_HOTEND_OFFSET "Abstand 2te Düse" #define STRING_PROBE_OFFSET "Sensor Versatz" #define STRING_LIN_ADVANCE "Linear Advance" #define STRING_CURRENT_SETTING "Treiber Strom (mA)" @@ -247,6 +237,7 @@ #define STRING_SETTINGS "Parameter" #define STRING_SCREEN_SETTINGS "Bildschirm" #define STRING_MACHINE_SETTINGS "Drucker" + #define STRING_MARLIN_MODE_SETTINGS "MarlinMode" #define STRING_FEATURE_SETTINGS "Andere" #define STRING_SOUND "Töne" #define STRING_RGB_SETTINGS "LED Farbe" @@ -287,8 +278,8 @@ #define STRING_TOUCHSCREEN_ADJUST "TSC kalib." #define STRING_MORE "Mehr" #define STRING_SCREEN_INFO "Info" - #define STRING_SIMULATOR_BG_COLOR "Hintergrundfarbe Marlin" - #define STRING_SIMULATOR_FONT_COLOR "Schriftfarbe Marlin" + #define STRING_BG_COLOR "Hintergrundfarbe" + #define STRING_FONT_COLOR "Schriftfarbe" #define STRING_PERCENTAGE "Prozent" #define STRING_PERCENTAGE_SPEED "Geschw." #define STRING_PERCENTAGE_FLOW "Fluss" diff --git a/TFT/src/User/API/Language/language_du.h b/TFT/src/User/API/Language/language_du.h index 70782efaee..4213cdc499 100644 --- a/TFT/src/User/API/Language/language_du.h +++ b/TFT/src/User/API/Language/language_du.h @@ -7,30 +7,20 @@ #define STRING_LANGUAGE "Dutch" #define STRING_ROTATE_UI "Draai UI" #define STRING_TERMINAL_ACK "Laat ACK in Terminal zien" - #define STRING_INVERT_X_AXIS "Inverteer X Axis" - #define STRING_INVERT_Y_AXIS "Inverteer Y Axis" - #define STRING_INVERT_Z_AXIS "Inverteer Z Axis" #define STRING_PERSISTENT_INFO "Aanhoudende statusinfo" #define STRING_FILE_LIST_MODE "Files viewer List Mode" #define STRING_ACK_NOTIFICATION "ACK notification style" - #define STRING_DEFAULT_MODE "Default Mode" #define STRING_SERIAL_ALWAYS_ON "Serial Always ON" #define STRING_MARLIN_SHOW_TITLE "Marlin Mode Title Support" #define STRING_MARLIN_FULLSCREEN "Marlin mode in fullscreen" #define STRING_MARLIN_TYPE "Marlin Mode Type" #define STRING_MOVE_SPEED "Bewegingssnelheid(X Y Z)" #define STRING_AUTO_LOAD_LEVELING "Auto Save Load Leveling" - #define STRING_TOUCHMI_SENSOR "TouchMI" - #define STRING_ONBOARD_SD_SUPPORT "Onboard SD Card Support" - #define STRING_M27_ALWAYS_ACTIVE "M27 Always Active" - #define STRING_LONG_FILENAME_SUPPORT "Long File Names Support" #define STRING_FAN_SPEED_PERCENT "Fan Speed As Percentage" #define STRING_XY_OFFSET_PROBING "XY Offset Probing Support" #define STRING_Z_STEPPERS_ALIGNMENT "Z Steppers Auto-Alignment" #define STRING_PS_ON "Auto Power" - #define STRING_PS_ON_ACTIVE_HIGH "Power Supply Active HIGH" #define STRING_FIL_RUNOUT "Filament sensor" - #define STRING_FIL_RUNOUT_INVERTING "Inverted Filament Runout Logic" #define STRING_PL_RECOVERY_EN "Power loss recovery" #define STRING_PL_RECOVERY_HOME "Power Loss Recovery Homing" #define STRING_BTT_MINI_UPS "BTT UPS Support" @@ -40,9 +30,9 @@ #define STRING_HEATER_SOUND "Heater notification" #define STRING_KNOB_LED_COLOR "Draaiknop LED" #define STRING_KNOB_LED_IDLE "Draaiknop LED inactief" - #define STRING_LCD_BRIGHTNESS "LCD Brightness" - #define STRING_LCD_IDLE_BRIGHTNESS "LCD Brightness dim" - #define STRING_LCD_IDLE_DELAY "LCD dim idle timer" + #define STRING_LCD_BRIGHTNESS "Brightness" + #define STRING_LCD_IDLE_BRIGHTNESS "Idle brightness" + #define STRING_LCD_IDLE_DELAY "Idle timeout" #define STRING_START_GCODE_ENABLED "Start Gcode before print" #define STRING_END_GCODE_ENABLED "End Gcode after print" #define STRING_CANCEL_GCODE_ENABLED "Cancel Gcode" @@ -58,7 +48,7 @@ #define STRING_FWRETRACT "FW Retraction" #define STRING_FWRECOVER "FW Retraction Recover" #define STRING_RETRACT_AUTO "Auto Firmware Retract" - #define STRING_OFFSET_TOOL "Offset 2nd Nozzle" + #define STRING_HOTEND_OFFSET "Offset 2nd Nozzle" #define STRING_PROBE_OFFSET "Probe Offset" #define STRING_LIN_ADVANCE "Linear Advance" #define STRING_CURRENT_SETTING "Driver stroom (mA)" @@ -247,6 +237,7 @@ #define STRING_SETTINGS "Instellingen" #define STRING_SCREEN_SETTINGS "Scherm" #define STRING_MACHINE_SETTINGS "Machine" + #define STRING_MARLIN_MODE_SETTINGS "MarlinMode" #define STRING_FEATURE_SETTINGS "Kenmerk" #define STRING_SOUND "Sound" #define STRING_RGB_SETTINGS "LED Kleur" @@ -287,8 +278,8 @@ #define STRING_TOUCHSCREEN_ADJUST "TSC Aanpassen" #define STRING_MORE "Meer" #define STRING_SCREEN_INFO "Info" - #define STRING_SIMULATOR_BG_COLOR "Marlin simulator achtergrond kleur" - #define STRING_SIMULATOR_FONT_COLOR "Marlin simulator tekst kleur" + #define STRING_BG_COLOR "achtergrond kleur" + #define STRING_FONT_COLOR "tekst kleur" #define STRING_PERCENTAGE "Percentage" #define STRING_PERCENTAGE_SPEED "Snelheid" #define STRING_PERCENTAGE_FLOW "Stromen" diff --git a/TFT/src/User/API/Language/language_en.h b/TFT/src/User/API/Language/language_en.h index 2bbdd72352..96467f10c8 100644 --- a/TFT/src/User/API/Language/language_en.h +++ b/TFT/src/User/API/Language/language_en.h @@ -7,32 +7,22 @@ #define STRING_LANGUAGE "English" #define STRING_ROTATE_UI "Rotate UI" #define STRING_TERMINAL_ACK "Show ACK in Terminal" - #define STRING_INVERT_X_AXIS "Invert X Axis" - #define STRING_INVERT_Y_AXIS "Invert Y Axis" - #define STRING_INVERT_Z_AXIS "Invert Z Axis" #define STRING_PERSISTENT_INFO "Persistent Status Info" #define STRING_FILE_LIST_MODE "Files viewer List Mode" #define STRING_ACK_NOTIFICATION "ACK notification style" - #define STRING_DEFAULT_MODE "Default Mode" #define STRING_SERIAL_ALWAYS_ON "Serial Always ON" - #define STRING_MARLIN_SHOW_TITLE "Marlin Mode Title Support" - #define STRING_MARLIN_FULLSCREEN "Marlin mode in fullscreen" + #define STRING_MARLIN_SHOW_TITLE "Show Title" + #define STRING_MARLIN_FULLSCREEN "Fullscreen Mode" #define STRING_MARLIN_TYPE "Marlin Mode Type" #define STRING_MOVE_SPEED "Move speed(X Y Z)" #define STRING_AUTO_LOAD_LEVELING "Auto Save Load Leveling" - #define STRING_TOUCHMI_SENSOR "TouchMI" - #define STRING_ONBOARD_SD_SUPPORT "Onboard SD Card Support" - #define STRING_M27_ALWAYS_ACTIVE "M27 Always Active" - #define STRING_LONG_FILENAME_SUPPORT "Long File Names Support" - #define STRING_FAN_SPEED_PERCENT "Fan Speed As Percentage" + #define STRING_FAN_SPEED_PERCENT "Fan Speed in Percent" #define STRING_XY_OFFSET_PROBING "XY Offset Probing Support" #define STRING_Z_STEPPERS_ALIGNMENT "Z Steppers Auto-Alignment" #define STRING_PS_ON "Auto Power" - #define STRING_PS_ON_ACTIVE_HIGH "Power Supply Active HIGH" #define STRING_FIL_RUNOUT "Filament sensor" - #define STRING_FIL_RUNOUT_INVERTING "Inverted Filament Runout Logic" #define STRING_PL_RECOVERY_EN "Power loss recovery" - #define STRING_PL_RECOVERY_HOME "Power Loss Recovery Homing" + #define STRING_PL_RECOVERY_HOME "Home after power loss" #define STRING_BTT_MINI_UPS "BTT UPS Support" #define STRING_TOUCH_SOUND "Touch sounds" #define STRING_TOAST_SOUND "Toast Notifications" @@ -40,9 +30,9 @@ #define STRING_HEATER_SOUND "Heater notification" #define STRING_KNOB_LED_COLOR "Rotary Knob LED" #define STRING_KNOB_LED_IDLE "Rotary Knob LED idle" - #define STRING_LCD_BRIGHTNESS "LCD Brightness" - #define STRING_LCD_IDLE_BRIGHTNESS "LCD Brightness dim" - #define STRING_LCD_IDLE_DELAY "LCD dim idle timer" + #define STRING_LCD_BRIGHTNESS "Brightness" + #define STRING_LCD_IDLE_BRIGHTNESS "Idle brightness" + #define STRING_LCD_IDLE_DELAY "Idle timeout" #define STRING_START_GCODE_ENABLED "Start Gcode before print" #define STRING_END_GCODE_ENABLED "End Gcode after print" #define STRING_CANCEL_GCODE_ENABLED "Cancel Gcode" @@ -58,7 +48,7 @@ #define STRING_FWRETRACT "FW Retraction" #define STRING_FWRECOVER "FW Retraction Recover" #define STRING_RETRACT_AUTO "Auto Firmware Retract" - #define STRING_OFFSET_TOOL "Offset 2nd Nozzle" + #define STRING_HOTEND_OFFSET "Offset 2nd Nozzle" #define STRING_PROBE_OFFSET "Probe Offset" #define STRING_LIN_ADVANCE "Linear Advance" #define STRING_CURRENT_SETTING "Driver Current (mA)" @@ -124,12 +114,12 @@ #define STRING_RESUME "Resume" #define STRING_INIT "Init" #define STRING_DISCONNECT "Disconnect" - #define STRING_SHUT_DOWN "Shut Down" + #define STRING_SHUT_DOWN "Shut down" #define STRING_FORCE_SHUT_DOWN "Force" #define STRING_EMERGENCYSTOP "EM. STOP" #define STRING_PREHEAT "Preheat" #define STRING_PREHEAT_BOTH "Both" - #define STRING_COOLDOWN "Cool Down" + #define STRING_COOLDOWN "Cool down" // Dialog Buttons #define STRING_CONFIRM "\u088E OK" //Confirm Sign @@ -247,6 +237,7 @@ #define STRING_SETTINGS "Settings" #define STRING_SCREEN_SETTINGS "Screen" #define STRING_MACHINE_SETTINGS "Machine" + #define STRING_MARLIN_MODE_SETTINGS "MarlinMode" #define STRING_FEATURE_SETTINGS "Feature" #define STRING_SOUND "Sound" #define STRING_RGB_SETTINGS "LED Color" @@ -287,8 +278,8 @@ #define STRING_TOUCHSCREEN_ADJUST "TSC Adjust" #define STRING_MORE "More" #define STRING_SCREEN_INFO "Info" - #define STRING_SIMULATOR_BG_COLOR "Marlin simulator background color" - #define STRING_SIMULATOR_FONT_COLOR "Marlin simulator font color" + #define STRING_BG_COLOR "Background color" + #define STRING_FONT_COLOR "Font color" #define STRING_PERCENTAGE "Percentage" #define STRING_PERCENTAGE_SPEED "Speed" #define STRING_PERCENTAGE_FLOW "Flow" diff --git a/TFT/src/User/API/Language/language_es.h b/TFT/src/User/API/Language/language_es.h index df69755507..13237efc99 100644 --- a/TFT/src/User/API/Language/language_es.h +++ b/TFT/src/User/API/Language/language_es.h @@ -7,30 +7,20 @@ #define STRING_LANGUAGE "Español" #define STRING_ROTATE_UI "Rotar" #define STRING_TERMINAL_ACK "Show ACK in Terminal" - #define STRING_INVERT_X_AXIS "Invert X Axis" - #define STRING_INVERT_Y_AXIS "Invert Y Axis" - #define STRING_INVERT_Z_AXIS "Invert Z Axis" #define STRING_PERSISTENT_INFO "Persistent Status Info" #define STRING_FILE_LIST_MODE "Files viewer List Mode" #define STRING_ACK_NOTIFICATION "ACK notification style" - #define STRING_DEFAULT_MODE "Default Mode" #define STRING_SERIAL_ALWAYS_ON "Serial Always ON" #define STRING_MARLIN_SHOW_TITLE "Marlin Mode Title Support" #define STRING_MARLIN_FULLSCREEN "Marlin mode in fullscreen" #define STRING_MARLIN_TYPE "Marlin Mode Type" #define STRING_MOVE_SPEED "Move speed(X Y Z)" #define STRING_AUTO_LOAD_LEVELING "Auto Save Load Leveling" - #define STRING_TOUCHMI_SENSOR "TouchMI" - #define STRING_ONBOARD_SD_SUPPORT "Onboard SD Card Support" - #define STRING_M27_ALWAYS_ACTIVE "M27 Always Active" - #define STRING_LONG_FILENAME_SUPPORT "Long File Names Support" #define STRING_FAN_SPEED_PERCENT "Fan Speed As Percentage" #define STRING_XY_OFFSET_PROBING "XY Offset Probing Support" #define STRING_Z_STEPPERS_ALIGNMENT "Z Steppers Auto-Alignment" #define STRING_PS_ON "Apag. aut." - #define STRING_PS_ON_ACTIVE_HIGH "Power Supply Active HIGH" #define STRING_FIL_RUNOUT "Filament sensor" - #define STRING_FIL_RUNOUT_INVERTING "Inverted Filament Runout Logic" #define STRING_PL_RECOVERY_EN "Power loss recovery" #define STRING_PL_RECOVERY_HOME "Power Loss Recovery Homing" #define STRING_BTT_MINI_UPS "BTT UPS Support" @@ -40,9 +30,9 @@ #define STRING_HEATER_SOUND "Heater notification" #define STRING_KNOB_LED_COLOR "Rotary Knob LED" #define STRING_KNOB_LED_IDLE "Rotary Knob LED idle" - #define STRING_LCD_BRIGHTNESS "LCD Brightness" - #define STRING_LCD_IDLE_BRIGHTNESS "LCD Brightness dim" - #define STRING_LCD_IDLE_DELAY "LCD dim idle timer" + #define STRING_LCD_BRIGHTNESS "Brightness" + #define STRING_LCD_IDLE_BRIGHTNESS "Idle brightness" + #define STRING_LCD_IDLE_DELAY "Idle timeout" #define STRING_START_GCODE_ENABLED "Start Gcode before print" #define STRING_END_GCODE_ENABLED "End Gcode after print" #define STRING_CANCEL_GCODE_ENABLED "Cancel Gcode" @@ -58,7 +48,7 @@ #define STRING_FWRETRACT "FW Retraction" #define STRING_FWRECOVER "FW Retraction Recover" #define STRING_RETRACT_AUTO "Auto Firmware Retract" - #define STRING_OFFSET_TOOL "Offset 2nd Nozzle" + #define STRING_HOTEND_OFFSET "Offset 2nd Nozzle" #define STRING_PROBE_OFFSET "Sonda Compensar" #define STRING_LIN_ADVANCE "Linear Advance" #define STRING_CURRENT_SETTING "Driver Current (mA)" @@ -247,6 +237,7 @@ #define STRING_SETTINGS "Configurar" #define STRING_SCREEN_SETTINGS "Pantalla" #define STRING_MACHINE_SETTINGS "Máquina" + #define STRING_MARLIN_MODE_SETTINGS "MarlinMode" #define STRING_FEATURE_SETTINGS "Añadidos" #define STRING_SOUND "Sound" #define STRING_RGB_SETTINGS "Color LED" @@ -287,8 +278,8 @@ #define STRING_TOUCHSCREEN_ADJUST "Calibrar" #define STRING_MORE "Más" #define STRING_SCREEN_INFO "Informar" - #define STRING_SIMULATOR_BG_COLOR "Marlin simulator background color" - #define STRING_SIMULATOR_FONT_COLOR "Marlin simulator font color" + #define STRING_BG_COLOR "Background color" + #define STRING_FONT_COLOR "Font color" #define STRING_PERCENTAGE "Porcentaje" #define STRING_PERCENTAGE_SPEED "Velocidad" #define STRING_PERCENTAGE_FLOW "Flujo" diff --git a/TFT/src/User/API/Language/language_fr.h b/TFT/src/User/API/Language/language_fr.h index 30cb3fb63a..bbdb7318ad 100644 --- a/TFT/src/User/API/Language/language_fr.h +++ b/TFT/src/User/API/Language/language_fr.h @@ -7,30 +7,20 @@ #define STRING_LANGUAGE "Français" #define STRING_ROTATE_UI "Rotation" #define STRING_TERMINAL_ACK "Afficher ACK sur Terminal" - #define STRING_INVERT_X_AXIS "Inverser l'axe X" - #define STRING_INVERT_Y_AXIS "Inverser l'axe Y" - #define STRING_INVERT_Z_AXIS "Inverser l'axe Z" #define STRING_PERSISTENT_INFO "Temp. toujours affichées" #define STRING_FILE_LIST_MODE "Fichiers en mode liste" #define STRING_ACK_NOTIFICATION "Style de notification ACK" - #define STRING_DEFAULT_MODE "Mode par défaut" #define STRING_SERIAL_ALWAYS_ON "Serial toujours actif" #define STRING_MARLIN_SHOW_TITLE "Titre en Mode Marlin" #define STRING_MARLIN_FULLSCREEN "Mode Marlin plein écran" #define STRING_MARLIN_TYPE "Type du Mode Marlin" #define STRING_MOVE_SPEED "Vitesse de déplacement (X Y Z)" #define STRING_AUTO_LOAD_LEVELING "Auto-Sauvegarde Leveling" - #define STRING_TOUCHMI_SENSOR "TouchMI" - #define STRING_ONBOARD_SD_SUPPORT "Support SD interne" - #define STRING_M27_ALWAYS_ACTIVE "M27 toujours actif" - #define STRING_LONG_FILENAME_SUPPORT "Noms de fichiers longs" #define STRING_FAN_SPEED_PERCENT "Vitesse ventilateur en %" #define STRING_XY_OFFSET_PROBING "Support XY Offset" #define STRING_Z_STEPPERS_ALIGNMENT "Auto-Alignement moteurs Z" #define STRING_PS_ON "Extinction automatique" - #define STRING_PS_ON_ACTIVE_HIGH "Alimentation active HIGH" #define STRING_FIL_RUNOUT "Capteur de filament" - #define STRING_FIL_RUNOUT_INVERTING "Inversion logique capteur" #define STRING_PL_RECOVERY_EN "Reprise après coupure" #define STRING_PL_RECOVERY_HOME "Home avant reprise" #define STRING_BTT_MINI_UPS "Support BTT UPS" @@ -40,7 +30,7 @@ #define STRING_HEATER_SOUND "Notification de chauffe" #define STRING_KNOB_LED_COLOR "LED du bouton rotatif" #define STRING_KNOB_LED_IDLE "Veille du bouton rotatif" - #define STRING_LCD_BRIGHTNESS "Luminosité LCD" + #define STRING_LCD_BRIGHTNESS "Luminosité" #define STRING_LCD_IDLE_BRIGHTNESS "Diminution luminosité" #define STRING_LCD_IDLE_DELAY "Durée avant diminution" #define STRING_START_GCODE_ENABLED "Gcode avant l'impression" @@ -58,7 +48,7 @@ #define STRING_FWRETRACT "Rétraction firmware" #define STRING_FWRECOVER "Récupération firmware" #define STRING_RETRACT_AUTO "Rétraction firmware auto" - #define STRING_OFFSET_TOOL "Offset 2ème Buse" + #define STRING_HOTEND_OFFSET "Offset 2ème Buse" #define STRING_PROBE_OFFSET "Décalage Palpeur" #define STRING_LIN_ADVANCE "Linear Advance" #define STRING_CURRENT_SETTING "Courant drivers (mA)" @@ -247,6 +237,7 @@ #define STRING_SETTINGS "Options" #define STRING_SCREEN_SETTINGS "Écran" #define STRING_MACHINE_SETTINGS "Machine" + #define STRING_MARLIN_MODE_SETTINGS "MarlinMode" #define STRING_FEATURE_SETTINGS "Paramètres" #define STRING_SOUND "Son" #define STRING_RGB_SETTINGS "LED" @@ -287,8 +278,8 @@ #define STRING_TOUCHSCREEN_ADJUST "Ajuster" #define STRING_MORE "Plus" #define STRING_SCREEN_INFO "Infos" - #define STRING_SIMULATOR_BG_COLOR "Couleur de l'arrière-plan Marlin" - #define STRING_SIMULATOR_FONT_COLOR "Couleur de la police Marlin" + #define STRING_BG_COLOR "Couleur de l'arrière-plan" + #define STRING_FONT_COLOR "Couleur de la police" #define STRING_PERCENTAGE "Avancement" #define STRING_PERCENTAGE_SPEED "Vitesse" #define STRING_PERCENTAGE_FLOW "Débit" diff --git a/TFT/src/User/API/Language/language_gr.h b/TFT/src/User/API/Language/language_gr.h index 27769849a8..cba803a543 100644 --- a/TFT/src/User/API/Language/language_gr.h +++ b/TFT/src/User/API/Language/language_gr.h @@ -7,30 +7,20 @@ #define STRING_LANGUAGE "Ελληνικά" #define STRING_ROTATE_UI "Περιστροφή UI" #define STRING_TERMINAL_ACK "Εμφάνιση ACK στο τερματικό" - #define STRING_INVERT_X_AXIS "Αντιστρέψει X άξονα" - #define STRING_INVERT_Y_AXIS "Αντιστρέψει Y άξονα" - #define STRING_INVERT_Z_AXIS "Αντιστρέψει Z άξονα" #define STRING_PERSISTENT_INFO "Πληροφορίες μόνιμης κατάστασης" #define STRING_FILE_LIST_MODE "Λειτουργία λίστας προβολής αρχείων" #define STRING_ACK_NOTIFICATION "ACK notification style" - #define STRING_DEFAULT_MODE "Default Mode" #define STRING_SERIAL_ALWAYS_ON "Serial Always ON" #define STRING_MARLIN_SHOW_TITLE "Marlin Mode Title Support" #define STRING_MARLIN_FULLSCREEN "Λειτουργία Marlin σε πλήρη οθόνη" #define STRING_MARLIN_TYPE "Marlin Mode Type" #define STRING_MOVE_SPEED "Ταχύτητα κίνησης(X Y Z)" #define STRING_AUTO_LOAD_LEVELING "Auto Save Load Leveling" - #define STRING_TOUCHMI_SENSOR "TouchMI" - #define STRING_ONBOARD_SD_SUPPORT "Onboard SD Card Support" - #define STRING_M27_ALWAYS_ACTIVE "M27 Always Active" - #define STRING_LONG_FILENAME_SUPPORT "Long File Names Support" #define STRING_FAN_SPEED_PERCENT "Fan Speed As Percentage" #define STRING_XY_OFFSET_PROBING "XY Offset Probing Support" #define STRING_Z_STEPPERS_ALIGNMENT "Z Steppers Auto-Alignment" #define STRING_PS_ON "Αυτόματη απενεργοποίηση" - #define STRING_PS_ON_ACTIVE_HIGH "Power Supply Active HIGH" #define STRING_FIL_RUNOUT "Αισθητήρας νήματος" - #define STRING_FIL_RUNOUT_INVERTING "Inverted Filament Runout Logic" #define STRING_PL_RECOVERY_EN "Power loss recovery" #define STRING_PL_RECOVERY_HOME "Power Loss Recovery Homing" #define STRING_BTT_MINI_UPS "BTT UPS Support" @@ -40,7 +30,7 @@ #define STRING_HEATER_SOUND "Heater notification" #define STRING_KNOB_LED_COLOR "LED περιστροφικού κουμπιού" #define STRING_KNOB_LED_IDLE "Rotary Knob LED idle" - #define STRING_LCD_BRIGHTNESS "Φωτεινότητα οθόνης" + #define STRING_LCD_BRIGHTNESS "Φωτεινότητα" #define STRING_LCD_IDLE_BRIGHTNESS "Φωτεινότητα LCD σκοτεινή" #define STRING_LCD_IDLE_DELAY "Xρονομετρητής αδράνειας οθόνης" #define STRING_START_GCODE_ENABLED "Αρχικό Gcode προ εκτύπωσης" @@ -58,7 +48,7 @@ #define STRING_FWRETRACT "FW Retraction" #define STRING_FWRECOVER "FW Retraction Recover" #define STRING_RETRACT_AUTO "Auto Firmware Retract" - #define STRING_OFFSET_TOOL "Offset 2nd Nozzle" + #define STRING_HOTEND_OFFSET "Offset 2nd Nozzle" #define STRING_PROBE_OFFSET "Αντιστάθμιση Καθετήρας" #define STRING_LIN_ADVANCE "Linear Advance" #define STRING_CURRENT_SETTING "Ένταση η. ρεύ. οδηγού(mA)" @@ -247,6 +237,7 @@ #define STRING_SETTINGS "Ρυθμίσεις" #define STRING_SCREEN_SETTINGS "Οθόνη" #define STRING_MACHINE_SETTINGS "Μηχανήματος" + #define STRING_MARLIN_MODE_SETTINGS "MarlinMode" #define STRING_FEATURE_SETTINGS "Χαρακτηριστικών" #define STRING_SOUND "Sound" #define STRING_RGB_SETTINGS "Χρώμα LED" @@ -287,8 +278,8 @@ #define STRING_TOUCHSCREEN_ADJUST "Προσαρμογή TOUCH" #define STRING_MORE "Περισσότερα" #define STRING_SCREEN_INFO "Πληροφορίες" - #define STRING_SIMULATOR_BG_COLOR "Marlin simulator background color" - #define STRING_SIMULATOR_FONT_COLOR "Marlin simulator font color" + #define STRING_BG_COLOR "Background color" + #define STRING_FONT_COLOR "Font color" #define STRING_PERCENTAGE "Ποσοστό" #define STRING_PERCENTAGE_SPEED "Ταχύτητα" #define STRING_PERCENTAGE_FLOW "Ροή" diff --git a/TFT/src/User/API/Language/language_hu.h b/TFT/src/User/API/Language/language_hu.h index 7bd699a324..e81e83f2be 100644 --- a/TFT/src/User/API/Language/language_hu.h +++ b/TFT/src/User/API/Language/language_hu.h @@ -7,30 +7,20 @@ #define STRING_LANGUAGE "Magyar" #define STRING_ROTATE_UI "Forgatás" #define STRING_TERMINAL_ACK "ACK Megjelenítése" - #define STRING_INVERT_X_AXIS "X megfordítása" - #define STRING_INVERT_Y_AXIS "Y megfordítása" - #define STRING_INVERT_Z_AXIS "Z megfordítása" #define STRING_PERSISTENT_INFO "Állandó állapotinfó" #define STRING_FILE_LIST_MODE "Fájlnéző listamód" #define STRING_ACK_NOTIFICATION "ACK Értesítési stílus" - #define STRING_DEFAULT_MODE "Alapértelmezett mód" #define STRING_SERIAL_ALWAYS_ON "Soros port folytonos" #define STRING_MARLIN_SHOW_TITLE "Marlin mód cím támogatás" #define STRING_MARLIN_FULLSCREEN "Nagyképernyős Marlin mód" #define STRING_MARLIN_TYPE "Marlin mód típusa" #define STRING_MOVE_SPEED "Mozgás seb. (X-Y-Z)" #define STRING_AUTO_LOAD_LEVELING "Szint. auto-mentés/töltés" - #define STRING_TOUCHMI_SENSOR "TouchMI" - #define STRING_ONBOARD_SD_SUPPORT "Alaplapi SD támogatás" - #define STRING_M27_ALWAYS_ACTIVE "M27 Mindig aktív" - #define STRING_LONG_FILENAME_SUPPORT "Hosszú fájlnevek tám." #define STRING_FAN_SPEED_PERCENT "Ventilátor sebesség %-ban" #define STRING_XY_OFFSET_PROBING "X-Y Végpont tapintás tám." #define STRING_Z_STEPPERS_ALIGNMENT "Z Motorok automata igazí." #define STRING_PS_ON "Automata kikapcsolás" - #define STRING_PS_ON_ACTIVE_HIGH "Tápegység aktív MAGAS" #define STRING_FIL_RUNOUT "Szál érzékelő" - #define STRING_FIL_RUNOUT_INVERTING "Szál érzékelő fordítva" #define STRING_PL_RECOVERY_EN "Energiavesztés helyreáll." #define STRING_PL_RECOVERY_HOME "Áramkimaradás helyreáll." #define STRING_BTT_MINI_UPS "BTT UPS Támogatás" @@ -40,7 +30,7 @@ #define STRING_HEATER_SOUND "Fűtés hang" #define STRING_KNOB_LED_COLOR "Forgatógomb LED" #define STRING_KNOB_LED_IDLE "Forgatógomb tétlen" - #define STRING_LCD_BRIGHTNESS "LCD Fényerősség" + #define STRING_LCD_BRIGHTNESS "Fényerősség" #define STRING_LCD_IDLE_BRIGHTNESS "LCD Halványítás" #define STRING_LCD_IDLE_DELAY "LCD Halványítási idő" #define STRING_START_GCODE_ENABLED "Kezdő G-Kód" @@ -58,7 +48,7 @@ #define STRING_FWRETRACT "FW Visszahúzás" #define STRING_FWRECOVER "FW Visszanyomás" #define STRING_RETRACT_AUTO "Automata visszahúz." - #define STRING_OFFSET_TOOL "Második fej eltolása" + #define STRING_HOTEND_OFFSET "Második fej eltolása" #define STRING_PROBE_OFFSET "Szonda eltolás" #define STRING_LIN_ADVANCE "Lineáris haladás" #define STRING_CURRENT_SETTING "Motoráramok beállítása" @@ -247,6 +237,7 @@ #define STRING_SETTINGS "Opciók" #define STRING_SCREEN_SETTINGS "Kijelző" #define STRING_MACHINE_SETTINGS "Gép" + #define STRING_MARLIN_MODE_SETTINGS "MarlinMode" #define STRING_FEATURE_SETTINGS "Funkciók" #define STRING_SOUND "Hangok" #define STRING_RGB_SETTINGS "LED Szín" @@ -287,8 +278,8 @@ #define STRING_TOUCHSCREEN_ADJUST "Igazítás" #define STRING_MORE "Több" #define STRING_SCREEN_INFO "Infó" - #define STRING_SIMULATOR_BG_COLOR "Marlin mód háttérszín" - #define STRING_SIMULATOR_FONT_COLOR "Marlin mód betűszín" + #define STRING_BG_COLOR "háttérszín" + #define STRING_FONT_COLOR "betűszín" #define STRING_PERCENTAGE "Százalék" #define STRING_PERCENTAGE_SPEED "Sebesség" #define STRING_PERCENTAGE_FLOW "Hozam" diff --git a/TFT/src/User/API/Language/language_it.h b/TFT/src/User/API/Language/language_it.h index c28945c5a6..26ce4ad44e 100644 --- a/TFT/src/User/API/Language/language_it.h +++ b/TFT/src/User/API/Language/language_it.h @@ -7,30 +7,20 @@ #define STRING_LANGUAGE "Italiano" #define STRING_ROTATE_UI "Ruota" #define STRING_TERMINAL_ACK "Mostra ACK in console" - #define STRING_INVERT_X_AXIS "Inverti asse X" - #define STRING_INVERT_Y_AXIS "Inverti asse Y" - #define STRING_INVERT_Z_AXIS "Inverti asse Z" #define STRING_PERSISTENT_INFO "Mostra barra di stato" #define STRING_FILE_LIST_MODE "File in modalità lista" #define STRING_ACK_NOTIFICATION "Tipo di popup" - #define STRING_DEFAULT_MODE "Modalità default" #define STRING_SERIAL_ALWAYS_ON "Seriale sempre accesa" #define STRING_MARLIN_SHOW_TITLE "Mostra titolo in Marlin" #define STRING_MARLIN_FULLSCREEN "Marlin a schermo intero" #define STRING_MARLIN_TYPE "Modalità Marlin" #define STRING_MOVE_SPEED "Vel. movimenti(X Y Z)" #define STRING_AUTO_LOAD_LEVELING "Auto salva/carica liv." - #define STRING_TOUCHMI_SENSOR "TouchMI" - #define STRING_ONBOARD_SD_SUPPORT "Supporto SD onboard" - #define STRING_M27_ALWAYS_ACTIVE "M27 sempre attivo" - #define STRING_LONG_FILENAME_SUPPORT "Supporto nomi lunghi" #define STRING_FAN_SPEED_PERCENT "Ventola in percentuale" #define STRING_XY_OFFSET_PROBING "Supp. probing offset XY" #define STRING_Z_STEPPERS_ALIGNMENT "Auto allineamento asse Z" #define STRING_PS_ON "Auto spegnimento" - #define STRING_PS_ON_ACTIVE_HIGH "Alimentatore attivo HIGH" #define STRING_FIL_RUNOUT "Sensore filamento" - #define STRING_FIL_RUNOUT_INVERTING "Inv. logica sens. filamento" #define STRING_PL_RECOVERY_EN "Power loss recovery" #define STRING_PL_RECOVERY_HOME "Power loss rec. homing" #define STRING_BTT_MINI_UPS "Supporto a BTT UPS" @@ -40,7 +30,7 @@ #define STRING_HEATER_SOUND "Notifica temperatura" #define STRING_KNOB_LED_COLOR "LED manopola " #define STRING_KNOB_LED_IDLE "LED manopola spento" - #define STRING_LCD_BRIGHTNESS "Luminosità schermo" + #define STRING_LCD_BRIGHTNESS "Luminosità" #define STRING_LCD_IDLE_BRIGHTNESS "Luminosità in idle" #define STRING_LCD_IDLE_DELAY "Timer luminosità" #define STRING_START_GCODE_ENABLED "Inserisci start gcode" @@ -58,7 +48,7 @@ #define STRING_FWRETRACT "Retrazione firmware" #define STRING_FWRECOVER "Retrazione firmware rec." #define STRING_RETRACT_AUTO "Retrazione firmware" - #define STRING_OFFSET_TOOL "Offset secondo hotend" + #define STRING_HOTEND_OFFSET "Offset secondo hotend" #define STRING_PROBE_OFFSET "Probe offset" #define STRING_LIN_ADVANCE "Linear advance" #define STRING_CURRENT_SETTING "Corrente driver (mA)" @@ -247,6 +237,7 @@ #define STRING_SETTINGS "Opzioni" #define STRING_SCREEN_SETTINGS "Schermo" #define STRING_MACHINE_SETTINGS "Stampante" + #define STRING_MARLIN_MODE_SETTINGS "MarlinMode" #define STRING_FEATURE_SETTINGS "Configura" #define STRING_SOUND "Suono" #define STRING_RGB_SETTINGS "LED RGB" @@ -287,8 +278,8 @@ #define STRING_TOUCHSCREEN_ADJUST "Calibra" #define STRING_MORE "Altro" #define STRING_SCREEN_INFO "Info" - #define STRING_SIMULATOR_BG_COLOR "Colore sfondo modalità Marlin" - #define STRING_SIMULATOR_FONT_COLOR "Colore font modalità Marlin" + #define STRING_BG_COLOR "Colore sfondo" + #define STRING_FONT_COLOR "Colore font" #define STRING_PERCENTAGE "Percentuale" #define STRING_PERCENTAGE_SPEED "Velocità" #define STRING_PERCENTAGE_FLOW "Flusso" diff --git a/TFT/src/User/API/Language/language_jp.h b/TFT/src/User/API/Language/language_jp.h index 2fc80dea07..ca65893b6a 100644 --- a/TFT/src/User/API/Language/language_jp.h +++ b/TFT/src/User/API/Language/language_jp.h @@ -7,30 +7,20 @@ #define STRING_LANGUAGE "日本語" #define STRING_ROTATE_UI "回転UI" #define STRING_TERMINAL_ACK "端末でACKを表示する" - #define STRING_INVERT_X_AXIS "X軸を反転" - #define STRING_INVERT_Y_AXIS "Y軸を反転" - #define STRING_INVERT_Z_AXIS "Z軸を反転" #define STRING_PERSISTENT_INFO "永続的なステータス情報" #define STRING_FILE_LIST_MODE "ファイルビューアリストモード" #define STRING_ACK_NOTIFICATION "ACK notification style" - #define STRING_DEFAULT_MODE "Default Mode" #define STRING_SERIAL_ALWAYS_ON "Serial Always ON" #define STRING_MARLIN_SHOW_TITLE "Marlin Mode Title Support" #define STRING_MARLIN_FULLSCREEN "フルスクリーンでマーリンモード" #define STRING_MARLIN_TYPE "Marlin Mode Type" #define STRING_MOVE_SPEED "移動速度(X Y Z)" #define STRING_AUTO_LOAD_LEVELING "Auto Save Load Leveling" - #define STRING_TOUCHMI_SENSOR "TouchMI" - #define STRING_ONBOARD_SD_SUPPORT "Onboard SD Card Support" - #define STRING_M27_ALWAYS_ACTIVE "M27 Always Active" - #define STRING_LONG_FILENAME_SUPPORT "Long File Names Support" #define STRING_FAN_SPEED_PERCENT "Fan Speed As Percentage" #define STRING_XY_OFFSET_PROBING "XY Offset Probing Support" #define STRING_Z_STEPPERS_ALIGNMENT "Z Steppers Auto-Alignment" #define STRING_PS_ON "オートパワー" - #define STRING_PS_ON_ACTIVE_HIGH "Power Supply Active HIGH" #define STRING_FIL_RUNOUT "フィラメントセンサ" - #define STRING_FIL_RUNOUT_INVERTING "Inverted Filament Runout Logic" #define STRING_PL_RECOVERY_EN "Power loss recovery" #define STRING_PL_RECOVERY_HOME "Power Loss Recovery Homing" #define STRING_BTT_MINI_UPS "BTT UPS Support" @@ -58,7 +48,7 @@ #define STRING_FWRETRACT "FW Retraction" #define STRING_FWRECOVER "FW Retraction Recover" #define STRING_RETRACT_AUTO "Auto Firmware Retract" - #define STRING_OFFSET_TOOL "Offset 2nd Nozzle" + #define STRING_HOTEND_OFFSET "Offset 2nd Nozzle" #define STRING_PROBE_OFFSET "プローブオフセット" #define STRING_LIN_ADVANCE "Linear Advance" #define STRING_CURRENT_SETTING "ドライバー電流 (mA)" @@ -247,6 +237,7 @@ #define STRING_SETTINGS "設定" #define STRING_SCREEN_SETTINGS "画面" #define STRING_MACHINE_SETTINGS "マシン" + #define STRING_MARLIN_MODE_SETTINGS "MarlinMode" #define STRING_FEATURE_SETTINGS "機能" #define STRING_SOUND "Sound" #define STRING_RGB_SETTINGS "LED カラー" @@ -287,8 +278,8 @@ #define STRING_TOUCHSCREEN_ADJUST "校正する" #define STRING_MORE "詳細" #define STRING_SCREEN_INFO "ついて" - #define STRING_SIMULATOR_BG_COLOR "Marlin シミュレータの背景色" - #define STRING_SIMULATOR_FONT_COLOR "Marlinシミュレータフォントの色" + #define STRING_BG_COLOR "背景色" + #define STRING_FONT_COLOR "フォントの色" #define STRING_PERCENTAGE "パーセント" #define STRING_PERCENTAGE_SPEED "スビード" #define STRING_PERCENTAGE_FLOW "押出" diff --git a/TFT/src/User/API/Language/language_keywords.h b/TFT/src/User/API/Language/language_keywords.h index f75315af5d..b9d6a98838 100644 --- a/TFT/src/User/API/Language/language_keywords.h +++ b/TFT/src/User/API/Language/language_keywords.h @@ -14,30 +14,20 @@ extern "C" { #define LANG_KEY_LANGUAGE "label_language:" #define LANG_KEY_ROTATE_UI "label_rotate_ui:" #define LANG_KEY_TERMINAL_ACK "label_terminal_ack:" -#define LANG_KEY_INVERT_X_AXIS "label_invert_x_axis:" -#define LANG_KEY_INVERT_Y_AXIS "label_invert_y_axis:" -#define LANG_KEY_INVERT_Z_AXIS "label_invert_z_axis:" #define LANG_KEY_PERSISTENT_INFO "label_persistent_info:" #define LANG_KEY_FILE_LIST_MODE "label_file_list_mode:" #define LANG_KEY_ACK_NOTIFICATION "label_ack_notification:" -#define LANG_KEY_DEFAULT_MODE "label_default_mode:" #define LANG_KEY_SERIAL_ALWAYS_ON "label_serial_always_on:" #define LANG_KEY_MARLIN_SHOW_TITLE "label_marlin_show_title:" #define LANG_KEY_MARLIN_FULLSCREEN "label_marlin_fullscreen:" #define LANG_KEY_MARLIN_TYPE "label_marlin_type:" #define LANG_KEY_MOVE_SPEED "label_move_speed:" #define LANG_KEY_AUTO_LOAD_LEVELING "label_auto_load_leveling:" -#define LANG_KEY_TOUCHMI_SENSOR "label_touchmi_sensor:" -#define LANG_KEY_ONBOARD_SD_SUPPORT "label_onboard_sd_support:" -#define LANG_KEY_M27_ALWAYS_ACTIVE "label_m27_always_active:" -#define LANG_KEY_LONG_FILENAME_SUPPORT "label_long_filename_support:" #define LANG_KEY_FAN_SPEED_PERCENT "label_fan_speed_percent:" #define LANG_KEY_XY_OFFSET_PROBING "label_xy_offset_probing:" #define LANG_KEY_Z_STEPPERS_ALIGNMENT "label_z_steppers_alignment:" #define LANG_KEY_PS_ON "label_ps_on:" -#define LANG_KEY_PS_ON_ACTIVE_HIGH "label_ps_on_active_high:" #define LANG_KEY_FIL_RUNOUT "label_fil_runout:" -#define LANG_KEY_FIL_RUNOUT_INVERTING "label_fil_runout_inverting:" #define LANG_KEY_PL_RECOVERY_EN "label_pl_recovery_en:" #define LANG_KEY_PL_RECOVERY_HOME "label_pl_recovery_home:" #define LANG_KEY_BTT_MINI_UPS "label_btt_mini_ups:" @@ -65,7 +55,7 @@ extern "C" { #define LANG_KEY_FWRETRACT "label_fwretract:" #define LANG_KEY_FWRECOVER "label_fwrecover:" #define LANG_KEY_RETRACT_AUTO "label_retract_auto:" -#define LANG_KEY_OFFSET_TOOL "label_offset_tool:" +#define LANG_KEY_HOTEND_OFFSET "label_hotend_offset:" #define LANG_KEY_PROBE_OFFSET "label_probe_offset:" #define LANG_KEY_LIN_ADVANCE "label_lin_advance:" #define LANG_KEY_CURRENT_SETTING "label_current_setting:" @@ -254,6 +244,7 @@ extern "C" { #define LANG_KEY_SETTINGS "label_settings:" #define LANG_KEY_SCREEN_SETTINGS "label_screen_settings:" #define LANG_KEY_MACHINE_SETTINGS "label_machine_settings:" +#define LANG_KEY_MARLIN_MODE_SETTINGS "label_marlin_mode_settings:" #define LANG_KEY_FEATURE_SETTINGS "label_feature_settings:" #define LANG_KEY_SOUND "label_sound:" #define LANG_KEY_RGB_SETTINGS "label_rgb_settings:" @@ -294,8 +285,8 @@ extern "C" { #define LANG_KEY_TOUCHSCREEN_ADJUST "label_touchscreen_adjust:" #define LANG_KEY_MORE "label_more:" #define LANG_KEY_SCREEN_INFO "label_screen_info:" -#define LANG_KEY_SIMULATOR_BG_COLOR "label_simulator_bg_color:" -#define LANG_KEY_SIMULATOR_FONT_COLOR "label_simulator_font_color:" +#define LANG_KEY_BG_COLOR "label_bg_color:" +#define LANG_KEY_FONT_COLOR "label_font_color:" #define LANG_KEY_PERCENTAGE "label_percentage:" #define LANG_KEY_PERCENTAGE_SPEED "label_percentage_speed:" #define LANG_KEY_PERCENTAGE_FLOW "label_percentage_flow:" diff --git a/TFT/src/User/API/Language/language_pl.h b/TFT/src/User/API/Language/language_pl.h index c7d0f5d0a4..6e6524125b 100644 --- a/TFT/src/User/API/Language/language_pl.h +++ b/TFT/src/User/API/Language/language_pl.h @@ -7,30 +7,20 @@ #define STRING_LANGUAGE "Polski" #define STRING_ROTATE_UI "Obrót" #define STRING_TERMINAL_ACK "Show ACK in Terminal" - #define STRING_INVERT_X_AXIS "Invert X Axis" - #define STRING_INVERT_Y_AXIS "Invert Y Axis" - #define STRING_INVERT_Z_AXIS "Invert Z Axis" #define STRING_PERSISTENT_INFO "Persistent Status Info" #define STRING_FILE_LIST_MODE "Files viewer List Mode" #define STRING_ACK_NOTIFICATION "ACK notification style" - #define STRING_DEFAULT_MODE "Default Mode" #define STRING_SERIAL_ALWAYS_ON "Serial Always ON" #define STRING_MARLIN_SHOW_TITLE "Marlin Mode Title Support" #define STRING_MARLIN_FULLSCREEN "Marlin mode in fullscreen" #define STRING_MARLIN_TYPE "Marlin Mode Type" #define STRING_MOVE_SPEED "Move speed(X Y Z)" #define STRING_AUTO_LOAD_LEVELING "Auto Save Load Leveling" - #define STRING_TOUCHMI_SENSOR "TouchMI" - #define STRING_ONBOARD_SD_SUPPORT "Onboard SD Card Support" - #define STRING_M27_ALWAYS_ACTIVE "M27 Always Active" - #define STRING_LONG_FILENAME_SUPPORT "Long File Names Support" #define STRING_FAN_SPEED_PERCENT "Fan Speed As Percentage" #define STRING_XY_OFFSET_PROBING "XY Offset Probing Support" #define STRING_Z_STEPPERS_ALIGNMENT "Z Steppers Auto-Alignment" #define STRING_PS_ON "Auto Power" - #define STRING_PS_ON_ACTIVE_HIGH "Power Supply Active HIGH" #define STRING_FIL_RUNOUT "Filament sensor" - #define STRING_FIL_RUNOUT_INVERTING "Inverted Filament Runout Logic" #define STRING_PL_RECOVERY_EN "Power loss recovery" #define STRING_PL_RECOVERY_HOME "Power Loss Recovery Homing" #define STRING_BTT_MINI_UPS "BTT UPS Support" @@ -40,9 +30,9 @@ #define STRING_HEATER_SOUND "Heater notification" #define STRING_KNOB_LED_COLOR "Rotary Knob LED" #define STRING_KNOB_LED_IDLE "Rotary Knob LED idle" - #define STRING_LCD_BRIGHTNESS "LCD Brightness" - #define STRING_LCD_IDLE_BRIGHTNESS "LCD Brightness dim" - #define STRING_LCD_IDLE_DELAY "LCD dim idle timer" + #define STRING_LCD_BRIGHTNESS "Brightness" + #define STRING_LCD_IDLE_BRIGHTNESS "Idle brightness" + #define STRING_LCD_IDLE_DELAY "Idle timeout" #define STRING_START_GCODE_ENABLED "Start Gcode before print" #define STRING_END_GCODE_ENABLED "End Gcode after print" #define STRING_CANCEL_GCODE_ENABLED "Cancel Gcode" @@ -58,7 +48,7 @@ #define STRING_FWRETRACT "FW Retraction" #define STRING_FWRECOVER "FW Retraction Recover" #define STRING_RETRACT_AUTO "Auto Firmware Retract" - #define STRING_OFFSET_TOOL "Offset 2nd Nozzle" + #define STRING_HOTEND_OFFSET "Offset 2nd Nozzle" #define STRING_PROBE_OFFSET "Przesunięcie" #define STRING_LIN_ADVANCE "Linear Advance" #define STRING_CURRENT_SETTING "Driver Current (mA)" @@ -247,6 +237,7 @@ #define STRING_SETTINGS "Ustawienia" #define STRING_SCREEN_SETTINGS "Ekran" #define STRING_MACHINE_SETTINGS "Drukarka" + #define STRING_MARLIN_MODE_SETTINGS "MarlinMode" #define STRING_FEATURE_SETTINGS "Opcje" #define STRING_SOUND "Sound" #define STRING_RGB_SETTINGS "Kolor LED" @@ -287,8 +278,8 @@ #define STRING_TOUCHSCREEN_ADJUST "Kalibracja" #define STRING_MORE "Więcej" #define STRING_SCREEN_INFO "Info" - #define STRING_SIMULATOR_BG_COLOR "Marlin simulator background color" - #define STRING_SIMULATOR_FONT_COLOR "Marlin simulator font color" + #define STRING_BG_COLOR "Background color" + #define STRING_FONT_COLOR "Font color" #define STRING_PERCENTAGE "Procent" #define STRING_PERCENTAGE_SPEED "Prędkość" #define STRING_PERCENTAGE_FLOW "Flow" diff --git a/TFT/src/User/API/Language/language_pt.h b/TFT/src/User/API/Language/language_pt.h index 6b55b1f5cb..532f4406de 100644 --- a/TFT/src/User/API/Language/language_pt.h +++ b/TFT/src/User/API/Language/language_pt.h @@ -7,30 +7,20 @@ #define STRING_LANGUAGE "Portugues" #define STRING_ROTATE_UI "Rodar" #define STRING_TERMINAL_ACK "Show ACK in Terminal" - #define STRING_INVERT_X_AXIS "Invert X Axis" - #define STRING_INVERT_Y_AXIS "Invert Y Axis" - #define STRING_INVERT_Z_AXIS "Invert Z Axis" #define STRING_PERSISTENT_INFO "Persistent Status Info" #define STRING_FILE_LIST_MODE "Files viewer List Mode" #define STRING_ACK_NOTIFICATION "ACK notification style" - #define STRING_DEFAULT_MODE "Default Mode" #define STRING_SERIAL_ALWAYS_ON "Serial Always ON" #define STRING_MARLIN_SHOW_TITLE "Marlin Mode Title Support" #define STRING_MARLIN_FULLSCREEN "Marlin mode in fullscreen" #define STRING_MARLIN_TYPE "Marlin Mode Type" #define STRING_MOVE_SPEED "Move speed(X Y Z)" #define STRING_AUTO_LOAD_LEVELING "Auto Save Load Leveling" - #define STRING_TOUCHMI_SENSOR "TouchMI" - #define STRING_ONBOARD_SD_SUPPORT "Onboard SD Card Support" - #define STRING_M27_ALWAYS_ACTIVE "M27 Always Active" - #define STRING_LONG_FILENAME_SUPPORT "Long File Names Support" #define STRING_FAN_SPEED_PERCENT "Fan Speed As Percentage" #define STRING_XY_OFFSET_PROBING "XY Offset Probing Support" #define STRING_Z_STEPPERS_ALIGNMENT "Z Steppers Auto-Alignment" #define STRING_PS_ON "Auto Power" - #define STRING_PS_ON_ACTIVE_HIGH "Power Supply Active HIGH" #define STRING_FIL_RUNOUT "Filament sensor" - #define STRING_FIL_RUNOUT_INVERTING "Inverted Filament Runout Logic" #define STRING_PL_RECOVERY_EN "Power loss recovery" #define STRING_PL_RECOVERY_HOME "Power Loss Recovery Homing" #define STRING_BTT_MINI_UPS "BTT UPS Support" @@ -40,9 +30,9 @@ #define STRING_HEATER_SOUND "Heater notification" #define STRING_KNOB_LED_COLOR "Rotary Knob LED" #define STRING_KNOB_LED_IDLE "Rotary Knob LED idle" - #define STRING_LCD_BRIGHTNESS "LCD Brightness" - #define STRING_LCD_IDLE_BRIGHTNESS "LCD Brightness dim" - #define STRING_LCD_IDLE_DELAY "LCD dim idle timer" + #define STRING_LCD_BRIGHTNESS "Brightness" + #define STRING_LCD_IDLE_BRIGHTNESS "Idle brightness" + #define STRING_LCD_IDLE_DELAY "Idle timeout" #define STRING_START_GCODE_ENABLED "Start Gcode before print" #define STRING_END_GCODE_ENABLED "End Gcode after print" #define STRING_CANCEL_GCODE_ENABLED "Cancel Gcode" @@ -58,7 +48,7 @@ #define STRING_FWRETRACT "FW Retraction" #define STRING_FWRECOVER "FW Retraction Recover" #define STRING_RETRACT_AUTO "Auto Firmware Retract" - #define STRING_OFFSET_TOOL "Offset 2nd Nozzle" + #define STRING_HOTEND_OFFSET "Offset 2nd Nozzle" #define STRING_PROBE_OFFSET "Probe Offset" #define STRING_LIN_ADVANCE "Linear Advance" #define STRING_CURRENT_SETTING "Driver Current (mA)" @@ -247,6 +237,7 @@ #define STRING_SETTINGS "Configurar" #define STRING_SCREEN_SETTINGS "Ecra" #define STRING_MACHINE_SETTINGS "Impressora" + #define STRING_MARLIN_MODE_SETTINGS "MarlinMode" #define STRING_FEATURE_SETTINGS "Extras" #define STRING_SOUND "Sound" #define STRING_RGB_SETTINGS "LED cor" @@ -287,8 +278,8 @@ #define STRING_TOUCHSCREEN_ADJUST "Ajustar" #define STRING_MORE "Mais" #define STRING_SCREEN_INFO "Info" - #define STRING_SIMULATOR_BG_COLOR "Marlin simulator background color" - #define STRING_SIMULATOR_FONT_COLOR "Marlin simulator font color" + #define STRING_BG_COLOR "Background color" + #define STRING_FONT_COLOR "Font color" #define STRING_PERCENTAGE "Percentagem" #define STRING_PERCENTAGE_SPEED "Rapidez" #define STRING_PERCENTAGE_FLOW "Fluxo" diff --git a/TFT/src/User/API/Language/language_ru.h b/TFT/src/User/API/Language/language_ru.h index 5669678668..ab24aee84b 100644 --- a/TFT/src/User/API/Language/language_ru.h +++ b/TFT/src/User/API/Language/language_ru.h @@ -7,30 +7,20 @@ #define STRING_LANGUAGE "Русский" #define STRING_ROTATE_UI "Переворот" #define STRING_TERMINAL_ACK "ACK терминала (C°)" - #define STRING_INVERT_X_AXIS "Инверсия оси X" - #define STRING_INVERT_Y_AXIS "Инверсия оси Y" - #define STRING_INVERT_Z_AXIS "Инверсия оси Z" #define STRING_PERSISTENT_INFO "Нагрев в инфостроке" #define STRING_FILE_LIST_MODE "Файлы в режиме строк" #define STRING_ACK_NOTIFICATION "ACK стиль уведомления" - #define STRING_DEFAULT_MODE "Default Mode" #define STRING_SERIAL_ALWAYS_ON "Serial Always ON" #define STRING_MARLIN_SHOW_TITLE "Marlin Mode Title Support" #define STRING_MARLIN_FULLSCREEN "Marlin на весь экран" #define STRING_MARLIN_TYPE "Marlin Mode Type" #define STRING_MOVE_SPEED "Скорость (X Y Z)" #define STRING_AUTO_LOAD_LEVELING "Auto Save Load Leveling" - #define STRING_TOUCHMI_SENSOR "TouchMI" - #define STRING_ONBOARD_SD_SUPPORT "Onboard SD Card Support" - #define STRING_M27_ALWAYS_ACTIVE "M27 Always Active" - #define STRING_LONG_FILENAME_SUPPORT "Long File Names Support" #define STRING_FAN_SPEED_PERCENT "Fan Speed As Percentage" #define STRING_XY_OFFSET_PROBING "XY Offset Probing Support" #define STRING_Z_STEPPERS_ALIGNMENT "Z Steppers Auto-Alignment" #define STRING_PS_ON "Автовыключение" - #define STRING_PS_ON_ACTIVE_HIGH "Power Supply Active HIGH" #define STRING_FIL_RUNOUT "Сенсор прутка" - #define STRING_FIL_RUNOUT_INVERTING "Inverted Filament Runout Logic" #define STRING_PL_RECOVERY_EN "Работа после потери питания" #define STRING_PL_RECOVERY_HOME "Power Loss Recovery Homing" #define STRING_BTT_MINI_UPS "BTT UPS Support" @@ -40,7 +30,7 @@ #define STRING_HEATER_SOUND "Heater notification" #define STRING_KNOB_LED_COLOR "Подсветка энкодера" #define STRING_KNOB_LED_IDLE "Простой подсветки энкодера" - #define STRING_LCD_BRIGHTNESS "Яркость LCD" + #define STRING_LCD_BRIGHTNESS "Яркость" #define STRING_LCD_IDLE_BRIGHTNESS "Регулировка яркости LCD" #define STRING_LCD_IDLE_DELAY "Время до гашения LCD" #define STRING_START_GCODE_ENABLED "G-код перед печатью" @@ -58,7 +48,7 @@ #define STRING_FWRETRACT "M207 ретракт" #define STRING_FWRECOVER "M208 восстановление ретракта" #define STRING_RETRACT_AUTO "Авто FW ретракт" - #define STRING_OFFSET_TOOL "Смещение 2-го сопла" + #define STRING_HOTEND_OFFSET "Смещение 2-го сопла" #define STRING_PROBE_OFFSET "Смещение датчика" #define STRING_LIN_ADVANCE "К-фактор" #define STRING_CURRENT_SETTING "Настройка TMC драйверов" @@ -247,6 +237,7 @@ #define STRING_SETTINGS "Настройки" #define STRING_SCREEN_SETTINGS "Экран" #define STRING_MACHINE_SETTINGS "Принтер" + #define STRING_MARLIN_MODE_SETTINGS "MarlinMode" #define STRING_FEATURE_SETTINGS "Опции" #define STRING_SOUND "Звуки" #define STRING_RGB_SETTINGS "Цвет LED" @@ -287,8 +278,8 @@ #define STRING_TOUCHSCREEN_ADJUST "Калибровка" #define STRING_MORE "Больше" #define STRING_SCREEN_INFO "Инфо" - #define STRING_SIMULATOR_BG_COLOR "Задний фон Marlin режима" - #define STRING_SIMULATOR_FONT_COLOR "Передний фон Marlin режима" + #define STRING_BG_COLOR "Фоновый цвет" + #define STRING_FONT_COLOR "Цвет шрифта" #define STRING_PERCENTAGE "Подстройки" #define STRING_PERCENTAGE_SPEED "Скорость" #define STRING_PERCENTAGE_FLOW "Поток" diff --git a/TFT/src/User/API/Language/language_sk.h b/TFT/src/User/API/Language/language_sk.h index 3f1df749ca..33450367bc 100644 --- a/TFT/src/User/API/Language/language_sk.h +++ b/TFT/src/User/API/Language/language_sk.h @@ -7,30 +7,20 @@ #define STRING_LANGUAGE "Slovensky" #define STRING_ROTATE_UI "Otočiť" #define STRING_TERMINAL_ACK "Show ACK in Terminal" - #define STRING_INVERT_X_AXIS "Invertovať os X" - #define STRING_INVERT_Y_AXIS "Invertovať os Y" - #define STRING_INVERT_Z_AXIS "Invertovať os Z" #define STRING_PERSISTENT_INFO "Trvalé info o stave" #define STRING_FILE_LIST_MODE "Zobraziť súbory ako zoznam" #define STRING_ACK_NOTIFICATION "ACK notification style" - #define STRING_DEFAULT_MODE "Default Mode" #define STRING_SERIAL_ALWAYS_ON "Serial Always ON" #define STRING_MARLIN_SHOW_TITLE "Marlin Mode Title Support" #define STRING_MARLIN_FULLSCREEN "Marlin mode in fullscreen" #define STRING_MARLIN_TYPE "Marlin Mode Type" #define STRING_MOVE_SPEED "Rýchlosť pohybu XYZ" #define STRING_AUTO_LOAD_LEVELING "Auto Save Load Leveling" - #define STRING_TOUCHMI_SENSOR "TouchMI" - #define STRING_ONBOARD_SD_SUPPORT "Onboard SD Card Support" - #define STRING_M27_ALWAYS_ACTIVE "M27 Always Active" - #define STRING_LONG_FILENAME_SUPPORT "Long File Names Support" #define STRING_FAN_SPEED_PERCENT "Fan Speed As Percentage" #define STRING_XY_OFFSET_PROBING "XY Offset Probing Support" #define STRING_Z_STEPPERS_ALIGNMENT "Z Steppers Auto-Alignment" #define STRING_PS_ON "Auto vyp." - #define STRING_PS_ON_ACTIVE_HIGH "Power Supply Active HIGH" #define STRING_FIL_RUNOUT "Filament senzor" - #define STRING_FIL_RUNOUT_INVERTING "Inverted Filament Runout Logic" #define STRING_PL_RECOVERY_EN "Power loss recovery" #define STRING_PL_RECOVERY_HOME "Power Loss Recovery Homing" #define STRING_BTT_MINI_UPS "BTT UPS Support" @@ -58,7 +48,7 @@ #define STRING_FWRETRACT "FW Retraction" #define STRING_FWRECOVER "FW Retraction Recover" #define STRING_RETRACT_AUTO "Auto Firmware Retract" - #define STRING_OFFSET_TOOL "Offset 2nd Nozzle" + #define STRING_HOTEND_OFFSET "Offset 2nd Nozzle" #define STRING_PROBE_OFFSET "Probe Offset" #define STRING_LIN_ADVANCE "Linear Advance" #define STRING_CURRENT_SETTING "Prúd ovládača (mA)" @@ -247,6 +237,7 @@ #define STRING_SETTINGS "Nastavenia" #define STRING_SCREEN_SETTINGS "Obrazovka" #define STRING_MACHINE_SETTINGS "Tlačiareň" + #define STRING_MARLIN_MODE_SETTINGS "MarlinMode" #define STRING_FEATURE_SETTINGS "Funkcie" #define STRING_SOUND "Sound" #define STRING_RGB_SETTINGS "Farba LED" @@ -287,8 +278,8 @@ #define STRING_TOUCHSCREEN_ADJUST "Kalibrácia" #define STRING_MORE "Viacej" #define STRING_SCREEN_INFO "Info" - #define STRING_SIMULATOR_BG_COLOR "Marlin simulator background color" - #define STRING_SIMULATOR_FONT_COLOR "Marlin simulator font color" + #define STRING_BG_COLOR "Background color" + #define STRING_FONT_COLOR "Font color" #define STRING_PERCENTAGE "Percentá" #define STRING_PERCENTAGE_SPEED "Rýchlosť" #define STRING_PERCENTAGE_FLOW "Prietok" diff --git a/TFT/src/User/API/Language/language_sl.h b/TFT/src/User/API/Language/language_sl.h index 539db0e8e3..03a5c453af 100644 --- a/TFT/src/User/API/Language/language_sl.h +++ b/TFT/src/User/API/Language/language_sl.h @@ -7,30 +7,20 @@ #define STRING_LANGUAGE "Slovenski" #define STRING_ROTATE_UI "Obrni UI" #define STRING_TERMINAL_ACK "Pokaži ACK v terminalu" - #define STRING_INVERT_X_AXIS "Invertiraj X os" - #define STRING_INVERT_Y_AXIS "Invertiraj Y os" - #define STRING_INVERT_Z_AXIS "Invertiraj Z os" #define STRING_PERSISTENT_INFO "Stalno prikazuj status" #define STRING_FILE_LIST_MODE "Prikaz datotek v seznamu" #define STRING_ACK_NOTIFICATION "ACK notification style" - #define STRING_DEFAULT_MODE "Default Mode" #define STRING_SERIAL_ALWAYS_ON "Serial Always ON" #define STRING_MARLIN_SHOW_TITLE "Marlin Mode Title Support" #define STRING_MARLIN_FULLSCREEN "Marlin čez cel zaslon" #define STRING_MARLIN_TYPE "Marlin Mode Type" #define STRING_MOVE_SPEED "Hitr. pomika (X Y Z)" #define STRING_AUTO_LOAD_LEVELING "Auto Save Load Leveling" - #define STRING_TOUCHMI_SENSOR "TouchMI" - #define STRING_ONBOARD_SD_SUPPORT "Onboard SD Card Support" - #define STRING_M27_ALWAYS_ACTIVE "M27 Always Active" - #define STRING_LONG_FILENAME_SUPPORT "Long File Names Support" #define STRING_FAN_SPEED_PERCENT "Fan Speed As Percentage" #define STRING_XY_OFFSET_PROBING "XY Offset Probing Support" #define STRING_Z_STEPPERS_ALIGNMENT "Z Steppers Auto-Alignment" #define STRING_PS_ON "Samodejni izklop" - #define STRING_PS_ON_ACTIVE_HIGH "Power Supply Active HIGH" #define STRING_FIL_RUNOUT "Senzor filamenta" - #define STRING_FIL_RUNOUT_INVERTING "Inverted Filament Runout Logic" #define STRING_PL_RECOVERY_EN "Power loss recovery" #define STRING_PL_RECOVERY_HOME "Power Loss Recovery Homing" #define STRING_BTT_MINI_UPS "BTT UPS Support" @@ -40,7 +30,7 @@ #define STRING_HEATER_SOUND "Heater notification" #define STRING_KNOB_LED_COLOR "LED enkoder gumba" #define STRING_KNOB_LED_IDLE "Rotary Knob LED idle" - #define STRING_LCD_BRIGHTNESS "Svetilnost LCD" + #define STRING_LCD_BRIGHTNESS "Svetilnost" #define STRING_LCD_IDLE_BRIGHTNESS "Zatemnitev LCD" #define STRING_LCD_IDLE_DELAY "Zatemnitev po času" #define STRING_START_GCODE_ENABLED "Zaženi startno G-kodo" @@ -58,7 +48,7 @@ #define STRING_FWRETRACT "FW Retraction" #define STRING_FWRECOVER "FW Retraction Recover" #define STRING_RETRACT_AUTO "Auto Firmware Retract" - #define STRING_OFFSET_TOOL "Offset 2nd Nozzle" + #define STRING_HOTEND_OFFSET "Offset 2nd Nozzle" #define STRING_PROBE_OFFSET "Odmik sonde" #define STRING_LIN_ADVANCE "Linear Advance" #define STRING_CURRENT_SETTING "Tok driverja mot. (mA)" @@ -247,6 +237,7 @@ #define STRING_SETTINGS "Nastavitve" #define STRING_SCREEN_SETTINGS "Zaslon" #define STRING_MACHINE_SETTINGS "Naprava" + #define STRING_MARLIN_MODE_SETTINGS "MarlinMode" #define STRING_FEATURE_SETTINGS "Funkcije" #define STRING_SOUND "Sound" #define STRING_RGB_SETTINGS "Barva LED" @@ -287,8 +278,8 @@ #define STRING_TOUCHSCREEN_ADJUST "Umeri" #define STRING_MORE "Več" #define STRING_SCREEN_INFO "Info" - #define STRING_SIMULATOR_BG_COLOR "Barva ozadja Marlin simulatorja" - #define STRING_SIMULATOR_FONT_COLOR "Barva pisave Marlin simulatorja" + #define STRING_BG_COLOR "Barva ozadja" + #define STRING_FONT_COLOR "Barva pisave" #define STRING_PERCENTAGE "Procent" #define STRING_PERCENTAGE_SPEED "Hitrost" #define STRING_PERCENTAGE_FLOW "Pretok" diff --git a/TFT/src/User/API/Language/language_tc.h b/TFT/src/User/API/Language/language_tc.h index cfe1ae5b2c..44f2b20301 100644 --- a/TFT/src/User/API/Language/language_tc.h +++ b/TFT/src/User/API/Language/language_tc.h @@ -7,30 +7,20 @@ #define STRING_LANGUAGE "正體中文" #define STRING_ROTATE_UI "顯示方向" #define STRING_TERMINAL_ACK "在G-code終端顯示溫度" - #define STRING_INVERT_X_AXIS "X軸反向運轉" - #define STRING_INVERT_Y_AXIS "Y軸反向運轉" - #define STRING_INVERT_Z_AXIS "Z軸反向運轉" #define STRING_PERSISTENT_INFO "頂部溫度訊息" #define STRING_FILE_LIST_MODE "文件預覽列表模式" #define STRING_ACK_NOTIFICATION "ACK 弹窗类型" - #define STRING_DEFAULT_MODE "Default Mode" #define STRING_SERIAL_ALWAYS_ON "Serial Always ON" #define STRING_MARLIN_SHOW_TITLE "Marlin Mode Title Support" #define STRING_MARLIN_FULLSCREEN "全螢幕Marlin模式" #define STRING_MARLIN_TYPE "Marlin Mode Type" #define STRING_MOVE_SPEED "移動速度(X Y Z)" #define STRING_AUTO_LOAD_LEVELING "Auto Save Load Leveling" - #define STRING_TOUCHMI_SENSOR "TouchMI" - #define STRING_ONBOARD_SD_SUPPORT "Onboard SD Card Support" - #define STRING_M27_ALWAYS_ACTIVE "M27 Always Active" - #define STRING_LONG_FILENAME_SUPPORT "Long File Names Support" #define STRING_FAN_SPEED_PERCENT "Fan Speed As Percentage" #define STRING_XY_OFFSET_PROBING "XY Offset Probing Support" #define STRING_Z_STEPPERS_ALIGNMENT "Z Steppers Auto-Alignment" #define STRING_PS_ON "自動關機" - #define STRING_PS_ON_ACTIVE_HIGH "Power Supply Active HIGH" #define STRING_FIL_RUNOUT "耗材感應器" - #define STRING_FIL_RUNOUT_INVERTING "Inverted Filament Runout Logic" #define STRING_PL_RECOVERY_EN "断电续打" #define STRING_PL_RECOVERY_HOME "Power Loss Recovery Homing" #define STRING_BTT_MINI_UPS "BTT UPS Support" @@ -58,7 +48,7 @@ #define STRING_FWRETRACT "FW Retraction" #define STRING_FWRECOVER "FW Retraction Recover" #define STRING_RETRACT_AUTO "FW自动回抽" - #define STRING_OFFSET_TOOL "Offset 2nd Nozzle" + #define STRING_HOTEND_OFFSET "Offset 2nd Nozzle" #define STRING_PROBE_OFFSET "探針偏移" #define STRING_LIN_ADVANCE "Linear Advance" #define STRING_CURRENT_SETTING "驅動晶片電流設定 (mA)" @@ -247,6 +237,7 @@ #define STRING_SETTINGS "設定" #define STRING_SCREEN_SETTINGS "螢幕設定" #define STRING_MACHINE_SETTINGS "機器設定" + #define STRING_MARLIN_MODE_SETTINGS "MarlinMode" #define STRING_FEATURE_SETTINGS "功能設定" #define STRING_SOUND "聲音" #define STRING_RGB_SETTINGS "燈光顏色" @@ -287,8 +278,8 @@ #define STRING_TOUCHSCREEN_ADJUST "觸控校正" #define STRING_MORE "更多" #define STRING_SCREEN_INFO "關於" - #define STRING_SIMULATOR_BG_COLOR "Marlin模式背景顏色" - #define STRING_SIMULATOR_FONT_COLOR "Marlin模式字體顏色" + #define STRING_BG_COLOR "背景顏色" + #define STRING_FONT_COLOR "字體顏色" #define STRING_PERCENTAGE "百分比" #define STRING_PERCENTAGE_SPEED "速度百分比" #define STRING_PERCENTAGE_FLOW "流量百分比" diff --git a/TFT/src/User/API/Language/language_tr.h b/TFT/src/User/API/Language/language_tr.h index 86f2092ed4..c96359d2c9 100644 --- a/TFT/src/User/API/Language/language_tr.h +++ b/TFT/src/User/API/Language/language_tr.h @@ -7,30 +7,20 @@ #define STRING_LANGUAGE "Türkçe" #define STRING_ROTATE_UI "Döndür" #define STRING_TERMINAL_ACK "Terminalde onay mesajları" - #define STRING_INVERT_X_AXIS "X Eksenini Tersine Çevir" - #define STRING_INVERT_Y_AXIS "Y Eksenini Tersine Çevir" - #define STRING_INVERT_Z_AXIS "Z Eksenini Tersine Çevir" #define STRING_PERSISTENT_INFO "Kalıcı Durum Mesajı" #define STRING_FILE_LIST_MODE "Liste Görünümü" #define STRING_ACK_NOTIFICATION "Onay mesajı stili" - #define STRING_DEFAULT_MODE "Varsayılan Mod" #define STRING_SERIAL_ALWAYS_ON "Seri Bağ. Sürekli Açık" #define STRING_MARLIN_SHOW_TITLE "Marlin Modu Başlık Desteği" #define STRING_MARLIN_FULLSCREEN "Tam Ekran Marlin Modu" #define STRING_MARLIN_TYPE "Marlin Mode Type" #define STRING_MOVE_SPEED "Hareket Hızı(X Y Z)" #define STRING_AUTO_LOAD_LEVELING "Seviyelemeyi Oto Kaydet/Yükle" - #define STRING_TOUCHMI_SENSOR "TouchMI" - #define STRING_ONBOARD_SD_SUPPORT "Dahili SD Desteği" - #define STRING_M27_ALWAYS_ACTIVE "M27 Sürekli Aktif" - #define STRING_LONG_FILENAME_SUPPORT "Uzun Dosya Adı Desteği" #define STRING_FAN_SPEED_PERCENT "Yüzdesel Fan Hızı" #define STRING_XY_OFFSET_PROBING "XY Algılama Offset Desteği" #define STRING_Z_STEPPERS_ALIGNMENT "Z Motor Oto-Hizalama" #define STRING_PS_ON "Oto. Kapanma" - #define STRING_PS_ON_ACTIVE_HIGH "Power Supply Active HIGH" #define STRING_FIL_RUNOUT "Filaman Sensörü" - #define STRING_FIL_RUNOUT_INVERTING "Ters Filaman Algılama Sinyali" #define STRING_PL_RECOVERY_EN "Güç Kesintisi Kurtarma" #define STRING_PL_RECOVERY_HOME "Güç Kesintisi Sıfırama" #define STRING_BTT_MINI_UPS "BTT UPS Desteği" @@ -58,7 +48,7 @@ #define STRING_FWRETRACT "Yazılım Geriçekmesi" #define STRING_FWRECOVER "Yazılım Geriitmesi" #define STRING_RETRACT_AUTO "Oto. yazılım geriçekmesi" - #define STRING_OFFSET_TOOL "2. Nozül Mesafesi" + #define STRING_HOTEND_OFFSET "2. Nozül Mesafesi" #define STRING_PROBE_OFFSET "Prob Offseti" #define STRING_LIN_ADVANCE "Linear Advance" #define STRING_CURRENT_SETTING "Sürücü Akımı (mA)" @@ -247,6 +237,7 @@ #define STRING_SETTINGS "Ayarlar" #define STRING_SCREEN_SETTINGS "Ekran" #define STRING_MACHINE_SETTINGS "Makine" + #define STRING_MARLIN_MODE_SETTINGS "MarlinMode" #define STRING_FEATURE_SETTINGS "Özellik" #define STRING_SOUND "Ses" #define STRING_RGB_SETTINGS "LED Rengi" @@ -287,8 +278,8 @@ #define STRING_TOUCHSCREEN_ADJUST "Kalibre" #define STRING_MORE "Ayar" #define STRING_SCREEN_INFO "Bilgi" - #define STRING_SIMULATOR_BG_COLOR "Marlin modu arkaplan renk" - #define STRING_SIMULATOR_FONT_COLOR "Marlin modu font renk" + #define STRING_BG_COLOR "arkaplan renk" + #define STRING_FONT_COLOR font renk" #define STRING_PERCENTAGE "Yüzde" #define STRING_PERCENTAGE_SPEED "Hız" #define STRING_PERCENTAGE_FLOW "Akış" diff --git a/TFT/src/User/API/Language/language_uk.h b/TFT/src/User/API/Language/language_uk.h index 4f2263b5f6..c41942310c 100644 --- a/TFT/src/User/API/Language/language_uk.h +++ b/TFT/src/User/API/Language/language_uk.h @@ -7,30 +7,20 @@ #define STRING_LANGUAGE "Українська" #define STRING_ROTATE_UI "Повернути інтерфейс" #define STRING_TERMINAL_ACK "ACK терміналу (°С)" - #define STRING_INVERT_X_AXIS "Інверсія осі X" - #define STRING_INVERT_Y_AXIS "Інверсія осі Y" - #define STRING_INVERT_Z_AXIS "Інверсія осі Z" #define STRING_PERSISTENT_INFO "Нагрівання в інфостроці" #define STRING_FILE_LIST_MODE "Файли в режимі рядків" #define STRING_ACK_NOTIFICATION "ACK стиль повідомлення" - #define STRING_DEFAULT_MODE "Default Mode" #define STRING_SERIAL_ALWAYS_ON "Serial Always ON" #define STRING_MARLIN_SHOW_TITLE "Marlin Mode Title Support" #define STRING_MARLIN_FULLSCREEN "Marlin на весь екран" #define STRING_MARLIN_TYPE "Marlin Mode Type" #define STRING_MOVE_SPEED "Швидкість (X Y Z)" #define STRING_AUTO_LOAD_LEVELING "Auto Save Load Leveling" - #define STRING_TOUCHMI_SENSOR "TouchMI" - #define STRING_ONBOARD_SD_SUPPORT "Onboard SD Card Support" - #define STRING_M27_ALWAYS_ACTIVE "M27 Always Active" - #define STRING_LONG_FILENAME_SUPPORT "Long File Names Support" #define STRING_FAN_SPEED_PERCENT "Fan Speed As Percentage" #define STRING_XY_OFFSET_PROBING "XY Offset Probing Support" #define STRING_Z_STEPPERS_ALIGNMENT "Z Steppers Auto-Alignment" #define STRING_PS_ON "автовимкнення" - #define STRING_PS_ON_ACTIVE_HIGH "Power Supply Active HIGH" #define STRING_FIL_RUNOUT "Сенсор філаменту" - #define STRING_FIL_RUNOUT_INVERTING "Inverted Filament Runout Logic" #define STRING_PL_RECOVERY_EN "Робота після втрати живлення" #define STRING_PL_RECOVERY_HOME "Power Loss Recovery Homing" #define STRING_BTT_MINI_UPS "BTT UPS Support" @@ -40,7 +30,7 @@ #define STRING_HEATER_SOUND "Heater notification" #define STRING_KNOB_LED_COLOR "Підсвічування енкодера" #define STRING_KNOB_LED_IDLE "Простій підсвічування енкодера" - #define STRING_LCD_BRIGHTNESS "Яскравість LCD" + #define STRING_LCD_BRIGHTNESS "Яскравість" #define STRING_LCD_IDLE_BRIGHTNESS "Регулювання яскравості LCD" #define STRING_LCD_IDLE_DELAY "Час до загасання LCD" #define STRING_START_GCODE_ENABLED "Розпочати G-код перед друком" @@ -58,7 +48,7 @@ #define STRING_FWRETRACT "M207 ретракт" #define STRING_FWRECOVER "M208 відновлення ретракт" #define STRING_RETRACT_AUTO "Авто FW ретракт" - #define STRING_OFFSET_TOOL "Зсув 2-го сопла" + #define STRING_HOTEND_OFFSET "Зсув 2-го сопла" #define STRING_PROBE_OFFSET "Зміщення датчика" #define STRING_LIN_ADVANCE "К-фактор" #define STRING_CURRENT_SETTING "Налаштування TMC драйверів" @@ -247,6 +237,7 @@ #define STRING_SETTINGS "Налаштування" #define STRING_SCREEN_SETTINGS "Екран" #define STRING_MACHINE_SETTINGS "Принтер" + #define STRING_MARLIN_MODE_SETTINGS "MarlinMode" #define STRING_FEATURE_SETTINGS "Опції" #define STRING_SOUND "Звуки" #define STRING_RGB_SETTINGS "Колір LED" @@ -287,8 +278,8 @@ #define STRING_TOUCHSCREEN_ADJUST "Калібрування сенсору" #define STRING_MORE "Більше \u089C" // Curved Right Arrow #define STRING_SCREEN_INFO "Інформація" - #define STRING_SIMULATOR_BG_COLOR "Колір фону Marlin симулятору" - #define STRING_SIMULATOR_FONT_COLOR "Колір шрифту Marlin симулятору" + #define STRING_BG_COLOR "Колір фону" + #define STRING_FONT_COLOR "Колір шрифту" #define STRING_PERCENTAGE "підстроювання" #define STRING_PERCENTAGE_SPEED "Швидкість" #define STRING_PERCENTAGE_FLOW "Потік" diff --git a/TFT/src/User/API/Language/utf8_decode.c b/TFT/src/User/API/Language/utf8_decode.c index b3e228bbc8..7f117ba1bc 100644 --- a/TFT/src/User/API/Language/utf8_decode.c +++ b/TFT/src/User/API/Language/utf8_decode.c @@ -73,7 +73,7 @@ static FONT_BITMAP font[] = { 0, }, { // default font - 0x0, + 0x9, 0xFFFF, BYTE_HEIGHT, BYTE_WIDTH * 2, @@ -133,8 +133,15 @@ static void getUTF8EncodeInfo(const uint8_t *ch, CHAR_INFO *pInfo) // get character font bitmap info static void getBitMapFontInfo(CHAR_INFO *pInfo) { - uint8_t i; - for (i = 0; i < COUNT(font); i++) + if(pInfo->codePoint < 9) + { + pInfo->pixelWidth = 0; + pInfo->pixelHeight = 0; + pInfo->bitMapAddr = 0; + return; + } + + for (uint8_t i = 0; i < COUNT(font); i++) { if(pInfo->codePoint >= font[i].startCodePoint && pInfo->codePoint <= font[i].endCodePoint) { diff --git a/TFT/src/User/API/MachineParameters.c b/TFT/src/User/API/MachineParameters.c index d097f05c73..b3d8ed5dc5 100644 --- a/TFT/src/User/API/MachineParameters.c +++ b/TFT/src/User/API/MachineParameters.c @@ -3,27 +3,27 @@ PARAMETERS infoParameters; -const u8 parameter_element_count[PARAMETERS_COUNT] = {5, 5, 5, 3, 4, 1, 3, 4, 4, 1, 3, 2, 3, 2, 5, 3, 5, 1}; - -const char *const parameter_Cmd[PARAMETERS_COUNT][STEPPER_COUNT] = { - {"M92 X%.2f\n", "M92 Y%.2f\n", "M92 Z%.2f\n", "M92 T0 E%.2f\n", "M92 T1 E%.2f\nM503 S0\n"}, //Steps/mm - {"M203 X%.0f\n", "M203 Y%.0f\n", "M203 Z%.0f\n", "M203 T0 E%.0f\n", "M203 T1 E%.0f\nM503 S0\n"}, //MaxFeedrate - {"M201 X%.0f\n", "M201 Y%.0f\n", "M201 Z%.0f\n", "M201 T0 E%.0f\n", "M201 T1 E%.0f\nM503 S0\n"}, //MaxAcceleration - {"M204 P%.0f\n", "M204 R%.0f\n", "M204 T%.0f\n", NULL, NULL}, //Acceleration - {"M205 X%.0f\n", "M205 Y%.0f\n", "M205 Z%.2f\n", "M205 E%.2f\n", NULL}, //Jerk - {"M205 J%.3f\n", NULL, NULL, NULL, NULL}, //Junction Deviation - {"M206 X%.2f\n", "M206 Y%.2f\n", "M206 Z%.2f\n", NULL, NULL}, //Home offset - {"M207 S%.2f\n", "M207 W%.2f\n", "M207 F%.2f\n", "M207 Z%.2f\n", NULL}, //FW retract - {"M208 S%.2f\n", "M208 W%.2f\n", "M208 F%.2f\n", "M208 R%.2f\n", NULL}, //FW retract recover - {"M209 S%.0f\nM503 S0\n", NULL, NULL, NULL, NULL}, //Set auto FW retract - {"M218 T1 X%.2f\nM503 S0\n", "M218 T1 Y%.2f\nM503 S0\n", "M218 T1 Z%.2f\nM503 S0\n", NULL, NULL}, //Offset Tools - {"M420 S%.0f\n", "M420 Z%.2f\n", NULL, NULL, NULL}, //ABL State + Z Fade - {"M851 X%.2f\n", "M851 Y%.2f\n", "M851 Z%.2f\n", NULL, NULL}, //Probe offset - {"M900 T0 K%.2f\n", "M900 T1 K%.2f\nM503 S0\n", NULL, NULL, NULL}, //Linear Advance - {"M906 X%.0f\n", "M906 Y%.0f\n", "M906 Z%.0f\n", "M906 T0 E%.0f\n", "M906 T1 E%.0f\nM503 S0\n"}, //Current - {"M914 X%.0f\n", "M914 Y%.0f\n", "M914 Z%.0f\n", NULL, NULL}, //bump Sensitivity - {"M913 X%.0f\n", "M913 Y%.0f\n", "M913 Z%.0f\n", "M913 E%.0f\n", "M913 T1 E%.0f\nM503 S0\n"}, //TMC Hybrid Threshold Speed - {"G29 S4 Z%.2f\n", NULL, NULL, NULL, NULL}, //MBL offset +const uint8_t parameter_element_count[PARAMETERS_COUNT] = {5, 5, 5, 3, 4, 1, 3, 4, 4, 1, 3, 2, 3, 2, 5, 3, 5, 1}; + +const char * const parameter_Cmd[PARAMETERS_COUNT][STEPPER_COUNT] = { + {"M92 X%.2f\n", "M92 Y%.2f\n", "M92 Z%.2f\n", "M92 T0 E%.2f\n", "M92 T1 E%.2f\n"}, //Steps/mm + {"M203 X%.0f\n", "M203 Y%.0f\n", "M203 Z%.0f\n", "M203 T0 E%.0f\n", "M203 T1 E%.0f\n"}, //MaxFeedrate + {"M201 X%.0f\n", "M201 Y%.0f\n", "M201 Z%.0f\n", "M201 T0 E%.0f\n", "M201 T1 E%.0f\n"}, //MaxAcceleration + {"M204 P%.0f\n", "M204 R%.0f\n", "M204 T%.0f\n", NULL, NULL}, //Acceleration + {"M205 X%.0f\n", "M205 Y%.0f\n", "M205 Z%.2f\n", "M205 E%.2f\n", NULL}, //Jerk + {"M205 J%.3f\n", NULL, NULL, NULL, NULL}, //Junction Deviation + {"M206 X%.2f\n", "M206 Y%.2f\n", "M206 Z%.2f\n", NULL, NULL}, //Home offset + {"M207 S%.2f\n", "M207 W%.2f\n", "M207 F%.2f\n", "M207 Z%.2f\n", NULL}, //FW retract + {"M208 S%.2f\n", "M208 W%.2f\n", "M208 F%.2f\n", "M208 R%.2f\n", NULL}, //FW retract recover + {"M209 S%.0f\n", NULL, NULL, NULL, NULL}, //Set auto FW retract + {"M218 T1 X%.2f", "M218 T1 Y%.2f\n", "M218 T1 Z%.2f\n", NULL, NULL}, //Hotend Offset + {"M420 S%.0f\n", "M420 Z%.2f\n", NULL, NULL, NULL}, //ABL State + Z Fade + {"M851 X%.2f\n", "M851 Y%.2f\n", "M851 Z%.2f\n", NULL, NULL}, //Probe offset + {"M900 T0 K%.2f\n", "M900 T1 K%.2f\n", NULL, NULL, NULL}, //Linear Advance + {"M906 X%.0f\n", "M906 Y%.0f\n", "M906 Z%.0f\n", "M906 T0 E%.0f\n", "M906 T1 E%.0f\n"}, //Current + {"M914 X%.0f\n", "M914 Y%.0f\n", "M914 Z%.0f\n", NULL, NULL}, //bump Sensitivity + {"M913 X%.0f\n", "M913 Y%.0f\n", "M913 Z%.0f\n", "M913 T0 E%.0f\n", "M913 T1 E%.0f\n"}, //TMC Hybrid Threshold Speed + {"G29 S4 Z%.2f\n", NULL, NULL, NULL, NULL}, //MBL offset }; const VAL_TYPE parameter_val_type[PARAMETERS_COUNT][STEPPER_COUNT] = { @@ -37,7 +37,7 @@ const VAL_TYPE parameter_val_type[PARAMETERS_COUNT][STEPPER_COUNT] = { {VAL_TYPE_FLOAT, VAL_TYPE_FLOAT, VAL_TYPE_INT, VAL_TYPE_FLOAT}, //FW retract {VAL_TYPE_FLOAT, VAL_TYPE_FLOAT, VAL_TYPE_INT, VAL_TYPE_INT}, //FW retract recover {VAL_TYPE_INT}, //Set auto FW retract - {VAL_TYPE_NEG_FLOAT, VAL_TYPE_NEG_FLOAT, VAL_TYPE_NEG_FLOAT}, //Offset Tools + {VAL_TYPE_NEG_FLOAT, VAL_TYPE_NEG_FLOAT, VAL_TYPE_NEG_FLOAT}, //Hotend Offset {VAL_TYPE_INT, VAL_TYPE_FLOAT}, //ABL State + Z Fade {VAL_TYPE_NEG_FLOAT, VAL_TYPE_NEG_FLOAT, VAL_TYPE_NEG_FLOAT}, //Probe offset {VAL_TYPE_FLOAT, VAL_TYPE_FLOAT}, //Linear Advance @@ -64,7 +64,7 @@ const LABEL recover_disp_ID[] = {LABEL_RECOVER_LENGTH, LABEL_SWAP_RECOVER_LENGTH const LABEL retract_auto_ID[] = {LABEL_RETRACT_AUTO}; const LABEL junction_deviation_disp_ID[] = {LABEL_JUNCTION_DEVIATION}; -float getParameter(PARAMETER_NAME name, u8 index) +float getParameter(PARAMETER_NAME name, uint8_t index) { if (index >= parameter_element_count[name]) return 0.0f; @@ -100,8 +100,8 @@ float getParameter(PARAMETER_NAME name, u8 index) case P_AUTO_RETRACT: return infoParameters.AutoRetract[index]; - case P_OFFSET_TOOL: - return infoParameters.OffsetTool[index]; + case P_HOTEND_OFFSET: + return infoParameters.HotendOffset[index]; case P_ABL_STATE: return infoParameters.ABLState[index]; @@ -129,7 +129,7 @@ float getParameter(PARAMETER_NAME name, u8 index) } } -void setParameter(PARAMETER_NAME name, u8 index, float val) +void setParameter(PARAMETER_NAME name, uint8_t index, float val) { if (index >= parameter_element_count[name]) return; @@ -176,8 +176,8 @@ void setParameter(PARAMETER_NAME name, u8 index, float val) infoParameters.AutoRetract[index] = val; break; - case P_OFFSET_TOOL: - infoParameters.OffsetTool[index] = val; + case P_HOTEND_OFFSET: + infoParameters.HotendOffset[index] = val; break; case P_ABL_STATE: @@ -213,27 +213,27 @@ void setParameter(PARAMETER_NAME name, u8 index, float val) } } -u8 getParameterElementCount(PARAMETER_NAME para) +uint8_t getParameterElementCount(PARAMETER_NAME para) { return parameter_element_count[para]; } -VAL_TYPE getParameterValType(PARAMETER_NAME para, u8 index) +VAL_TYPE getParameterValType(PARAMETER_NAME para, uint8_t index) { return parameter_val_type[para][index]; } -void setDualStepperStatus(u8 index, bool status) +void setDualStepperStatus(uint8_t index, bool status) { dualstepper[index] = status; } -bool getDualstepperStatus(u8 index) +bool getDualstepperStatus(uint8_t index) { return dualstepper[index]; } -void sendParameterCmd(PARAMETER_NAME para, u8 stepper_index, float Value) +void sendParameterCmd(PARAMETER_NAME para, uint8_t stepper_index, float Value) { storeCmd(parameter_Cmd[para][stepper_index], Value); diff --git a/TFT/src/User/API/MachineParameters.h b/TFT/src/User/API/MachineParameters.h index a740d5fbed..d229093e3c 100644 --- a/TFT/src/User/API/MachineParameters.h +++ b/TFT/src/User/API/MachineParameters.h @@ -20,7 +20,7 @@ typedef enum P_FWRETRACT, P_FWRECOVER, P_AUTO_RETRACT, - P_OFFSET_TOOL, + P_HOTEND_OFFSET, P_ABL_STATE, P_PROBE_OFFSET, P_LIN_ADV, @@ -67,7 +67,7 @@ typedef struct float FwRetract[4]; float FwRecover[4]; float AutoRetract[1]; - float OffsetTool[3]; + float HotendOffset[3]; float ABLState[2]; float ProbeOffset[3]; float LinAdvance[2]; @@ -93,16 +93,16 @@ void setParameter(PARAMETER_NAME name, uint8_t index, float val); uint8_t getParameterElementCount(PARAMETER_NAME para); //Get type of value a parameter element holds -VAL_TYPE getParameterValType(PARAMETER_NAME para, u8 index); +VAL_TYPE getParameterValType(PARAMETER_NAME para, uint8_t index); //set status of dual stepper for an axis -void setDualStepperStatus(u8 index, bool status); +void setDualStepperStatus(uint8_t index, bool status); //get status of dual stepper for an axis -bool getDualstepperStatus(u8 index); +bool getDualstepperStatus(uint8_t index); //send parameter cmd (Parameter value gets updated after the cmd passes through the cmd cache) -void sendParameterCmd(PARAMETER_NAME para_index, u8 stepper_index, float Value); +void sendParameterCmd(PARAMETER_NAME para_index, uint8_t stepper_index, float Value); //Save parameter setting to eeprom void saveEepromSettings(void); diff --git a/TFT/src/User/API/Notification.c b/TFT/src/User/API/Notification.c index 1022b23a10..1874cb5a59 100644 --- a/TFT/src/User/API/Notification.c +++ b/TFT/src/User/API/Notification.c @@ -93,7 +93,7 @@ void drawToast(bool redraw) GUI_SetColor(MAT_LOWWHITE); GUI_FillPrect(&toastRect); GUI_SetColor(DARKGRAY); - GUI_DispStringInPrect(&toastRect, (u8 *)toastlist[curToastDisplay].text); + GUI_DispStringInPrect(&toastRect, (uint8_t *)toastlist[curToastDisplay].text); //set current toast notification as old/completed toastlist[curToastDisplay].isNew = false; @@ -151,7 +151,7 @@ void addNotification(DIALOG_TYPE style, char *title, char *text, bool ShowDialog msglist[nextMsgIndex].title[MAX_MSG_TITLE_LENGTH - 1] = 0; //ensure string ends with null terminator if (ShowDialog && infoMenu.menu[infoMenu.cur] != menuNotification) - popupReminder(style, (u8 *)title, (u8 *)msglist[nextMsgIndex].text); + popupReminder(style, (uint8_t *)title, (uint8_t *)msglist[nextMsgIndex].text); if (nextMsgIndex < MAX_MSG_COUNT) nextMsgIndex += 1;//(nextMsgIndex + 1) % MAX_MSG_COUNT; @@ -160,14 +160,14 @@ void addNotification(DIALOG_TYPE style, char *title, char *text, bool ShowDialog notificationDot(); - statusScreen_setMsg((u8 *)title, (u8 *)text); + statusScreen_setMsg((uint8_t *)title, (uint8_t *)text); } //Replay a notification void replayNotification(uint8_t index) { if (index < nextMsgIndex) - popupReminder(msglist[index].style, (u8 *)msglist[index].title, (u8 *)msglist[index].text); + popupReminder(msglist[index].style, (uint8_t *)msglist[index].title, (uint8_t *)msglist[index].text); } //Retrive a stored notification diff --git a/TFT/src/User/API/Printing.c b/TFT/src/User/API/Printing.c index f95781635b..2fe27430eb 100644 --- a/TFT/src/User/API/Printing.c +++ b/TFT/src/User/API/Printing.c @@ -355,7 +355,7 @@ void abortPrinting(void) // wait for cool down, in the meantime, you can shut down by force void shutdown(void) { - for(u8 i = 0; i < infoSettings.fan_count; i++) + for(uint8_t i = 0; i < infoSettings.fan_count; i++) { if (fanIsType(i, FAN_TYPE_F)) mustStoreCmd("%s S0\n", fanCmd[i]); } @@ -383,11 +383,11 @@ void startShutdown(void) LABELCHAR(tempbody, LABEL_WAIT_TEMP_SHUT_DOWN); sprintf(tempstr, tempbody, infoSettings.auto_off_temp); - for(u8 i = 0; i < infoSettings.fan_count; i++) + for(uint8_t i = 0; i < infoSettings.fan_count; i++) { if (fanIsType(i,FAN_TYPE_F)) mustStoreCmd("%s S255\n", fanCmd[i]); } - setDialogText(LABEL_SHUT_DOWN, (u8 *)tempstr, LABEL_FORCE_SHUT_DOWN, LABEL_CANCEL); + setDialogText(LABEL_SHUT_DOWN, (uint8_t *)tempstr, LABEL_FORCE_SHUT_DOWN, LABEL_CANCEL); showDialog(DIALOG_TYPE_INFO, shutdown, NULL, shutdownLoop); } @@ -397,7 +397,7 @@ void getGcodeFromFile(void) bool sd_comment_mode = false; bool sd_comment_space = true; char sd_char; - u8 sd_count = 0; + uint8_t sd_count = 0; UINT br = 0; if (isPrinting() == false || infoFile.source >= BOARD_SD) return; @@ -484,7 +484,7 @@ bool hasPrintingMenu(void) void loopCheckPrinting(void) { - #if defined(ST7920_SPI) || defined(LCD2004_simulator) + #ifdef HAS_EMULATOR if (infoMenu.menu[infoMenu.cur] == menuMarlinMode) return; #endif diff --git a/TFT/src/User/API/Settings.c b/TFT/src/User/API/Settings.c index ecfaf765ad..3bc3f49927 100644 --- a/TFT/src/User/API/Settings.c +++ b/TFT/src/User/API/Settings.c @@ -4,18 +4,18 @@ SETTINGS infoSettings; MACHINESETTINGS infoMachineSettings; -const u16 default_max_temp[] = HEAT_MAX_TEMP; -const u16 default_max_fanPWM[] = FAN_MAX_PWM; -const u16 default_size_min[] = {X_MIN_POS,Y_MIN_POS,Z_MIN_POS}; -const u16 default_size_max[] = {X_MAX_POS,Y_MAX_POS,Z_MAX_POS}; -const u16 default_xy_speed[] = {SPEED_XY_SLOW, SPEED_XY_NORMAL, SPEED_XY_FAST}; -const u16 default_z_speed[] = {SPEED_Z_SLOW, SPEED_Z_NORMAL, SPEED_Z_FAST}; -const u16 default_ext_speed[] = {EXTRUDE_SLOW_SPEED, EXTRUDE_NORMAL_SPEED, EXTRUDE_FAST_SPEED}; -const u16 default_level_speed[] = {LEVELING_POINT_XY_FEEDRATE, LEVELING_POINT_Z_FEEDRATE}; -const u16 default_pause_speed[] = {NOZZLE_PAUSE_XY_FEEDRATE, NOZZLE_PAUSE_Z_FEEDRATE, NOZZLE_PAUSE_E_FEEDRATE}; -const u16 default_preheat_ext[] = PREHEAT_HOTEND; -const u16 default_preheat_bed[] = PREHEAT_BED; -const u8 default_custom_enabled[] = CUSTOM_GCODE_ENABLED; +const uint16_t default_max_temp[] = HEAT_MAX_TEMP; +const uint16_t default_max_fanPWM[] = FAN_MAX_PWM; +const uint16_t default_size_min[] = {X_MIN_POS,Y_MIN_POS,Z_MIN_POS}; +const uint16_t default_size_max[] = {X_MAX_POS,Y_MAX_POS,Z_MAX_POS}; +const uint16_t default_xy_speed[] = {SPEED_XY_SLOW, SPEED_XY_NORMAL, SPEED_XY_FAST}; +const uint16_t default_z_speed[] = {SPEED_Z_SLOW, SPEED_Z_NORMAL, SPEED_Z_FAST}; +const uint16_t default_ext_speed[] = {EXTRUDE_SLOW_SPEED, EXTRUDE_NORMAL_SPEED, EXTRUDE_FAST_SPEED}; +const uint16_t default_level_speed[] = {LEVELING_POINT_XY_FEEDRATE, LEVELING_POINT_Z_FEEDRATE}; +const uint16_t default_pause_speed[] = {NOZZLE_PAUSE_XY_FEEDRATE, NOZZLE_PAUSE_Z_FEEDRATE, NOZZLE_PAUSE_E_FEEDRATE}; +const uint16_t default_preheat_ext[] = PREHEAT_HOTEND; +const uint16_t default_preheat_bed[] = PREHEAT_BED; +const uint8_t default_custom_enabled[] = CUSTOM_GCODE_ENABLED; // Reset settings data void infoSettingsReset(void) @@ -48,7 +48,7 @@ void infoSettingsReset(void) infoSettings.marlin_mode_bg_color = lcd_colors[MARLIN_BKCOLOR]; infoSettings.marlin_mode_font_color = lcd_colors[MARLIN_FNCOLOR]; infoSettings.marlin_mode_showtitle = MARLIN_SHOW_BANNER; - infoSettings.marlin_mode_fullscreen = DEFAULT_ST7920_FULLSCREEN_MODE; + infoSettings.marlin_mode_fullscreen = MARLIN_MODE_FULLSCREEN; infoSettings.marlin_type = LCD12864; // Printer / Machine Settings diff --git a/TFT/src/User/API/Settings.h b/TFT/src/User/API/Settings.h index 6e0a864e44..a48d8be3e9 100644 --- a/TFT/src/User/API/Settings.h +++ b/TFT/src/User/API/Settings.h @@ -29,12 +29,12 @@ typedef enum // Config version support // change if new elements/keywords are added/removed/changed in the configuration.h Format YYYYMMDD // this number should match CONFIG_VERSION in configuration.h -#define CONFIG_SUPPPORT 20210124 +#define CONFIG_SUPPPORT 20210217 #define FONT_FLASH_SIGN 20200908 //(YYYYMMDD) change if fonts require updating -#define CONFIG_FLASH_SIGN 20210130 //(YYYYMMDD) change if any keyword(s) in config.ini is added or removed -#define LANGUAGE_FLASH_SIGN 20210130 //(YYYYMMDD) change if any keyword(s) in language pack is added or removed -#define ICON_FLASH_SIGN 20210130 //(YYYYMMDD) change if any icon(s) is added or removed +#define CONFIG_FLASH_SIGN 20210217 //(YYYYMMDD) change if any keyword(s) in config.ini is added or removed +#define LANGUAGE_FLASH_SIGN 20210217 //(YYYYMMDD) change if any keyword(s) in language pack is added or removed +#define ICON_FLASH_SIGN 20210217 //(YYYYMMDD) change if any icon(s) is added or removed #define FONT_CHECK_SIGN (FONT_FLASH_SIGN + WORD_UNICODE) #define CONFIG_CHECK_SIGN (CONFIG_FLASH_SIGN + STRINGS_STORE_ADDR) @@ -75,8 +75,8 @@ typedef enum typedef enum { - LCD2004 = 0, - LCD12864 + LCD12864 = 0, + LCD2004, } MARLIN_MODE_TYPE; typedef struct @@ -253,17 +253,17 @@ typedef struct extern SETTINGS infoSettings; extern MACHINESETTINGS infoMachineSettings; -extern const u16 default_max_temp[]; -extern const u16 default_max_fanPWM[]; -extern const u16 default_size_min[]; -extern const u16 default_size_max[]; -extern const u16 default_move_speed[]; -extern const u16 default_ext_speed[]; -extern const u16 default_level_speed[]; -extern const u16 default_pause_speed[]; -extern const u16 default_preheat_ext[]; -extern const u16 default_preheat_bed[]; -extern const u8 default_custom_enabled[]; +extern const uint16_t default_max_temp[]; +extern const uint16_t default_max_fanPWM[]; +extern const uint16_t default_size_min[]; +extern const uint16_t default_size_max[]; +extern const uint16_t default_move_speed[]; +extern const uint16_t default_ext_speed[]; +extern const uint16_t default_level_speed[]; +extern const uint16_t default_pause_speed[]; +extern const uint16_t default_preheat_ext[]; +extern const uint16_t default_preheat_bed[]; +extern const uint8_t default_custom_enabled[]; void initMachineSetting(void); void infoSettingsReset(void); diff --git a/TFT/src/User/API/SpeedControl.c b/TFT/src/User/API/SpeedControl.c index 687efb3956..52549dd992 100644 --- a/TFT/src/User/API/SpeedControl.c +++ b/TFT/src/User/API/SpeedControl.c @@ -35,7 +35,7 @@ uint16_t speedGetSetPercent(uint8_t tool) void loopSpeed(void) { - for (u8 i = 0; i < SPEED_NUM; i++) + for (uint8_t i = 0; i < SPEED_NUM; i++) { if (lastSetPercent[i] != setPercent[i] && (OS_GetTimeMs() > nextSpeedTime)) { diff --git a/TFT/src/User/API/Temperature.c b/TFT/src/User/API/Temperature.c index 7f8b5e4f9d..d87fa32425 100644 --- a/TFT/src/User/API/Temperature.c +++ b/TFT/src/User/API/Temperature.c @@ -50,7 +50,7 @@ void heatSyncTargetTemp(uint8_t index, int16_t temp) } //Get target temperature -u16 heatGetTargetTemp(uint8_t index) +uint16_t heatGetTargetTemp(uint8_t index) { index = fixHeaterIndex(index); return heater.T[index].target; diff --git a/TFT/src/User/API/UI/GUI.c b/TFT/src/User/API/UI/GUI.c index 6a6657a02c..49a420eb03 100644 --- a/TFT/src/User/API/UI/GUI.c +++ b/TFT/src/User/API/UI/GUI.c @@ -826,7 +826,7 @@ void _GUI_DispLabelInPrectEOL(const GUI_RECT *rect, uint16_t index) #define RADIO_IDLE_COLOR WHITE void RADIO_Create(RADIO *radio) { - u16 tmp = GUI_GetColor(); + uint16_t tmp = GUI_GetColor(); uint8_t i=0; for(i=0;inum;i++) { @@ -843,7 +843,7 @@ void RADIO_Create(RADIO *radio) void RADIO_Select(RADIO *radio, uint8_t select) { - u16 tmp = GUI_GetColor(); + uint16_t tmp = GUI_GetColor(); uint8_t i=0; if(radio->select==select) return; @@ -1005,12 +1005,12 @@ void GUI_DrawWindow(const WINDOW *window, const uint8_t *title, const uint8_t *i { GUI_RECT w_rect = window->rect; - u16 title_height = window->titleHeight; - //u16 action_height = window->actionBarHeight; - u16 title_txt_y0 = w_rect.y0 + (title_height - BYTE_HEIGHT) / 2; - u16 title_y1 = window->rect.y0 + window->titleHeight; - u16 action_y0 = window->rect.y1 - window->actionBarHeight; - u8 margin = BYTE_WIDTH/2; + uint16_t title_height = window->titleHeight; + //uint16_t action_height = window->actionBarHeight; + uint16_t title_txt_y0 = w_rect.y0 + (title_height - BYTE_HEIGHT) / 2; + uint16_t title_y1 = window->rect.y0 + window->titleHeight; + uint16_t action_y0 = window->rect.y1 - window->actionBarHeight; + uint8_t margin = BYTE_WIDTH/2; //draw title background GUI_SetColor(window->title.backColor); @@ -1028,7 +1028,7 @@ void GUI_DrawWindow(const WINDOW *window, const uint8_t *title, const uint8_t *i GUI_SetTextMode(GUI_TEXTMODE_TRANS); //draw window type icon - u8 * char_icon; + uint8_t * char_icon; switch(window->type) { case DIALOG_TYPE_ALERT: @@ -1068,7 +1068,7 @@ void GUI_DrawWindow(const WINDOW *window, const uint8_t *title, const uint8_t *i } //draw window border GUI_SetColor(window->lineColor); - for (u8 i = 0; i < window->lineWidth; i++) + for (uint8_t i = 0; i < window->lineWidth; i++) { GUI_DrawRect(w_rect.x0 - i, w_rect.y0 - i, w_rect.x1 + i, w_rect.y1 + i); } diff --git a/TFT/src/User/API/UI/HD44780_Simulator.c b/TFT/src/User/API/UI/HD44780_Emulator.c similarity index 99% rename from TFT/src/User/API/UI/HD44780_Simulator.c rename to TFT/src/User/API/UI/HD44780_Emulator.c index 900e7fc5e4..bf47f0067b 100644 --- a/TFT/src/User/API/UI/HD44780_Simulator.c +++ b/TFT/src/User/API/UI/HD44780_Emulator.c @@ -1,10 +1,10 @@ -#include "HD44780_Simulator.h" +#include "HD44780_Emulator.h" #include "includes.h" #include "GUI.h" #include "../../Configuration.h" #include "HD44780.h" -#ifdef LCD2004_simulator +#ifdef LCD2004_EMULATOR uint8_t HD44780_CGRAM[8][8]; // [64*2] = [4 * 16*2*8], means 4 * [16*16] bitmap font, HD44780_PIXEL HD44780 = { diff --git a/TFT/src/User/API/UI/HD44780_Simulator.h b/TFT/src/User/API/UI/HD44780_Emulator.h similarity index 100% rename from TFT/src/User/API/UI/HD44780_Simulator.h rename to TFT/src/User/API/UI/HD44780_Emulator.h diff --git a/TFT/src/User/API/UI/Numpad.c b/TFT/src/User/API/UI/Numpad.c index 72bb8a3ed2..2661cbae05 100644 --- a/TFT/src/User/API/UI/Numpad.c +++ b/TFT/src/User/API/UI/Numpad.c @@ -32,7 +32,7 @@ const GUI_RECT oldParameterRect = {0, 0, LCD_WIDTH/2 - BY const GUI_RECT newParameterRect = {LCD_WIDTH/2 + BYTE_WIDTH, 0, LCD_WIDTH, ICON_START_Y+0*SKEYHEIGHT}; const GUI_RECT arrowRect = {LCD_WIDTH/2 - BYTE_WIDTH, 0, LCD_WIDTH/2 + BYTE_WIDTH, ICON_START_Y+0*SKEYHEIGHT}; -void keyPress(u8 index, u8 ispressed) +void keyPress(uint8_t index, uint8_t ispressed) { if (index < KEY_NUM) { @@ -43,7 +43,7 @@ void keyPress(u8 index, u8 ispressed) } } -void Draw_keyboard(u8 * title, bool NumberOnly, bool negative) +void Draw_keyboard(uint8_t * title, bool NumberOnly, bool negative) { GUI_ClearRect(0, 0, LCD_WIDTH, rect_of_numkey[0].y0); GUI_ClearRect(0, rect_of_numkey[0].y0, LCD_WIDTH, LCD_HEIGHT); @@ -77,7 +77,7 @@ void Draw_keyboard(u8 * title, bool NumberOnly, bool negative) DrawCharIcon(&rect_of_numkey[NUM_KEY_EXIT], MIDDLE, ICONCHAR_CANCEL, false, 0); DrawCharIcon(&rect_of_numkey[NUM_KEY_RESET], MIDDLE, ICONCHAR_RESET, false, 0); - GUI_DispStringInPrect(&arrowRect,(u8 *)"\u089A"); + GUI_DispStringInPrect(&arrowRect,(uint8_t *)"\u089A"); GUI_DispStringInPrect(&oldParameterRect, title); GUI_RestoreColorDefault(); @@ -91,9 +91,9 @@ float numPadFloat(u8* title, float old_val, float reset_val, bool negative) NUM_KEY_VALUES key_num = NUM_KEY_IDLE; touchSound = false; setLargeFont(true); - u8 nowIndex = 0, lastIndex = 0; + uint8_t nowIndex = 0, lastIndex = 0; char ParameterBuf[FLOAT_BUFLONG + 1] = {0}; - u8 prec = (old_val == 0) ? 0 : 3; + uint8_t prec = (old_val == 0) ? 0 : 3; sprintf(ParameterBuf,"%.*f", prec, old_val); nowIndex = strlen(ParameterBuf); @@ -101,7 +101,7 @@ float numPadFloat(u8* title, float old_val, float reset_val, bool negative) { char tempstr[FLOAT_BUFLONG + 1]; sprintf(tempstr, "%.*f", prec, old_val); - title = (u8 *)tempstr; + title = (uint8_t *)tempstr; } setMenu(MENU_TYPE_FULLSCREEN, NULL, COUNT(rect_of_numkey), rect_of_numkey, keyPress, NULL); Draw_keyboard(title, false, negative); @@ -210,7 +210,7 @@ float numPadFloat(u8* title, float old_val, float reset_val, bool negative) lastIndex = nowIndex; GUI_ClearPrect(&newParameterRect); setLargeFont(true); - GUI_DispStringInPrect(&newParameterRect, (u8 *)ParameterBuf); + GUI_DispStringInPrect(&newParameterRect, (uint8_t *)ParameterBuf); } loopBackEnd(); } @@ -235,7 +235,7 @@ int32_t numPadInt(u8* title, int32_t old_val, int32_t reset_val, bool negative) { char tempstr[INT_BUFLONG + 1]; sprintf(tempstr, "%i", old_val); - title = (u8 *)tempstr; + title = (uint8_t *)tempstr; } setMenu(MENU_TYPE_FULLSCREEN, NULL, COUNT(rect_of_numkey), rect_of_numkey, keyPress, NULL); Draw_keyboard(title, true, negative); @@ -243,7 +243,7 @@ int32_t numPadInt(u8* title, int32_t old_val, int32_t reset_val, bool negative) sprintf(ParameterBuf,"%i",val); len = strlen(ParameterBuf); setLargeFont(true); - GUI_DispStringInPrect(&newParameterRect, (u8 *)ParameterBuf); + GUI_DispStringInPrect(&newParameterRect, (uint8_t *)ParameterBuf); while (1) { @@ -323,7 +323,7 @@ int32_t numPadInt(u8* title, int32_t old_val, int32_t reset_val, bool negative) GUI_ClearPrect(&newParameterRect); sprintf(ParameterBuf, "%s%i", n, val); setLargeFont(true); - GUI_DispStringInPrect(&newParameterRect, (u8 *)ParameterBuf); + GUI_DispStringInPrect(&newParameterRect, (uint8_t *)ParameterBuf); } loopBackEnd(); } diff --git a/TFT/src/User/API/UI/ST7920_Simulator.c b/TFT/src/User/API/UI/ST7920_Emulator.c similarity index 99% rename from TFT/src/User/API/UI/ST7920_Simulator.c rename to TFT/src/User/API/UI/ST7920_Emulator.c index 1fb6b803b2..6106e879cc 100644 --- a/TFT/src/User/API/UI/ST7920_Simulator.c +++ b/TFT/src/User/API/UI/ST7920_Emulator.c @@ -1,9 +1,9 @@ -#include "ST7920_Simulator.h" +#include "ST7920_Emulator.h" #include "includes.h" #include "GUI.h" #include "../../Configuration.h" -#ifdef ST7920_SPI +#ifdef ST7920_EMULATOR // CGRAM buffer uint8_t ST7920_CGRAM[64][2]; // [64*2] = [4 * 16*2*8], means 4 * [16*16] bitmap font, diff --git a/TFT/src/User/API/UI/ST7920_Simulator.h b/TFT/src/User/API/UI/ST7920_Emulator.h similarity index 100% rename from TFT/src/User/API/UI/ST7920_Simulator.h rename to TFT/src/User/API/UI/ST7920_Emulator.h diff --git a/TFT/src/User/API/UI/list_item.c b/TFT/src/User/API/UI/list_item.c index eeedba68dd..bd7ef1c4ef 100644 --- a/TFT/src/User/API/UI/list_item.c +++ b/TFT/src/User/API/UI/list_item.c @@ -478,7 +478,7 @@ void draw_itemtitle(GUI_POINT pos, LABEL label, uint8_t position, int textarea_w { int textarea_width = LISTITEM_WIDTH - (pos.x + 1); //width after removing the width for icon if (label.index == LABEL_DYNAMIC) - GUI_DispLenString(pos.x, pos.y, (u8 *)getDynamicLabel(position), textarea_width, true); + GUI_DispLenString(pos.x, pos.y, (uint8_t *)getDynamicLabel(position), textarea_width, true); else GUI_DispLenString(pos.x, pos.y, labelGetAddress(&label), textarea_width, true); } @@ -516,7 +516,7 @@ void ListItem_DisplayCustomValue(const GUI_RECT * rect, LABEL value, int i) GUI_SetColor(MAT_LOWWHITE); if (value.index == LABEL_CUSTOM_VALUE || value.index == LABEL_DYNAMIC) //show custom text value - GUI_DispStringInPrect(&rectVal, (u8 *)getDynamicTextValue(i)); + GUI_DispStringInPrect(&rectVal, (uint8_t *)getDynamicTextValue(i)); else //show regular text labels GUI_DispStringInPrect(&rectVal, (int32_t)value.index); diff --git a/TFT/src/User/API/UI/touch_process.c b/TFT/src/User/API/UI/touch_process.c index dafe601af4..00643929a9 100644 --- a/TFT/src/User/API/UI/touch_process.c +++ b/TFT/src/User/API/UI/touch_process.c @@ -31,20 +31,20 @@ int32_t TSC_Para[7]; static volatile bool touchScreenIsPress=false; bool touchSound = true; -void TS_Get_Coordinates(u16 *x, u16 *y) +void TS_Get_Coordinates(uint16_t *x, uint16_t *y) { - u16 tp_x = XPT2046_Repeated_Compare_AD(CMD_RDX); - u16 tp_y = XPT2046_Repeated_Compare_AD(CMD_RDY); + uint16_t tp_x = XPT2046_Repeated_Compare_AD(CMD_RDX); + uint16_t tp_y = XPT2046_Repeated_Compare_AD(CMD_RDY); *x = (A*tp_x+B*tp_y+C)/K; *y = (D*tp_x+E*tp_y+F)/K; } #define TS_ERR_RANGE 10 -u8 calibrationEnsure(u16 x,u16 y) +uint8_t calibrationEnsure(uint16_t x,uint16_t y) { - u32 i; - u16 tp_x,tp_y; + uint32_t i; + uint16_t tp_x,tp_y; int lcd_x,lcd_y; GUI_SetColor(BLACK); GUI_FillCircle(x,y,5); @@ -84,10 +84,10 @@ u8 calibrationEnsure(u16 x,u16 y) void TSC_Calibration(void) { - u32 LCD_X[3] = {40, LCD_WIDTH-40, LCD_WIDTH-40}; - u32 LCD_Y[3] = {40, 40, LCD_HEIGHT-40}; - u16 TP_X[3],TP_Y[3]; - u32 tp_num = 0; + uint32_t LCD_X[3] = {40, LCD_WIDTH-40, LCD_WIDTH-40}; + uint32_t LCD_Y[3] = {40, 40, LCD_HEIGHT-40}; + uint16_t TP_X[3],TP_Y[3]; + uint32_t tp_num = 0; int i; do @@ -126,10 +126,10 @@ void TSC_Calibration(void) } -u16 Key_value(u8 total_rect,const GUI_RECT* menuRect) +uint16_t Key_value(uint8_t total_rect,const GUI_RECT* menuRect) { - u8 i=0; - u16 x, y; + uint8_t i=0; + uint16_t x, y; TS_Get_Coordinates(&x,&y); for(i=0;i= 20) // 20ms @@ -166,20 +166,20 @@ void loopTouchScreen(void) // Handle in interrupt } } -u8 isPress(void) +uint8_t isPress(void) { return touchScreenIsPress; } -void (*TSC_ReDrawIcon)(u8 position, u8 is_press) = NULL; +void (*TSC_ReDrawIcon)(uint8_t position, uint8_t is_press) = NULL; -u16 KEY_GetValue(u8 total_rect,const GUI_RECT* menuRect) +uint16_t KEY_GetValue(uint8_t total_rect,const GUI_RECT* menuRect) { - static u16 key_num = IDLE_TOUCH; + static uint16_t key_num = IDLE_TOUCH; static bool firstPress = true; - u16 key_return = IDLE_TOUCH; + uint16_t key_return = IDLE_TOUCH; if (touchScreenIsPress) { @@ -220,13 +220,13 @@ typedef enum #define KEY_LONG_PRESS_SPACE_MAX 10 //锟斤拷锟斤拷时 锟筋长锟斤拷梅锟斤拷锟揭伙拷渭锟街? #define KEY_LONG_PRESS_SPACE_MIN 2 //����ʱ ��̶�÷���һ�μ�ֵ -//u16 KEY_GetValue(u8 total_rect,const GUI_RECT* menuRect) +//uint16_t KEY_GetValue(uint8_t total_rect,const GUI_RECT* menuRect) //{ -// u16 key_return=NO_TOUCH; +// uint16_t key_return=NO_TOUCH; -// static u16 first_key = NO_TOUCH; -// static u32 first_time = 0; -// static u8 long_press_space = KEY_LONG_PRESS_SPACE_MAX; +// static uint16_t first_key = NO_TOUCH; +// static uint32_t first_time = 0; +// static uint8_t long_press_space = KEY_LONG_PRESS_SPACE_MAX; // static KEY_STATUS nowStatus = NO_CLICK; //������ǰ��״̬ @@ -315,13 +315,13 @@ typedef enum // return key_return; //} -u16 KNOB_GetRV(GUI_RECT *knob) +uint16_t KNOB_GetRV(GUI_RECT *knob) { - u16 key_return=IDLE_TOUCH; - u16 x=0,y=0; + uint16_t key_return=IDLE_TOUCH; + uint16_t x=0,y=0; - static u16 oldx=0,oldy=0; - static u32 mytime; + static uint16_t oldx=0,oldy=0; + static uint32_t mytime; if(touchScreenIsPress && OS_GetTimeMs() > mytime) { diff --git a/TFT/src/User/API/UI/touch_process.h b/TFT/src/User/API/UI/touch_process.h index cfc7489c1d..b5dfded6cc 100644 --- a/TFT/src/User/API/UI/touch_process.h +++ b/TFT/src/User/API/UI/touch_process.h @@ -16,7 +16,7 @@ enum KNOB_DEC, }; -#define KEY_CLICK 0x0000 // The key is defined as u16, 16 (u16 16bit)-3 (3 bits flag) = 13 bit, so u16 supports a maximum of 2 ^ 13 = 8192 key values +#define KEY_CLICK 0x0000 // The key is defined as uint16_t , 16 (uint16_t 16bit)-3 (3 bits flag) = 13 bit, so uint16_t supports a maximum of 2 ^ 13 = 8192 key values #define KEY_DOUBLE_CLICK 0x2000 //The third bit is used to identify the double-click action #define KEY_LONG_RELEASE 0x4000 // The second bit is used to identify the release action after a long press #define KEY_LONG_CLICK 0x8000 // The first bit is used to identify the long press action @@ -24,15 +24,15 @@ enum extern bool touchSound; void TSC_Calibration(void); -u8 isPress(void); -u16 KEY_GetValue(u8 total_rect,const GUI_RECT* menuRect); -u16 Key_value(u8 total_rect,const GUI_RECT* menuRect); -u16 KNOB_GetRV(GUI_RECT *knob); +uint8_t isPress(void); +uint16_t KEY_GetValue(uint8_t total_rect,const GUI_RECT* menuRect); +uint16_t Key_value(uint8_t total_rect,const GUI_RECT* menuRect); +uint16_t KNOB_GetRV(GUI_RECT *knob); void loopTouchScreen(void); -extern void (*TSC_ReDrawIcon)(u8 position, u8 is_press); -extern void TS_Get_Coordinates(u16 *x, u16 *y); +extern void (*TSC_ReDrawIcon)(uint8_t position, uint8_t is_press); +extern void TS_Get_Coordinates(uint16_t *x, uint16_t *y); #ifdef __cplusplus } diff --git a/TFT/src/User/API/UI/ui_draw.c b/TFT/src/User/API/UI/ui_draw.c index c3ba8e878e..a1dca8c247 100644 --- a/TFT/src/User/API/UI/ui_draw.c +++ b/TFT/src/User/API/UI/ui_draw.c @@ -3,14 +3,14 @@ #ifdef STM32_HAS_FSMC -void lcd_frame_display(u16 sx,u16 sy,u16 w,u16 h, u32 addr); +void lcd_frame_display(uint16_t sx,uint16_t sy,uint16_t w,uint16_t h, u32 addr); #else -void lcd_frame_display(u16 sx,u16 sy,u16 w,u16 h, u32 addr) +void lcd_frame_display(uint16_t sx,uint16_t sy,uint16_t w,uint16_t h, u32 addr) { - u16 x,y; - u16 color = 0; + uint16_t x,y; + uint16_t color = 0; u32 address = addr; LCD_SetWindow(sx,sy,sx+w-1,sy+h-1); @@ -48,14 +48,14 @@ uint32_t getBMPsize(uint8_t * w, uint8_t * h, uint32_t address) void LOGO_ReadDisplay(void) { uint16_t w, h; - uint32_t addr = getBMPsize((u8 *)&w, (u8 *)&h, LOGO_ADDR); + uint32_t addr = getBMPsize((uint8_t *)&w, (uint8_t *)&h, LOGO_ADDR); lcd_frame_display(0, 0, w, h, addr); } -void ICON_ReadDisplay(u16 sx,u16 sy, u8 icon) +void ICON_ReadDisplay(uint16_t sx,uint16_t sy, uint8_t icon) { uint16_t w, h; - uint32_t addr = getBMPsize((u8 *)&w, (u8 *)&h, ICON_ADDR(icon)); + uint32_t addr = getBMPsize((uint8_t *)&w, (uint8_t *)&h, ICON_ADDR(icon)); lcd_frame_display(sx, sy, w, h, addr); } @@ -148,25 +148,25 @@ bool model_DecodeToFlash(char *gcode) } //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, u32 address) +void ICON_CustomReadDisplay(uint16_t sx,uint16_t sy, u32 address) { uint16_t w,h; - address = getBMPsize((u8 *)&w, (u8 *)&h, address); + address = getBMPsize((uint8_t *)&w, (uint8_t *)&h, address); lcd_frame_display(sx, sy, w, h, address); } -void SMALLICON_ReadDisplay(u16 sx,u16 sy, u8 icon) +void SMALLICON_ReadDisplay(uint16_t sx,uint16_t sy, uint8_t icon) { lcd_frame_display(sx, sy, SMALLICON_WIDTH, SMALLICON_HEIGHT, SMALL_ICON_ADDR(icon)); } -void ICON_PressedDisplay(u16 sx,u16 sy, u8 icon) +void ICON_PressedDisplay(uint16_t sx,uint16_t sy, uint8_t icon) { - u16 mode=0x0FF0; - u16 x,y; + uint16_t mode=0x0FF0; + uint16_t x,y; uint16_t w,h; - u16 color = 0; - u32 address = getBMPsize((u8 *)&w, (u8 *)&h, ICON_ADDR(icon)); + uint16_t color = 0; + u32 address = getBMPsize((uint8_t *)&w, (uint8_t *)&h, ICON_ADDR(icon)); LCD_SetWindow(sx, sy, sx+w-1, sy+h-1); LCD_WR_REG(0x2C); diff --git a/TFT/src/User/API/UI/ui_draw.h b/TFT/src/User/API/UI/ui_draw.h index 50cc6c2e16..b8e2e46468 100644 --- a/TFT/src/User/API/UI/ui_draw.h +++ b/TFT/src/User/API/UI/ui_draw.h @@ -30,9 +30,9 @@ void LOGO_ReadDisplay(void); void ICON_ReadDisplay(uint16_t sx, uint16_t sy, uint8_t icon); bool model_DirectDisplay(GUI_POINT pos, char *gcode); bool model_DecodeToFlash(char *gcode); -void ICON_CustomReadDisplay(u16 sx,u16 sy, u32 address); -void SMALLICON_ReadDisplay(u16 sx,u16 sy, u8 icon); -void ICON_PressedDisplay(u16 sx,u16 sy, u8 icon); +void ICON_CustomReadDisplay(uint16_t sx,uint16_t sy, u32 address); +void SMALLICON_ReadDisplay(uint16_t sx,uint16_t sy, uint8_t icon); +void ICON_PressedDisplay(uint16_t sx,uint16_t sy, uint8_t icon); #ifdef __cplusplus diff --git a/TFT/src/User/API/Vfs/vfs.c b/TFT/src/User/API/Vfs/vfs.c index 214fc43bc3..ffd46bece5 100644 --- a/TFT/src/User/API/Vfs/vfs.c +++ b/TFT/src/User/API/Vfs/vfs.c @@ -121,7 +121,7 @@ bool IsRootDir(void) // Volume exist detect static bool volumeSrcStatus[FF_VOLUMES] = {false, false}; -bool isVolumeExist(u8 src) +bool isVolumeExist(uint8_t src) { if (src >= FF_VOLUMES) return true; @@ -132,7 +132,7 @@ uint8_t (*volumeInserted[FF_VOLUMES])(void) = {SD_CD_Inserted, USBH_USR_Inserted void loopVolumeSource(void) { - for (u8 i = 0; i < FF_VOLUMES; i++) + for (uint8_t i = 0; i < FF_VOLUMES; i++) { if (volumeSrcStatus[i] != (*volumeInserted[i])()) { diff --git a/TFT/src/User/API/boot.c b/TFT/src/User/API/boot.c index b3c7bad0e7..a47e2d237f 100644 --- a/TFT/src/User/API/boot.c +++ b/TFT/src/User/API/boot.c @@ -25,7 +25,7 @@ const char smallIconBmpName[][32]={ //add new icons in small_icon_list.inc only }; -BMPUPDATE_STAT bmpDecode(char *bmp, u32 addr) +BMPUPDATE_STAT bmpDecode(char *bmp, uint32_t addr) { FIL bmpFile; char magic[2]; @@ -217,11 +217,11 @@ void dispIconFail(uint8_t *lbl, BMPUPDATE_STAT bmpState) Delay_ms(1000); // give some time to the user to read failed icon name. } -bool updateFont(char *font, u32 addr) +bool updateFont(char *font, uint32_t addr) { uint8_t progress = 0; UINT rnum = 0; - u32 offset = 0; + uint32_t offset = 0; char buffer[128]; FIL myfp; uint8_t* tempbuf = NULL; diff --git a/TFT/src/User/API/boot.h b/TFT/src/User/API/boot.h index df5e7730a8..5de5bbdbbf 100644 --- a/TFT/src/User/API/boot.h +++ b/TFT/src/User/API/boot.h @@ -89,18 +89,18 @@ typedef enum typedef union { - u16 color; + uint16_t color; struct { - u16 b:5; - u16 g:6; - u16 r:5; + uint16_t b:5; + uint16_t g:6; + uint16_t r:5; }RGB; }GUI_COLOR; void scanUpdates(void); -void dispIconFail(u8 *lbl, BMPUPDATE_STAT bmpState); -BMPUPDATE_STAT bmpDecode(char *bmp, u32 addr); +void dispIconFail(uint8_t *lbl, BMPUPDATE_STAT bmpState); +BMPUPDATE_STAT bmpDecode(char *bmp, uint32_t addr); #ifdef __cplusplus } diff --git a/TFT/src/User/API/config.c b/TFT/src/User/API/config.c index efe897cbb9..f0cff8622f 100644 --- a/TFT/src/User/API/config.c +++ b/TFT/src/User/API/config.c @@ -17,11 +17,11 @@ const GUI_RECT recterrortxt = {BYTE_WIDTH/2, BYTE_HEIGHT*2+4, LCD_WI const GUI_RECT rectProgressframe = {BYTE_WIDTH/2-2, LCD_HEIGHT-(BYTE_HEIGHT*2+BYTE_HEIGHT/2), LCD_WIDTH-BYTE_WIDTH/2+2,LCD_HEIGHT-BYTE_HEIGHT/2}; const GUI_POINT pointProgressText = {BYTE_WIDTH/2-2, LCD_HEIGHT-(BYTE_HEIGHT*4)}; -u16 foundkeys = 0; +uint16_t foundkeys = 0; CONFIGFILE * CurConfigFile; char * cur_line = NULL; -static u16 c_index = 0; +static uint16_t c_index = 0; uint8_t customcode_index = 0; uint8_t customcode_good[CUSTOM_GCODES_COUNT]; @@ -134,7 +134,7 @@ bool readConfigFile(const char * path, void (*lineParser)(), uint16_t maxLineLen bool comment_space = true; char cur_char; char last_char = 0; - u8 count = 0; + uint8_t count = 0; UINT br = 0; CONFIGFILE configFile; CurConfigFile = &configFile; @@ -240,7 +240,7 @@ bool inLimit(int val, int min, int max) //check if config keyword exits in the buffer line bool key_seen(const char * keyStr) { - u16 i; + uint16_t i; for (c_index = 0; c_index < ACK_MAX_SIZE && cur_line[c_index] != 0; c_index++) { for (i = 0; keyStr[i] != 0 && cur_line[c_index + i] != 0 && cur_line[c_index + i] == keyStr[i]; i++) @@ -329,7 +329,7 @@ static inline void config_set_color(uint16_t *color_src) //check keywords in the config line in buffer void parseConfigLine(void) { - for (u16 i = 0; i < CONFIG_COUNT; i++) + for (uint16_t i = 0; i < CONFIG_COUNT; i++) { if (key_seen(config_keywords[i])) { @@ -353,14 +353,14 @@ void parseLangLine(void) PRINTDEBUG("\n"); PRINTDEBUG((char *)lang_key_list[i]); uint32_t key_addr = LANGUAGE_ADDR + (MAX_LANG_LABEL_LENGTH * i); - u8 * pchr = (u8 *)strchr(cur_line, ':') + 1; + uint8_t * pchr = (uint8_t *)strchr(cur_line, ':') + 1; int bytelen = strlen((char *)pchr); if (inLimit(bytelen, 1, MAX_LANG_LABEL_LENGTH)) { W25Qxx_WritePage(pchr, key_addr, MAX_LANG_LABEL_LENGTH); char check[MAX_LANG_LABEL_LENGTH]; - W25Qxx_ReadBuffer((u8 *)&check, key_addr, MAX_LANG_LABEL_LENGTH); + W25Qxx_ReadBuffer((uint8_t *)&check, key_addr, MAX_LANG_LABEL_LENGTH); if (strcmp(strchr(cur_line, ':') + 1, check) != 0) showError(CSTAT_SPI_WRITE_FAIL); } @@ -383,7 +383,7 @@ void saveConfig(void) #ifdef CONFIG_DEBUG CUSTOM_GCODES tempgcode; // = NULL; - uint8_t * data_r = (u8 *)&tempgcode; + uint8_t * data_r = (uint8_t *)&tempgcode; W25Qxx_ReadBuffer(data_r, CUSTOM_GCODE_ADDR, sizeof(CUSTOM_GCODES)); PRINTDEBUG("\nread done"); @@ -456,7 +456,7 @@ void resetConfig(void) writeConfig((uint8_t *)&tempST, sizeof(STRINGS_STORE), STRINGS_STORE_ADDR, STRINGS_STORE_MAX_SIZE); } -void drawProgressPage(u8 * title) +void drawProgressPage(uint8_t * title) { GUI_Clear(BLACK); GUI_DispString(2, 2, title); @@ -469,8 +469,8 @@ void drawProgress(void) { char tempstr[50]; sprintf(tempstr, "Total keywords found: %d", foundkeys); - GUI_DispString(pointProgressText.x, pointProgressText.y, (u8 *)tempstr); - u16 p = map(CurConfigFile->cur, 0, CurConfigFile->size, rectProgressframe.x0, rectProgressframe.x1); + GUI_DispString(pointProgressText.x, pointProgressText.y, (uint8_t *)tempstr); + uint16_t p = map(CurConfigFile->cur, 0, CurConfigFile->size, rectProgressframe.x0, rectProgressframe.x1); GUI_FillRect(rectProgressframe.x0, rectProgressframe.y0, p, rectProgressframe.y1); } @@ -523,7 +523,7 @@ void showError(CONFIG_STATS stat) } // parse the keyword values in the buffer -void parseConfigKey(u16 index) +void parseConfigKey(uint16_t index) { switch (index) { @@ -613,7 +613,7 @@ void parseConfigKey(u16 index) //----------------------------Marlin Mode Settings (only for TFT24_V1.1 & TFT28/TFT35/TFT43/TFT50/TFT70_V3.0) - #if defined(ST7920_SPI) || defined(LCD2004_simulator) + #ifdef HAS_EMULATOR case C_INDEX_MODE: SET_VALID_INT_VALUE(infoSettings.mode, 0, MODE_COUNT - 1); @@ -654,7 +654,7 @@ void parseConfigKey(u16 index) break; } - #endif // ST7920_SPI || LCD2004_simulator + #endif // ST7920_EMULATOR || LCD2004_EMULATOR //----------------------------Printer / Machine Settings @@ -820,7 +820,7 @@ void parseConfigKey(u16 index) { char pchr[LINE_MAX_CHAR]; strcpy(pchr, strrchr(cur_line, ':') + 1); - int utf8len = getUTF8Length((u8 *)pchr); + int utf8len = getUTF8Length((uint8_t *)pchr); int bytelen = strlen(pchr) + 1; if (inLimit(utf8len, NAME_MIN_LENGTH, MAX_STRING_LENGTH) && inLimit(bytelen, NAME_MIN_LENGTH, MAX_GCODE_LENGTH)) strcpy(configStringsStore->preheat_name[index - C_INDEX_PREHEAT_NAME_1], pchr); @@ -1030,7 +1030,7 @@ void parseConfigKey(u16 index) strcpy(configPrintGcodes->start_gcode, pchr); #ifdef CONFIG_DEBUG GUI_DispStringInRect(recterrortxt.x0, recterrortxt.y0 + (BYTE_HEIGHT * 2), recterrortxt.x1, recterrortxt.y1, - (u8 *)configPrintGcodes->start_gcode); + (uint8_t *)configPrintGcodes->start_gcode); Delay_ms(1000); Delay_ms(1000); #endif @@ -1048,7 +1048,7 @@ void parseConfigKey(u16 index) strcpy(configPrintGcodes->end_gcode, pchr); #ifdef CONFIG_DEBUG GUI_DispStringInRect(recterrortxt.x0, recterrortxt.y0 + (BYTE_HEIGHT * 2), recterrortxt.x1, recterrortxt.y1, - (u8 *)configPrintGcodes->end_gcode); + (uint8_t *)configPrintGcodes->end_gcode); Delay_ms(1000); Delay_ms(1000); #endif @@ -1066,7 +1066,7 @@ void parseConfigKey(u16 index) strcpy(configPrintGcodes->cancel_gcode, pchr); #ifdef CONFIG_DEBUG GUI_DispStringInRect(recterrortxt.x0, recterrortxt.y0 + (BYTE_HEIGHT * 2), recterrortxt.x1, recterrortxt.y1, - (u8 *)configPrintGcodes->cancel_gcode); + (uint8_t *)configPrintGcodes->cancel_gcode); Delay_ms(1000); Delay_ms(1000); #endif diff --git a/TFT/src/User/API/config.h b/TFT/src/User/API/config.h index 6f8f7a9e5f..2aeea25e37 100644 --- a/TFT/src/User/API/config.h +++ b/TFT/src/User/API/config.h @@ -184,8 +184,8 @@ extern "C" { typedef struct { FIL file; - u32 size; // total size of config file - u32 cur; // total size of + uint32_t size; // total size of config file + uint32_t cur; // total size of } CONFIGFILE; typedef enum @@ -207,12 +207,12 @@ bool readConfigFile(const char * path, void (*lineParser)(), uint16_t maxLineLen void parseConfigLine(void); void parseLangLine(void); -void parseConfigKey(u16 index); +void parseConfigKey(uint16_t index); void writeConfig(uint8_t* dataBytes, uint16_t numBytes, uint32_t addr, uint32_t maxSize); void saveConfig(void); void resetConfig(void); -void drawProgressPage(u8 * title); +void drawProgressPage(uint8_t * title); void drawProgress(void); void showError(CONFIG_STATS stat); diff --git a/TFT/src/User/API/extend.c b/TFT/src/User/API/extend.c index f233a95871..aa0b7811f6 100644 --- a/TFT/src/User/API/extend.c +++ b/TFT/src/User/API/extend.c @@ -59,9 +59,9 @@ void FIL_Runout_Init(void) bool FIL_RunoutPinFilteredLevel(void) { static bool rst = false; - static u32 nextRunoutTime = 0; - static u32 trueTimes = 0; - static u32 falseTimes = 0; + static uint32_t nextRunoutTime = 0; + static uint32_t trueTimes = 0; + static uint32_t falseTimes = 0; if (OS_GetTimeMs() > nextRunoutTime) { @@ -118,7 +118,7 @@ bool FIL_RunoutPinFilteredLevel(void) } -static u32 update_PosE_time = 2000; +static uint32_t update_PosE_time = 2000; // Use an encoder disc to toggles the runout // Suitable for BigTreeTech Smart Filament Sensor static uint8_t SFS_IsAlive = false; @@ -132,7 +132,7 @@ bool FIL_SmartRunoutDetect(void) { static float lastExtrudePosition = 0.0f; static uint8_t lastRunoutPinLevel = 0; - static u32 nextRunoutTime = 0; + static uint32_t nextRunoutTime = 0; bool pinLevel = FIL_RunoutPinFilteredLevel(); float actualExtrude = coordinateGetExtruderActual(); @@ -219,7 +219,7 @@ void loopFrontEndFILRunoutDetect(void) setRunoutAlarmTrue(); setDialogText(LABEL_WARNING, LABEL_FILAMENT_RUNOUT, LABEL_CONFIRM, LABEL_BACKGROUND); showDialog(DIALOG_TYPE_ALERT, setRunoutAlarmFalse, NULL, NULL); - } + } if ((OS_GetTimeMs() > nextTime) && (getRunoutAlarm() == true)) { diff --git a/TFT/src/User/API/flashStore.c b/TFT/src/User/API/flashStore.c index c8641ee996..11c07f9385 100644 --- a/TFT/src/User/API/flashStore.c +++ b/TFT/src/User/API/flashStore.c @@ -17,10 +17,10 @@ extern SETTINGS infoSettings; uint8_t paraStatus = 0; -void wordToByte(u32 word, u8 *bytes) +void wordToByte(uint32_t word, uint8_t *bytes) { - u8 len = 4; - u8 i = 0; + uint8_t len = 4; + uint8_t i = 0; for(i = 0; i < len; i++) { bytes[i] = (word >> 24) & 0xFF; @@ -28,10 +28,10 @@ void wordToByte(u32 word, u8 *bytes) } } -u32 byteToWord(u8 *bytes, u8 len) +uint32_t byteToWord(uint8_t *bytes, uint8_t len) { - u32 word = 0; - u8 i = 0; + uint32_t word = 0; + uint8_t i = 0; for(i = 0; i < len; i++) { word <<= 8; @@ -43,9 +43,9 @@ u32 byteToWord(u8 *bytes, u8 len) // Read settings parameter if exist, or reset settings parameter void readStoredPara(void) { - u8 data[PARA_SIZE]; - u32 index = 0; - u32 sign = 0; + uint8_t data[PARA_SIZE]; + uint32_t index = 0; + uint32_t sign = 0; STM32_FlashRead(data, PARA_SIZE); @@ -74,8 +74,8 @@ void readStoredPara(void) void storePara(void) { - u8 data[PARA_SIZE]; - u32 index = 0; + uint8_t data[PARA_SIZE]; + uint32_t index = 0; wordToByte(TSC_SIGN, data + (index += 4)); for (int i = 0; i < sizeof(TSC_Para) / sizeof(TSC_Para[0]); i++) diff --git a/TFT/src/User/API/icon_list.inc b/TFT/src/User/API/icon_list.inc index 4c568f140c..eb4b279f2b 100644 --- a/TFT/src/User/API/icon_list.inc +++ b/TFT/src/User/API/icon_list.inc @@ -67,8 +67,7 @@ X_ICON (LANGUAGE) X_ICON (TOUCHSCREEN_ADJUST) X_ICON (MORE) X_ICON (SCREEN_INFO) -X_ICON (BKCOLOR) -X_ICON (FONTCOLOR) +X_ICON (MARLIN_MODE) X_ICON (DISCONNECT) X_ICON (BAUD_RATE) X_ICON (PERCENTAGE) @@ -143,5 +142,6 @@ X_ICON (CONNECTION_SETTINGS) X_ICON (CASE_LIGHT) X_ICON (Z_ALIGN) X_ICON (MESH_EDITOR) +X_ICON (BRIGHTNESS) //after changing/adding/removing an icon, change the ICON_FLASH_SIGN in Settings.h diff --git a/TFT/src/User/API/interfaceCmd.c b/TFT/src/User/API/interfaceCmd.c index 2e89613a94..7464a18345 100644 --- a/TFT/src/User/API/interfaceCmd.c +++ b/TFT/src/User/API/interfaceCmd.c @@ -4,7 +4,7 @@ GCODE_QUEUE infoCmd; GCODE_QUEUE infoCacheCmd; // Only when heatHasWaiting() is false the cmd in this cache will move to infoCmd queue. -static u8 cmd_index = 0; +static uint8_t cmd_index = 0; static bool ispolling = true; // Is there a code character in the current gcode command. @@ -12,7 +12,7 @@ static bool cmd_seen(char code) { for(cmd_index = 0; infoCmd.queue[infoCmd.index_r].gcode[cmd_index] != 0 && cmd_index < CMD_MAX_CHAR; cmd_index++) { - if(infoCmd.queue[infoCmd.index_r].gcode[cmd_index] == code) + if (infoCmd.queue[infoCmd.index_r].gcode[cmd_index] == code) { cmd_index += 1; return true; @@ -22,7 +22,7 @@ static bool cmd_seen(char code) } // Get the int after 'code', Call after cmd_seen('code'). -static u32 cmd_value(void) +static int32_t cmd_value(void) { return (strtol(&infoCmd.queue[infoCmd.index_r].gcode[cmd_index], NULL, 10)); } @@ -153,7 +153,7 @@ void mustStoreCacheCmd(const char * format,...) { GCODE_QUEUE *pQueue = &infoCacheCmd; - if(pQueue->count == CMD_MAX_LIST) reminderMessage(LABEL_BUSY, STATUS_BUSY); + if (pQueue->count == CMD_MAX_LIST) reminderMessage(LABEL_BUSY, STATUS_BUSY); while (pQueue->count >= CMD_MAX_LIST) { @@ -169,8 +169,8 @@ void mustStoreCacheCmd(const char * format,...) // Move gcode cmd from infoCacheCmd to infoCmd queue. bool moveCacheToCmd(void) { - if(infoCmd.count >= CMD_MAX_LIST) return false; - if(infoCacheCmd.count == 0) return false; + if (infoCmd.count >= CMD_MAX_LIST) return false; + if (infoCacheCmd.count == 0) return false; storeCmd("%s", infoCacheCmd.queue[infoCacheCmd.index_r].gcode); infoCacheCmd.count--; @@ -196,11 +196,11 @@ void purgeLastCmd(void) // Parse and send gcode cmd in infoCmd. void sendQueueCmd(void) { - if(infoHost.wait == true) return; - if(infoCmd.count == 0) return; + if (infoHost.wait == true) return; + if (infoCmd.count == 0) return; bool avoid_terminal = false; - u16 cmd=0; + uint16_t cmd=0; cmd_index = 0; //check if cmd is from TFT or other host bool fromTFT = (infoCmd.queue[infoCmd.index_r].src == SERIAL_PORT); @@ -234,7 +234,7 @@ void sendQueueCmd(void) break; case 18: //M18/M84 disable steppers case 84: - if(cmd_seen('S') && !cmd_seen('Y') && !cmd_seen('Z') && !cmd_seen('E')) + if (cmd_seen('S') && !cmd_seen('Y') && !cmd_seen('Z') && !cmd_seen('E')) { // Do not mark coordinate as unknown in this case as this is a M18/M84 S // command that doesn't disable the motors right away but will set their idling @@ -296,7 +296,7 @@ void sendQueueCmd(void) if (startsWith("M23 SD:", infoCmd.queue[infoCmd.index_r].gcode) || startsWith("M23 U:", infoCmd.queue[infoCmd.index_r].gcode)) { - if(startsWith("M23 SD:", infoCmd.queue[infoCmd.index_r].gcode)) + if (startsWith("M23 SD:", infoCmd.queue[infoCmd.index_r].gcode)) infoFile.source = TFT_SD; else infoFile.source = TFT_UDISK; @@ -417,7 +417,7 @@ void sendQueueCmd(void) if (startsWith("M30 SD:", infoCmd.queue[infoCmd.index_r].gcode) || startsWith("M30 U:", infoCmd.queue[infoCmd.index_r].gcode)) { - if(startsWith("M30 SD:", infoCmd.queue[infoCmd.index_r].gcode)) infoFile.source = TFT_SD; + if (startsWith("M30 SD:", infoCmd.queue[infoCmd.index_r].gcode)) infoFile.source = TFT_SD; else infoFile.source = TFT_UDISK; TCHAR filepath[MAX_PATH_LEN]; strncpy(filepath, &infoCmd.queue[infoCmd.index_r].gcode[cmd_index + 4], MAX_PATH_LEN); @@ -518,12 +518,15 @@ void sendQueueCmd(void) break; case 92: //M92 Steps per unit - if(cmd_seen('X')) setParameter(P_STEPS_PER_MM, X_AXIS, cmd_float()); - if(cmd_seen('Y')) setParameter(P_STEPS_PER_MM, Y_AXIS, cmd_float()); - if(cmd_seen('Z')) setParameter(P_STEPS_PER_MM, Z_AXIS, cmd_float()); - if(cmd_seen('E')) setParameter(P_STEPS_PER_MM, E_AXIS, cmd_float()); + { + if (cmd_seen('X')) setParameter(P_STEPS_PER_MM, X_AXIS, cmd_float()); + if (cmd_seen('Y')) setParameter(P_STEPS_PER_MM, Y_AXIS, cmd_float()); + if (cmd_seen('Z')) setParameter(P_STEPS_PER_MM, Z_AXIS, cmd_float()); + uint8_t i = 0; + if (cmd_seen('T')) i = cmd_value(); + if (cmd_seen('E')) setParameter(P_STEPS_PER_MM, E_STEPPER + i, cmd_float()); break; - + } case 105: //M105 if (fromTFT) { @@ -536,7 +539,7 @@ void sendQueueCmd(void) if (fromTFT) { heatSetUpdateWaiting(false); - if(cmd_seen('S')) + if (cmd_seen('S')) { heatSyncUpdateSeconds(cmd_value()); } @@ -552,7 +555,7 @@ void sendQueueCmd(void) case 106: //M106 { uint8_t i = cmd_seen('P') ? cmd_value() : 0; - if(cmd_seen('S') && fanIsType(i, FAN_TYPE_F) ) + if (cmd_seen('S') && fanIsType(i, FAN_TYPE_F) ) { fanSetCurSpeed(i, cmd_value()); } @@ -574,9 +577,9 @@ void sendQueueCmd(void) case 710: //M710 Controller Fan { - u8 i = 0; - if(cmd_seen('S')) i = fanGetTypID(i,FAN_TYPE_CTRL_S); - if(cmd_seen('I')) i = fanGetTypID(i=0,FAN_TYPE_CTRL_I); + uint8_t i = 0; + if (cmd_seen('S')) i = fanGetTypID(i,FAN_TYPE_CTRL_S); + if (cmd_seen('I')) i = fanGetTypID(i=0,FAN_TYPE_CTRL_I); fanSetCurSpeed(i, cmd_value()); break; } @@ -601,7 +604,7 @@ void sendQueueCmd(void) if (fromTFT) { uint8_t i = cmd_seen('T') ? cmd_value() : heatGetCurrentHotend(); - if(cmd_seen('S')) + if (cmd_seen('S')) { heatSyncTargetTemp(i, cmd_value()); } @@ -623,25 +626,25 @@ void sendQueueCmd(void) break; case 117: //M117 + { + char message[CMD_MAX_CHAR]; + strncpy(message, &infoCmd.queue[infoCmd.index_r].gcode[cmd_index + 4], CMD_MAX_CHAR); + // strip out any checksum that might be in the string + for (int i = 0; i < CMD_MAX_CHAR && message[i] !=0 ; i++) { - char message[CMD_MAX_CHAR]; - strncpy(message, &infoCmd.queue[infoCmd.index_r].gcode[cmd_index + 4], CMD_MAX_CHAR); - // strip out any checksum that might be in the string - for (int i = 0; i < CMD_MAX_CHAR && message[i] !=0 ; i++) - { - if (message[i] == '*') - { - message[i] = 0; - break; - } - } - statusScreen_setMsg((u8 *)"M117", (u8 *)&message); - if (infoMenu.menu[infoMenu.cur] != menuStatus) + if (message[i] == '*') { - addToast(DIALOG_TYPE_INFO, message); + message[i] = 0; + break; } } - break; + statusScreen_setMsg((uint8_t *)"M117", (uint8_t *)&message); + if (infoMenu.menu[infoMenu.cur] != menuStatus) + { + addToast(DIALOG_TYPE_INFO, message); + } + } + break; case 190: //M190 if (fromTFT) @@ -707,52 +710,64 @@ void sendQueueCmd(void) } break; case 201: //M201 Maximum Acceleration (units/s2) - if(cmd_seen('X')) setParameter(P_MAX_ACCELERATION, X_AXIS, cmd_float()); - if(cmd_seen('Y')) setParameter(P_MAX_ACCELERATION, Y_AXIS, cmd_float()); - if(cmd_seen('Z')) setParameter(P_MAX_ACCELERATION, Z_AXIS, cmd_float()); - if(cmd_seen('E')) setParameter(P_MAX_ACCELERATION, E_AXIS, cmd_float()); + { + if (cmd_seen('X')) setParameter(P_MAX_ACCELERATION, X_STEPPER, cmd_float()); + if (cmd_seen('Y')) setParameter(P_MAX_ACCELERATION, Y_STEPPER, cmd_float()); + if (cmd_seen('Z')) setParameter(P_MAX_ACCELERATION, Z_STEPPER, cmd_float()); + uint8_t i = 0; + if (cmd_seen('T')) i = cmd_value(); + if (cmd_seen('E')) setParameter(P_MAX_ACCELERATION, E_STEPPER + i, cmd_float()); break; + } case 203: //M203 Maximum feedrates (units/s) - if(cmd_seen('X')) setParameter(P_MAX_FEED_RATE, X_AXIS, cmd_float()); - if(cmd_seen('Y')) setParameter(P_MAX_FEED_RATE, Y_AXIS, cmd_float()); - if(cmd_seen('Z')) setParameter(P_MAX_FEED_RATE, Z_AXIS, cmd_float()); - if(cmd_seen('E')) setParameter(P_MAX_FEED_RATE, E_AXIS, cmd_float()); + { + if (cmd_seen('X')) setParameter(P_MAX_FEED_RATE, X_STEPPER, cmd_float()); + if (cmd_seen('Y')) setParameter(P_MAX_FEED_RATE, Y_STEPPER, cmd_float()); + if (cmd_seen('Z')) setParameter(P_MAX_FEED_RATE, Z_STEPPER, cmd_float()); + uint8_t i = 0; + if (cmd_seen('T')) i = cmd_value(); + if (cmd_seen('E')) setParameter(P_MAX_FEED_RATE, E_STEPPER + i, cmd_float()); break; + } case 204: //M204 Acceleration (units/s2) - if(cmd_seen('P')) setParameter(P_ACCELERATION, 0, cmd_float()); - if(cmd_seen('R')) setParameter(P_ACCELERATION, 1, cmd_float()); - if(cmd_seen('T')) setParameter(P_ACCELERATION, 2, cmd_float()); + if (cmd_seen('P')) setParameter(P_ACCELERATION, 0, cmd_float()); + if (cmd_seen('R')) setParameter(P_ACCELERATION, 1, cmd_float()); + if (cmd_seen('T')) setParameter(P_ACCELERATION, 2, cmd_float()); break; case 205: //M205 - Set Advanced Settings - if(cmd_seen('X')) setParameter(P_JERK, X_AXIS, cmd_float()); - if(cmd_seen('Y')) setParameter(P_JERK, Y_AXIS, cmd_float()); - if(cmd_seen('Z')) setParameter(P_JERK, Z_AXIS, cmd_float()); - if(cmd_seen('E')) setParameter(P_JERK, E_AXIS, cmd_float()); - if(cmd_seen('J')) setParameter(P_JUNCTION_DEVIATION, 0, cmd_float()); + if (cmd_seen('X')) setParameter(P_JERK, X_AXIS, cmd_float()); + if (cmd_seen('Y')) setParameter(P_JERK, Y_AXIS, cmd_float()); + if (cmd_seen('Z')) setParameter(P_JERK, Z_AXIS, cmd_float()); + if (cmd_seen('E')) setParameter(P_JERK, E_AXIS, cmd_float()); + if (cmd_seen('J')) setParameter(P_JUNCTION_DEVIATION, 0, cmd_float()); break; case 206: //M206 Home offset - if(cmd_seen('X')) setParameter(P_HOME_OFFSET, X_AXIS, cmd_float()); - if(cmd_seen('Y')) setParameter(P_HOME_OFFSET, Y_AXIS, cmd_float()); - if(cmd_seen('Z')) setParameter(P_HOME_OFFSET, Z_AXIS, cmd_float()); + if (cmd_seen('X')) setParameter(P_HOME_OFFSET, X_AXIS, cmd_float()); + if (cmd_seen('Y')) setParameter(P_HOME_OFFSET, Y_AXIS, cmd_float()); + if (cmd_seen('Z')) setParameter(P_HOME_OFFSET, Z_AXIS, cmd_float()); break; case 207: //M207 FW Retract - if(cmd_seen('S')) setParameter(P_FWRETRACT, 0, cmd_float()); - if(cmd_seen('W')) setParameter(P_FWRETRACT, 1, cmd_float()); - if(cmd_seen('F')) setParameter(P_FWRETRACT, 2, cmd_float()); - if(cmd_seen('Z')) setParameter(P_FWRETRACT, 3, cmd_float()); + if (cmd_seen('S')) setParameter(P_FWRETRACT, 0, cmd_float()); + if (cmd_seen('W')) setParameter(P_FWRETRACT, 1, cmd_float()); + if (cmd_seen('F')) setParameter(P_FWRETRACT, 2, cmd_float()); + if (cmd_seen('Z')) setParameter(P_FWRETRACT, 3, cmd_float()); break; case 208: //M208 FW Retract recover - if(cmd_seen('S')) setParameter(P_FWRECOVER, 0, cmd_float()); - if(cmd_seen('W')) setParameter(P_FWRECOVER, 1, cmd_float()); - if(cmd_seen('F')) setParameter(P_FWRECOVER, 2, cmd_float()); - if(cmd_seen('R')) setParameter(P_FWRECOVER, 3, cmd_float()); - break; + if (cmd_seen('S')) setParameter(P_FWRECOVER, 0, cmd_float()); + if (cmd_seen('W')) setParameter(P_FWRECOVER, 1, cmd_float()); + if (cmd_seen('F')) setParameter(P_FWRECOVER, 2, cmd_float()); + if (cmd_seen('R')) setParameter(P_FWRECOVER, 3, cmd_float()); + break; + case 218: //M218 Hotend Offset + if (cmd_seen('X')) setParameter(P_HOTEND_OFFSET, X_AXIS, cmd_float()); + if (cmd_seen('Y')) setParameter(P_HOTEND_OFFSET, Y_AXIS, cmd_float()); + if (cmd_seen('Z')) setParameter(P_HOTEND_OFFSET, Z_AXIS, cmd_float()); case 220: //M220 - if(cmd_seen('S')) + if (cmd_seen('S')) speedSetCurPercent(0,cmd_value()); break; case 221: //M221 - if(cmd_seen('S')) + if (cmd_seen('S')) speedSetCurPercent(1,cmd_value()); break; @@ -776,12 +791,12 @@ void sendQueueCmd(void) #endif case 355: //M355 { - if(cmd_seen('S')) + if (cmd_seen('S')) { caseLightSetState(cmd_value() > 0); caseLightSendWaiting(false); } - if(cmd_seen('P')) + if (cmd_seen('P')) { caseLightSetBrightness(cmd_value()); caseLightSendWaiting(false); @@ -792,7 +807,7 @@ void sendQueueCmd(void) case 420: //M420 //ABL state will be set through parsACK.c after receiving confirmation message from the printer // to prevent wrong state in case of error. - if(cmd_seen('Z')) setParameter(P_ABL_STATE,1,cmd_float()); + if (cmd_seen('Z')) setParameter(P_ABL_STATE,1,cmd_float()); break; #ifdef NOZZLE_PAUSE_M600_M601 @@ -816,44 +831,49 @@ void sendQueueCmd(void) #endif case 851: //M851 Z probe offset - if(cmd_seen('X')) setParameter(P_PROBE_OFFSET, X_AXIS, cmd_float()); - if(cmd_seen('Y')) setParameter(P_PROBE_OFFSET, Y_AXIS, cmd_float()); - if(cmd_seen('Z')) setParameter(P_PROBE_OFFSET, Z_AXIS, cmd_float()); + { + if (cmd_seen('X')) setParameter(P_PROBE_OFFSET, X_AXIS, cmd_float()); + if (cmd_seen('Y')) setParameter(P_PROBE_OFFSET, Y_AXIS, cmd_float()); + if (cmd_seen('Z')) setParameter(P_PROBE_OFFSET, Z_AXIS, cmd_float()); break; + } case 900: //M900 Linear advance - if (cmd_seen('K')) setParameter(P_LIN_ADV, 0, cmd_float()); + { + uint8_t i = 0; + if (cmd_seen('T')) i = cmd_value(); + if (cmd_seen('K')) setParameter(P_LIN_ADV, i, cmd_float()); break; + } case 906: //M906 Stepper driver current - if(cmd_seen('X')) setParameter(P_CURRENT, X_AXIS, cmd_value()); - if(cmd_seen('Y')) setParameter(P_CURRENT, Y_AXIS, cmd_value()); - if(cmd_seen('Z')) setParameter(P_CURRENT, Z_AXIS, cmd_value()); - if(cmd_seen('E')) setParameter(P_CURRENT, E_AXIS, cmd_value()); - if(cmd_seen('I')) - { - if(cmd_seen('X')) setDualStepperStatus(X_STEPPER,true); - if(cmd_seen('Y')) setDualStepperStatus(Y_STEPPER,true); - if(cmd_seen('Z')) setDualStepperStatus(Z_STEPPER,true); - } - if(cmd_seen('T') && cmd_value() == 0) - { - if(cmd_seen('E')) setParameter(P_CURRENT,E_STEPPER,cmd_value()); - } - if(cmd_seen('T') && cmd_value() == 1) + { + if (cmd_seen('X')) setParameter(P_CURRENT, X_AXIS, cmd_value()); + if (cmd_seen('Y')) setParameter(P_CURRENT, Y_AXIS, cmd_value()); + if (cmd_seen('Z')) setParameter(P_CURRENT, Z_AXIS, cmd_value()); + if (cmd_seen('I')) { - if(cmd_seen('E')) setParameter(P_CURRENT,E2_STEPPER,cmd_value()); - setDualStepperStatus(E_STEPPER,true); + if (cmd_seen('X')) setDualStepperStatus(X_STEPPER,true); + if (cmd_seen('Y')) setDualStepperStatus(Y_STEPPER,true); + if (cmd_seen('Z')) setDualStepperStatus(Z_STEPPER,true); } + uint8_t i = 0; + if (cmd_seen('T')) i = cmd_value(); + if (cmd_seen('E')) setParameter(P_CURRENT, E_STEPPER + i, cmd_value()); break; - case 914: //parse and store TMC Bump sensitivity values - if(cmd_seen('X')) setParameter(P_BUMPSENSITIVITY, X_STEPPER, cmd_float()); - if(cmd_seen('Y')) setParameter(P_BUMPSENSITIVITY, Y_STEPPER, cmd_float()); - if(cmd_seen('Z')) setParameter(P_BUMPSENSITIVITY, Z_STEPPER, cmd_float()); - break; + } case 913: //M913 Hybrid Threshold Speed - if(cmd_seen('X')) setParameter(P_HYBRID_THRESHOLD, X_STEPPER, cmd_value()); - if(cmd_seen('Y')) setParameter(P_HYBRID_THRESHOLD, Y_STEPPER, cmd_value()); - if(cmd_seen('Z')) setParameter(P_HYBRID_THRESHOLD, Z_STEPPER, cmd_value()); - if(cmd_seen('E')) setParameter(P_HYBRID_THRESHOLD, E_STEPPER, cmd_value()); + { + if (cmd_seen('X')) setParameter(P_HYBRID_THRESHOLD, X_STEPPER, cmd_value()); + if (cmd_seen('Y')) setParameter(P_HYBRID_THRESHOLD, Y_STEPPER, cmd_value()); + if (cmd_seen('Z')) setParameter(P_HYBRID_THRESHOLD, Z_STEPPER, cmd_value()); + uint8_t i = 0; + if (cmd_seen('T')) i = cmd_value(); + if (cmd_seen('E')) setParameter(P_HYBRID_THRESHOLD, E_STEPPER + i, cmd_value()); + break; + } + case 914: //parse and store TMC Bump sensitivity values + if (cmd_seen('X')) setParameter(P_BUMPSENSITIVITY, X_STEPPER, cmd_value()); + if (cmd_seen('Y')) setParameter(P_BUMPSENSITIVITY, Y_STEPPER, cmd_value()); + if (cmd_seen('Z')) setParameter(P_BUMPSENSITIVITY, Z_STEPPER, cmd_value()); break; } break; //end parsing M-codes @@ -870,12 +890,12 @@ void sendQueueCmd(void) AXIS i; for(i=X_AXIS;i 0 // if not Disabled case 29: //G29 { - if(cmd_seen('A')) + if (cmd_seen('A')) { setParameter(P_ABL_STATE,0,1); storeCmd("M117 UBL active\n"); } - if(cmd_seen('D')) + if (cmd_seen('D')) { setParameter(P_ABL_STATE,0,0); storeCmd("M117 UBL inactive\n"); @@ -922,7 +942,7 @@ void sendQueueCmd(void) eSetRelative(false); for(AXIS i = X_AXIS; i < TOTAL_AXIS; i++) { - if(cmd_seen(axis_id[i])) + if (cmd_seen(axis_id[i])) { coordinateSetAxisTarget(i, cmd_float()); #ifdef FIL_RUNOUT_PIN diff --git a/TFT/src/User/API/menu.c b/TFT/src/User/API/menu.c index a844edbacc..2c584465e3 100644 --- a/TFT/src/User/API/menu.c +++ b/TFT/src/User/API/menu.c @@ -237,7 +237,7 @@ static const void (* curMenuRedrawHandle)(void) = NULL; //current custom menu static MENU_TYPE menuType = MENU_TYPE_ICON; static LABEL * curTitle = NULL; static const GUI_RECT *curRect = NULL; //current menu layout grid -static u16 curRectCount = 0; //current menu layout rect count +static uint16_t curRectCount = 0; //current menu layout rect count static REMINDER reminder = {{0, 0, LCD_WIDTH, TITLE_END_Y}, 0, STATUS_UNCONNECT, LABEL_UNCONNECTED}; static REMINDER volumeReminder = {{0, 0, LCD_WIDTH, TITLE_END_Y}, 0, STATUS_IDLE, LABEL_BACKGROUND}; @@ -318,7 +318,7 @@ MENU_TYPE getMenuType(void) return menuType; } -void setMenu(MENU_TYPE menu_type, LABEL * title, u16 rectCount, const GUI_RECT * menuRect, void(*action_redraw)(u8 position, u8 is_press), void (* menu_redraw)(void)) +void setMenu(MENU_TYPE menu_type, LABEL * title, uint16_t rectCount, const GUI_RECT * menuRect, void(*action_redraw)(uint8_t position, uint8_t is_press), void (* menu_redraw)(void)) { menuType = menu_type; curRect = menuRect; @@ -519,7 +519,7 @@ void menuReDrawCurTitle(void) //Draw the entire interface void menuDrawPage(const MENUITEMS *menuItems) { - u8 i = 0; + uint8_t i = 0; menuType = MENU_TYPE_ICON; curMenuItems = menuItems; TSC_ReDrawIcon = itemDrawIconPress; @@ -540,7 +540,7 @@ void menuDrawPage(const MENUITEMS *menuItems) //Draw the entire interface void menuDrawListPage(const LISTITEMS *listItems) { - u8 i = 0; + uint8_t i = 0; menuType = MENU_TYPE_LISTVIEW; curListItems = listItems; TSC_ReDrawIcon = itemDrawIconPress; @@ -618,7 +618,7 @@ void showLiveInfo(uint8_t index, const LIVE_INFO * liveicon, const ITEM * item) } //showLiveInfo //When there is a button value, the icon changes color and redraws -void itemDrawIconPress(u8 position, u8 is_press) +void itemDrawIconPress(uint8_t position, uint8_t is_press) { if (position > KEY_ICON_7) return; @@ -817,7 +817,7 @@ void loopBackEnd(void) #endif #if LCD_ENCODER_SUPPORT - #if defined(ST7920_SPI) || defined(LCD2004_simulator) + #ifdef HAS_EMULATOR if (infoMenu.menu[infoMenu.cur] != menuMarlinMode) #endif { @@ -825,7 +825,7 @@ void loopBackEnd(void) } #endif -#if defined(ST7920_SPI) || defined(LCD2004_simulator) +#ifdef HAS_EMULATOR loopCheckMode(); #endif diff --git a/TFT/src/User/API/parseACK.c b/TFT/src/User/API/parseACK.c index b9369149db..a726a7e851 100644 --- a/TFT/src/User/API/parseACK.c +++ b/TFT/src/User/API/parseACK.c @@ -2,8 +2,8 @@ #include "parseACK.h" char dmaL2Cache[ACK_MAX_SIZE]; -static u16 ack_index=0; -static u8 ack_cur_src = SERIAL_PORT; +static uint16_t ack_index=0; +static uint8_t ack_cur_src = SERIAL_PORT; bool portSeen[_UART_CNT] = {false, false, false, false, false, false}; @@ -45,9 +45,9 @@ void setCurrentAckSrc(uint8_t src) portSeen[src] = true; } -static char ack_seen(const char * str) +static bool ack_seen(const char * str) { - u16 i; + uint16_t i; for (ack_index = 0; ack_index < ACK_MAX_SIZE && dmaL2Cache[ack_index] != 0; ack_index++) { for (i = 0; str[i] != 0 && dmaL2Cache[ack_index + i] != 0 && dmaL2Cache[ack_index + i] == str[i]; i++) @@ -61,9 +61,9 @@ static char ack_seen(const char * str) return false; } -static char ack_cmp(const char *str) +static bool ack_cmp(const char *str) { - u16 i; + uint16_t i; for(i=0; iIDR & (1<<12)) != 0) { diff --git a/TFT/src/User/Hal/stm32f10x/spi_slave_mks.c b/TFT/src/User/Hal/stm32f10x/spi_slave_mks.c index 6b63cdd17a..a59e4ae84c 100644 --- a/TFT/src/User/Hal/stm32f10x/spi_slave_mks.c +++ b/TFT/src/User/Hal/stm32f10x/spi_slave_mks.c @@ -6,7 +6,7 @@ #if defined(MKS_32_V1_4) || defined (MKS_28_V1_0) -#if defined(ST7920_SPI) +#if defined(ST7920_EMULATOR) //TODO: //now support SPI3 and PB1 CS only //more compatibility changes are needed @@ -157,6 +157,6 @@ void EXTI1_IRQHandler(void) EXTI->PR = 1<<1; // Clear interrupt status register } -#endif // endif for #if defined(ST7920_SPI) +#endif // endif for #if defined(ST7920_EMULATOR) #endif // endif for #if defined(MKS_32_V1_4) || defined (MKS_28_V1_0) diff --git a/TFT/src/User/Hal/stm32f2_f4xx/spi_slave.c b/TFT/src/User/Hal/stm32f2_f4xx/spi_slave.c index d064dd4950..253621bf63 100644 --- a/TFT/src/User/Hal/stm32f2_f4xx/spi_slave.c +++ b/TFT/src/User/Hal/stm32f2_f4xx/spi_slave.c @@ -6,7 +6,7 @@ #include "Settings.h" #include "HD44780.h" -#if defined(ST7920_SPI) +#if defined(ST7920_EMULATOR) //TODO: //now support SPI2 and PB12 CS only //more compatibility changes are needed @@ -134,19 +134,19 @@ void SPI_Slave_CS_Config(void) } #endif -#if defined(ST7920_SPI) || defined(LCD2004_simulator) +#ifdef HAS_EMULATOR // External interruption void EXTI15_10_IRQHandler(void) { switch (infoSettings.marlin_type) { - #ifdef LCD2004_simulator + #ifdef LCD2004_EMULATOR case LCD2004: HD44780_writeData(); break; #endif - #ifdef ST7920_SPI + #ifdef ST7920_EMULATOR case LCD12864: if((GPIOB->IDR & (1<<12)) != 0) { diff --git a/TFT/src/User/Hal/xpt2046.c b/TFT/src/User/Hal/xpt2046.c index 9fc0eb9699..6b2e051893 100644 --- a/TFT/src/User/Hal/xpt2046.c +++ b/TFT/src/User/Hal/xpt2046.c @@ -41,9 +41,9 @@ u8 XPT2046_Read_Pen(void) /******************************************************************************************************************/ //Read the converted AD value of XPT2046 //Read the converted AD value of XPT2046 -u16 XPT2046_Read_AD(u8 CMD) +uint16_t XPT2046_Read_AD(u8 CMD) { - u16 ADNum; + uint16_t ADNum; XPT2046_CS_Set(0); XPT2046_ReadWriteByte(CMD); @@ -57,12 +57,12 @@ u16 XPT2046_Read_AD(u8 CMD) #define READ_TIMES 5 //Read times //Read times #define LOST_VAL 1 //Drop value //Drop value -u16 XPT2046_Average_AD(u8 CMD) +uint16_t XPT2046_Average_AD(u8 CMD) { - u16 i, j; - u16 buf[READ_TIMES]; - u16 sum=0; - u16 temp; + uint16_t i, j; + uint16_t buf[READ_TIMES]; + uint16_t sum=0; + uint16_t temp; for(i=0; i>1, exhibitRect.y0, (uint8_t *)"RAW"); + GUI_DispStringCenter((exhibitRect.x0 + exhibitRect.x1)>>1, exhibitRect.y0, (uint8_t *)"PWM"); } setLargeFont(false); } @@ -35,7 +35,7 @@ void fanSpeedReDraw(bool skip_header) sprintf(tempstr, " %d/%d ", (int)fanGetCurSpeed(curIndex), (int)fanGetSetSpeed(curIndex)); setLargeFont(true); - GUI_DispStringInPrect(&exhibitRect, (u8 *)tempstr); + GUI_DispStringInPrect(&exhibitRect, (uint8_t *)tempstr); setLargeFont(false); } @@ -93,7 +93,7 @@ void menuFan(void) if (infoSettings.fan_percentage == 1) { strcpy(titlestr, "Min:0 | Max:100"); - uint8_t val = numPadInt((u8 *) titlestr, fanGetSetPercent(curIndex), 0, false); + uint8_t val = numPadInt((uint8_t *) titlestr, fanGetSetPercent(curIndex), 0, false); val = NOBEYOND(0, val, 100); if (val != fanGetSetPercent(curIndex)) @@ -102,7 +102,7 @@ void menuFan(void) else { sprintf(titlestr, "Min:0 | Max:%d", infoSettings.fan_max[curIndex]); - uint8_t val = numPadInt((u8 *) titlestr, fanGetCurSpeed(curIndex), 0, false); + uint8_t val = numPadInt((uint8_t *) titlestr, fanGetCurSpeed(curIndex), 0, false); val = NOBEYOND(0, val, infoSettings.fan_max[curIndex]); if (val != fanGetCurSpeed(curIndex)) diff --git a/TFT/src/User/Menu/FeatureSettings.c b/TFT/src/User/Menu/FeatureSettings.c index 2a3552e245..6292fc5b1a 100644 --- a/TFT/src/User/Menu/FeatureSettings.c +++ b/TFT/src/User/Menu/FeatureSettings.c @@ -21,12 +21,6 @@ LISTITEMS featureSettingsItems = { //parameter values // -const uint16_t iconToggle[ITEM_TOGGLE_NUM] = -{ - ICONCHAR_TOGGLE_OFF, - ICONCHAR_TOGGLE_ON -}; - #define ITEM_TOGGLE_AUTO_NUM 3 const LABEL itemToggleAuto[ITEM_TOGGLE_AUTO_NUM] = { @@ -43,22 +37,6 @@ const LABEL itemToggleSmart[ITEM_TOGGLE_SMART_NUM] = LABEL_SMART }; -#define ITEM_DEFAULT_MODE_NUM 2 -const char *const itemDefaultMode[ITEM_DEFAULT_MODE_NUM] = -{ - //item value text(only for custom value) - "Marlin", - "Touch" -}; - -#define ITEM_MARLIN_TYPE_NUM 2 -const char *const itemMarlinType[ITEM_MARLIN_TYPE_NUM] = -{ - //item value text(only for custom value) - "LCD2004", - "LCD12864" -}; - #define ITEM_NOTIFICATION_TYPE_NUM 3 const char *const itemNotificationType[ITEM_NOTIFICATION_TYPE_NUM] = { @@ -73,41 +51,23 @@ const char *const itemNotificationType[ITEM_NOTIFICATION_TYPE_NUM] = // typedef enum { - SKEY_STATUS_SCREEN = 0, - SKEY_TERMINAL_ACK, - SKEY_INVERT_X_AXIS, - SKEY_INVERT_Y_AXIS, - SKEY_INVERT_Z_AXIS, + SKEY_TERMINAL_ACK = 0, SKEY_PERSISTENT_INFO, SKEY_FILE_LIST_MODE, SKEY_ACK_NOTIFICATION, - SKEY_DEFAULT_MODE, SKEY_SERIAL_ALWAYS_ON, - - #ifdef ST7920_SPI - SKEY_MARLIN_SHOW_TITLE, - SKEY_MARLIN_FULLSCREEN, - SKEY_MARLIN_TYPE, - #endif - SKEY_SPEED, SKEY_AUTO_LOAD_LEVELING, - SKEY_TOUCHMI_SENSOR, - SKEY_ONBOARD_SD_SUPPORT, - SKEY_M27_ALWAYS_ACTIVE, - SKEY_LONG_FILENAME_SUPPORT, SKEY_FAN_SPEED_PERCENT, SKEY_XY_OFFSET_PROBING, SKEY_Z_STEPPERS_ALIGNMENT, #ifdef PS_ON_PIN SKEY_PS_ON, - SKEY_PS_ON_ACTIVE_HIGH, #endif #ifdef FIL_RUNOUT_PIN SKEY_FIL_RUNOUT, - SKEY_FIL_RUNOUT_INVERTING, #endif SKEY_PL_RECOVERY_EN, @@ -122,12 +82,6 @@ typedef enum #endif #endif - #ifdef LCD_LED_PWM_CHANNEL - SKEY_LCD_BRIGHTNESS, - SKEY_LCD_IDLE_BRIGTHNESS, - SKEY_LCD_IDLE_DELAY, - #endif - SKEY_START_GCODE_ENABLED, SKEY_END_GCODE_ENABLED, SKEY_CANCEL_GCODE_ENABLED, @@ -142,41 +96,23 @@ int fe_cur_page = 0; //set item types // LISTITEM settingPage[SKEY_COUNT] = { - {ICONCHAR_TOGGLE_ON, LIST_TOGGLE, LABEL_STATUS_SCREEN, LABEL_BACKGROUND}, {ICONCHAR_TOGGLE_ON, LIST_TOGGLE, LABEL_TERMINAL_ACK, LABEL_BACKGROUND}, - {ICONCHAR_TOGGLE_ON, LIST_TOGGLE, LABEL_INVERT_X_AXIS, LABEL_BACKGROUND}, - {ICONCHAR_TOGGLE_ON, LIST_TOGGLE, LABEL_INVERT_Y_AXIS, LABEL_BACKGROUND}, - {ICONCHAR_TOGGLE_ON, LIST_TOGGLE, LABEL_INVERT_Z_AXIS, LABEL_BACKGROUND}, {ICONCHAR_TOGGLE_ON, LIST_TOGGLE, LABEL_PERSISTENT_INFO, LABEL_BACKGROUND}, {ICONCHAR_TOGGLE_ON, LIST_TOGGLE, LABEL_FILE_LIST_MODE, LABEL_BACKGROUND}, {ICONCHAR_BLANK, LIST_CUSTOMVALUE, LABEL_ACK_NOTIFICATION, LABEL_DYNAMIC}, - {ICONCHAR_BLANK, LIST_CUSTOMVALUE, LABEL_DEFAULT_MODE, LABEL_DYNAMIC}, {ICONCHAR_TOGGLE_ON, LIST_TOGGLE, LABEL_SERIAL_ALWAYS_ON, LABEL_BACKGROUND}, - - #ifdef ST7920_SPI - {ICONCHAR_TOGGLE_ON, LIST_TOGGLE, LABEL_MARLIN_SHOW_TITLE, LABEL_BACKGROUND}, - {ICONCHAR_TOGGLE_ON, LIST_TOGGLE, LABEL_MARLIN_FULLSCREEN, LABEL_BACKGROUND}, - {ICONCHAR_BLANK, LIST_CUSTOMVALUE, LABEL_MARLIN_TYPE, LABEL_DYNAMIC}, - #endif - {ICONCHAR_BLANK, LIST_CUSTOMVALUE, LABEL_MOVE_SPEED, LABEL_NORMAL}, {ICONCHAR_TOGGLE_ON, LIST_TOGGLE, LABEL_AUTO_LOAD_LEVELING, LABEL_BACKGROUND}, - {ICONCHAR_TOGGLE_ON, LIST_TOGGLE, LABEL_TOUCHMI_SENSOR, LABEL_BACKGROUND}, - {ICONCHAR_BLANK, LIST_CUSTOMVALUE, LABEL_ONBOARD_SD_SUPPORT, LABEL_OFF}, - {ICONCHAR_TOGGLE_ON, LIST_TOGGLE, LABEL_M27_ALWAYS_ACTIVE, LABEL_BACKGROUND}, - {ICONCHAR_BLANK, LIST_CUSTOMVALUE, LABEL_LONG_FILENAME_SUPPORT, LABEL_OFF}, {ICONCHAR_TOGGLE_ON, LIST_TOGGLE, LABEL_FAN_SPEED_PERCENT, LABEL_BACKGROUND}, {ICONCHAR_TOGGLE_ON, LIST_TOGGLE, LABEL_XY_OFFSET_PROBING, LABEL_BACKGROUND}, {ICONCHAR_TOGGLE_ON, LIST_TOGGLE, LABEL_Z_STEPPERS_ALIGNMENT, LABEL_BACKGROUND}, #ifdef PS_ON_PIN {ICONCHAR_BLANK, LIST_CUSTOMVALUE, LABEL_PS_ON, LABEL_OFF}, - {ICONCHAR_TOGGLE_ON, LIST_TOGGLE, LABEL_PS_ON_ACTIVE_HIGH, LABEL_BACKGROUND}, #endif #ifdef FIL_RUNOUT_PIN {ICONCHAR_BLANK, LIST_CUSTOMVALUE, LABEL_FIL_RUNOUT, LABEL_OFF}, - {ICONCHAR_TOGGLE_ON, LIST_TOGGLE, LABEL_FIL_RUNOUT_INVERTING, LABEL_BACKGROUND}, #endif {ICONCHAR_TOGGLE_ON, LIST_TOGGLE, LABEL_PL_RECOVERY_EN, LABEL_BACKGROUND}, @@ -191,12 +127,6 @@ LISTITEM settingPage[SKEY_COUNT] = { #endif #endif - #ifdef LCD_LED_PWM_CHANNEL - {ICONCHAR_BLANK, LIST_CUSTOMVALUE, LABEL_LCD_BRIGHTNESS, LABEL_DYNAMIC}, - {ICONCHAR_BLANK, LIST_CUSTOMVALUE, LABEL_LCD_IDLE_BRIGHTNESS, LABEL_DYNAMIC}, - {ICONCHAR_BLANK, LIST_CUSTOMVALUE, LABEL_LCD_IDLE_DELAY, LABEL_DYNAMIC}, - #endif - {ICONCHAR_TOGGLE_ON, LIST_TOGGLE, LABEL_START_GCODE_ENABLED, LABEL_BACKGROUND}, {ICONCHAR_TOGGLE_ON, LIST_TOGGLE, LABEL_END_GCODE_ENABLED, LABEL_BACKGROUND}, {ICONCHAR_TOGGLE_ON, LIST_TOGGLE, LABEL_CANCEL_GCODE_ENABLED, LABEL_BACKGROUND}, @@ -216,35 +146,15 @@ void resetSettings(void) // void updateFeatureSettings(uint8_t key_val) { - uint8_t item_index = fe_cur_page*LISTITEM_PER_PAGE+ key_val; + uint8_t item_index = fe_cur_page * LISTITEM_PER_PAGE + key_val; switch (item_index) { - case SKEY_STATUS_SCREEN: - infoSettings.status_screen = (infoSettings.status_screen + 1) % ITEM_TOGGLE_NUM; - settingPage[item_index].icon = iconToggle[infoSettings.status_screen]; - break; - case SKEY_TERMINAL_ACK: infoSettings.terminalACK = (infoSettings.terminalACK + 1) % ITEM_TOGGLE_NUM; settingPage[item_index].icon = iconToggle[infoSettings.terminalACK]; break; - case SKEY_INVERT_X_AXIS: - infoSettings.invert_axis[X_AXIS] = (infoSettings.invert_axis[X_AXIS] + 1) % ITEM_TOGGLE_NUM; - settingPage[item_index].icon = iconToggle[infoSettings.invert_axis[X_AXIS]]; - break; - - case SKEY_INVERT_Y_AXIS: - infoSettings.invert_axis[Y_AXIS] = (infoSettings.invert_axis[Y_AXIS] + 1) % ITEM_TOGGLE_NUM; - settingPage[item_index].icon = iconToggle[infoSettings.invert_axis[Y_AXIS]]; - break; - - case SKEY_INVERT_Z_AXIS: - infoSettings.invert_axis[Z_AXIS] = (infoSettings.invert_axis[Z_AXIS] + 1) % ITEM_TOGGLE_NUM; - settingPage[item_index].icon = iconToggle[infoSettings.invert_axis[Z_AXIS]]; - break; - case SKEY_PERSISTENT_INFO: infoSettings.persistent_info = (infoSettings.persistent_info + 1) % ITEM_TOGGLE_NUM; settingPage[item_index].icon = iconToggle[infoSettings.persistent_info]; @@ -260,33 +170,11 @@ void updateFeatureSettings(uint8_t key_val) setDynamicTextValue(key_val, (char *)itemNotificationType[infoSettings.ack_notification]); break; - case SKEY_DEFAULT_MODE: - infoSettings.mode = (infoSettings.mode + 1) % ITEM_DEFAULT_MODE_NUM; - setDynamicTextValue(key_val, (char *)itemDefaultMode[infoSettings.mode]); - break; - case SKEY_SERIAL_ALWAYS_ON: infoSettings.serial_alwaysOn = (infoSettings.serial_alwaysOn + 1) % ITEM_TOGGLE_NUM; settingPage[item_index].icon = iconToggle[infoSettings.serial_alwaysOn]; break; - #ifdef ST7920_SPI - case SKEY_MARLIN_SHOW_TITLE: - infoSettings.marlin_mode_showtitle = (infoSettings.marlin_mode_showtitle + 1) % ITEM_TOGGLE_NUM; - settingPage[item_index].icon = iconToggle[infoSettings.marlin_mode_showtitle]; - break; - - case SKEY_MARLIN_FULLSCREEN: - infoSettings.marlin_mode_fullscreen = (infoSettings.marlin_mode_fullscreen + 1) % ITEM_TOGGLE_NUM; - settingPage[item_index].icon = iconToggle[infoSettings.marlin_mode_fullscreen]; - break; - - case SKEY_MARLIN_TYPE: - infoSettings.marlin_type = (infoSettings.marlin_type + 1) % ITEM_MARLIN_TYPE_NUM; - setDynamicTextValue(key_val, (char *)itemMarlinType[infoSettings.marlin_type]); - break; - #endif - case SKEY_SPEED: infoSettings.move_speed = (infoSettings.move_speed + 1) % ITEM_SPEED_NUM; settingPage[item_index].valueLabel = itemSpeed[infoSettings.move_speed].label; @@ -297,26 +185,6 @@ void updateFeatureSettings(uint8_t key_val) settingPage[item_index].icon = iconToggle[infoSettings.auto_load_leveling]; break; - case SKEY_TOUCHMI_SENSOR: - infoSettings.touchmi_sensor = (infoSettings.touchmi_sensor + 1) % ITEM_TOGGLE_NUM; - settingPage[item_index].icon = iconToggle[infoSettings.touchmi_sensor]; - break; - - case SKEY_ONBOARD_SD_SUPPORT: - infoSettings.onboardSD = (infoSettings.onboardSD + 1) % ITEM_TOGGLE_AUTO_NUM; - settingPage[item_index].valueLabel = itemToggleAuto[infoSettings.onboardSD]; - break; - - case SKEY_M27_ALWAYS_ACTIVE: - infoSettings.m27_active = (infoSettings.m27_active + 1) % ITEM_TOGGLE_NUM; - settingPage[item_index].icon = iconToggle[infoSettings.m27_active]; - break; - - case SKEY_LONG_FILENAME_SUPPORT: - infoSettings.longFileName = (infoSettings.longFileName + 1) % ITEM_TOGGLE_AUTO_NUM; - settingPage[item_index].valueLabel = itemToggleAuto[infoSettings.longFileName]; - break; - case SKEY_FAN_SPEED_PERCENT: infoSettings.fan_percentage = (infoSettings.fan_percentage + 1) % ITEM_TOGGLE_NUM; settingPage[item_index].icon = iconToggle[infoSettings.fan_percentage]; @@ -337,11 +205,6 @@ void updateFeatureSettings(uint8_t key_val) infoSettings.auto_off = (infoSettings.auto_off + 1) % ITEM_TOGGLE_AUTO_NUM; settingPage[item_index].valueLabel = itemToggleAuto[infoSettings.auto_off]; break; - - case SKEY_PS_ON_ACTIVE_HIGH: - infoSettings.powerloss_invert = (infoSettings.powerloss_invert + 1) % ITEM_TOGGLE_NUM; - settingPage[item_index].icon = iconToggle[infoSettings.powerloss_invert]; - break; #endif #ifdef FIL_RUNOUT_PIN @@ -349,11 +212,6 @@ void updateFeatureSettings(uint8_t key_val) infoSettings.runout = (infoSettings.runout + 1) % ITEM_TOGGLE_SMART_NUM; settingPage[item_index].valueLabel = itemToggleSmart[infoSettings.runout]; break; - - case SKEY_FIL_RUNOUT_INVERTING: - infoSettings.runout_invert = (infoSettings.runout_invert + 1) % ITEM_TOGGLE_NUM; - settingPage[item_index].icon = iconToggle[infoSettings.runout_invert]; - break; #endif case SKEY_PL_RECOVERY_EN: @@ -386,36 +244,6 @@ void updateFeatureSettings(uint8_t key_val) #endif //LCD_LED_PWM_CHANNEL #endif - #ifdef LCD_LED_PWM_CHANNEL - case SKEY_LCD_BRIGHTNESS: - { - infoSettings.lcd_brightness = (infoSettings.lcd_brightness + 1) % ITEM_BRIGHTNESS_NUM; - - if (infoSettings.lcd_brightness == 0) - infoSettings.lcd_brightness = 1; //In Normal it should not be off. Set back to 5% - - char tempstr[8]; - sprintf(tempstr, (char *)textSelect(LABEL_PERCENT_VALUE), LCD_BRIGHTNESS[infoSettings.lcd_brightness]); - setDynamicTextValue(key_val, tempstr); - Set_LCD_Brightness(LCD_BRIGHTNESS[infoSettings.lcd_brightness]); - break; - } - - case SKEY_LCD_IDLE_BRIGTHNESS: - { - infoSettings.lcd_idle_brightness = (infoSettings.lcd_idle_brightness + 1) % ITEM_BRIGHTNESS_NUM; - char tempstr[8]; - sprintf(tempstr,(char *)textSelect(LABEL_PERCENT_VALUE), LCD_BRIGHTNESS[infoSettings.lcd_idle_brightness]); - setDynamicTextValue(key_val,tempstr); - break; - } - - case SKEY_LCD_IDLE_DELAY: - infoSettings.lcd_idle_timer = (infoSettings.lcd_idle_timer + 1) % ITEM_SECONDS_NUM; - settingPage[item_index].valueLabel = itemDimTime[infoSettings.lcd_idle_timer]; - break; - #endif //LCD_LED_PWM_CHANNEL - case SKEY_START_GCODE_ENABLED: infoSettings.send_start_gcode = (infoSettings.send_start_gcode + 1) % ITEM_TOGGLE_NUM; settingPage[item_index].icon = iconToggle[infoSettings.send_start_gcode]; @@ -441,7 +269,7 @@ void updateFeatureSettings(uint8_t key_val) } featureSettingsItems.items[key_val] = settingPage[item_index]; -} //updateFeatureSettings +} //updateFeatureSettings // //load values on page change and reload @@ -456,26 +284,10 @@ void loadFeatureSettings() { switch (item_index) { - case SKEY_STATUS_SCREEN: - settingPage[item_index].icon = iconToggle[infoSettings.status_screen]; - break; - case SKEY_TERMINAL_ACK: settingPage[item_index].icon = iconToggle[infoSettings.terminalACK]; break; - case SKEY_INVERT_X_AXIS: - settingPage[item_index].icon = iconToggle[infoSettings.invert_axis[X_AXIS]]; - break; - - case SKEY_INVERT_Y_AXIS: - settingPage[item_index].icon = iconToggle[infoSettings.invert_axis[Y_AXIS]]; - break; - - case SKEY_INVERT_Z_AXIS: - settingPage[item_index].icon = iconToggle[infoSettings.invert_axis[Z_AXIS]]; - break; - case SKEY_PERSISTENT_INFO: settingPage[item_index].icon = iconToggle[infoSettings.persistent_info]; break; @@ -488,28 +300,10 @@ void loadFeatureSettings() setDynamicTextValue(i, (char *)itemNotificationType[infoSettings.ack_notification]); break; - case SKEY_DEFAULT_MODE: - setDynamicTextValue(i, (char *)itemDefaultMode[infoSettings.mode]); - break; - case SKEY_SERIAL_ALWAYS_ON: settingPage[item_index].icon = iconToggle[infoSettings.serial_alwaysOn]; break; - #ifdef ST7920_SPI - case SKEY_MARLIN_SHOW_TITLE: - settingPage[item_index].icon = iconToggle[infoSettings.marlin_mode_showtitle]; - break; - - case SKEY_MARLIN_FULLSCREEN: - settingPage[item_index].icon = iconToggle[infoSettings.marlin_mode_fullscreen]; - break; - - case SKEY_MARLIN_TYPE: - setDynamicTextValue(i, (char *)itemMarlinType[infoSettings.marlin_type]); - break; - #endif - case SKEY_SPEED: settingPage[item_index].valueLabel = itemSpeed[infoSettings.move_speed].label; break; @@ -518,22 +312,6 @@ void loadFeatureSettings() settingPage[item_index].icon = iconToggle[infoSettings.auto_load_leveling]; break; - case SKEY_TOUCHMI_SENSOR: - settingPage[item_index].icon = iconToggle[infoSettings.touchmi_sensor]; - break; - - case SKEY_ONBOARD_SD_SUPPORT: - settingPage[item_index].valueLabel = itemToggleAuto[infoSettings.onboardSD]; - break; - - case SKEY_M27_ALWAYS_ACTIVE: - settingPage[item_index].icon = iconToggle[infoSettings.m27_active]; - break; - - case SKEY_LONG_FILENAME_SUPPORT: - settingPage[item_index].valueLabel = itemToggleAuto[infoSettings.longFileName]; - break; - case SKEY_FAN_SPEED_PERCENT: settingPage[item_index].icon = iconToggle[infoSettings.fan_percentage]; break; @@ -550,20 +328,12 @@ void loadFeatureSettings() case SKEY_PS_ON: settingPage[item_index].valueLabel = itemToggleAuto[infoSettings.auto_off]; break; - - case SKEY_PS_ON_ACTIVE_HIGH: - settingPage[item_index].icon = iconToggle[infoSettings.powerloss_invert]; - break; #endif #ifdef FIL_RUNOUT_PIN case SKEY_FIL_RUNOUT: settingPage[item_index].valueLabel = itemToggleSmart[infoSettings.runout]; break; - - case SKEY_FIL_RUNOUT_INVERTING: - settingPage[item_index].icon = iconToggle[infoSettings.runout_invert]; - break; #endif case SKEY_PL_RECOVERY_EN: @@ -591,28 +361,6 @@ void loadFeatureSettings() #endif #endif - #ifdef LCD_LED_PWM_CHANNEL - case SKEY_LCD_BRIGHTNESS: - { - char tempstr[8]; - sprintf(tempstr, (char *)textSelect(LABEL_PERCENT_VALUE), LCD_BRIGHTNESS[infoSettings.lcd_brightness]); - setDynamicTextValue(i, tempstr); - break; - } - - case SKEY_LCD_IDLE_BRIGTHNESS: - { - char tempstr[8]; - sprintf(tempstr, (char *)textSelect(LABEL_PERCENT_VALUE), LCD_BRIGHTNESS[infoSettings.lcd_idle_brightness]); - setDynamicTextValue(i, tempstr); - break; - } - - case SKEY_LCD_IDLE_DELAY: - settingPage[item_index].valueLabel = itemDimTime[infoSettings.lcd_idle_timer]; - break; - #endif //LCD_LED_PWM_CHANNEL - case SKEY_START_GCODE_ENABLED: settingPage[item_index].icon = iconToggle[infoSettings.send_start_gcode]; break; diff --git a/TFT/src/User/Menu/Heat.c b/TFT/src/User/Menu/Heat.c index 99bfb155fa..8581524598 100644 --- a/TFT/src/User/Menu/Heat.c +++ b/TFT/src/User/Menu/Heat.c @@ -17,11 +17,11 @@ void showTemperature(uint8_t index) char tempstr[20]; sprintf(tempstr, "%-15s", heatDisplayID[index]); - GUI_DispString(exhibitRect.x0, exhibitRect.y0, (u8 *)tempstr); + GUI_DispString(exhibitRect.x0, exhibitRect.y0, (uint8_t *)tempstr); sprintf(tempstr, "%4d/%-4d", heatGetCurrentTemp(index), heatGetTargetTemp(index)); setLargeFont(true); - GUI_DispStringInPrect(&exhibitRect, (u8 *)tempstr); + GUI_DispStringInPrect(&exhibitRect, (uint8_t *)tempstr); setLargeFont(false); } @@ -72,7 +72,7 @@ void menuHeat(void) char titlestr[30]; sprintf(titlestr, "Min:0 | Max:%i", infoSettings.max_temp[c_heater]); - int16_t val = numPadInt((u8 *) titlestr, actTarget, 0, false); + int16_t val = numPadInt((uint8_t *) titlestr, actTarget, 0, false); val = NOBEYOND(0, val, infoSettings.max_temp[c_heater]); if (val != actTarget) diff --git a/TFT/src/User/Menu/Leveling.c b/TFT/src/User/Menu/Leveling.c index d91e7e1e17..03fa6faee2 100644 --- a/TFT/src/User/Menu/Leveling.c +++ b/TFT/src/User/Menu/Leveling.c @@ -15,9 +15,9 @@ const MENUITEMS manualLevelingItems = { {ICON_BACK, LABEL_BACK},} }; -void moveToLevelingPoint(u8 point) +void moveToLevelingPoint(uint8_t point) { - s16 pointPosition[5][2] = { + int16_t pointPosition[5][2] = { {infoSettings.machine_size_min[X_AXIS] + infoSettings.level_edge, infoSettings.machine_size_min[Y_AXIS] + infoSettings.level_edge}, {infoSettings.machine_size_max[X_AXIS] - infoSettings.level_edge, infoSettings.machine_size_min[Y_AXIS] + infoSettings.level_edge}, {infoSettings.machine_size_max[X_AXIS] - infoSettings.level_edge, infoSettings.machine_size_max[Y_AXIS] - infoSettings.level_edge}, @@ -71,7 +71,7 @@ void menuManualLeveling(void) char tempstr[30]; sprintf(tempstr, "%Min:%d | Max:%d", LEVELING_EDGE_DISTANCE_MIN, LEVELING_EDGE_DISTANCE_MAX); - int val = numPadInt((u8 *)tempstr, infoSettings.level_edge, LEVELING_EDGE_DISTANCE_DEFAULT, false); + int val = numPadInt((uint8_t *)tempstr, infoSettings.level_edge, LEVELING_EDGE_DISTANCE_DEFAULT, false); infoSettings.level_edge = NOBEYOND(LEVELING_EDGE_DISTANCE_MIN, val, LEVELING_EDGE_DISTANCE_MAX); menuDrawPage(&manualLevelingItems); diff --git a/TFT/src/User/Menu/LoadUnload.c b/TFT/src/User/Menu/LoadUnload.c index 7f72c78345..c8b87c267d 100644 --- a/TFT/src/User/Menu/LoadUnload.c +++ b/TFT/src/User/Menu/LoadUnload.c @@ -19,8 +19,8 @@ const MENUITEMS loadUnloadItems = { {ICON_BACK, LABEL_BACK},} }; -static u8 curExt_index = 0; -static u8 lastcmd = NONE; +static uint8_t curExt_index = 0; +static uint8_t lastcmd = NONE; void extruderIdReDraw(void) { @@ -28,7 +28,7 @@ void extruderIdReDraw(void) sprintf(tempstr, "%2s: %3d/%-3d", heatDisplayID[curExt_index], heatGetCurrentTemp(curExt_index), heatGetTargetTemp(curExt_index)); setLargeFont(true); - GUI_DispStringInPrect(&exhibitRect, (u8 *)tempstr); + GUI_DispStringInPrect(&exhibitRect, (uint8_t *)tempstr); setLargeFont(false); } diff --git a/TFT/src/User/Menu/MBL.c b/TFT/src/User/Menu/MBL.c index eb301e38b5..18ed065515 100644 --- a/TFT/src/User/Menu/MBL.c +++ b/TFT/src/User/Menu/MBL.c @@ -63,12 +63,12 @@ void mblUpdateStatus(bool succeeded) { sprintf(&tempMsg[strlen(tempMsg)], "\n %s", textSelect(LABEL_EEPROM_SAVE_INFO)); - setDialogText(LABEL_MBL_SETTINGS, (u8 *) tempMsg, LABEL_CONFIRM, LABEL_CANCEL); + setDialogText(LABEL_MBL_SETTINGS, (uint8_t *) tempMsg, LABEL_CONFIRM, LABEL_CANCEL); showDialog(DIALOG_TYPE_SUCCESS, saveEepromSettings, NULL, NULL); } else { - popupReminder(DIALOG_TYPE_SUCCESS, LABEL_MBL_SETTINGS, (u8 *) tempMsg); + popupReminder(DIALOG_TYPE_SUCCESS, LABEL_MBL_SETTINGS, (uint8_t *) tempMsg); } } else // if bed leveling process failed, provide an error dialog @@ -89,7 +89,7 @@ void mblNotifyError(void) addToast(DIALOG_TYPE_ERROR, tempMsg); } -void mblDrawHeader(u8 *point) +void mblDrawHeader(uint8_t *point) { char tempstr[20]; @@ -106,7 +106,7 @@ void mblDrawHeader(u8 *point) GUI_SetColor(infoSettings.reminder_color); } - GUI_DispString(exhibitRect.x0, exhibitRect.y0, (u8 *) tempstr); + GUI_DispString(exhibitRect.x0, exhibitRect.y0, (uint8_t *) tempstr); GUI_SetColor(infoSettings.font_color); } @@ -117,7 +117,7 @@ void mblDrawValue(float val) sprintf(tempstr, " %.2f ", val); setLargeFont(true); - GUI_DispStringInPrect(&exhibitRect, (u8 *) tempstr); + GUI_DispStringInPrect(&exhibitRect, (uint8_t *) tempstr); setLargeFont(false); } diff --git a/TFT/src/User/Menu/MarlinMode.c b/TFT/src/User/Menu/MarlinMode.c index d31800f602..a6484fd18b 100644 --- a/TFT/src/User/Menu/MarlinMode.c +++ b/TFT/src/User/Menu/MarlinMode.c @@ -3,7 +3,7 @@ #include "HD44780.h" #include "includes.h" -#if defined(ST7920_SPI) || defined(LCD2004_simulator) +#ifdef HAS_EMULATOR typedef void (*CB_INIT)(CIRCULAR_QUEUE *); typedef void (*CB_DEINIT)(void); @@ -28,7 +28,7 @@ void menuMarlinMode(void) GUI_DispStringInRect(0, 0, LCD_WIDTH, ST7920_GYSTART_FULLSCREEN, (uint8_t *)tempST.marlin_title); } - #if defined(ST7920_SPI) + #if defined(ST7920_EMULATOR) if (infoSettings.marlin_type == LCD12864) { marlinInit = SPI_Slave; @@ -37,7 +37,7 @@ void menuMarlinMode(void) marlinParse = ST7920_ParseRecv; } #endif - #if defined(LCD2004_simulator) + #if defined(LCD2004_EMULATOR) if (infoSettings.marlin_type == LCD2004) { marlinInit = HD44780_Config; @@ -74,12 +74,11 @@ void menuMarlinMode(void) loopDimTimer(); #endif - if (infoSettings.serial_alwaysOn == 1) + if (infoSettings.serial_alwaysOn == ENABLED) { loopBackEnd(); } } - marlinDeInit(); } diff --git a/TFT/src/User/Menu/MeshEditor.c b/TFT/src/User/Menu/MeshEditor.c index 69453e7e29..7e8097e575 100644 --- a/TFT/src/User/Menu/MeshEditor.c +++ b/TFT/src/User/Menu/MeshEditor.c @@ -263,7 +263,7 @@ void meshDeallocData(void) bool processKnownDataFormat(char *dataRow) { bool isKnown = false; - u8 i; + uint8_t i; for (i = 0; i < COUNT(meshDataFormat); i++) { @@ -568,7 +568,7 @@ void meshDrawInfoCell(const GUI_RECT *rect, float *val, bool largeFont, uint16_t GUI_SetColor(color); setLargeFont(largeFont); - GUI_DispStringInPrect(rect, (u8 *) tempstr); + GUI_DispStringInPrect(rect, (uint8_t *) tempstr); setLargeFont(false); } @@ -598,7 +598,7 @@ void meshDrawFullInfo(void) meshDrawInfo(&minValue, &maxValue, &origValue, &curValue); } -void meshKeyPress(u8 index, u8 isPressed) +void meshKeyPress(uint8_t index, uint8_t isPressed) { if (index >= ME_KEY_NUM) return; @@ -635,7 +635,7 @@ void meshDrawKeyboard(void) for (uint8_t i = 0; i < ME_KEY_NUM; i++) { if (!(i == ME_KEY_SAVE || i == ME_KEY_OK || i == ME_KEY_RESET || i == ME_KEY_HOME)) // if not a unicode string - GUI_DispStringInPrect(&meshKeyRect[i], (u8 *) meshKeyString[i]); + GUI_DispStringInPrect(&meshKeyRect[i], (uint8_t *) meshKeyString[i]); } if (infoMachineSettings.EEPROM == 1) @@ -698,7 +698,7 @@ void meshSave(bool saveOnChange) if (infoMachineSettings.EEPROM == 1) { - setDialogText((u8 *) meshData->saveTitle, LABEL_EEPROM_SAVE_INFO, LABEL_CONFIRM, LABEL_CANCEL); + setDialogText((uint8_t *) meshData->saveTitle, LABEL_EEPROM_SAVE_INFO, LABEL_CONFIRM, LABEL_CANCEL); showDialog(DIALOG_TYPE_QUESTION, meshSaveCallback, NULL, NULL); } } @@ -826,7 +826,7 @@ void meshUpdateData(char *dataRow) sprintf(&tempMsg[strlen(tempMsg)], "\n %s", dataRow); - popupReminder(DIALOG_TYPE_ERROR, LABEL_MESH_EDITOR, (u8 *) tempMsg); + popupReminder(DIALOG_TYPE_ERROR, LABEL_MESH_EDITOR, (uint8_t *) tempMsg); infoMenu.cur--; // exit from mesh editor menu. it avoids to loop in case of persistent error diff --git a/TFT/src/User/Menu/MeshTuner.c b/TFT/src/User/Menu/MeshTuner.c index cd9408fee6..8f908b7acc 100644 --- a/TFT/src/User/Menu/MeshTuner.c +++ b/TFT/src/User/Menu/MeshTuner.c @@ -1,7 +1,7 @@ #include "MeshTuner.h" #include "includes.h" -static u8 curUnit_index = 0; +static uint8_t curUnit_index = 0; /* Init mesh point */ static inline void meshInitPoint(uint16_t col, uint16_t row, float value) @@ -37,7 +37,7 @@ void meshDrawHeader(uint16_t col, uint16_t row) sprintf(tempstr, "I: %d J: %d", col, row); GUI_SetColor(infoSettings.sd_reminder_color); - GUI_DispString(exhibitRect.x0, exhibitRect.y0, (u8 *) tempstr); + GUI_DispString(exhibitRect.x0, exhibitRect.y0, (uint8_t *) tempstr); GUI_SetColor(infoSettings.font_color); } @@ -48,7 +48,7 @@ void meshDrawValue(float val) sprintf(tempstr, " %.3f ", val); setLargeFont(true); - GUI_DispStringInPrect(&exhibitRect, (u8 *) tempstr); + GUI_DispStringInPrect(&exhibitRect, (uint8_t *) tempstr); setLargeFont(false); } diff --git a/TFT/src/User/Menu/Move.c b/TFT/src/User/Menu/Move.c index 6b8f92dd3f..e6e96171a9 100644 --- a/TFT/src/User/Menu/Move.c +++ b/TFT/src/User/Menu/Move.c @@ -10,7 +10,7 @@ #define GANTRY_UPDATE_DELAY 500 // 1 seconds is 1000 const char *const xyzMoveCmd[] = {X_MOVE_GCODE, Y_MOVE_GCODE, Z_MOVE_GCODE}; -static u8 item_moveLen_index = 1; +static uint8_t item_moveLen_index = 1; AXIS nowAxis = X_AXIS; MENUITEMS moveItems = { @@ -171,13 +171,13 @@ void drawXYZ(void) GUI_SetColor(INFOBOX_ICON_COLOR); sprintf(tempstr, "X:%.2f ", coordinateGetAxisActual(X_AXIS)); - GUI_DispString(START_X + 1 * SPACE_X + 1 * ICON_WIDTH, (ICON_START_Y - BYTE_HEIGHT) / 2, (u8 *)tempstr); + GUI_DispString(START_X + 1 * SPACE_X + 1 * ICON_WIDTH, (ICON_START_Y - BYTE_HEIGHT) / 2, (uint8_t *)tempstr); sprintf(tempstr, "Y:%.2f ", coordinateGetAxisActual(Y_AXIS)); - GUI_DispString(START_X + 2 * SPACE_X + 2 * ICON_WIDTH, (ICON_START_Y - BYTE_HEIGHT) / 2, (u8 *)tempstr); + GUI_DispString(START_X + 2 * SPACE_X + 2 * ICON_WIDTH, (ICON_START_Y - BYTE_HEIGHT) / 2, (uint8_t *)tempstr); sprintf(tempstr, "Z:%.2f ", coordinateGetAxisActual(Z_AXIS)); - GUI_DispString(START_X + 3 * SPACE_X + 3 * ICON_WIDTH, (ICON_START_Y - BYTE_HEIGHT) / 2, (u8 *)tempstr); + GUI_DispString(START_X + 3 * SPACE_X + 3 * ICON_WIDTH, (ICON_START_Y - BYTE_HEIGHT) / 2, (uint8_t *)tempstr); GUI_SetColor(infoSettings.font_color); } diff --git a/TFT/src/User/Menu/Parametersetting.c b/TFT/src/User/Menu/Parametersetting.c index 9149449669..abcd7f05f3 100644 --- a/TFT/src/User/Menu/Parametersetting.c +++ b/TFT/src/User/Menu/Parametersetting.c @@ -1,9 +1,9 @@ #include "Parametersetting.h" #include "includes.h" -static u8 ps_cur_page = 0; -static u8 cur_parameter = 0; -static u8 total_pages = 1; +static uint8_t ps_cur_page = 0; +static uint8_t cur_parameter = 0; +static uint8_t total_pages = 1; bool parametersChanged = false; @@ -19,7 +19,7 @@ const LISTITEM parametertypes[P_ITEMSCOUNT] = { {ICONCHAR_SETTING1, LIST_MOREBUTTON, LABEL_FWRETRACT, LABEL_BACKGROUND}, {ICONCHAR_SETTING1, LIST_MOREBUTTON, LABEL_FWRECOVER, LABEL_BACKGROUND}, {ICONCHAR_SETTING1, LIST_MOREBUTTON, LABEL_RETRACT_AUTO, LABEL_BACKGROUND}, - {ICONCHAR_SETTING1, LIST_MOREBUTTON, LABEL_OFFSET_TOOL, LABEL_BACKGROUND}, + {ICONCHAR_SETTING1, LIST_MOREBUTTON, LABEL_HOTEND_OFFSET, LABEL_BACKGROUND}, {ICONCHAR_SETTING1, LIST_MOREBUTTON, LABEL_ABL, LABEL_BACKGROUND}, {ICONCHAR_SETTING1, LIST_MOREBUTTON, LABEL_PROBE_OFFSET, LABEL_BACKGROUND}, {ICONCHAR_SETTING1, LIST_MOREBUTTON, LABEL_LIN_ADVANCE, LABEL_BACKGROUND}, @@ -110,7 +110,7 @@ void menuShowParameter(void) parameter_menuitems.items[i].titlelabel = retract_auto_ID[i]; break; - case P_OFFSET_TOOL: + case P_HOTEND_OFFSET: parameter_menuitems.items[X_AXIS].titlelabel.address = "X"; parameter_menuitems.items[Y_AXIS].titlelabel.address = "Y"; parameter_menuitems.items[Z_AXIS].titlelabel.address = "Z"; @@ -437,7 +437,7 @@ int16_t drawTemperatureStatus(void) x_offset -= GUI_StrPixelWidth((uint8_t *)tempstr); GUI_StrPixelWidth(LABEL_10_PERCENT); - GUI_DispString(x_offset, start_y, (u8 *)tempstr); // value + GUI_DispString(x_offset, start_y, (uint8_t *)tempstr); // value x_offset -= GLOBALICON_INTERVAL; GUI_ClearRect(x_offset, start_y, x_offset + GLOBALICON_INTERVAL, start_y + GLOBALICON_HEIGHT); x_offset -= GLOBALICON_WIDTH; diff --git a/TFT/src/User/Menu/Pid.c b/TFT/src/User/Menu/Pid.c index 7ac8c8e6a0..73fe20bbeb 100644 --- a/TFT/src/User/Menu/Pid.c +++ b/TFT/src/User/Menu/Pid.c @@ -20,9 +20,9 @@ const MENUITEMS pidWaitItems = { const char *const pidCmd[] = PID_CMD; static int16_t pidHeaterTarget[MAX_HEATER_COUNT] = {0}; static uint8_t curToolIndex = NOZZLE0; -static u8 degreeSteps_index = 1; +static uint8_t degreeSteps_index = 1; u32 pidTimeout = 0; -u8 pidCounter = 0; +uint8_t pidCounter = 0; bool pidSucceeded = false; bool pidRunning = false; bool pidInitialized = false; @@ -69,12 +69,12 @@ void pidUpdateStatus(bool succeeded) { sprintf(&tempMsg[strlen(tempMsg)], "\n %s", textSelect(LABEL_EEPROM_SAVE_INFO)); - setDialogText(LABEL_PID_TITLE, (u8 *) tempMsg, LABEL_CONFIRM, LABEL_CANCEL); + setDialogText(LABEL_PID_TITLE, (uint8_t *) tempMsg, LABEL_CONFIRM, LABEL_CANCEL); showDialog(DIALOG_TYPE_SUCCESS, saveEepromSettings, NULL, NULL); } else { - popupReminder(DIALOG_TYPE_SUCCESS, LABEL_PID_TITLE, (u8 *) tempMsg); + popupReminder(DIALOG_TYPE_SUCCESS, LABEL_PID_TITLE, (uint8_t *) tempMsg); } } else // if at least a PID process failed, provide an error dialog @@ -93,13 +93,13 @@ static inline void pidCheckTimeout(void) if (OS_GetTimeMs() > pidTimeout) { pidRunning = false; - // u8 pidCounter = 0; // we voluntary don't reset (commented out the code) also pidCounter and pidSucceeded to let the + // uint8_t pidCounter = 0; // we voluntary don't reset (commented out the code) also pidCounter and pidSucceeded to let the // pidSucceeded = false; // pidUpdateStatus function allow to handle status updates eventually arriving after the timeout LABELCHAR(tempMsg, LABEL_TIMEOUT_REACHED); sprintf(&tempMsg[strlen(tempMsg)], "\n %s", textSelect(LABEL_PROCESS_ABORTED)); BUZZER_PLAY(sound_error); - popupReminder(DIALOG_TYPE_ERROR, LABEL_PID_TITLE, (u8 *) tempMsg); + popupReminder(DIALOG_TYPE_ERROR, LABEL_PID_TITLE, (uint8_t *) tempMsg); } } } @@ -180,12 +180,12 @@ void pidTemperatureReDraw(bool skip_header) if (!skip_header) { sprintf(tempstr, "%s ", heatDisplayID[curToolIndex]); - GUI_DispString(exhibitRect.x0, exhibitRect.y0, (u8 *) tempstr); + GUI_DispString(exhibitRect.x0, exhibitRect.y0, (uint8_t *) tempstr); } sprintf(tempstr, " %d ", pidHeaterTarget[curToolIndex]); setLargeFont(true); - GUI_DispStringInPrect(&exhibitRect, (u8 *) tempstr); + GUI_DispStringInPrect(&exhibitRect, (uint8_t *) tempstr); setLargeFont(false); } @@ -247,7 +247,7 @@ void menuPid(void) char titlestr[30]; sprintf(titlestr, "Min:0 | Max:%i", infoSettings.max_temp[curToolIndex]); - int32_t val = numPadInt((u8 *) titlestr, pidHeaterTarget[curToolIndex], 0, false); + int32_t val = numPadInt((uint8_t *) titlestr, pidHeaterTarget[curToolIndex], 0, false); val = NOBEYOND(0, val, infoSettings.max_temp[curToolIndex]); if (val != pidHeaterTarget[curToolIndex]) // if value is different than target change it diff --git a/TFT/src/User/Menu/Popup.c b/TFT/src/User/Menu/Popup.c index 0608e85cdc..92879299dd 100644 --- a/TFT/src/User/Menu/Popup.c +++ b/TFT/src/User/Menu/Popup.c @@ -31,7 +31,7 @@ static WINDOW window = { }; static BUTTON *windowButton = NULL; -static u16 buttonNum = 0; +static uint16_t buttonNum = 0; static const GUI_RECT * cur_btn_rect = NULL; static void (*action_ok)() = NULL; @@ -45,7 +45,7 @@ static uint8_t popup_ok[24]; static uint8_t popup_cancel[24]; static DIALOG_TYPE popup_type; -void windowReDrawButton(u8 position, u8 pressed) +void windowReDrawButton(uint8_t position, uint8_t pressed) { if (position >= buttonNum) return; @@ -85,7 +85,7 @@ void popupDrawPage(DIALOG_TYPE type, BUTTON * btn, const uint8_t * title, const if (btn != NULL) // draw a window with buttons bar { GUI_DrawWindow(&window, title, context, true); - for (u8 i = 0; i < buttonNum; i++) GUI_DrawButton(&windowButton[i], 0); + for (uint8_t i = 0; i < buttonNum; i++) GUI_DrawButton(&windowButton[i], 0); } else // draw a window with no buttons bar { diff --git a/TFT/src/User/Menu/PowerFailed.c b/TFT/src/User/Menu/PowerFailed.c index 61b9c04441..c1d09564b3 100644 --- a/TFT/src/User/Menu/PowerFailed.c +++ b/TFT/src/User/Menu/PowerFailed.c @@ -62,7 +62,7 @@ void powerFailedCache(u32 offset) } infoBreakPoint.tool = heatGetCurrentTool(); - for(u8 i = 0; i < infoSettings.fan_count; i++) + for(uint8_t i = 0; i < infoSettings.fan_count; i++) { infoBreakPoint.fan[i] = fanGetCurSpeed(i); } @@ -187,7 +187,7 @@ bool powerOffGetData(void) void menuPowerOff(void) { - u16 key_num = IDLE_TOUCH; + uint16_t key_num = IDLE_TOUCH; clearPowerFailed(); GUI_Clear(infoSettings.bg_color); diff --git a/TFT/src/User/Menu/PreheatMenu.c b/TFT/src/User/Menu/PreheatMenu.c index 501ab3f722..d85819d597 100755 --- a/TFT/src/User/Menu/PreheatMenu.c +++ b/TFT/src/User/Menu/PreheatMenu.c @@ -52,14 +52,14 @@ void refreshPreheatIcon(int8_t preheatnum, int8_t icon_index, const ITEM * menui lvIcon.lines[2].pos = preheat_val_bed; lvIcon.lines[2].large_font = false; - lvIcon.lines[0].text = (u8 *)preheatnames.preheat_name[preheatnum]; + lvIcon.lines[0].text = (uint8_t *)preheatnames.preheat_name[preheatnum]; char temptool[5]; char tempbed[5]; sprintf(temptool, "%d", infoSettings.preheat_temp[preheatnum]); sprintf(tempbed, "%d", infoSettings.preheat_bed[preheatnum]); - lvIcon.lines[1].text = (u8 *)temptool; - lvIcon.lines[2].text = (u8 *)tempbed; + lvIcon.lines[1].text = (uint8_t *)temptool; + lvIcon.lines[2].text = (uint8_t *)tempbed; showLiveInfo(icon_index, &lvIcon, menuitem); } diff --git a/TFT/src/User/Menu/PrintingMenu.c b/TFT/src/User/Menu/PrintingMenu.c index 18412395a9..ac6bc24858 100644 --- a/TFT/src/User/Menu/PrintingMenu.c +++ b/TFT/src/User/Menu/PrintingMenu.c @@ -136,8 +136,8 @@ static inline void reValueNozzle(int icon_pos) GUI_SetTextMode(GUI_TEXTMODE_TRANS); ICON_ReadDisplay(printinfo_points[icon_pos].x, printinfo_points[icon_pos].y, ICON_PRINTING_NOZZLE); GUI_DispString(printinfo_points[icon_pos].x + PICON_TITLE_X, printinfo_points[icon_pos].y + PICON_TITLE_Y, - (u8 *)heatDisplayID[currentTool]); - GUI_DispStringInPrect(&printinfo_val_rect[icon_pos], (u8 *)tempstr); + (uint8_t *)heatDisplayID[currentTool]); + GUI_DispStringInPrect(&printinfo_val_rect[icon_pos], (uint8_t *)tempstr); GUI_SetTextMode(GUI_TEXTMODE_NORMAL); } @@ -149,8 +149,8 @@ static inline void reValueBed(int icon_pos) GUI_SetTextMode(GUI_TEXTMODE_TRANS); ICON_ReadDisplay(printinfo_points[icon_pos].x, printinfo_points[icon_pos].y, ICON_PRINTING_BED); GUI_DispString(printinfo_points[icon_pos].x + PICON_TITLE_X, printinfo_points[icon_pos].y + PICON_TITLE_Y, - (u8 *)heatDisplayID[BED]); - GUI_DispStringInPrect(&printinfo_val_rect[icon_pos], (u8 *)tempstr); + (uint8_t *)heatDisplayID[BED]); + GUI_DispStringInPrect(&printinfo_val_rect[icon_pos], (uint8_t *)tempstr); GUI_SetTextMode(GUI_TEXTMODE_NORMAL); } @@ -165,8 +165,8 @@ static inline void reDrawFan(int icon_pos) GUI_SetTextMode(GUI_TEXTMODE_TRANS); ICON_ReadDisplay(printinfo_points[icon_pos].x, printinfo_points[icon_pos].y, ICON_PRINTING_FAN); GUI_DispString(printinfo_points[icon_pos].x + PICON_TITLE_X, printinfo_points[icon_pos].y + PICON_TITLE_Y, - (u8 *)fanID[currentFan]); - GUI_DispStringInPrect(&printinfo_val_rect[icon_pos], (u8 *)tempstr); + (uint8_t *)fanID[currentFan]); + GUI_DispStringInPrect(&printinfo_val_rect[icon_pos], (uint8_t *)tempstr); GUI_SetTextMode(GUI_TEXTMODE_NORMAL); } @@ -182,14 +182,14 @@ static inline void reDrawSpeed(int icon_pos) GUI_SetTextMode(GUI_TEXTMODE_TRANS); sprintf(tempstr, "%d%%", speedGetCurPercent(currentSpeedID)); GUI_DispString(printinfo_points[icon_pos].x + PICON_TITLE_X, printinfo_points[icon_pos].y + PICON_TITLE_Y, - (u8 *)Speed_ID[currentSpeedID]); - GUI_DispStringInPrect(&printinfo_val_rect[icon_pos], (u8 *)tempstr); + (uint8_t *)Speed_ID[currentSpeedID]); + GUI_DispStringInPrect(&printinfo_val_rect[icon_pos], (uint8_t *)tempstr); GUI_SetTextMode(GUI_TEXTMODE_NORMAL); } static inline void reDrawTime(int icon_pos) { - u8 hour = infoPrinting.time / 3600, + uint8_t hour = infoPrinting.time / 3600, min = infoPrinting.time % 3600 / 60, sec = infoPrinting.time % 60; @@ -198,7 +198,7 @@ static inline void reDrawTime(int icon_pos) char tempstr[10]; sprintf(tempstr, "%02u:%02u:%02u", hour, min, sec); ICON_ReadDisplay(printinfo_points[icon_pos].x, printinfo_points[icon_pos].y, ICON_PRINTING_TIMER); - GUI_DispStringInPrect(&printinfo_val_rect[icon_pos], (u8 *)tempstr); + GUI_DispStringInPrect(&printinfo_val_rect[icon_pos], (uint8_t *)tempstr); GUI_SetNumMode(GUI_NUMMODE_SPACE); GUI_SetTextMode(GUI_TEXTMODE_NORMAL); } @@ -208,7 +208,7 @@ static inline void reDrawProgress(int icon_pos) char buf[6]; sprintf(buf, "%d%%", infoPrinting.progress); GUI_SetTextMode(GUI_TEXTMODE_TRANS); - GUI_DispString(printinfo_points[3].x + PICON_TITLE_X, printinfo_points[3].y + PICON_TITLE_Y, (u8 *)buf); + GUI_DispString(printinfo_points[3].x + PICON_TITLE_X, printinfo_points[3].y + PICON_TITLE_Y, (uint8_t *)buf); GUI_SetTextMode(GUI_TEXTMODE_NORMAL); } @@ -223,8 +223,8 @@ static inline void reDrawLayer(int icon_pos) GUI_SetTextMode(GUI_TEXTMODE_TRANS); ICON_ReadDisplay(printinfo_points[icon_pos].x, printinfo_points[icon_pos].y, ICON_PRINTING_ZLAYER); GUI_DispString(printinfo_points[icon_pos].x + PICON_TITLE_X, printinfo_points[icon_pos].y + PICON_TITLE_Y, - (u8 *)LAYER_TITLE); - GUI_DispStringInPrect(&printinfo_val_rect[icon_pos], (u8 *)tempstr); + (uint8_t *)LAYER_TITLE); + GUI_DispStringInPrect(&printinfo_val_rect[icon_pos], (uint8_t *)tempstr); GUI_SetTextMode(GUI_TEXTMODE_NORMAL); nextLayerDrawTime = OS_GetTimeMs() + LAYER_DRAW_TIME; } diff --git a/TFT/src/User/Menu/ScreenSettings.c b/TFT/src/User/Menu/ScreenSettings.c index 1632ba2ef6..74f720bdc9 100644 --- a/TFT/src/User/Menu/ScreenSettings.c +++ b/TFT/src/User/Menu/ScreenSettings.c @@ -2,20 +2,27 @@ #include "includes.h" #include "Colors.h" -#ifdef BUZZER_PIN // Speaker - #define BUZZER_KEY_INDEX KEY_ICON_3 -#endif - - -#ifdef ST7920_SPI // LCD12864 color settings +enum +{ + KEY_INDEX_OFFSET = 2, + #ifdef LCD_LED_PWM_CHANNEL + KEY_INDEX_BRIGHTNESS, + #endif #ifdef BUZZER_PIN - #define LCD12864_BG_INDEX KEY_ICON_4 - #else - #define LCD12864_BG_INDEX KEY_ICON_3 + KEY_INDEX_BUZZER, + #endif + #ifdef HAS_EMULATOR + KEY_INDEX_EMULATOR, #endif - #define LCD12864_FN_INDEX (LCD12864_BG_INDEX+1) -#endif +}; +#define ITEM_MARLIN_TYPE_NUM 2 +const char *const labelMarlinType[ITEM_MARLIN_TYPE_NUM] = +{ + //item value text(only for custom value) + "128x64", + "20x4" +}; void menuLanguage(void) { @@ -27,7 +34,7 @@ void menuLanguage(void) // fill language items uint8_t tmp_language = infoSettings.language; - for(uint8_t i = 0; i < COUNT(totalItems); i++) + for (uint8_t i = 0; i < COUNT(totalItems); i++) { if (i == tmp_language) totalItems[i].icon = ICONCHAR_CHECKED; @@ -47,53 +54,53 @@ void menuLanguage(void) key_num = menuKeyGetValue(); switch (key_num) { - case KEY_ICON_5: - listWidgetPreviousPage(); - break; + case KEY_ICON_5: + listWidgetPreviousPage(); + break; - case KEY_ICON_6: - listWidgetNextPage(); - break; + case KEY_ICON_6: + listWidgetNextPage(); + break; - case KEY_ICON_7: - infoMenu.cur--; - break; + case KEY_ICON_7: + infoMenu.cur--; + break; - default: - if(key_num < LISTITEM_PER_PAGE) - { - uint16_t cur_item = infoSettings.language; - uint16_t tmp_i = listWidgetGetCurPage() * LISTITEM_PER_PAGE + key_num; - if (tmp_i < LANGUAGE_NUM && tmp_i != cur_item) // has changed + default: + if (key_num < LISTITEM_PER_PAGE) { - totalItems[cur_item].icon = ICONCHAR_UNCHECKED; - listWidgetRefreshItem(cur_item); // refresh unchecked status - cur_item = tmp_i; - totalItems[cur_item].icon = ICONCHAR_CHECKED; - listWidgetRefreshItem(cur_item); // refresh checked status - - infoSettings.language = cur_item; - menuDrawTitle(textSelect(LABEL_LANGUAGE)); + uint16_t cur_item = infoSettings.language; + uint16_t tmp_i = listWidgetGetCurPage() * LISTITEM_PER_PAGE + key_num; + if (tmp_i < LANGUAGE_NUM && tmp_i != cur_item) // has changed + { + totalItems[cur_item].icon = ICONCHAR_UNCHECKED; + listWidgetRefreshItem(cur_item); // refresh unchecked status + cur_item = tmp_i; + totalItems[cur_item].icon = ICONCHAR_CHECKED; + listWidgetRefreshItem(cur_item); // refresh checked status + + infoSettings.language = cur_item; + menuDrawTitle(textSelect(LABEL_LANGUAGE)); + } } - } - break; + break; } loopProcess(); } - if(memcmp(&now, &infoSettings, sizeof(SETTINGS))) + if (memcmp(&now, &infoSettings, sizeof(SETTINGS))) { - statusScreen_setReady(); // restore msg buffer when language is changed + statusScreen_setReady(); // restore msg buffer when language is changed storePara(); } } -#ifdef ST7920_SPI +#ifdef HAS_EMULATOR -void menuSimulatorBackGroundColor(void) +void menuEmulatorBGColor(void) { - LABEL title = {LABEL_SIMULATOR_BG_COLOR}; + LABEL title = {LABEL_BG_COLOR}; LISTITEM totalItems[LCD_COLOR_COUNT]; KEY_VALUES key_num = KEY_IDLE; SETTINGS now = infoSettings; @@ -117,53 +124,53 @@ void menuSimulatorBackGroundColor(void) listWidgetCreate(title, totalItems, COUNT(totalItems), cur_item/ LISTITEM_PER_PAGE); - while (infoMenu.menu[infoMenu.cur] == menuSimulatorBackGroundColor) + while (infoMenu.menu[infoMenu.cur] == menuEmulatorBGColor) { key_num = menuKeyGetValue(); switch (key_num) { - case KEY_ICON_5: - listWidgetPreviousPage(); - break; + case KEY_ICON_5: + listWidgetPreviousPage(); + break; - case KEY_ICON_6: - listWidgetNextPage(); - break; + case KEY_ICON_6: + listWidgetNextPage(); + break; - case KEY_ICON_7: - infoMenu.cur--; - break; + case KEY_ICON_7: + infoMenu.cur--; + break; - default: - if (key_num < LISTITEM_PER_PAGE) - { - uint16_t tmp_i = listWidgetGetCurPage() * LISTITEM_PER_PAGE + key_num; - if (tmp_i < LCD_COLOR_COUNT && tmp_i != cur_item) // has changed + default: + if (key_num < LISTITEM_PER_PAGE) { - totalItems[cur_item].icon = ICONCHAR_UNCHECKED; - listWidgetRefreshItem(cur_item); // refresh unchecked status - cur_item = tmp_i; - totalItems[cur_item].icon = ICONCHAR_CHECKED; - listWidgetRefreshItem(cur_item); // refresh checked status - - infoSettings.marlin_mode_bg_color = lcd_colors[cur_item]; + uint16_t tmp_i = listWidgetGetCurPage() * LISTITEM_PER_PAGE + key_num; + if (tmp_i < LCD_COLOR_COUNT && tmp_i != cur_item) // has changed + { + totalItems[cur_item].icon = ICONCHAR_UNCHECKED; + listWidgetRefreshItem(cur_item); // refresh unchecked status + cur_item = tmp_i; + totalItems[cur_item].icon = ICONCHAR_CHECKED; + listWidgetRefreshItem(cur_item); // refresh checked status + + infoSettings.marlin_mode_bg_color = lcd_colors[cur_item]; + } } - } - break; + break; } loopProcess(); } - if(memcmp(&now, &infoSettings, sizeof(SETTINGS))) + if (memcmp(&now, &infoSettings, sizeof(SETTINGS))) { storePara(); } } -void menuSimulatorFontColor(void) +void menuEmulatorFontColor(void) { - LABEL title = {LABEL_SIMULATOR_FONT_COLOR}; + LABEL title = {LABEL_FONT_COLOR}; LISTITEM totalItems[LCD_COLOR_COUNT]; KEY_VALUES key_num = KEY_IDLE; SETTINGS now = infoSettings; @@ -187,50 +194,133 @@ void menuSimulatorFontColor(void) listWidgetCreate(title, totalItems, COUNT(totalItems), cur_item/ LISTITEM_PER_PAGE); - while (infoMenu.menu[infoMenu.cur] == menuSimulatorFontColor) + while (infoMenu.menu[infoMenu.cur] == menuEmulatorFontColor) { key_num = menuKeyGetValue(); switch (key_num) { - case KEY_ICON_5: - listWidgetPreviousPage(); - break; + case KEY_ICON_5: + listWidgetPreviousPage(); + break; - case KEY_ICON_6: - listWidgetNextPage(); - break; + case KEY_ICON_6: + listWidgetNextPage(); + break; - case KEY_ICON_7: - infoMenu.cur--; - break; + case KEY_ICON_7: + infoMenu.cur--; + break; - default: - if (key_num < LISTITEM_PER_PAGE) - { - uint16_t tmp_i = listWidgetGetCurPage() * LISTITEM_PER_PAGE + key_num; - if (tmp_i < LCD_COLOR_COUNT && tmp_i != cur_item) // has changed + default: + if (key_num < LISTITEM_PER_PAGE) { - totalItems[cur_item].icon = ICONCHAR_UNCHECKED; - listWidgetRefreshItem(cur_item); // refresh unchecked status - cur_item = tmp_i; - totalItems[cur_item].icon = ICONCHAR_CHECKED; - listWidgetRefreshItem(cur_item); // refresh checked status - - infoSettings.marlin_mode_font_color = lcd_colors[cur_item]; + uint16_t tmp_i = listWidgetGetCurPage() * LISTITEM_PER_PAGE + key_num; + if (tmp_i < LCD_COLOR_COUNT && tmp_i != cur_item) // has changed + { + totalItems[cur_item].icon = ICONCHAR_UNCHECKED; + listWidgetRefreshItem(cur_item); // refresh unchecked status + cur_item = tmp_i; + totalItems[cur_item].icon = ICONCHAR_CHECKED; + listWidgetRefreshItem(cur_item); // refresh checked status + + infoSettings.marlin_mode_font_color = lcd_colors[cur_item]; + } } - } - break; + break; } loopProcess(); } - if(memcmp(&now, &infoSettings, sizeof(SETTINGS))) + if (memcmp(&now, &infoSettings, sizeof(SETTINGS))) { storePara(); } } -#endif // ST7920_SPI + +void menuMarlinModeSettings(void) +{ + LISTITEMS marlinModeitems = { + // title + LABEL_MARLIN_MODE_SETTINGS, + // icon ItemType Item Title item value text(only for custom value) + { + {ICONCHAR_FONT_COLOR, LIST_CUSTOMVALUE, LABEL_FONT_COLOR, LABEL_CUSTOM}, + {ICONCHAR_BACKGROUND_COLOR, LIST_CUSTOMVALUE, LABEL_BG_COLOR, LABEL_CUSTOM}, + {ICONCHAR_TOGGLE_ON, LIST_TOGGLE, LABEL_MARLIN_SHOW_TITLE, LABEL_BACKGROUND}, + {ICONCHAR_TOGGLE_ON, LIST_TOGGLE, LABEL_MARLIN_FULLSCREEN, LABEL_BACKGROUND}, + {ICONCHAR_BLANK, LIST_CUSTOMVALUE, LABEL_MARLIN_TYPE, LABEL_DYNAMIC}, + {ICONCHAR_BACKGROUND, LIST_LABEL, LABEL_BACKGROUND, LABEL_BACKGROUND}, + {ICONCHAR_BACKGROUND, LIST_LABEL, LABEL_BACKGROUND, LABEL_BACKGROUND}, + {ICONCHAR_BACK, LIST_LABEL, LABEL_BACKGROUND, LABEL_BACKGROUND},} + }; + + for (uint8_t i = 0; i < LCD_COLOR_COUNT; i++) + { + if (infoSettings.marlin_mode_font_color == lcd_colors[i]) + marlinModeitems.items[0].valueLabel = lcd_color_names[i]; + + if (infoSettings.marlin_mode_bg_color == lcd_colors[i]) + marlinModeitems.items[1].valueLabel = lcd_color_names[i]; + } + + marlinModeitems.items[2].icon = (infoSettings.marlin_mode_showtitle == 1) ? ICONCHAR_TOGGLE_ON : ICONCHAR_TOGGLE_OFF; + marlinModeitems.items[3].icon = (infoSettings.marlin_mode_fullscreen == 1) ? ICONCHAR_TOGGLE_ON : ICONCHAR_TOGGLE_OFF; + setDynamicTextValue(4, (char *)labelMarlinType[infoSettings.marlin_type]); + + KEY_VALUES key_num = KEY_IDLE; + SETTINGS now = infoSettings; + + menuDrawListPage(&marlinModeitems); + + while (infoMenu.menu[infoMenu.cur] == menuMarlinModeSettings) + { + key_num = menuKeyGetValue(); + switch(key_num) + { + case KEY_ICON_0: + infoMenu.menu[++infoMenu.cur] = menuEmulatorFontColor; + break; + + case KEY_ICON_1: + infoMenu.menu[++infoMenu.cur] = menuEmulatorBGColor; + break; + + case KEY_ICON_2: + infoSettings.marlin_mode_showtitle = (infoSettings.marlin_mode_showtitle + 1) % 2; + marlinModeitems.items[key_num].icon = (infoSettings.marlin_mode_showtitle == 1) ? ICONCHAR_TOGGLE_ON : ICONCHAR_TOGGLE_OFF; + menuDrawListItem(&marlinModeitems.items[key_num], key_num); + break; + + case KEY_ICON_3: + infoSettings.marlin_mode_fullscreen = (infoSettings.marlin_mode_fullscreen + 1) % 2; + marlinModeitems.items[key_num].icon = (infoSettings.marlin_mode_fullscreen == 1) ? ICONCHAR_TOGGLE_ON : ICONCHAR_TOGGLE_OFF; + menuDrawListItem(&marlinModeitems.items[key_num], key_num); + break; + + case KEY_ICON_4: + infoSettings.marlin_type = (infoSettings.marlin_type + 1) % ITEM_MARLIN_TYPE_NUM; + setDynamicTextValue(key_num, (char *)labelMarlinType[infoSettings.marlin_type]); + menuDrawListItem(&marlinModeitems.items[key_num], key_num); + break; + + case KEY_ICON_7: + infoMenu.cur--; + break; + + default: + break; + } + loopProcess(); + } + + if (memcmp(&now, &infoSettings, sizeof(SETTINGS))) + { + storePara(); + } +} + +#endif // ST7920_EMULATOR #ifdef BUZZER_PIN @@ -244,7 +334,7 @@ void menuSoundSettings(void) {ICONCHAR_TOGGLE_ON, LIST_TOGGLE, LABEL_TOUCH_SOUND, LABEL_BACKGROUND}, {ICONCHAR_TOGGLE_ON, LIST_TOGGLE, LABEL_TOAST_SOUND, LABEL_BACKGROUND}, {ICONCHAR_TOGGLE_ON, LIST_TOGGLE, LABEL_ALERT_SOUND, LABEL_BACKGROUND}, - {ICONCHAR_TOGGLE_ON, LIST_TOGGLE, LABEL_HEATER_SOUND, LABEL_BACKGROUND}, + {ICONCHAR_TOGGLE_ON, LIST_TOGGLE, LABEL_HEATER_SOUND, LABEL_BACKGROUND}, {ICONCHAR_BACKGROUND, LIST_LABEL, LABEL_BACKGROUND, LABEL_BACKGROUND}, {ICONCHAR_BACKGROUND, LIST_LABEL, LABEL_BACKGROUND, LABEL_BACKGROUND}, {ICONCHAR_BACKGROUND, LIST_LABEL, LABEL_BACKGROUND, LABEL_BACKGROUND}, @@ -264,38 +354,38 @@ void menuSoundSettings(void) while (infoMenu.menu[infoMenu.cur] == menuSoundSettings) { key_num = menuKeyGetValue(); - switch(key_num) + switch (key_num) { - case KEY_ICON_0: - infoSettings.touchSound = (infoSettings.touchSound + 1) % 2; - sounditems.items[key_num].icon = (infoSettings.touchSound == 1) ? ICONCHAR_TOGGLE_ON : ICONCHAR_TOGGLE_OFF; - menuDrawListItem(&sounditems.items[key_num], key_num); - break; - - case KEY_ICON_1: - infoSettings.toastSound = (infoSettings.toastSound + 1) % 2; - sounditems.items[key_num].icon = (infoSettings.toastSound == 1) ? ICONCHAR_TOGGLE_ON : ICONCHAR_TOGGLE_OFF; - menuDrawListItem(&sounditems.items[key_num], key_num); - break; - - case KEY_ICON_2: - infoSettings.alertSound = (infoSettings.alertSound + 1) % 2; - sounditems.items[key_num].icon = (infoSettings.alertSound == 1) ? ICONCHAR_TOGGLE_ON : ICONCHAR_TOGGLE_OFF; - menuDrawListItem(&sounditems.items[key_num], key_num); - break; - - case KEY_ICON_3: - infoSettings.heaterSound = (infoSettings.heaterSound + 1) % 2; - sounditems.items[key_num].icon = (infoSettings.heaterSound == 1) ? ICONCHAR_TOGGLE_ON : ICONCHAR_TOGGLE_OFF; - menuDrawListItem(&sounditems.items[key_num], key_num); - break; - - case KEY_ICON_7: - infoMenu.cur--; - break; - - default: - break; + case KEY_ICON_0: + infoSettings.touchSound = (infoSettings.touchSound + 1) % 2; + sounditems.items[key_num].icon = (infoSettings.touchSound == 1) ? ICONCHAR_TOGGLE_ON : ICONCHAR_TOGGLE_OFF; + menuDrawListItem(&sounditems.items[key_num], key_num); + break; + + case KEY_ICON_1: + infoSettings.toastSound = (infoSettings.toastSound + 1) % 2; + sounditems.items[key_num].icon = (infoSettings.toastSound == 1) ? ICONCHAR_TOGGLE_ON : ICONCHAR_TOGGLE_OFF; + menuDrawListItem(&sounditems.items[key_num], key_num); + break; + + case KEY_ICON_2: + infoSettings.alertSound = (infoSettings.alertSound + 1) % 2; + sounditems.items[key_num].icon = (infoSettings.alertSound == 1) ? ICONCHAR_TOGGLE_ON : ICONCHAR_TOGGLE_OFF; + menuDrawListItem(&sounditems.items[key_num], key_num); + break; + + case KEY_ICON_3: + infoSettings.heaterSound = (infoSettings.heaterSound + 1) % 2; + sounditems.items[key_num].icon = (infoSettings.heaterSound == 1) ? ICONCHAR_TOGGLE_ON : ICONCHAR_TOGGLE_OFF; + menuDrawListItem(&sounditems.items[key_num], key_num); + break; + + case KEY_ICON_7: + infoMenu.cur--; + break; + + default: + break; } loopProcess(); } @@ -308,53 +398,124 @@ void menuSoundSettings(void) #endif // BUZZER_PIN -void menuScreenSettings(void) +#ifdef LCD_LED_PWM_CHANNEL + +void menuBrightnessSettings(void) { - MENUITEMS screenSettingsItems = { + LISTITEMS brightnessitems = { // title - LABEL_SCREEN_SETTINGS, - // icon label - {{ICON_ROTATE_UI, LABEL_ROTATE_UI}, - {ICON_TOUCHSCREEN_ADJUST, LABEL_TOUCHSCREEN_ADJUST}, - {ICON_LANGUAGE, LABEL_LANGUAGE}, - {ICON_BACKGROUND, LABEL_BACKGROUND}, - {ICON_BACKGROUND, LABEL_BACKGROUND}, - {ICON_BACKGROUND, LABEL_BACKGROUND}, - {ICON_BACKGROUND, LABEL_BACKGROUND}, - {ICON_BACK, LABEL_BACK}} + LABEL_LCD_BRIGHTNESS, + // icon ItemType Item Title item value text(only for custom value) + { + {ICONCHAR_BLANK, LIST_CUSTOMVALUE, LABEL_LCD_BRIGHTNESS, LABEL_DYNAMIC}, + {ICONCHAR_BLANK, LIST_CUSTOMVALUE, LABEL_LCD_IDLE_BRIGHTNESS, LABEL_DYNAMIC}, + {ICONCHAR_BLANK, LIST_CUSTOMVALUE, LABEL_LCD_IDLE_DELAY, LABEL_DYNAMIC}, + {ICONCHAR_BACKGROUND, LIST_LABEL, LABEL_BACKGROUND, LABEL_BACKGROUND}, + {ICONCHAR_BACKGROUND, LIST_LABEL, LABEL_BACKGROUND, LABEL_BACKGROUND}, + {ICONCHAR_BACKGROUND, LIST_LABEL, LABEL_BACKGROUND, LABEL_BACKGROUND}, + {ICONCHAR_BACKGROUND, LIST_LABEL, LABEL_BACKGROUND, LABEL_BACKGROUND}, + {ICONCHAR_BACK, LIST_LABEL, LABEL_BACKGROUND, LABEL_BACKGROUND},} }; - //load buzzer icon - #ifdef BUZZER_PIN - screenSettingsItems.items[BUZZER_KEY_INDEX].icon = ICON_SOUND; - screenSettingsItems.items[BUZZER_KEY_INDEX].label.index = LABEL_SOUND; - #endif + KEY_VALUES key_num = KEY_IDLE; + SETTINGS now = infoSettings; - #ifdef ST7920_SPI - // LCD12864 background color - screenSettingsItems.items[LCD12864_BG_INDEX].icon = ICON_BKCOLOR; - screenSettingsItems.items[LCD12864_BG_INDEX].label.index = LABEL_CUSTOM; + char tempstr[8]; + sprintf(tempstr, (char *)textSelect(LABEL_PERCENT_VALUE), LCD_BRIGHTNESS[infoSettings.lcd_brightness]); + setDynamicTextValue(KEY_ICON_0, tempstr); - screenSettingsItems.items[LCD12864_FN_INDEX].icon = ICON_FONTCOLOR; - screenSettingsItems.items[LCD12864_FN_INDEX].label.index = LABEL_CUSTOM; + sprintf(tempstr, (char *)textSelect(LABEL_PERCENT_VALUE), LCD_BRIGHTNESS[infoSettings.lcd_idle_brightness]); + setDynamicTextValue(KEY_ICON_1, tempstr); - for(u8 i = 0; i < LCD_COLOR_COUNT; i++) + brightnessitems.items[KEY_ICON_2].valueLabel = itemDimTime[infoSettings.lcd_idle_timer]; + + menuDrawListPage(&brightnessitems); + + while (infoMenu.menu[infoMenu.cur] == menuBrightnessSettings) + { + key_num = menuKeyGetValue(); + switch(key_num) { - if(infoSettings.marlin_mode_bg_color == lcd_colors[i]) + case KEY_ICON_0: { - screenSettingsItems.items[LCD12864_BG_INDEX].label = lcd_color_names[i]; + infoSettings.lcd_brightness = (infoSettings.lcd_brightness + 1) % ITEM_BRIGHTNESS_NUM; + + if (infoSettings.lcd_brightness == 0) + infoSettings.lcd_brightness = 1; //In Normal it should not be off. Set back to 5% + + char tempstr[8]; + sprintf(tempstr, (char *)textSelect(LABEL_PERCENT_VALUE), LCD_BRIGHTNESS[infoSettings.lcd_brightness]); + setDynamicTextValue(key_num, tempstr); + Set_LCD_Brightness(LCD_BRIGHTNESS[infoSettings.lcd_brightness]); + menuDrawListItem(&brightnessitems.items[key_num], key_num); + break; } - } - // LCD12864 font color - for(u8 i = 0; i < LCD_COLOR_COUNT; i++) - { - if(infoSettings.marlin_mode_font_color == lcd_colors[i]) + case KEY_ICON_1: { - screenSettingsItems.items[LCD12864_FN_INDEX].label = lcd_color_names[i]; + infoSettings.lcd_idle_brightness = (infoSettings.lcd_idle_brightness + 1) % ITEM_BRIGHTNESS_NUM; + char tempstr[8]; + sprintf(tempstr, (char *)textSelect(LABEL_PERCENT_VALUE), LCD_BRIGHTNESS[infoSettings.lcd_idle_brightness]); + setDynamicTextValue(key_num, tempstr); + menuDrawListItem(&brightnessitems.items[key_num], key_num); + break; } + + case KEY_ICON_2: + infoSettings.lcd_idle_timer = (infoSettings.lcd_idle_timer + 1) % ITEM_SECONDS_NUM; + brightnessitems.items[key_num].valueLabel = itemDimTime[infoSettings.lcd_idle_timer]; + menuDrawListItem(&brightnessitems.items[key_num], key_num); + break; + + case KEY_ICON_7: + infoMenu.cur--; + break; + + default: + break; } + loopProcess(); + } + + if (memcmp(&now, &infoSettings, sizeof(SETTINGS))) + { + storePara(); + } +} + +#endif //LCD_LED_PWM_CHANNEL + +void menuScreenSettings(void) +{ + MENUITEMS screenSettingsItems = { + // title + LABEL_SCREEN_SETTINGS, + // icon label + { + {ICON_ROTATE_UI, LABEL_ROTATE_UI}, + {ICON_TOUCHSCREEN_ADJUST, LABEL_TOUCHSCREEN_ADJUST}, + {ICON_LANGUAGE, LABEL_LANGUAGE}, + {ICON_BACKGROUND, LABEL_BACKGROUND}, + {ICON_BACKGROUND, LABEL_BACKGROUND}, + {ICON_BACKGROUND, LABEL_BACKGROUND}, + {ICON_BACKGROUND, LABEL_BACKGROUND}, + {ICON_BACK, LABEL_BACK}} + }; + + #ifdef LCD_LED_PWM_CHANNEL + screenSettingsItems.items[KEY_INDEX_BRIGHTNESS].icon = ICON_BRIGHTNESS; + screenSettingsItems.items[KEY_INDEX_BRIGHTNESS].label.index = LABEL_LCD_BRIGHTNESS; + #endif + //load buzzer icon + #ifdef BUZZER_PIN + screenSettingsItems.items[KEY_INDEX_BUZZER].icon = ICON_SOUND; + screenSettingsItems.items[KEY_INDEX_BUZZER].label.index = LABEL_SOUND; + #endif + #ifdef ST7920_EMULATOR + // LCD12864 background color + screenSettingsItems.items[KEY_INDEX_EMULATOR].icon = ICON_MARLIN_MODE; + screenSettingsItems.items[KEY_INDEX_EMULATOR].label.index = LABEL_MARLIN_MODE_SETTINGS; #endif KEY_VALUES key_num = KEY_IDLE; @@ -383,23 +544,26 @@ void menuScreenSettings(void) if (getFlashSignStatus(lang_sign)) infoMenu.menu[++infoMenu.cur] = menuLanguage; else - popupReminder(DIALOG_TYPE_ALERT,(u8*)"Language not available", (u8*)"To change Language first flash a Language pack ini file."); + popupReminder(DIALOG_TYPE_ALERT, (uint8_t *)"Language not available", + (uint8_t *)"To change Language first flash a Language pack ini file."); break; - #ifdef BUZZER_PIN - case BUZZER_KEY_INDEX: - infoMenu.menu[++infoMenu.cur] = menuSoundSettings; - break; + #ifdef LCD_LED_PWM_CHANNEL + case KEY_INDEX_BRIGHTNESS: + infoMenu.menu[++infoMenu.cur] = menuBrightnessSettings; + break; #endif - #ifdef ST7920_SPI - case LCD12864_BG_INDEX: - infoMenu.menu[++infoMenu.cur] = menuSimulatorBackGroundColor; - break; + #ifdef BUZZER_PIN + case KEY_INDEX_BUZZER: + infoMenu.menu[++infoMenu.cur] = menuSoundSettings; + break; + #endif - case LCD12864_FN_INDEX: - infoMenu.menu[++infoMenu.cur] = menuSimulatorFontColor; - break; + #ifdef ST7920_EMULATOR + case KEY_INDEX_EMULATOR: + infoMenu.menu[++infoMenu.cur] = menuMarlinModeSettings; + break; #endif case KEY_ICON_7: diff --git a/TFT/src/User/Menu/Selectmode.c b/TFT/src/User/Menu/Selectmode.c index 8fc7ce66dc..6b2974bcba 100644 --- a/TFT/src/User/Menu/Selectmode.c +++ b/TFT/src/User/Menu/Selectmode.c @@ -30,18 +30,13 @@ void drawModeIcon(void) }; GUI_RestoreColorDefault(); - - if(infoSettings.marlin_type == LCD12864) - GUI_DispStringInPrect(&mode_title_rect[0],(uint8_t *)"LCD12864 Mode"); - else - GUI_DispStringInPrect(&mode_title_rect[0],(uint8_t *)"LCD2004 Mode"); - + GUI_DispStringInPrect(&mode_title_rect[0],(uint8_t *)"Marlin Mode"); GUI_DispStringInPrect(&mode_title_rect[1],(uint8_t *)"Touch Mode"); } bool LCD_ReadPen(uint16_t intervals) { - static u32 TouchTime = 0; + static uint32_t TouchTime = 0; if(!XPT2046_Read_Pen()) { if(OS_GetTimeMs() - TouchTime >= intervals) @@ -164,9 +159,9 @@ void menuMode(void) // Setup hardware for selected UI mode static inline void setupModeHardware(uint8_t mode) { - Serial_ReSourceInit(); // enable serial comm by default if (mode == MODE_SERIAL_TSC) { + Serial_ReSourceInit(); // enable serial comm in TSC mode #ifdef BUZZER_PIN // enable buzzer in Touchsreen mode Buzzer_Config(); #endif @@ -192,7 +187,7 @@ static inline void setupModeHardware(uint8_t mode) #if LED_COLOR_PIN #ifndef KEEP_KNOB_LED_COLOR_MARLIN_MODE // enable knob led in marlin mode - knob_LED_DeInit(); + knob_LED_DeInit(); #endif #endif @@ -225,7 +220,7 @@ void switchMode(void) #ifdef SHOW_BTT_BOOTSCREEN if (freshBoot) { - u32 startUpTime = OS_GetTimeMs(); + uint32_t startUpTime = OS_GetTimeMs(); heatSetUpdateSeconds(TEMPERATURE_QUERY_FAST_SECONDS); LOGO_ReadDisplay(); updateNextHeatCheckTime(); // send "M105" after a delay, because of mega2560 will be hanged when received data at startup @@ -240,7 +235,7 @@ void switchMode(void) break; case MODE_MARLIN: - #if defined(ST7920_SPI) || defined(LCD2004_simulator) + #ifdef HAS_EMULATOR if (infoSettings.serial_alwaysOn == ENABLED) updateNextHeatCheckTime(); // send "M105" after a delay, because of mega2560 will be hanged when received data at startup infoMenu.menu[infoMenu.cur] = menuMarlinMode; diff --git a/TFT/src/User/Menu/SendGcode.c b/TFT/src/User/Menu/SendGcode.c index f581ce67e4..0fe15720e7 100644 --- a/TFT/src/User/Menu/SendGcode.c +++ b/TFT/src/User/Menu/SendGcode.c @@ -436,7 +436,7 @@ TERMINAL_PAGE terminal_page = {terminalBuf, 0, 0, 0, 0, 0}; static uint16_t terminalBufTail = 0; uint8_t buf_full = 0; -void sendGcodeReDrawButton(u8 index, u8 isPressed) +void sendGcodeReDrawButton(uint8_t index, uint8_t isPressed) { if (index >= GKEY_KEY_NUM) return; @@ -476,10 +476,10 @@ void sendGcodeReDrawButton(u8 index, u8 isPressed) #if defined(HAS_ABC_KEY) GUI_DispStringInRect(gcodeKeyRect[index].x0 + 2, gcodeKeyRect[index].y0 + 2, gcodeKeyRect[index].x1 - 1, - gcodeKeyRect[index].y1 - 1, (u8 *)gcodeKey[gcodeKeyType][index]); + gcodeKeyRect[index].y1 - 1, (uint8_t *)gcodeKey[gcodeKeyType][index]); #else GUI_DispStringInRect(gcodeKeyRect[index].x0 + 2, gcodeKeyRect[index].y0 + 2, gcodeKeyRect[index].x1 - 1, - gcodeKeyRect[index].y1 - 1, (u8 *)gcodeKey[0][index]); + gcodeKeyRect[index].y1 - 1, (uint8_t *)gcodeKey[0][index]); #endif setLargeFont(false); @@ -494,7 +494,7 @@ void sendGcodeDrawGcode(char *gcode) if (gcode != NULL) GUI_DispStringInRect(gcodeValueRect.x0 + 1, gcodeValueRect.y0 + 1, gcodeValueRect.x1 - 1, gcodeValueRect.y1 - 1, - (u8 *)gcode); + (uint8_t *)gcode); } void sendGcodeDrawKeyboard(void) @@ -670,7 +670,7 @@ void sendGcodeTerminalCache(char *stream, TERMINAL_SRC src) saveGcodeTerminalCache(stream_len, stream); } -void terminalReDrawButton(u8 index, u8 isPressed) +void terminalReDrawButton(uint8_t index, uint8_t isPressed) { if (index >= TERM_KEY_NUM) return; @@ -691,7 +691,7 @@ void terminalReDrawButton(u8 index, u8 isPressed) GUI_ClearRect(terminalKeyRect[index].x0 + 2, terminalKeyRect[index].y0 + 2, terminalKeyRect[index].x1 - 1, terminalKeyRect[index].y1 - 1); GUI_DispStringInRect(terminalKeyRect[index].x0 + 2, terminalKeyRect[index].y0 + 2, terminalKeyRect[index].x1 - 1, - terminalKeyRect[index].y1 - 1, (u8 *)terminalKey[index]); + terminalKeyRect[index].y1 - 1, (uint8_t *)terminalKey[index]); setLargeFont(false); } @@ -706,7 +706,7 @@ void terminalDrawPage(char *pageNum) if (pageNum != NULL) GUI_DispStringInRect(terminalPageRect.x0 + 1, terminalPageRect.y0 + 1, terminalPageRect.x1 - 1, terminalPageRect.y1 - 1, - (u8 *)pageNum); + (uint8_t *)pageNum); setLargeFont(false); } @@ -814,7 +814,7 @@ void menuTerminal(void) terminalDrawPage(pageNum); } - getCharacterInfo((u8 *) &terminalBuf[lastTerminalIndex], &info); + getCharacterInfo((uint8_t *) &terminalBuf[lastTerminalIndex], &info); while ((terminalBuf[lastTerminalIndex]) && (lastTerminalIndex != terminalBufTail)) { @@ -858,7 +858,7 @@ void menuTerminal(void) GUI_SetColor(TERM_FONT_COLOR); GUI_SetBkColor(TERM_BG_COLOR); - GUI_DispOne(cursorX, cursorY, (u8 *) &terminalBuf[lastTerminalIndex]); + GUI_DispOne(cursorX, cursorY, (uint8_t *) &terminalBuf[lastTerminalIndex]); cursorX += info.pixelWidth; } diff --git a/TFT/src/User/Menu/Speed.c b/TFT/src/User/Menu/Speed.c index 14b87ba500..9545ea76a9 100644 --- a/TFT/src/User/Menu/Speed.c +++ b/TFT/src/User/Menu/Speed.c @@ -11,8 +11,8 @@ static int16_t itemPercentTypeTitle[SPEED_NUM] = { LABEL_PERCENTAGE_SPEED, LABEL_PERCENTAGE_FLOW }; -static u8 item_index = 0; -static u8 percentSteps_index = 0; +static uint8_t item_index = 0; +static uint8_t percentSteps_index = 0; void setSpeedItemIndex(uint8_t index) { @@ -82,7 +82,7 @@ void menuSpeed(void) char titlestr[30]; sprintf(titlestr, "Min:%i | Max:%i", SPEED_MIN, SPEED_MAX); - u16 val = numPadInt((u8 *) titlestr, speedGetCurPercent(item_index), 100, false); + uint16_t val = numPadInt((uint8_t *) titlestr, speedGetCurPercent(item_index), 100, false); val = NOBEYOND(SPEED_MIN, val, SPEED_MAX); if (val != speedGetSetPercent(item_index)) diff --git a/TFT/src/User/Menu/StatusScreen.c b/TFT/src/User/Menu/StatusScreen.c index 5ae1ff1b27..c8bbbfde59 100644 --- a/TFT/src/User/Menu/StatusScreen.c +++ b/TFT/src/User/Menu/StatusScreen.c @@ -97,40 +97,40 @@ void drawTemperature(void) char tempstr2[45]; //TOOL / EXT - lvIcon.lines[0].text = (u8 *)heatDisplayID[currentTool]; + lvIcon.lines[0].text = (uint8_t *)heatDisplayID[currentTool]; sprintf(tempstr, "%d℃", heatGetCurrentTemp(currentTool)); sprintf(tempstr2, "%d℃", heatGetTargetTemp(currentTool)); - lvIcon.lines[1].text = (u8 *)tempstr; - lvIcon.lines[2].text = (u8 *)tempstr2; + lvIcon.lines[1].text = (uint8_t *)tempstr; + lvIcon.lines[2].text = (uint8_t *)tempstr2; showLiveInfo(0, &lvIcon, &StatusItems.items[0]); //BED - lvIcon.lines[0].text = (u8 *)heatDisplayID[BED]; + lvIcon.lines[0].text = (uint8_t *)heatDisplayID[BED]; sprintf(tempstr, "%d℃", heatGetCurrentTemp(BED)); sprintf(tempstr2, "%d℃", heatGetTargetTemp(BED)); - lvIcon.lines[1].text = (u8 *)tempstr; - lvIcon.lines[2].text = (u8 *)tempstr2; + lvIcon.lines[1].text = (uint8_t *)tempstr; + lvIcon.lines[2].text = (uint8_t *)tempstr2; showLiveInfo(1, &lvIcon, &StatusItems.items[1]); lvIcon.enabled[2] = false; #else //TOOL / EXT - lvIcon.lines[0].text = (u8 *)heatDisplayID[currentTool]; + lvIcon.lines[0].text = (uint8_t *)heatDisplayID[currentTool]; sprintf(tempstr, "%d/%d", heatGetCurrentTemp(currentTool), heatGetTargetTemp(currentTool)); - lvIcon.lines[1].text = (u8 *)tempstr; + lvIcon.lines[1].text = (uint8_t *)tempstr; showLiveInfo(0, &lvIcon, &StatusItems.items[0]); //BED - lvIcon.lines[0].text = (u8 *)heatDisplayID[BED]; + lvIcon.lines[0].text = (uint8_t *)heatDisplayID[BED]; sprintf(tempstr, "%d/%d", heatGetCurrentTemp(BED), heatGetTargetTemp(BED)); - lvIcon.lines[1].text = (u8 *)tempstr; + lvIcon.lines[1].text = (uint8_t *)tempstr; showLiveInfo(1, &lvIcon, &StatusItems.items[1]); #endif //FAN - lvIcon.lines[0].text = (u8 *)fanID[currentFan]; + lvIcon.lines[0].text = (uint8_t *)fanID[currentFan]; if (infoSettings.fan_percentage == 1) { @@ -140,27 +140,27 @@ void drawTemperature(void) { sprintf(tempstr, "%d", fanGetCurSpeed(currentFan)); } - lvIcon.lines[1].text = (u8 *)tempstr; + lvIcon.lines[1].text = (uint8_t *)tempstr; showLiveInfo(2, &lvIcon, &StatusItems.items[2]); #ifdef TFT70_V3_0 //SPEED - lvIcon.lines[0].text = (u8 *)SpeedID[0]; + lvIcon.lines[0].text = (uint8_t *)SpeedID[0]; sprintf(tempstr, "%d%%", speedGetCurPercent(0)); - lvIcon.lines[1].text = (u8 *)tempstr; + lvIcon.lines[1].text = (uint8_t *)tempstr; showLiveInfo(3, &lvIcon, &SpeedItems[0]); //FLOW - lvIcon.lines[0].text = (u8 *)SpeedID[1]; + lvIcon.lines[0].text = (uint8_t *)SpeedID[1]; sprintf(tempstr, "%d%%", speedGetCurPercent(1)); - lvIcon.lines[1].text = (u8 *)tempstr; + lvIcon.lines[1].text = (uint8_t *)tempstr; showLiveInfo(4, &lvIcon, &SpeedItems[1]); #else //SPEED / flow - lvIcon.lines[0].text = (u8 *)SpeedID[currentSpeedID]; + lvIcon.lines[0].text = (uint8_t *)SpeedID[currentSpeedID]; sprintf(tempstr, "%d%%", speedGetCurPercent(currentSpeedID)); - lvIcon.lines[1].text = (u8 *)tempstr; + lvIcon.lines[1].text = (uint8_t *)tempstr; showLiveInfo(3, &lvIcon, &SpeedItems[currentSpeedID]); #endif @@ -169,7 +169,7 @@ void drawTemperature(void) GUI_SetBkColor(infoSettings.status_xyz_bg_color); sprintf(tempstr, " X: %.2f Y: %.2f Z: %.2f ", coordinateGetAxisActual(X_AXIS), coordinateGetAxisActual(Y_AXIS), coordinateGetAxisActual(Z_AXIS)); - GUI_DispStringInPrect(&RecGantry, (u8 *)tempstr); + GUI_DispStringInPrect(&RecGantry, (uint8_t *)tempstr); GUI_RestoreColorDefault(); } @@ -209,11 +209,11 @@ void drawStatusScreenMsg(void) GUI_DispString(rect_of_keySS[17].x0 + BYTE_HEIGHT + STATUS_MSG_TITLE_XOFFSET, rect_of_keySS[17].y0 + STATUS_MSG_ICON_YOFFSET, - (u8 *)msgtitle); + (uint8_t *)msgtitle); GUI_SetBkColor(INFOMSG_BKCOLOR); GUI_FillPrect(&msgRect); - Scroll_CreatePara(&msgScroll, (u8 *)msgbody, &msgRect); + Scroll_CreatePara(&msgScroll, (uint8_t *)msgbody, &msgRect); GUI_RestoreColorDefault(); diff --git a/TFT/src/User/Menu/TuneExtruder.c b/TFT/src/User/Menu/TuneExtruder.c index b2544ef955..95890a076d 100644 --- a/TFT/src/User/Menu/TuneExtruder.c +++ b/TFT/src/User/Menu/TuneExtruder.c @@ -3,8 +3,8 @@ #define ITEM_TUNE_EXTRUDER_LEN_NUM 4 -static u8 degreeSteps_index = 1; -static u8 curExtStep_index = 0; +static uint8_t degreeSteps_index = 1; +static uint8_t curExtStep_index = 0; static uint8_t c_heater = NOZZLE0; // Show/draw temperature in heat menu @@ -13,11 +13,11 @@ void showExtrudeTemperature(uint8_t index) char tempstr[20]; sprintf(tempstr, "%-15s", heatDisplayID[index]); - GUI_DispString(exhibitRect.x0, exhibitRect.y0, (u8 *)tempstr); + GUI_DispString(exhibitRect.x0, exhibitRect.y0, (uint8_t *)tempstr); sprintf(tempstr, "%4d/%-4d", heatGetCurrentTemp(index), heatGetTargetTemp(index)); setLargeFont(true); - GUI_DispStringInPrect(&exhibitRect, (u8 *)tempstr); + GUI_DispStringInPrect(&exhibitRect, (uint8_t *)tempstr); setLargeFont(false); } @@ -42,13 +42,13 @@ void showNewESteps(const float measured_length, const float old_esteps, float * GUI_DispString(exhibitRect.x0, exhibitRect.y0, textSelect(LABEL_TUNE_EXT_MEASURED)); sprintf(tempstr, " %0.2fmm ", measured_length); - GUI_DispStringInPrect(&exhibitRect, (u8 *)tempstr); + GUI_DispStringInPrect(&exhibitRect, (uint8_t *)tempstr); sprintf(tempstr, (char*)textSelect(LABEL_TUNE_EXT_OLD_ESTEP), old_esteps); - GUI_DispString(exhibitRect.x0, BYTE_HEIGHT * 5, (u8 *)tempstr); + GUI_DispString(exhibitRect.x0, BYTE_HEIGHT * 5, (uint8_t *)tempstr); sprintf(tempstr, (char*)textSelect(LABEL_TUNE_EXT_NEW_ESTEP), *new_esteps); - GUI_DispString(exhibitRect.x0, BYTE_HEIGHT * 6, (u8 *)tempstr); + GUI_DispString(exhibitRect.x0, BYTE_HEIGHT * 6, (uint8_t *)tempstr); } static inline void extrudeFilament(void) @@ -109,7 +109,7 @@ void menuTuneExtruder(void) char titlestr[30]; sprintf(titlestr, "Min:0 | Max:%i", infoSettings.max_temp[c_heater]); - int16_t val = numPadInt((u8 *) titlestr, actTarget, 0, false); + int16_t val = numPadInt((uint8_t *) titlestr, actTarget, 0, false); val = NOBEYOND(0, val, infoSettings.max_temp[c_heater]); if (val != actTarget) @@ -150,7 +150,7 @@ void menuTuneExtruder(void) LABELCHAR(tempStr, LABEL_TUNE_EXT_TEMPLOW); sprintf(tempMsg, tempStr, infoSettings.min_ext_temp); - popupReminder(DIALOG_TYPE_ALERT, tuneExtruderItems.title.index, (u8 *) tempMsg); + popupReminder(DIALOG_TYPE_ALERT, tuneExtruderItems.title.index, (uint8_t *) tempMsg); } else if (heatGetCurrentTemp(c_heater) < heatGetTargetTemp(c_heater) - 1) { @@ -161,7 +161,7 @@ void menuTuneExtruder(void) LABELCHAR(tempStr, LABEL_TUNE_EXT_MARK120MM); sprintf(tempMsg, tempStr, textSelect(LABEL_EXTRUDE)); - setDialogText(tuneExtruderItems.title.index, (u8 *) tempMsg, LABEL_EXTRUDE, LABEL_CANCEL); + setDialogText(tuneExtruderItems.title.index, (uint8_t *) tempMsg, LABEL_EXTRUDE, LABEL_CANCEL); showDialog(DIALOG_TYPE_QUESTION, extrudeFilament, NULL, NULL); } } @@ -263,7 +263,7 @@ void menuNewExtruderESteps(void) storeCmd("M92 T0 E%0.2f\n", new_esteps); sprintf(tempMsg, tempStr, new_esteps); - popupReminder(DIALOG_TYPE_QUESTION, newExtruderESteps.title.index, (u8 *) tempMsg); + popupReminder(DIALOG_TYPE_QUESTION, newExtruderESteps.title.index, (uint8_t *) tempMsg); break; } diff --git a/TFT/src/User/Menu/ZOffset.c b/TFT/src/User/Menu/ZOffset.c index 633b18b82d..341b7ef62b 100644 --- a/TFT/src/User/Menu/ZOffset.c +++ b/TFT/src/User/Menu/ZOffset.c @@ -4,8 +4,8 @@ #define ITEM_Z_OFFSET_SUBMENU_NUM 4 static bool probeOffsetMenu = false; -static u8 curUnit_index = 0; -static u8 curSubmenu_index = 0; +static uint8_t curUnit_index = 0; +static uint8_t curSubmenu_index = 0; /* Show an error notification */ void zOffsetNotifyError(void) @@ -20,7 +20,7 @@ void zOffsetNotifyError(void) addToast(DIALOG_TYPE_ERROR, tempMsg); } -void zOffsetDrawStatus(bool status, u8 *val) +void zOffsetDrawStatus(bool status, uint8_t *val) { char tempstr[20]; @@ -31,7 +31,7 @@ void zOffsetDrawStatus(bool status, u8 *val) else GUI_SetColor(infoSettings.sd_reminder_color); - GUI_DispString(exhibitRect.x0, exhibitRect.y0, (u8 *) tempstr); + GUI_DispString(exhibitRect.x0, exhibitRect.y0, (uint8_t *) tempstr); GUI_SetColor(infoSettings.font_color); } @@ -42,7 +42,7 @@ void zOffsetDrawValue(float val) sprintf(tempstr, " %.2f ", val); setLargeFont(true); - GUI_DispStringInPrect(&exhibitRect, (u8 *) tempstr); + GUI_DispStringInPrect(&exhibitRect, (uint8_t *) tempstr); setLargeFont(false); } diff --git a/TFT/src/User/Menu/common.c b/TFT/src/User/Menu/common.c index a7dd041a56..8ac49e109c 100644 --- a/TFT/src/User/Menu/common.c +++ b/TFT/src/User/Menu/common.c @@ -31,7 +31,7 @@ const ITEM itemDegreeSteps[ITEM_DEGREE_NUM] = }; // List for temperature step change -const u8 degreeSteps[ITEM_DEGREE_NUM] = {1, 5, 10}; +const uint8_t degreeSteps[ITEM_DEGREE_NUM] = {1, 5, 10}; // Icons list for speed change steps const ITEM itemSpeed[ITEM_SPEED_NUM] = @@ -52,7 +52,7 @@ const ITEM itemPercent[ITEM_PERCENT_STEPS_NUM] = }; // List for percent change steps -const u8 percentSteps[ITEM_PERCENT_STEPS_NUM] = {1, 5, 10}; +const uint8_t percentSteps[ITEM_PERCENT_STEPS_NUM] = {1, 5, 10}; // Icons list for axis length/distance change steps const ITEM itemMoveLen[ITEM_MOVE_LEN_NUM] = @@ -89,6 +89,12 @@ const LABEL itemToggle[ITEM_TOGGLE_NUM] = LABEL_ON }; +const uint16_t iconToggle[ITEM_TOGGLE_NUM] = +{ + ICONCHAR_TOGGLE_OFF, + ICONCHAR_TOGGLE_ON +}; + // Check time elapsed against the time specified in milliseconds for displaying/updating info on screen // Use this for timed screen updates in menu loops only bool nextScreenUpdate(uint32_t duration) diff --git a/TFT/src/User/Menu/common.h b/TFT/src/User/Menu/common.h index 56d1f37884..9e12086d19 100644 --- a/TFT/src/User/Menu/common.h +++ b/TFT/src/User/Menu/common.h @@ -21,12 +21,12 @@ extern uint8_t currentSpeedID; extern const ITEM itemTool[MAX_HEATER_COUNT]; extern const ITEM itemDegreeSteps[ITEM_DEGREE_NUM]; -extern const u8 degreeSteps[ITEM_DEGREE_NUM]; +extern const uint8_t degreeSteps[ITEM_DEGREE_NUM]; extern const ITEM itemSpeed[ITEM_SPEED_NUM]; extern const ITEM itemPercent[ITEM_PERCENT_STEPS_NUM]; -extern const u8 percentSteps[ITEM_PERCENT_STEPS_NUM]; +extern const uint8_t percentSteps[ITEM_PERCENT_STEPS_NUM]; extern const ITEM itemMoveLen[ITEM_MOVE_LEN_NUM]; extern const float moveLenSteps[ITEM_MOVE_LEN_NUM]; @@ -35,6 +35,7 @@ extern const ITEM itemExtLenSteps[ITEM_EXT_LEN_NUM]; extern const float extlenSteps[ITEM_EXT_LEN_NUM]; extern const LABEL itemToggle[ITEM_TOGGLE_NUM]; +const uint16_t iconToggle[ITEM_TOGGLE_NUM]; bool nextScreenUpdate(uint32_t duration); diff --git a/TFT/src/User/SanityCheck.h b/TFT/src/User/SanityCheck.h index 3a321de21b..b145590202 100644 --- a/TFT/src/User/SanityCheck.h +++ b/TFT/src/User/SanityCheck.h @@ -24,7 +24,7 @@ #error "invalid Baudrate index. Pleas select a value only from options provided in configuration.h" #endif -#ifdef ST7920_SPI +#ifdef ST7920_EMULATOR #ifdef CLEAN_MODE_SWITCHING_SUPPORT #error "CLEAN_MODE_SWITCHING_SUPPORT is now SERIAL_ALWAYS_ON. Please update your configuration." #endif @@ -124,8 +124,8 @@ #error "CANCEL_PRINT_GCODE is now PRINT_CANCEL_GCODE. Please update your Configuration.h file." #endif -#ifndef ST7920_BANNER_TEXT - #define ST7920_BANNER_TEXT "LCD12864 Simulator" +#ifndef MARLIN_BANNER_TEXT + #define MARLIN_BANNER_TEXT "Marlin Mode" #endif #ifdef TOOL_NUM diff --git a/TFT/src/User/Variants/pin_MKS_TFT32_V1_4.h b/TFT/src/User/Variants/pin_MKS_TFT32_V1_4.h index 7a2fb4464e..fa28834188 100644 --- a/TFT/src/User/Variants/pin_MKS_TFT32_V1_4.h +++ b/TFT/src/User/Variants/pin_MKS_TFT32_V1_4.h @@ -80,7 +80,7 @@ // //---------------------------------------------------------------------------- -// How to setup Marlin mode (LCD12864 Simulator) on MKS Gen L V1.0 or SKR V1.3 +// How to setup Marlin mode (LCD12864 Emulator) on MKS Gen L V1.0 or SKR V1.3 //---------------------------------------------------------------------------- // // In order to use Marlin mode (12864 emulation mode), you need to make changes on both the HW and FW of the MKS TFT board @@ -172,28 +172,35 @@ // #define LCD_PINS_D4 EXPA2_09_PIN // EXPA1_05_PIN //CLK // -// ST7920 Simulator SPI pins -#define ST7920_SPI _SPI3 // uncomment to enable Marlin mode +// ST7920 Emulator SPI pins +#define ST7920_EMULATOR // uncomment to enable Marlin mode +#ifdef ST7920_EMULATOR + #define ST7920_SPI _SPI3 +#endif + +#if defined(ST7920_EMULATOR) || defined(LCD2004_EMULATOR) + #define HAS_EMULATOR +#endif // Buzzer support -#define BUZZER_PIN PA2 +#define BUZZER_PIN PA2 // Marlin mode + LCD Encoder support -#ifdef ST7920_SPI - #define SPI3_PIN_SMART_USAGE // if enabled, it avoids any SPI3 CS pin usage and free the MISO (PB4 pin) for encoder pins +#ifdef ST7920_EMULATOR + #define SPI3_PIN_SMART_USAGE // if enabled, it avoids any SPI3 CS pin usage and free the MISO (PB4 pin) for encoder pins - #define LCD_ENCA_PIN PA13 // map ENCA pin to JTAG DIO pin - #define LCD_ENCB_PIN PA14 // map ENCB pin to JTAG CLK pin + #define LCD_ENCA_PIN PA13 // map ENCA pin to JTAG DIO pin + #define LCD_ENCB_PIN PA14 // map ENCB pin to JTAG CLK pin -#ifdef SPI3_PIN_SMART_USAGE - #define LCD_BTN_PIN PB4 // map BTN pin to PB4 pin -#else - #define LCD_BTN_PIN PB0 // map BTN pin to PB0 pin + #ifdef SPI3_PIN_SMART_USAGE + #define LCD_BTN_PIN PB4 // map BTN pin to PB4 pin + #else + #define LCD_BTN_PIN PB0 // map BTN pin to PB0 pin - #define SPI3_CS_PIN PB1 // CS pin used for SPI3 slave mode mapped to PB1 pin -#endif + #define SPI3_CS_PIN PB1 // CS pin used for SPI3 slave mode mapped to PB1 pin + #endif - #define DISABLE_DEBUG // free JTAG(PB3/PB4) for SPI3 and free SWDIO PA13 PA14 for encoder pins + #define DISABLE_DEBUG // free JTAG(PB3/PB4) for SPI3 and free SWDIO PA13 PA14 for encoder pins #endif // U disk support @@ -201,7 +208,7 @@ #define USE_USB_OTG_FS // Extend function(PS_ON, filament_detect) -#if !defined(ST7920_SPI) || defined(SPI3_PIN_SMART_USAGE) +#if !defined(ST7920_EMULATOR) || defined(SPI3_PIN_SMART_USAGE) #ifndef PS_ON_PIN #define PS_ON_PIN PB0 #endif diff --git a/TFT/src/User/Variants/pin_TFT24_V1_1.h b/TFT/src/User/Variants/pin_TFT24_V1_1.h index b6d15d4415..a177f861e3 100644 --- a/TFT/src/User/Variants/pin_TFT24_V1_1.h +++ b/TFT/src/User/Variants/pin_TFT24_V1_1.h @@ -75,12 +75,15 @@ #define W25Qxx_SPI _SPI3 #define W25Qxx_CS_PIN PD2 -// ST7920 Simulator SPI pins -#define ST7920_SPI _SPI2 +// ST7920 Emulator SPI pins +#define ST7920_EMULATOR // uncomment to enable Marlin mode +#ifdef ST7920_EMULATOR + #define ST7920_SPI _SPI2 +#endif -// HD44780 Simulator pins -#define LCD2004_simulator -#ifdef LCD2004_simulator +// HD44780 Emulator pins +#define LCD2004_EMULATOR +#ifdef LCD2004_EMULATOR #define LCD_EN PB15 #define LCD_RS PB12 #define LCD_D4 PB13 @@ -101,6 +104,10 @@ #define LCD_D7_PORT GPIOB #endif +#if defined(ST7920_EMULATOR) || defined(LCD2004_EMULATOR) + #define HAS_EMULATOR +#endif + // Buzzer support #define BUZZER_PIN PA14 diff --git a/TFT/src/User/Variants/pin_TFT35_V1_0.h b/TFT/src/User/Variants/pin_TFT35_V1_0.h index 1325ee9616..e335407c06 100644 --- a/TFT/src/User/Variants/pin_TFT35_V1_0.h +++ b/TFT/src/User/Variants/pin_TFT35_V1_0.h @@ -77,8 +77,11 @@ #define W25Qxx_SPI _SPI1 #define W25Qxx_CS_PIN PA4 -// ST7920 Simulator SPI pins -//#define ST7920_SPI _SPI2 +// ST7920 Emulator SPI pins +//#define ST7920_EMULATOR // uncomment to enable Marlin mode +//#ifdef ST7920_EMULATOR +// #define ST7920_SPI _SPI2 +//#endif // Buzzer support //#define BUZZER_PIN PA14 diff --git a/TFT/src/User/Variants/pin_TFT35_V2_0.h b/TFT/src/User/Variants/pin_TFT35_V2_0.h index b5fc79f8eb..e195028c2e 100644 --- a/TFT/src/User/Variants/pin_TFT35_V2_0.h +++ b/TFT/src/User/Variants/pin_TFT35_V2_0.h @@ -79,11 +79,15 @@ #define W25Qxx_SPI _SPI1 #define W25Qxx_CS_PIN PA4 -// ST7920 Simulator SPI pins -//#define ST7920_SPI _SPI2 +// ST7920 Emulator SPI pins +//#define ST7920_EMULATOR // uncomment to enable Marlin mode +//#ifdef ST7920_EMULATOR +// #define ST7920_SPI _SPI2 +//#endif + // Buzzer support -#define BUZZER_PIN PB2 +#define BUZZER_PIN PB2 // LCD Encoder support //#define LCD_ENCA_PIN PB0 diff --git a/TFT/src/User/Variants/pin_TFT35_V3_0.h b/TFT/src/User/Variants/pin_TFT35_V3_0.h index ec9c7ad97d..4db6ffcf6e 100644 --- a/TFT/src/User/Variants/pin_TFT35_V3_0.h +++ b/TFT/src/User/Variants/pin_TFT35_V3_0.h @@ -75,12 +75,15 @@ #define W25Qxx_SPI _SPI3 #define W25Qxx_CS_PIN PB6 -// ST7920 Simulator SPI pins -#define ST7920_SPI _SPI2 +// ST7920 Emulator SPI pins +#define ST7920_EMULATOR // uncomment to enable Marlin mode +#ifdef ST7920_EMULATOR + #define ST7920_SPI _SPI2 +#endif -// HD44780 Simulator pins -#define LCD2004_simulator -#ifdef LCD2004_simulator +// HD44780 Emulator pins +#define LCD2004_EMULATOR +#ifdef LCD2004_EMULATOR #define LCD_EN PB15 #define LCD_RS PB12 #define LCD_D4 PB13 @@ -97,6 +100,10 @@ #define LCD_D7_PORT GPIOC #endif +#if defined(ST7920_EMULATOR) || defined(LCD2004_EMULATOR) + #define HAS_EMULATOR +#endif + // Buzzer support #define BUZZER_PIN PD13 diff --git a/TFT/src/User/Variants/pin_TFT70_V3_0.h b/TFT/src/User/Variants/pin_TFT70_V3_0.h index c186b0c59d..f469972f9a 100644 --- a/TFT/src/User/Variants/pin_TFT70_V3_0.h +++ b/TFT/src/User/Variants/pin_TFT70_V3_0.h @@ -89,12 +89,15 @@ #define W25Qxx_SPI _SPI3 #define W25Qxx_CS_PIN PB6 -// ST7920 Simulator SPI pins -#define ST7920_SPI _SPI2 +// ST7920 Emulator SPI pins +#define ST7920_EMULATOR // uncomment to enable Marlin mode +#ifdef ST7920_EMULATOR + #define ST7920_SPI _SPI2 +#endif -// HD44780 Simulator pins -#define LCD2004_simulator -#ifdef LCD2004_simulator +// HD44780 Emulator pins +#define LCD2004_EMULATOR +#ifdef LCD2004_EMULATOR #define LCD_EN PB15 #define LCD_RS PB12 #define LCD_D4 PB13 @@ -111,8 +114,12 @@ #define LCD_D7_PORT GPIOC #endif +#if defined(ST7920_EMULATOR) || defined(LCD2004_EMULATOR) + #define HAS_EMULATOR +#endif + // Buzzer support -#define BUZZER_PIN PD13 +#define BUZZER_PIN PD13 // LCD Encoder support #define LCD_ENCA_PIN PA8 diff --git a/TFT/src/User/Variants/pin_Template.h b/TFT/src/User/Variants/pin_Template.h index 759682215a..ddc36b8111 100644 --- a/TFT/src/User/Variants/pin_Template.h +++ b/TFT/src/User/Variants/pin_Template.h @@ -88,8 +88,34 @@ #define W25Qxx_SPI _SPI1 #define W25Qxx_CS_PIN PA4 -// ST7920 Simulator SPI pins -//#define ST7920_SPI _SPI2 +// ST7920 Emulator SPI pins +//#define ST7920_EMULATOR // uncomment to enable Marlin mode +//#ifdef ST7920_EMULATOR +// #define ST7920_SPI _SPI3 +//#endif + +// HD44780 Emulator pins +//#define LCD2004_EMULATOR +//#ifdef LCD2004_EMULATOR +// #define LCD_EN PB15 +// #define LCD_RS PB12 +// #define LCD_D4 PB13 +// #define LCD_D5 PB14 +// #define LCD_D6 PC7 +// #define LCD_D7 PC6 +// #define LCD_D4_PIN GPIO_Pin_13 +// #define LCD_D5_PIN GPIO_Pin_14 +// #define LCD_D6_PIN GPIO_Pin_7 +// #define LCD_D7_PIN GPIO_Pin_6 +// #define LCD_D4_PORT GPIOB +// #define LCD_D5_PORT GPIOB +// #define LCD_D6_PORT GPIOC +// #define LCD_D7_PORT GPIOC +//#endif + +//#if defined(ST7920_EMULATOR) || defined(LCD2004_EMULATOR) +// #define HAS_EMULATOR +//#endif // Buzzer support //#define BUZZER_PIN PA14 diff --git a/TFT/src/User/Variants/variants.h b/TFT/src/User/Variants/variants.h index d890bf3806..5f0cb1349d 100644 --- a/TFT/src/User/Variants/variants.h +++ b/TFT/src/User/Variants/variants.h @@ -51,7 +51,7 @@ #endif #define LCD_ENCODER_SUPPORT (defined(LCD_ENCA_PIN) && defined(LCD_ENCB_PIN) && defined(LCD_BTN_PIN)) -#define ENC_ACTIVE_SIGNAL (defined(LCD_ENC_EN_PIN) && defined(ST7920_SPI) && defined(LCD_ENCODER_SUPPORT)) +#define ENC_ACTIVE_SIGNAL (defined(LCD_ENC_EN_PIN) && defined(ST7920_EMULATOR) && defined(LCD_ENCODER_SUPPORT)) #define LCD_DRIVER_IS(n) (TFTLCD_DRIVER == n) diff --git a/TFT/src/User/config.ini b/TFT/src/User/config.ini index 976da36d69..11c2c4dc0e 100644 --- a/TFT/src/User/config.ini +++ b/TFT/src/User/config.ini @@ -203,12 +203,12 @@ marlin_fullscreen:0 #### Marlin Mode Type # Select Marlin Mode type. -# Options: [LCD2004: 0, LCD12864: 1] -marlin_type:1 +# Options: [128x64 Full Graphic LCD: 0, 20x4 Character LCD: 1] +marlin_type:0 #### Marlin Mode Title # Text displayed at the top of the TFT in Marlin Mode. -marlin_title:LCD12864 Simulator +marlin_title:Marlin Mode #-------------------------------------------------------------------- @@ -340,7 +340,7 @@ pause_pos:X10 Y10 pause_z_raise:10 ## Pause Feed Rate -# Feedrate to use when moving an axis whne printing is paused. +# Feedrate to use when moving an axis when printing is paused. # Format: [pause_feedrate: X Y Z E] # Unit: [feedrate in mm/min] pause_feedrate:XY6000 Z6000 E600 diff --git a/TFT/src/User/delay.c b/TFT/src/User/delay.c index cd33e82ac1..45084cd860 100644 --- a/TFT/src/User/delay.c +++ b/TFT/src/User/delay.c @@ -1,6 +1,6 @@ #include "includes.h" -static u8 fac_us=0; +static uint8_t fac_us=0; void Delay_init(void) { @@ -8,9 +8,9 @@ void Delay_init(void) fac_us=mcuClocks.rccClocks.HCLK_Frequency/(8*1000000); // 8 Frequency after frequency division Unit M is 1us times } -void Delay_us(u32 us) //Delay is less than 1800 * 1000us +void Delay_us(uint32_t us) //Delay is less than 1800 * 1000us { - u32 temp; + uint32_t temp; SysTick->LOAD=us*fac_us; //Loading times, 1us fac_us times, us microsecond us * fac_us times SysTick->VAL=0x00; //Clear counter SysTick->CTRL=0x01; //Start countdown @@ -22,9 +22,9 @@ void Delay_us(u32 us) //Delay is less than 1800 * 1000us SysTick->VAL=0x00; //Clear counter } -void Delay_ms(u16 ms) +void Delay_ms(uint16_t ms) { - for (u16 i = 0; i < ms; i++) { + for (uint16_t i = 0; i < ms; i++) { Delay_us(1000); } } diff --git a/TFT/src/User/includes.h b/TFT/src/User/includes.h index 858acf5c85..f110ee1d66 100644 --- a/TFT/src/User/includes.h +++ b/TFT/src/User/includes.h @@ -43,8 +43,8 @@ #include "buzzer.h" #include "LCD_Encoder.h" -#include "ST7920_Simulator.h" -#include "HD44780_Simulator.h" +#include "ST7920_Emulator.h" +#include "HD44780_Emulator.h" #include "ui_draw.h" #include "touch_process.h" #include "serialConnection.h" @@ -132,7 +132,7 @@ typedef void (*FP_MENU)(void); typedef struct { FP_MENU menu[MAX_MENU_DEPTH]; // Menu function buffer - u8 cur; // Current menu index in buffer + uint8_t cur; // Current menu index in buffer }MENU; extern MENU infoMenu; @@ -150,8 +150,8 @@ extern HOST infoHost; typedef struct { RCC_ClocksTypeDef rccClocks; - u32 PCLK1_Timer_Frequency; - u32 PCLK2_Timer_Frequency; + uint32_t PCLK1_Timer_Frequency; + uint32_t PCLK2_Timer_Frequency; }CLOCKS; extern CLOCKS mcuClocks; diff --git a/coding_standard.md b/coding_standard.md index fecc49d37b..9039a4dd00 100644 --- a/coding_standard.md +++ b/coding_standard.md @@ -140,14 +140,14 @@ bool updateIcon(void) char nowBmp[64]; GUI_Clear(infoSettings.bg_color); - GUI_DispString(5, PADDING, (u8 *)"Updating Icons"); + GUI_DispString(5, PADDING, (uint8_t *)"Updating Icons"); GUI_ClearPrect(&iconUpdateRect); for (int i = 0; i < COUNT(iconBmpName); i++) { sprintf(nowBmp, BMP_ROOT_DIR "/%s.bmp", iconBmpName[i]); GUI_ClearPrect(&labelUpdateRect); - GUI_DispString(labelUpdateRect.x0, labelUpdateRect.y0, (u8 *)nowBmp); + GUI_DispString(labelUpdateRect.x0, labelUpdateRect.y0, (uint8_t *)nowBmp); processIcon(nowBmp, ICON_ADDR(i)); }