diff --git a/.github/workflows/buildBinary.yml b/.github/workflows/buildBinary.yml index b4d600cb60..f24328396b 100644 --- a/.github/workflows/buildBinary.yml +++ b/.github/workflows/buildBinary.yml @@ -2,9 +2,19 @@ name: Build Binaries on: push: branches: [ master ] + paths-ignore: + - .devcontainer/** + - .github/** + - Bootloader/** + - Copy to SD Card root directory to update/** + - images/** + - readme/** + - '**/*.md' + jobs: main: - name: Main + name: Build Binaries + if: github.repository == 'bigtreetech/BIGTREETECH-TouchScreenFirmware' runs-on: ubuntu-latest steps: - uses: actions/checkout@master @@ -54,14 +64,20 @@ jobs: run: platformio run --environment MKS_32_V1_4_NOBL - name: Build MKS TFT28 V1.0 run: platformio run --environment MKS_28_V1_0 - - name: Clean Up Folder + - name: Remove Old Binaries run: find "Copy to SD Card root directory to update/" -name '*.bin' -print -delete - - name: Copy Files + - name: Remove Old Config + run: find "Copy to SD Card root directory to update/" -name 'config.ini' -print -delete + - name: Copy New Binaries run: find .pio/build/ -name '*.bin' -exec cp -vf '{}' "./Copy to SD Card root directory to update/" ";" - - name: Stage Changes - run: git config user.email "actions@example.com" && git config user.name "Github Actions" && find "Copy to SD Card root directory to update/" -name '*.bin' -exec git add {} \; + - name: Copy New Config + run: find TFT/src/User/ -name 'config.ini' -exec cp -vf '{}' "./Copy to SD Card root directory to update/" ";" + - name: Stage New Binaries + run: git config user.email "${GITHUB_ACTOR}@users.noreply.github.com" && git config user.name "${GITHUB_ACTOR}" && find "Copy to SD Card root directory to update/" -name '*.bin' -exec git add {} \; + - name: Stage New Config + run: git config user.email "${GITHUB_ACTOR}@users.noreply.github.com" && git config user.name "${GITHUB_ACTOR}" && find "Copy to SD Card root directory to update/" -name 'config.ini' -exec git add {} \; - name: Push uses: actions-x/commit@v2 with: - message: Update prebuilt binaries + message: Update prebuilt binaries and config token: ${{ secrets.MY_SECRET_TOKEN }} \ No newline at end of file diff --git a/.github/workflows/buildTest.yml b/.github/workflows/buildTest.yml index 27930a5d69..0db0e57645 100644 --- a/.github/workflows/buildTest.yml +++ b/.github/workflows/buildTest.yml @@ -1,9 +1,24 @@ name: Build Test -on: [pull_request, push] +on: + pull_request: + paths-ignore: + - Bootloader/** + - Copy to SD Card root directory to update/** + - images/** + - readme/** + - '**/*.md' + + push: + paths-ignore: + - Bootloader/** + - Copy to SD Card root directory to update/** + - images/** + - readme/** + - '**/*.md' jobs: main: - name: Main + name: Build Test runs-on: ubuntu-latest steps: - uses: actions/checkout@master diff --git a/Copy to SD Card root directory to update/BIGTREE_TFT24_V1.1.26.x.bin b/Copy to SD Card root directory to update/BIGTREE_TFT24_V1.1.26.x.bin index a76dc3897b..f754204b72 100644 Binary files a/Copy to SD Card root directory to update/BIGTREE_TFT24_V1.1.26.x.bin and b/Copy to SD Card root directory to update/BIGTREE_TFT24_V1.1.26.x.bin differ diff --git a/Copy to SD Card root directory to update/BIGTREE_TFT28_V3.0.26.x.bin b/Copy to SD Card root directory to update/BIGTREE_TFT28_V3.0.26.x.bin index f5627bd3ec..d8f102ad24 100644 Binary files a/Copy to SD Card root directory to update/BIGTREE_TFT28_V3.0.26.x.bin and b/Copy to SD Card root directory to update/BIGTREE_TFT28_V3.0.26.x.bin differ diff --git a/Copy to SD Card root directory to update/BIGTREE_TFT35_V3.0.26.x.bin b/Copy to SD Card root directory to update/BIGTREE_TFT35_V3.0.26.x.bin index c806732503..a1cd019bb1 100644 Binary files a/Copy to SD Card root directory to update/BIGTREE_TFT35_V3.0.26.x.bin and b/Copy to SD Card root directory to update/BIGTREE_TFT35_V3.0.26.x.bin differ diff --git a/Copy to SD Card root directory to update/BIGTREE_TFT35_V3.0_B1.26.x.bin b/Copy to SD Card root directory to update/BIGTREE_TFT35_V3.0_B1.26.x.bin index f1f24fb7f2..289a92e0f6 100644 Binary files a/Copy to SD Card root directory to update/BIGTREE_TFT35_V3.0_B1.26.x.bin and b/Copy to SD Card root directory to update/BIGTREE_TFT35_V3.0_B1.26.x.bin differ diff --git a/Copy to SD Card root directory to update/BIGTREE_TFT35_V3.0_E3.26.x.bin b/Copy to SD Card root directory to update/BIGTREE_TFT35_V3.0_E3.26.x.bin index 17d764a602..69f694c0ba 100644 Binary files a/Copy to SD Card root directory to update/BIGTREE_TFT35_V3.0_E3.26.x.bin and b/Copy to SD Card root directory to update/BIGTREE_TFT35_V3.0_E3.26.x.bin differ diff --git a/Copy to SD Card root directory to update/BIGTREE_TFT43_V3.0.26.x.bin b/Copy to SD Card root directory to update/BIGTREE_TFT43_V3.0.26.x.bin index e5c2457768..89691a47f4 100644 Binary files a/Copy to SD Card root directory to update/BIGTREE_TFT43_V3.0.26.x.bin and b/Copy to SD Card root directory to update/BIGTREE_TFT43_V3.0.26.x.bin differ diff --git a/Copy to SD Card root directory to update/BIGTREE_TFT50_V3.0.26.x.bin b/Copy to SD Card root directory to update/BIGTREE_TFT50_V3.0.26.x.bin index 1b52cca9f7..81478fc895 100644 Binary files a/Copy to SD Card root directory to update/BIGTREE_TFT50_V3.0.26.x.bin and b/Copy to SD Card root directory to update/BIGTREE_TFT50_V3.0.26.x.bin differ diff --git a/Copy to SD Card root directory to update/BIGTREE_TFT70_V3.0.26.x.bin b/Copy to SD Card root directory to update/BIGTREE_TFT70_V3.0.26.x.bin index fac820c28b..db422f1dd1 100644 Binary files a/Copy to SD Card root directory to update/BIGTREE_TFT70_V3.0.26.x.bin and b/Copy to SD Card root directory to update/BIGTREE_TFT70_V3.0.26.x.bin differ diff --git a/Copy to SD Card root directory to update/BIQU_TFT28_V1.0.26.x.bin b/Copy to SD Card root directory to update/BIQU_TFT28_V1.0.26.x.bin index 852c6c0021..ba95754d34 100644 Binary files a/Copy to SD Card root directory to update/BIQU_TFT28_V1.0.26.x.bin and b/Copy to SD Card root directory to update/BIQU_TFT28_V1.0.26.x.bin differ diff --git a/Copy to SD Card root directory to update/BIQU_TFT35_APP1_V2.0.26.x.bin b/Copy to SD Card root directory to update/BIQU_TFT35_APP1_V2.0.26.x.bin index d6329474d1..fd7d326750 100644 Binary files a/Copy to SD Card root directory to update/BIQU_TFT35_APP1_V2.0.26.x.bin and b/Copy to SD Card root directory to update/BIQU_TFT35_APP1_V2.0.26.x.bin differ diff --git a/Copy to SD Card root directory to update/BIQU_TFT35_V1.0.26.x.bin b/Copy to SD Card root directory to update/BIQU_TFT35_V1.0.26.x.bin index e5cafb77dc..e2f3332faa 100644 Binary files a/Copy to SD Card root directory to update/BIQU_TFT35_V1.0.26.x.bin and b/Copy to SD Card root directory to update/BIQU_TFT35_V1.0.26.x.bin differ diff --git a/Copy to SD Card root directory to update/BIQU_TFT35_V1.1.26.x.bin b/Copy to SD Card root directory to update/BIQU_TFT35_V1.1.26.x.bin index 8503dcb28c..13c7b28d0f 100644 Binary files a/Copy to SD Card root directory to update/BIQU_TFT35_V1.1.26.x.bin and b/Copy to SD Card root directory to update/BIQU_TFT35_V1.1.26.x.bin differ diff --git a/Copy to SD Card root directory to update/BIQU_TFT35_V1.2.26.x.bin b/Copy to SD Card root directory to update/BIQU_TFT35_V1.2.26.x.bin index 7d2282c33f..982f06b81d 100644 Binary files a/Copy to SD Card root directory to update/BIQU_TFT35_V1.2.26.x.bin and b/Copy to SD Card root directory to update/BIQU_TFT35_V1.2.26.x.bin differ 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 774fa8e725..5a5036be8b 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 @@ -206,7 +206,7 @@ label_send_start_gcode:Gcode vor Druck label_send_end_gcode:Gcode nach Druck label_send_cancel_gcode:Gcode bei Abbruch label_persistent_status_info:Speicherungs-Status -label_file_listmode:Datein als Liste +label_file_listmode:Dateien als Liste label_current_setting:Treiber Strom (mA) label_steps_setting:Steps pro mm label_maxfeedrate:max. Geschwindigkeit 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 a634036edd..512d7f94c4 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 @@ -7,7 +7,7 @@ label_language:Magyar label_heat:Fűtés label_move:Mozgás label_home:Végállás -label_disable_steppers:Léptetők +label_disable_steppers:Mot.tilt label_print:Nyomtatás label_extrude:Adagolás label_fan:Hűtés @@ -89,7 +89,7 @@ label_resume:Folytatás label_load:Betöltés label_unload:Kiadás label_load_unload:Betöltés/Kiadás -label_load_unload_short:Fil. Ki/Be +label_load_unload_short:Be/Ki label_slow_speed:Lassú label_normal_speed:Normál label_fast_speed:Gyors @@ -164,7 +164,7 @@ label_adjust_ok:Kalibrálás sikeres. label_adjust_failed:A kalibrálás sikertelen, próbáld újra label_warning:Figyelem! label_stop_print:Megállítod a nyomtatást? -label_confirm:Igen +label_confirm:Oké label_tftsd:TFT-SD label_read_tftsd_error:TFT-SD olvasási hiba! label_tftsd_inserted:SD-Kártya behelyezve! @@ -256,16 +256,16 @@ label_start_print:Elindítod a %s\nfájl nyomtatását? label_ack_notification:ACK egyéb típus label_leveling_edge_distance:Ágy szélének távolsága label_xy_unlock:Felold XY -label_tuning:Tuning +label_tuning:Hangolás label_pid:PID label_pid_title:PID Automatikus Hangolás label_pid_start_info:A PID önhangolása elindul.\nPercekig is eltarthat.\nFolytatod? label_pid_start_info_2:PID Automatikus hangolása zajlik! label_pid_start_info_3:NE ÉRINTSD meg a kijelzőt míg nincs kész! (zöld LED jelzi)! -label_tune_extruder:Lépés hangolás +label_tune_extruder:Adagoló label_tune_ext_extrude_100:Kiad 100mm label_tune_ext_temp:Adagoló hangolás | Fűt -label_tune_ext_templow:Túl alacsony a kívánt hőfok!\nMinimum hőmérséklet: %d C +label_tune_ext_templow:Túl alacsony a kívánt hőfok!\nMinimum hőmérséklet: %d℃ label_tune_ext_desiredval:A hőfok még nem érte el a kívánt értéket label_tune_ext_mark120mm:A 120mm-t jelöld be a szálon\nNyomd '%s' ha kész\nMérd meg a hátralévő hosszt\nadagolás után. label_tune_ext_heatoff:Kikapcsolod a fűtést? @@ -284,17 +284,17 @@ label_case_light:Gépház Világítás label_load_started:A filament betöltése folyamatban van,\nnem lehetséges további művelet,\nmíg véget nem ér.\nKérlek várj! label_unload_started:A filament kiadása folyamatban van,\nnem lehetséges további művelet,\nmíg véget nem ér.\nKérlek várj! label_heaters_on:Néhány fűtőelem még üzemel.\nKikapcsolod a fűtőelemeket? -label_print_finished: Printing\n finished. -label_main_screen:Main +label_print_finished: Nyomtatás\n elkészült. +label_main_screen:Főoldal label_previous_print_data:Összegzés -label_file_name:File: -label_print_time:Print Time: -label_filament_length:Filament length: %1.2fm -label_filament_weight:Filament weight: %1.2fg -label_filament_cost:Filament cost: %1.2f -label_no_filament_stats:No filament statistics. -label_click_for_more:Click for more. -label_ext_templow:Hotend temperature is below\nminimum temperature (%d℃). -label_cold_ext:Cold extrusion prevented -label_heat_hotend:Heat hotend to %d℃? +label_file_name:Fájl: +label_print_time:Nyomtatási idő: +label_filament_length:Szál hossza: %1.2fm +label_filament_weight:Szál súlya: %1.2fg +label_filament_cost:Szál költség: %1.2f +label_no_filament_stats:Nincs szál statisztika. +label_click_for_more:Kattints a részletekért. +label_ext_templow:Fejhőfok alacsonyabb, mint a\nminimális hőfok (%d℃). +label_cold_ext:Hideg adagolás tiltva +label_heat_hotend:Fűtöd a fejet %d℃-ra? 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 88264dd857..9b9e4371dc 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 @@ -284,16 +284,16 @@ label_case_light:Luce label_load_started:Carico filamento in corso...\nNon sono possibili altre\nazioni fino al termine.\nAttendere prego. label_unload_started:Scarico filamento in corso...\nNon sono possibili altre\nazioni fino al termine.\nAttendere prego. label_heaters_on:Alcuni riscaldatori sono ancora accesi\nVuoi spegnerli? -label_print_finished: Printing\n finished. -label_main_screen:Main -label_previous_print_data:Brief +label_print_finished: Stampa\n finita. +label_main_screen:Principale +label_previous_print_data:Ultima stampa label_file_name:File: -label_print_time:Print Time: -label_filament_length:Filament length: %1.2fm -label_filament_weight:Filament weight: %1.2fg -label_filament_cost:Filament cost: %1.2f -label_no_filament_stats:No filament statistics. -label_click_for_more:Click for more. +label_print_time:Durata stampa: +label_filament_length:Lunghezza filamento: %1.2fm +label_filament_weight:Peso filamento: %1.2fg +label_filament_cost:Costo filamento: %1.2f +label_no_filament_stats:Nessuna statistica del filamento. +label_click_for_more:Clicca per piu' info. label_ext_templow:La temperatura dell'hotend\nè al di sotto della temperatura\nminima (%d℃). label_cold_ext:Prevenzione dell'estrusione a freddo label_heat_hotend:Heat hotend to %d℃? diff --git a/Copy to SD Card root directory to update/MKSTFT28.bin b/Copy to SD Card root directory to update/MKSTFT28.bin new file mode 100644 index 0000000000..02921ec0da Binary files /dev/null and b/Copy to SD Card root directory to update/MKSTFT28.bin differ diff --git a/Copy to SD Card root directory to update/MKS_32_V1_1.26.x.bin b/Copy to SD Card root directory to update/MKS_32_V1_1.26.x.bin index 3f930bf6a2..1b9609db67 100644 Binary files a/Copy to SD Card root directory to update/MKS_32_V1_1.26.x.bin and b/Copy to SD Card root directory to update/MKS_32_V1_1.26.x.bin differ diff --git a/Copy to SD Card root directory to update/MKS_32_V1_2.26.x.bin b/Copy to SD Card root directory to update/MKS_32_V1_2.26.x.bin index a237fd6471..c3f86f92c3 100644 Binary files a/Copy to SD Card root directory to update/MKS_32_V1_2.26.x.bin and b/Copy to SD Card root directory to update/MKS_32_V1_2.26.x.bin differ diff --git a/Copy to SD Card root directory to update/MKS_32_V1_3.26.x.bin b/Copy to SD Card root directory to update/MKS_32_V1_3.26.x.bin index 4a3a4c325e..65f9ae290b 100644 Binary files a/Copy to SD Card root directory to update/MKS_32_V1_3.26.x.bin and b/Copy to SD Card root directory to update/MKS_32_V1_3.26.x.bin differ diff --git a/Copy to SD Card root directory to update/MKS_32_V1_4.26.x.bin b/Copy to SD Card root directory to update/MKS_32_V1_4.26.x.bin index 661646f7a5..4ed6056043 100644 Binary files a/Copy to SD Card root directory to update/MKS_32_V1_4.26.x.bin and b/Copy to SD Card root directory to update/MKS_32_V1_4.26.x.bin 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 383b9d8845..77c3aca8ab 100644 --- a/Copy to SD Card root directory to update/config.ini +++ b/Copy to SD Card root directory to update/config.ini @@ -13,7 +13,8 @@ # BIGTREE_TFT35_V2_0 / BIGTREE_TFT35_V3_0 / BIGTREE_TFT35_E3_V3_0 # BIGTREE_TFT35_B1_V3_0 / BIGTREE_TFT43_V3_0 / BIGTREE_TFT50_V3_0 # BIGTREE_TFT70_V3_0 / BIGTREE_TFT28_V1_0 / BIGTREE_TFT28_V3_0 -# BIGTREE_TFT24_V1_1 / MKS_32_V1_4 / MKS_28_V1_0 +# BIGTREE_TFT24_V1_1 / MKS_32_V1_1 / MKS_32_V1_2 +# MKS_32_V1_3 / MKS_32_V1_4 / MKS_28_V1_0 # # Firmware source: https://github.com/bigtreetech/BIGTREETECH-TouchScreenFirmware @@ -25,26 +26,26 @@ # Minimum Marlin firmware version: 2.0.5.4 # Distribution date: 2020-05-12 # Firmware source: https://github.com/MarlinFirmware/Marlin/releases - -## IMPORTANT NOTE: -# Ensure that the following options are enabled in Marlin firmware - -## General options: +# +# In order the TFT firmware is able to provide all of its functionalities/features, +# ensure that the following options are enabled in Marlin firmware. +# +# General options: # M115_GEOMETRY_REPORT (in Configuration_adv.h) # M114_DETAIL (in Configuration_adv.h) # REPORT_FAN_CHANGE (in Configuration_adv.h) # EMERGENCY_PARSER (in Configuration_adv.h) # SERIAL_FLOAT_PRECISION 4 (in Configuration_adv.h) # HOST_ACTION_COMMANDS (in Configuration_adv.h) - -## Options to support printing from onboard SD: +# +# Options to support printing from onboard SD: # SDSUPPORT (in Configuration.h) # AUTO_REPORT_TEMPERATURES (in Configuration_adv.h) # AUTO_REPORT_SD_STATUS (in Configuration_adv.h) # LONG_FILENAME_HOST_SUPPORT (in Configuration_adv.h) # SDCARD_CONNECTION ONBOARD (in Configuration_adv.h) - -## Options to support (Un)Load menu: +# +# Options to support (Un)Load menu: # FILAMENT_LOAD_UNLOAD_GCODES (in Configuration_adv.h) @@ -52,12 +53,11 @@ # General Settings #-------------------------------------------------------------------- - #### Enable Status Screen # Status screen or home screen displays the current temperature, fan and speeds. # If this disabled, the main menu will become the default home screen. # Options: [Enable: 1, Disable: 0] -status_screen:0 +status_screen:1 #### Baudrate / Connection speed # This baudrate setting is used for serial connection to the printer and other serial hosts like ESP8266. @@ -67,16 +67,16 @@ baudrate:5 #### Default Touch Mode Language # Select the language to display on the LCD while in Touch Mode. # To add/flash a second language copy the required "language_xx.ini" file from "Language Packs" folder -# to the SD root folder. Then preset the reset button to load/flash the copied language file +# to the SD root folder. Then preset the reset button to load/flash the copied language file. # Options: [primary language (english): 0, secondary language: 1] language:0 #### Default Touch Mode Colors # Set colors used in touchscreen mode. -# select an option from the provide list or set the color (RGB888 format) hex value directly (start with “0x”). -# Such as: Red: 0xFF0000 , Green: 0x00FF00, Blue: 0x0000FF +# Select an option from the provide list or set the color (RGB888 format) hex value directly (start with “0x”), +# such as: Red: 0xFF0000, Green: 0x00FF00, Blue: 0x0000FF. # Options: [ WHITE: 0, BLACK: 1, RED: 2, GREEN: 3, BLUE: 4, CYAN: 5, MAGENTA: 6, YELLOW: 7, -# ORANGE: 8, PURPLE: 9, LIME: 10, BROWN: 11, DARKBLUE: 12, DARKGREEN: 13, GRAY: 14, DARKGRAY: 15] +# ORANGE: 8, PURPLE: 9, LIME: 10, BROWN: 11, DARKBLUE: 12, DARKGREEN: 13, GRAY: 14, DARKGRAY: 15] ## Title background color title_back_color:1 @@ -109,12 +109,12 @@ mesh_min_color:7 mesh_max_color:2 #### Rotate UI -# Rotate UI by 180 degrees +# Rotate UI by 180 degrees. # Options: [enable: 1, disable: 0] rotate_ui:0 #### Temperature ACK -# Show or hide temperature ACK in Terminal menu +# Show or hide temperature ACK in Terminal menu. # Options: [show: 1, hide: 0] terminal_ack:0 @@ -125,25 +125,25 @@ terminal_ack:0 invert_axis:X0 Y0 Z0 #### Persistent Temperature Info -# Show persistent temperature info on all menus +# Show persistent temperature info on all menus. # Options: [enable: 1, disable: 0] -persistent_info:1 +persistent_info:0 #### File List Mode -# Display files in list mode instead of icon mode +# Display files in list mode instead of icon mode. # Options: [enable: 1, disable: 0] files_list_mode:1 #### Notification Style For ACK Messages -# Set the notification style to use for displaying the ACK messages which start with 'echo:' +# Set the notification style to use for displaying the ACK messages which start with 'echo:'. # # NOTE: The OFF value is applied to any ACK message type (e.g. even to known echo ACK). -# It means that any kind of ACK message is silently discarded +# It means that any kind of ACK message is silently discarded. # -# Options: [OFF: 0, POPUP: 1, TOAST: 2] -# OFF: No notification. The message is ignored -# POPUP: Display a popup window for user confirmation -# TOAST: A non-blocking Toast notification is displayed for few seconds. No user interaction is needed +# Options: [OFF: 0, POPUP: 1, TOAST: 2] +# OFF: No notification. The message is ignored. +# POPUP: Display a popup window for user confirmation. +# TOAST: A non-blocking Toast notification is displayed for few seconds. No user interaction is needed. ack_notification:1 @@ -157,15 +157,15 @@ default_mode:1 #### Serial Always ON # Keep UART (serial communication) alive in Marlin Mode. -# Allows seamless OctoPrint UART connection to the TFT's UART/serial expansion port no matter which mode the TFT is in +# Allows seamless OctoPrint UART connection to the TFT's UART/serial expansion port no matter which mode the TFT is in. # Options: [enable: 1, disable: 0] serial_always_on:0 #### Default Marlin Mode Background & Font Colors -# select an option from the provide list or set the color (RGB888 format) hex value directly (start with “0x”). -# Such as: Red: 0xFF0000 , Green: 0x00FF00, Blue: 0x0000FF +# Select an option from the provide list or set the color (RGB888 format) hex value directly (start with “0x”), +# such as: Red: 0xFF0000, Green: 0x00FF00, Blue: 0x0000FF. # Options: [ WHITE: 0, BLACK: 1, RED: 2, GREEN: 3, BLUE: 4, CYAN: 5, MAGENTA: 6, YELLOW: 7, -# ORANGE: 8, PURPLE: 9, LIME: 10, BROWN: 11, DARKBLUE: 12, DARKGREEN: 13, GRAY: 14, DARKGRAY: 15] +# ORANGE: 8, PURPLE: 9, LIME: 10, BROWN: 11, DARKBLUE: 12, DARKGREEN: 13, GRAY: 14, DARKGRAY: 15] ## Marlin Mode background color marlin_bg_color:1 @@ -174,25 +174,25 @@ marlin_bg_color:1 marlin_fn_color:8 #### Marlin Mode Title Support -# Show title in Marlin Mode +# Show title in Marlin Mode. # Options: [enable: 1, disable: 0] marlin_show_title:1 #### Marlin Mode Fullscreen Support -# Run Marlin Mode in fullscreen +# Run Marlin Mode in fullscreen. # -# Note: Disable is recommended for TFT24 +# NOTE: Disable is recommended for TFT24. # # Options: [enable: 1, disable: 0] marlin_fullscreen:0 #### Marlin Mode Type -# Select Marlin Mode type +# Select Marlin Mode type. # Options: [LCD12864: 1, LCD2004: 0] marlin_type:1 #### Marlin Mode Title -# Text displayed at the top of the TFT in Marlin Mode +# Text displayed at the top of the TFT in Marlin Mode. marlin_title:LCD12864 Simulator @@ -209,7 +209,7 @@ hotend_count:1 heated_bed:1 #### Heated Chamber Support -# The TFT will auto-detect if chamber heating is enabled in marlin firmware +# The TFT will auto-detect if chamber heating is enabled in Marlin firmware. # Options: [enable: 1, disable: 0] heated_chamber:0 @@ -239,11 +239,11 @@ min_temp:180 # Set minimum and maximum fan speed allowed by the printer. # Format: [fan_max: F0: F1: F2: F3: F4: F5: CtL: CtI:] # Value range: [min: 0, max: 255] -fan_max:F0:255 F1:255 F2:255 F3:255 F4:255 F5:255 CtL:255 CtI:255 +fan_max:F0:255 F1:255 F2:255 F3:255 F4:255 F5:255 CtL:255 CtI:255 #### Machine Size / Build Area # The TFT will auto-detect the machine size (min and max) in Marlin firmware (requires enabling `M115_GEOMETRY_REPORT` -# in Configuration_adv.h in Marlin firmware) +# in Configuration_adv.h in Marlin firmware). # Format: [size_min: X Y Z] # [size_max: X Y Z] # Unit: [mm] @@ -252,13 +252,13 @@ size_min:X0 Y0 Z0 size_max:X235 Y235 Z250 #### Default Move Speeds/feedrates -# move speeds used in move menu to move axes. +# Move speeds used in move menu to move axes. # Format: [move_speed: S N F] # Options: [slow: S, normal: N, fast: F] move_speed:S1000 N3000 F5000 #### Default Extruder Speeds/feedrates -# Speed settings used to extrude/retract +# Speed settings used to extrude/retract. # Format: [ext_speed: S N F] # Options: [slow: S, normal: N, fast: F] ext_speed:S60 N600 F1200 @@ -266,29 +266,29 @@ ext_speed:S60 N600 F1200 #### Auto Save Load Leveling Data # The TFT will auto-detect if Auto Bed Level is available. # Enable this will send "M500" after "G29" to store leveling value and send "M420 S1" -# to enable leveling state after startup +# to enable leveling state after startup. # Options: [enable: 1, disable: 0] auto_load_leveling:1 #### Onboard / Printer SD Card Support # On Marlin firmware, the TFT will auto-detect Onboard SD Card. -# Auto-detect is not available for other firmwares like Smoothieware +# Auto-detect is not available for other firmwares like Smoothieware. # Options: [enable: 1, disable: 0, auto-detect: 2] onboard_sd_support:2 #### M27 Printing Status Refresh Time -# M27 printing status refresh time (this will be used if SD_AUTOREPORT is not detected by the TFT) +# M27 printing status refresh time (this will be used if SD_AUTOREPORT is not detected by the TFT). # Unit: [time in seconds] M27_refresh_time:3 #### M27 Always Active -# Keep polling M27 even if not printing +# Keep polling M27 even if not printing. # Options: [enable: 1, disable: 0] M27_always_active:1 #### Long File Names Support # On Marlin firmware, the TFT will auto-detect Long File Name support. -# Auto-detect is not available for other firmwares like Smoothieware +# Auto-detect is not available for other firmwares like Smoothieware. # Options: [enable: 1, disable: 0, auto-detect: 2] long_filename_support:2 @@ -300,63 +300,71 @@ fan_speed_percent:1 #### Pause Settings # These settings are used when a print is paused. -## Pause retract distance +## Pause Retract Distance # Format: [pause_retract: R P] # Unit: [length in mm] pause_retract:R15 P16 -## Pause XY position +## Pause XY Position # Format: [pause_pos: X Y] # Unit: [distance in mm] pause_pos:X10 Y10 -## Pause Z raise -# raise Z axis this much relative to the current layer height. +## Pause Z Raise +# Raise Z axis this much relative to the current layer height. # Format: [pause_z_raise: Z] # Unit: [distance in mm] pause_z_raise:10 -## Pause feed rate +## Pause Feed Rate # Feedrate to use when moving an axis whne printing is paused. # Format: [pause_feedrate: X Y Z E] # Unit: [feedrate in mm/min] pause_feedrate:XY6000 Z6000 E600 -#### Leveling settings +#### Leveling Settings +# These settings are used for leveling. -## Z position for leveling -# Description: Lower z axis to this position after reaching a leveling point -# Format: [level_z_pos: Z] -# Unit: [distance in mm] +## Leveling Edge Distance (Manual Leveling) +# Inset distance from bed edges. This distance is added to minimum X & Y bed coordinates and +# subtracted from maximum X & Y bed coordinates to calculate manual leveling points. +# Format: [level_edge_distance:] +# Unit: [distance in mm] +level_edge_distance:20 + +## Z Position (Manual Leveling) +# Lower z axis to this position after reaching a leveling point. +# Format: [level_z_pos: Z] +# Unit: [distance in mm] level_z_pos:0.2 -## Leveling Z raise -# Description: Raise Z this much before moving to another point during leveling/probing procedures -# Format: [level_z_raise: Z] -# Unit: [distance in mm] +## Leveling Z Raise (Manual and Mesh Leveling) +# Raise Z this much before moving to another point during leveling/probing procedures. +# Format: [level_z_raise: Z] +# Unit: [distance in mm] level_z_raise:10 -## Leveling feed rate -# Feedrate to use when moving an axis during leveling/probing procedures -# Format: [level_feedrate: XY Z] -# Unit: [feedrate in mm/min] +## Leveling Feed Rate (Manual and Mesh Leveling) +# Feedrate to use when moving an axis during leveling/probing procedures. +# Format: [level_feedrate: XY Z] +# Unit: [feedrate in mm/min] level_feedrate:XY6000 Z6000 -## XY Offset Probing Support -# Used by Z Offset menu for the Z offset tuning process. -# It allows to move the nozzle to the defined (on Marlin FW) XY probing point set for homing. -# The nozzle is moved applying the XY offset configured on Marlin FW. +## XY Offset Probing Support (Probe Offset) +# Used by the Z Offset menu for the Z offset tuning process. +# It allows to move the nozzle to the defined (on Marlin firmware) XY probing point set for homing. +# The nozzle is moved applying the XY offset configured on Marlin firmware. # -# Note: Disable it in case the XY probing point set for homing is not reacheable by the nozzle -# (e.g. due to HW limitations/constraints or printer specific configuration) +# NOTE: Disable it in case the XY probing point set for homing is not reacheable by the nozzle +# (e.g. due to HW limitations/constraints or printer specific configuration). # # Format: [xy_offset_probing: