Skip to content

Commit

Permalink
Merge branch 'master' into bugfix-2023-07-23
Browse files Browse the repository at this point in the history
  • Loading branch information
digant73 authored Sep 26, 2023
2 parents 68528aa + 7d638de commit 0dd3b9e
Show file tree
Hide file tree
Showing 122 changed files with 756 additions and 182 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.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified Copy to SD Card root directory to update/BIQU_TFT28_V1.0.27.x.bin
Binary file not shown.
Binary file not shown.
Binary file modified Copy to SD Card root directory to update/BIQU_TFT35_V1.0.27.x.bin
Binary file not shown.
Binary file modified Copy to SD Card root directory to update/BIQU_TFT35_V1.1.27.x.bin
Binary file not shown.
Binary file modified Copy to SD Card root directory to update/BIQU_TFT35_V1.2.27.x.bin
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
#### Language Code:AM
## Language Version:20230209
## Language Version:20230821
## Maximum byte per keyword is 250 Bytes.
## Escape characters are not supported except newline '\n'

label_language:Հայերեն
label_advanced_ok:Advanced OK
label_emulated_m600:Emulated M600
label_emulated_m109_m190:Emulated M109 / M190
label_event_led:Event LED
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
#### Language Code:BR
## Language Version:20230209
## Language Version:20230821
## Maximum byte per keyword is 250 Bytes.
## Escape characters are not supported except newline '\n'

label_language:Português BRASIL
label_advanced_ok:Advanced OK
label_emulated_m600:M600 emulado
label_emulated_m109_m190:M109 / M190 emulado
label_event_led:Event LED
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
#### Language Code:CA
## Language Version:20230209
## Language Version:20230821
## Maximum byte per keyword is 250 Bytes.
## Escape characters are not supported except newline '\n'

label_language:Català
label_advanced_ok:Advanced OK
label_emulated_m600:Emulated M600
label_emulated_m109_m190:Emulated M109 / M190
label_event_led:Event LED
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
#### Language Code:CN
## Language Version:20230209
## Language Version:20230821
## Maximum byte per keyword is 250 Bytes.
## Escape characters are not supported except newline '\n'

label_language:简体中文
label_advanced_ok:Advanced OK
label_emulated_m600:模拟M600
label_emulated_m109_m190:Emulated M109 / M190
label_event_led:Event LED
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
#### Language Code:CZ
## Language Version:20230209
## Language Version:20230821
## Maximum byte per keyword is 250 Bytes.
## Escape characters are not supported except newline '\n'

label_language:Čeština
label_advanced_ok:Advanced OK
label_emulated_m600:Emulace M600
label_emulated_m109_m190:Emulace M109 / M190
label_event_led:LED události
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
#### Language Code:DE
## Language Version:20230209
## Language Version:20230821
## Maximum byte per keyword is 250 Bytes.
## Escape characters are not supported except newline '\n'

label_language:Deutsch
label_advanced_ok:Advanced OK
label_emulated_m600:Emuliere M600
label_emulated_m109_m190:Emulated M109 / M190
label_event_led:Event LED
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
#### Language Code:EN
## Language Version:20230209
## Language Version:20230821
## Maximum byte per keyword is 250 Bytes.
## Escape characters are not supported except newline '\n'

label_language:English
label_advanced_ok:Advanced OK
label_emulated_m600:Emulated M600
label_emulated_m109_m190:Emulated M109 / M190
label_event_led:Event LED
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
#### Language Code:ES
## Language Version:20230209
## Language Version:20230821
## Maximum byte per keyword is 250 Bytes.
## Escape characters are not supported except newline '\n'

label_language:Español
label_advanced_ok:Advanced OK
label_emulated_m600:Emulated M600
label_emulated_m109_m190:Emulated M109 / M190
label_event_led:Event LED
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
#### Language Code:FR
## Language Version:20230209
## Language Version:20230821
## Maximum byte per keyword is 250 Bytes.
## Escape characters are not supported except newline '\n'

label_language:Français
label_advanced_ok:Advanced OK
label_emulated_m600:Emuler M600
label_emulated_m109_m190:Emuler M109 / M190
label_event_led:LED Neopixel
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
#### Language Code:GR
## Language Version:20230209
## Language Version:20230821
## Maximum byte per keyword is 250 Bytes.
## Escape characters are not supported except newline '\n'

label_language:Ελληνικά
label_advanced_ok:Advanced OK
label_emulated_m600:Emulated M600
label_emulated_m109_m190:Emulated M109 / M190
label_event_led:Event LED
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
#### Language Code:HR
## Language Version:20230209
## Language Version:20230821
## Maximum byte per keyword is 250 Bytes.
## Escape characters are not supported except newline '\n'

label_language:Hrvatski
label_advanced_ok:Advanced OK
label_emulated_m600:Emuliraj M600
label_emulated_m109_m190:Emuliraj M109 / M190
label_event_led:LED event
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
#### Language Code:HU
## Language Version:20230209
## Language Version:20230821
## Maximum byte per keyword is 250 Bytes.
## Escape characters are not supported except newline '\n'

label_language:Magyar
label_advanced_ok:Advanced OK
label_emulated_m600:Emulált M600
label_emulated_m109_m190:Emulált M109 / M190
label_event_led:Esemény LED
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
#### Language Code:IT
## Language Version:20230209
## Language Version:20230821
## Maximum byte per keyword is 250 Bytes.
## Escape characters are not supported except newline '\n'

label_language:Italiano
label_advanced_ok:OK avanzato
label_emulated_m600:M600 emulato
label_emulated_m109_m190:M109 / M190 emulati
label_event_led:LED evento
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
#### Language Code:JP
## Language Version:20230209
## Language Version:20230821
## Maximum byte per keyword is 250 Bytes.
## Escape characters are not supported except newline '\n'

label_language:日本語
label_advanced_ok:Advanced OK
label_emulated_m600:Emulated M600
label_emulated_m109_m190:Emulated M109 / M190
label_event_led:Event LED
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
#### Language Code:NL
## Language Version:20230209
## Language Version:20230821
## Maximum byte per keyword is 250 Bytes.
## Escape characters are not supported except newline '\n'

label_language:Dutch
label_advanced_ok:Advanced OK
label_emulated_m600:Emulated M600
label_emulated_m109_m190:Emulated M109 / M190
label_event_led:Event LED
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
#### Language Code:PL
## Language Version:20230209
## Language Version:20230821
## Maximum byte per keyword is 250 Bytes.
## Escape characters are not supported except newline '\n'

label_language:Polski
label_advanced_ok:Advanced OK
label_emulated_m600:Emulowane M600
label_emulated_m109_m190:Emulowane M109 / M190
label_event_led:Sygn. zdarzenia diodą LED
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
#### Language Code:PT
## Language Version:20230209
## Language Version:20230821
## Maximum byte per keyword is 250 Bytes.
## Escape characters are not supported except newline '\n'

label_language:Portugues
label_advanced_ok:Advanced OK
label_emulated_m600:Emulated M600
label_emulated_m109_m190:Emulated M109 / M190
label_event_led:Event LED
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
#### Language Code:RU
## Language Version:20230209
## Language Version:20230821
## Maximum byte per keyword is 250 Bytes.
## Escape characters are not supported except newline '\n'

label_language:Русский
label_advanced_ok:Advanced OK
label_emulated_m600:Эмуляция M600
label_emulated_m109_m190:Emulated M109 / M190
label_event_led:Event LED
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
#### Language Code:SK
## Language Version:20230209
## Language Version:20230821
## Maximum byte per keyword is 250 Bytes.
## Escape characters are not supported except newline '\n'

label_language:Slovensky
label_advanced_ok:Advanced OK
label_emulated_m600:Emulated M600
label_emulated_m109_m190:Emulated M109 / M190
label_event_led:Event LED
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
#### Language Code:SL
## Language Version:20230209
## Language Version:20230821
## Maximum byte per keyword is 250 Bytes.
## Escape characters are not supported except newline '\n'

label_language:Slovenski
label_advanced_ok:Advanced OK
label_emulated_m600:Emulated M600
label_emulated_m109_m190:Emulated M109 / M190
label_event_led:Event LED
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
#### Language Code:TC
## Language Version:20230209
## Language Version:20230821
## Maximum byte per keyword is 250 Bytes.
## Escape characters are not supported except newline '\n'

label_language:正體中文
label_advanced_ok:Advanced OK
label_emulated_m600:Emulated M600
label_emulated_m109_m190:Emulated M109 / M190
label_event_led:Event LED
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
#### Language Code:TR
## Language Version:20230209
## Language Version:20230821
## Maximum byte per keyword is 250 Bytes.
## Escape characters are not supported except newline '\n'

label_language:Türkçe
label_advanced_ok:Advanced OK
label_emulated_m600:Emulated M600
label_emulated_m109_m190:Emulated M109 / M190
label_event_led:Event LED
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
#### Language Code:UK
## Language Version:20230209
## Language Version:20230821
## Maximum byte per keyword is 250 Bytes.
## Escape characters are not supported except newline '\n'

label_language:Українська
label_advanced_ok:Advanced OK
label_emulated_m600:Emulated M600
label_emulated_m109_m190:Emulated M109 / M190
label_event_led:Event LED
Expand Down
Binary file not shown.
Binary file modified Copy to SD Card root directory to update/MKS_TFT28_V3.0.27.x.bin
Binary file not shown.
Binary file modified Copy to SD Card root directory to update/MKS_TFT28_V4.0.27.x.bin
Binary file not shown.
Binary file modified Copy to SD Card root directory to update/MKS_TFT32L_V3_0.27.x.bin
Binary file not shown.
Binary file modified Copy to SD Card root directory to update/MKS_TFT32_V1.3.27.x.bin
Binary file not shown.
Binary file modified Copy to SD Card root directory to update/MKS_TFT32_V1.4.27.x.bin
Binary file not shown.
Binary file modified Copy to SD Card root directory to update/MKS_TFT35_V1_0.27.x.bin
Binary file not shown.
38 changes: 38 additions & 0 deletions Copy to SD Card root directory to update/config.ini
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,9 @@
# SET_PROGRESS_MANUALLY (in Configuration_adv.h)
# M73_REPORT (in Configuration_adv.h)
#
# Options to support ADVANCED_OK with host:
# ADVANCED_OK (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)
Expand Down Expand Up @@ -107,6 +110,41 @@
# Options: [OFF (port disabled): 0, 2400: 1, 9600: 2, 19200: 3, 38400: 4, 57600: 5, 115200: 6, 250000: 7, 500000: 8, 1000000: 9]
serial_port:P1:6 P2:0 P3:0 P4:0

#### TX Slots
# Used/effective only in case "advanced_ok" is also enabled.
# Maximum number of G-code TX slots used by the TFT for the communication with the printer.
#
# NOTES:
# - It requires "advanced_ok" to be enabled.
# - This setting allows a sort of static "ADVANCED_OK" feature implementation on TFT side just in
# case "ADVANCED_OK" feature is disabled in Marlin firmware. You have to set it according to the
# following key requirements:
# - a value not bigger than "BUFSIZE" configured in Configuration_adv.h in Marlin firmware.
# - "RX_BUFFER_SIZE" properly configured in Configuration_adv.h in Marlin firmware.
# To be safe you need (MAX_CMD_SIZE * BUFSIZE) RX buffer. By default this is 96 * 4 bytes so
# you would need to at least set RX_BUFFER_SIZE to 512 bytes, practically half of that will
# be enough, but more is better/safer.
# - Typically, a value of 2 is enough to keep the printer busy most of the time while preventing
# buffer overruns on RX buffer. Thus, 2 is the suggested value in case users want to use the
# static ADVANCED_OK feature allowed by this setting.
#
# Value range: [min: 2, max: 16]
tx_slots:2

#### Advanced OK
# If enabled:
# - if "ADVANCED_OK" feature is enabled in Configuration_adv.h in Marlin firmware, the TFT will use
# the available G-code TX slots indication provided by the mainboard to schedule the transmission
# of multiple G-codes, if any, for a maximum of the given indication.
# - if "ADVANCED_OK" feature is disabled in Configuration_adv.h in Marlin firmware, the TFT will
# support the transmission of G-codes according to the configured "tx_slots" setting.
# If disabled, the TFT will provide the standard transmission logic based on one G-code per time.
#
# NOTE: Disable it in case no ADVANCED_OK feature is requested/needed by the user.
#
# Options: [disable: 0, enable: 1]
advanced_ok:0

#### Emulated M600
# The TFT intercepts the M600 G-code (filament change) and emulates the handling logic
# otherwise provided by Marlin firmware.
Expand Down
35 changes: 35 additions & 0 deletions Copy to SD Card root directory to update/config_rrf.ini
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,41 @@
# Options: [OFF (port disabled): 0, 2400: 1, 9600: 2, 19200: 3, 38400: 4, 57600: 5, 115200: 6, 250000: 7, 500000: 8, 1000000: 9]
serial_port:P1:5 P2:0 P3:0 P4:0

#### TX Slots
# Used/effective only in case "advanced_ok" is also enabled.
# Maximum number of G-code TX slots used by the TFT for the communication with the printer.
#
# NOTES:
# - It requires "advanced_ok" to be enabled.
# - This setting allows a sort of static "ADVANCED_OK" feature implementation on TFT side just in
# case "ADVANCED_OK" feature is disabled in Marlin firmware. You have to set it according to the
# following key requirements:
# - a value not bigger than "BUFSIZE" configured in Configuration_adv.h in Marlin firmware.
# - "RX_BUFFER_SIZE" properly configured in Configuration_adv.h in Marlin firmware.
# To be safe you need (MAX_CMD_SIZE * BUFSIZE) RX buffer. By default this is 96 * 4 bytes so
# you would need to at least set RX_BUFFER_SIZE to 512 bytes, practically half of that will
# be enough, but more is better/safer.
# - Typically, a value of 2 is enough to keep the printer busy most of the time while preventing
# buffer overruns on RX buffer. Thus, 2 is the suggested value in case users want to use the
# static ADVANCED_OK feature allowed by this setting.
#
# Value range: [min: 2, max: 16]
tx_slots:2

#### Advanced OK
# If enabled:
# - if "ADVANCED_OK" feature is enabled in Configuration_adv.h in Marlin firmware, the TFT will use
# the available G-code TX slots indication provided by the mainboard to schedule the transmission
# of multiple G-codes, if any, for a maximum of the given indication.
# - if "ADVANCED_OK" feature is disabled in Configuration_adv.h in Marlin firmware, the TFT will
# support the transmission of G-codes according to the configured "tx_slots" setting.
# If disabled, the TFT will provide the standard transmission logic based on one G-code per time.
#
# NOTE: Disable it in case no ADVANCED_OK feature is requested/needed by the user.
#
# Options: [disable: 0, enable: 1]
advanced_ok:0

#### Emulated M600
# The TFT intercepts the M600 G-code (filament change) and emulates the handling logic
# otherwise provided by Marlin firmware.
Expand Down
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,10 @@ the following options must be enabled in Marlin firmware.
`SET_PROGRESS_MANUALLY` (in Configuration_adv.h)<br>
`M73_REPORT` (in Configuration_adv.h)<br>

**Options to support ADVANCED_OK with host:**

`ADVANCED_OK` (in Configuration_adv.h)<br>

**Options to support M600 with host & (Un)Load menu:**

`Options to support dialog with host` (as pre requisite)<br>
Expand Down
Loading

0 comments on commit 0dd3b9e

Please sign in to comment.