Skip to content

Commit

Permalink
Update 20210130
Browse files Browse the repository at this point in the history
adds keyboard layout for quertz awerty bigtreetech#1550
Correction CZ translation bigtreetech#1546
FIX bigtreetech#1539 bigtreetech#1541
Fix get filesize and cancle print for RepRapFirmware bigtreetech#1533
This PR is fixing the bugs introduced by merging PR bigtreetech#1487 bigtreetech#1526
update german translation and add missing icons bigtreetech#1525
Add missing icons and Hungarian language bigtreetech#1520
Added Home Offset menu + bugfixes and cleanup bigtreetech#1518
Readme.md update and format fix bigtreetech#1557
Reduce global variables and cleanup bigtreetech#1558
Added the possibility to change to time the bootscreen logo is shown bigtreetech#1560
Beep when temp reached bigtreetech#1561
Added new param in FeatureSettings menu + toggle ACK in Terminal menu… bigtreetech#1563
  • Loading branch information
Uz45 committed Jan 31, 2021
1 parent e5ea727 commit dc4481c
Show file tree
Hide file tree
Showing 116 changed files with 11,377 additions and 9,345 deletions.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
390 changes: 204 additions & 186 deletions Copy to SD Card root directory to update/Language Packs/language_am.ini

Large diffs are not rendered by default.

392 changes: 205 additions & 187 deletions Copy to SD Card root directory to update/Language Packs/language_ca.ini

Large diffs are not rendered by default.

390 changes: 204 additions & 186 deletions Copy to SD Card root directory to update/Language Packs/language_cn.ini

Large diffs are not rendered by default.

390 changes: 204 additions & 186 deletions Copy to SD Card root directory to update/Language Packs/language_cz.ini

Large diffs are not rendered by default.

390 changes: 204 additions & 186 deletions Copy to SD Card root directory to update/Language Packs/language_de.ini

Large diffs are not rendered by default.

390 changes: 204 additions & 186 deletions Copy to SD Card root directory to update/Language Packs/language_du.ini

Large diffs are not rendered by default.

390 changes: 204 additions & 186 deletions Copy to SD Card root directory to update/Language Packs/language_en.ini

Large diffs are not rendered by default.

390 changes: 204 additions & 186 deletions Copy to SD Card root directory to update/Language Packs/language_es.ini

Large diffs are not rendered by default.

390 changes: 204 additions & 186 deletions Copy to SD Card root directory to update/Language Packs/language_fr.ini

Large diffs are not rendered by default.

390 changes: 204 additions & 186 deletions Copy to SD Card root directory to update/Language Packs/language_gr.ini

Large diffs are not rendered by default.

390 changes: 204 additions & 186 deletions Copy to SD Card root directory to update/Language Packs/language_hu.ini

Large diffs are not rendered by default.

390 changes: 204 additions & 186 deletions Copy to SD Card root directory to update/Language Packs/language_it.ini

Large diffs are not rendered by default.

390 changes: 204 additions & 186 deletions Copy to SD Card root directory to update/Language Packs/language_jp.ini

Large diffs are not rendered by default.

390 changes: 204 additions & 186 deletions Copy to SD Card root directory to update/Language Packs/language_pl.ini

Large diffs are not rendered by default.

390 changes: 204 additions & 186 deletions Copy to SD Card root directory to update/Language Packs/language_pt.ini

Large diffs are not rendered by default.

390 changes: 204 additions & 186 deletions Copy to SD Card root directory to update/Language Packs/language_ru.ini

Large diffs are not rendered by default.

390 changes: 204 additions & 186 deletions Copy to SD Card root directory to update/Language Packs/language_sk.ini

Large diffs are not rendered by default.

390 changes: 204 additions & 186 deletions Copy to SD Card root directory to update/Language Packs/language_sl.ini

Large diffs are not rendered by default.

391 changes: 204 additions & 187 deletions Copy to SD Card root directory to update/Language Packs/language_tc.ini

Large diffs are not rendered by default.

390 changes: 204 additions & 186 deletions Copy to SD Card root directory to update/Language Packs/language_tr.ini

Large diffs are not rendered by default.

390 changes: 204 additions & 186 deletions Copy to SD Card root directory to update/Language Packs/language_uk.ini

Large diffs are not rendered by default.

Binary file modified Copy to SD Card root directory to update/MKSTFT28.bin
Binary file not shown.
Binary file modified Copy to SD Card root directory to update/MKS_32_V1_1.26.x.bin
Binary file not shown.
Binary file modified Copy to SD Card root directory to update/MKS_32_V1_2.26.x.bin
Binary file not shown.
Binary file modified Copy to SD Card root directory to update/MKS_32_V1_3.26.x.bin
Binary file not shown.
Binary file modified Copy to SD Card root directory to update/MKS_32_V1_4.26.x.bin
Binary file not shown.
56 changes: 37 additions & 19 deletions Copy to SD Card root directory to update/config.ini
Original file line number Diff line number Diff line change
Expand Up @@ -31,23 +31,38 @@
# ensure that the following options are enabled in Marlin firmware.
#
# General options:
# EEPROM_SETTINGS (in Configuration.h)
# AUTO_REPORT_TEMPERATURES (in Configuration_adv.h)
# 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:
# 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)
# AUTO_REPORT_SD_STATUS (in Configuration_adv.h)
# SDCARD_CONNECTION ONBOARD (in Configuration_adv.h)
#
# Options to support (Un)Load menu:
# Options to support dialog with host:
# EMERGENCY_PARSER (in Configuration_adv.h)
# SERIAL_FLOAT_PRECISION 4 (in Configuration_adv.h)
# HOST_ACTION_COMMANDS (in Configuration_adv.h)
# HOST_PROMPT_SUPPORT (in Configuration_adv.h)
#
# Options to support M600 with host & (Un)Load menu:
# Options to support dialog with host (as pre requisite)
# NOZZLE_PARK_FEATURE (in Configuration.h)
# ADVANCED_PAUSE_FEATURE (in Configuration_adv.h)
# FILAMENT_LOAD_UNLOAD_GCODES (in Configuration_adv.h)

#
# Options to support Babystep menu:
# BABYSTEPPING (in Configuration_adv.h)
#
# Options to support repeatibility test to test probe accuracy (M48):
# Z_MIN_PROBE_REPEATABILITY_TEST (in Configuration.h)
#
# Options to support aligment of multiple Z steppers using a bed probe (G34):
# Z_STEPPER_AUTO_ALIGN (in Configuration_adv.h)

#--------------------------------------------------------------------
# General Settings
Expand All @@ -57,12 +72,12 @@
# 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.
# Options: [2400: 0, 9600: 1, 19200: 2, 38400: 3, 57600: 4, 115200: 5, 250000: 6, 500000: 7, 1000000: 8]
baudrate:6
baudrate:5

#### Default Touch Mode Language
# Select the language to display on the LCD while in Touch Mode.
Expand Down Expand Up @@ -127,7 +142,7 @@ invert_axis:X0 Y0 Z0
#### Persistent Temperature Info
# 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.
Expand Down Expand Up @@ -188,7 +203,7 @@ marlin_fullscreen:0

#### Marlin Mode Type
# Select Marlin Mode type.
# Options: [LCD12864: 1, LCD2004: 0]
# Options: [LCD2004: 0, LCD12864: 1]
marlin_type:1

#### Marlin Mode Title
Expand Down Expand Up @@ -275,7 +290,7 @@ auto_load_leveling:1

#### TouchMI Settings (on ABL menu)
# Enable this option for settings TouchMI sensor on ABL Menu (Init, Z Offset, Save, Test).
# Options: [enable:1, disable:0]
# Options: [enable: 1, disable: 0]
touchmi_sensor:0

#### Onboard / Printer SD Card Support
Expand Down Expand Up @@ -408,11 +423,11 @@ preheat_temp6:T250 B90
#--------------------------------------------------------------------

#### Default Power Supply Mode
# Options: [OFF: 0, ON: 1, AUTO: 2]
# Options: [enable: 1, disable: 0, auto-detect: 2]
ps_on:0

#### Power Supply Active HIGH
# Options: [HIGH: 1, LOW: 0]
# Options: [enable: 1, disable: 0]
ps_on_active_high:1

#### Power Supply Auto Shutdown Temperature
Expand All @@ -427,7 +442,7 @@ auto_shutdown_temp:50
#--------------------------------------------------------------------

#### Default Filament Runout Sensor
# Options: [NONE: 0, NORMAL: 1, SMART: 2]
# Options: [enable: 1, disable: 0, smart: 2]
fil_runout:0

#### Inverted Filament Runout Logic
Expand Down Expand Up @@ -482,15 +497,18 @@ btt_mini_ups:0
# NOTE: Error messages from printer will always play the error sound.
#
# Parameters:
# touch_sound: Enable/disable this to control touch feedback sound.
# toast_sound: Enable/disable this to control all toast notification sounds.
# alert_sound: Enable/disable this to control all popup and alert sounds
# like print finish alert, dialog sound etc.
# touch_sound: Enable/disable this to control touch feedback sound.
# toast_sound: Enable/disable this to control all toast notification sounds.
# alert_sound: Enable/disable this to control all popup and alert sounds
# like print finish alert, dialog sound etc.
# heater_sound: Enable/disable this to control acoustic feedback when temperature
# has reached the desired value on heaters (nozzle, bed, chamber).
#
# Options: [enable: 1, disable: 0]
touch_sound:1
toast_sound:1
alert_sound:1
heater_sound:1

#### Knob LED Color (only for TFT28 V3.0, TFT35 E3.0, TFT43 V3.0, TFT50 V3.0 & TFT70 V3.0)
# Options: [OFF: 0, WHITE: 1, RED: 2, ORANGE: 3, YELLOW: 4, GREEN: 5, BLUE: 6, INDIGO: 7, VIOLET: 8]
Expand Down
34 changes: 23 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -86,11 +86,21 @@ The TFT firmware update is done in three steps described below and includes up t
- `V3.0`: hardware version
- `26.1`: software version

**element2:** Fonts and Icons (`TFT*` folder): Example: TFT35, which includes:
For the MKS TFT28 the binary file is `MKSTFT28.bin`.


**element2:** Fonts and Icons (in the `TFT*` or `MKS` folder):

For BTT TFTs the ROOT folder for fonts and icons is TFT*, where * is the size of the TFT (example: TFT24, TFT35, TFT50, etc).
Fonts and icons folder structure:
- `TFT*/font`: fonts
- `TFT*/bmp`: icons

For MKS TFTs the ROOT folder for fonts and icons is "MKS".
Fonts and icons folder structure:
- `MKS/font`: fonts
- `MKS/bmp`: icons

**element3:** The config.ini file

**element4:** One or several language file(s) **(optionally)**
Expand Down Expand Up @@ -194,6 +204,9 @@ See [Customization guides](https://github.com/bigtreetech/BIGTREETECH-TouchScree
;BIGTREE_TFT28_V1_0
;BIGTREE_TFT28_V3_0
;BIGTREE_TFT24_V1_1
;MKS_32_V1_1
;MKS_32_V1_2
;MKS_32_V1_3
;MKS_32_V1_4
;MKS_32_V1_4_NOBL
;MKS_28_V1_0
Expand Down Expand Up @@ -241,27 +254,26 @@ The second workaround for this issue is to carefully pry the two shells surround

**Firmware**

Edit the configuration.h file and enable the line that says: #define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER Rebuild and deploy the Marlin firmware to your 3D Printer.
Edit the configuration.h file and enable the line that says: `#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER`. Rebuild and deploy the Marlin firmware to your 3D Printer.



### Show more statistics at the end of the print

Statistics as filament length, filament weight and filament cost can be embedded into the gCode. These statistics will be presented after the print is finished in the new infobox area as a scrolling text. You can click that infobox and a popup will present you the printed filename (limited to the first 25 characters), the time needed for the print, the filament length used, the filament weight and its cost.
Statistics as filament length, filament weight and filament cost can be embedded into the gCode. After the print is finished there will be an infobox that you can click and a popup will present you the printed filename (limited to the first 25 characters), the time needed for the print, the filament length used, the filament weight and its cost.

The statistic data in the gCode must have the following format (a good practice would be to include this at the beginning of the gCode):

M118 P0 filament_data L:{12.3456}m L: represents the length in meters
M118 P0 filemant_data W:{1.23456}g W: represents the weight in grams
M118 P0 filament_data C:{0.1234} C: represents the cost without a unit
* `M118 P0 filament_data L:{12.3456}m` L: represents the length in meters
* `M118 P0 filemant_data W:{1.23456}g` W: represents the weight in grams
* `M118 P0 filament_data C:{0.1234}` C: represents the cost without a unit

The values of every filament data can be in a brackets, parentheses, apostrophes, etc. or without them, measurement units can be there or not.
So M118 P0 filament_data L:(12.3456)m, M118 P0 filament_data L:12.3456meters, M118 P0 filament_data L:[12.3456] and so on are all valid formats.
So `M118 P0 filament_data L:(12.3456)m`, `M118 P0 filament_data L:12.3456meters`, `M118 P0 filament_data L:[12.3456]` and so on are all valid formats.

The inclusion of the filament data into the gCode can be automated. In Cura all you have to do is to insert the following into the Start G-Code:
M118 P0 filament_data L:{filament_amount}m
M118 P0 filament_data W:{filament_weight}g
M118 P0 filament_data C:{filament_cost}
* `M118 P0 filament_data L:{filament_amount}m`
* `M118 P0 filament_data W:{filament_weight}g`
* `M118 P0 filament_data C:{filament_cost}`

In case the gCode file has been generated using the [BTT 3D Plug-In Suit](https://github.com/bigtreetech/Bigtree3DPluginSuit), the data is automatically added.

Expand Down
Loading

0 comments on commit dc4481c

Please sign in to comment.