Skip to content

Commit

Permalink
sync gd32f30x serial.h
Browse files Browse the repository at this point in the history
  • Loading branch information
bigtreetech committed Feb 19, 2024
1 parent 4f722c3 commit de4f60f
Show file tree
Hide file tree
Showing 32 changed files with 61 additions and 37 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/buildBinary.yml
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ jobs:
run: platformio run --environment MKS_TFT35_V1_0

- name: Build MKS GD TFT28 V1.2-4
run: platformio run --environment MKS_GD_TFT28_V1_2-4
run: platformio run --environment MKS_GD_TFT28_V1_2_4

- name: Remove Old Binaries
run: find "Copy to SD Card root directory to update/" -name '*.bin' -print -delete
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/buildTest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -115,4 +115,4 @@ jobs:
run: platformio run --environment MKS_TFT35_V1_0

- name: Build MKS GD TFT28 V1.2-4
run: platformio run --environment MKS_GD_TFT28_V1_2-4
run: platformio run --environment MKS_GD_TFT28_V1_2_4
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
#### Language Code:AM
## Language Version:20230821
## Language Version:20240203
## Maximum byte per keyword is 250 Bytes.
## Escape characters are not supported except newline '\n'

label_language:Հայերեն
label_advanced_ok:Advanced OK
label_command_checksum:Command checksum
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,10 +1,11 @@
#### Language Code:BR
## Language Version:20230821
## Language Version:20240203
## 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_command_checksum:Command checksum
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,10 +1,11 @@
#### Language Code:CA
## Language Version:20230821
## Language Version:20240203
## Maximum byte per keyword is 250 Bytes.
## Escape characters are not supported except newline '\n'

label_language:Català
label_advanced_ok:Advanced OK
label_command_checksum:Command checksum
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,10 +1,11 @@
#### Language Code:CN
## Language Version:20230821
## Language Version:20240203
## Maximum byte per keyword is 250 Bytes.
## Escape characters are not supported except newline '\n'

label_language:简体中文
label_advanced_ok:Advanced OK
label_command_checksum:Command checksum
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,10 +1,11 @@
#### Language Code:CZ
## Language Version:20230821
## Language Version:20240203
## 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_command_checksum:Command checksum
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,10 +1,11 @@
#### Language Code:DE
## Language Version:20230821
## Language Version:20240203
## Maximum byte per keyword is 250 Bytes.
## Escape characters are not supported except newline '\n'

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

label_language:English
label_advanced_ok:Advanced OK
label_command_checksum:Command checksum
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,10 +1,11 @@
#### Language Code:ES
## Language Version:20230821
## Language Version:20240203
## 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_command_checksum:Command checksum
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,10 +1,11 @@
#### Language Code:FR
## Language Version:20230821
## Language Version:20240203
## 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_command_checksum:Command checksum
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,10 +1,11 @@
#### Language Code:GR
## Language Version:20230821
## Language Version:20240203
## Maximum byte per keyword is 250 Bytes.
## Escape characters are not supported except newline '\n'

label_language:Ελληνικά
label_advanced_ok:Advanced OK
label_command_checksum:Command checksum
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,10 +1,11 @@
#### Language Code:HR
## Language Version:20230821
## Language Version:20240203
## Maximum byte per keyword is 250 Bytes.
## Escape characters are not supported except newline '\n'

label_language:Hrvatski
label_advanced_ok:Advanced OK
label_command_checksum:Command checksum
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,10 +1,11 @@
#### Language Code:HU
## Language Version:20230821
## Language Version:20240203
## Maximum byte per keyword is 250 Bytes.
## Escape characters are not supported except newline '\n'

label_language:Magyar
label_advanced_ok:Advanced OK
label_command_checksum:Command checksum
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,10 +1,11 @@
#### Language Code:IT
## Language Version:20230821
## Language Version:20240203
## Maximum byte per keyword is 250 Bytes.
## Escape characters are not supported except newline '\n'

label_language:Italiano
label_advanced_ok:OK avanzato
label_command_checksum:Checksum comando
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,10 +1,11 @@
#### Language Code:JP
## Language Version:20230821
## Language Version:20240203
## Maximum byte per keyword is 250 Bytes.
## Escape characters are not supported except newline '\n'

label_language:日本語
label_advanced_ok:Advanced OK
label_command_checksum:Command checksum
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,10 +1,11 @@
#### Language Code:NL
## Language Version:20230821
## Language Version:20240203
## Maximum byte per keyword is 250 Bytes.
## Escape characters are not supported except newline '\n'

label_language:Dutch
label_advanced_ok:Advanced OK
label_command_checksum:Command checksum
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,10 +1,11 @@
#### Language Code:PL
## Language Version:20230821
## Language Version:20240203
## Maximum byte per keyword is 250 Bytes.
## Escape characters are not supported except newline '\n'

label_language:Polski
label_advanced_ok:Advanced OK
label_command_checksum:Command checksum
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,10 +1,11 @@
#### Language Code:PT
## Language Version:20230821
## Language Version:20240203
## Maximum byte per keyword is 250 Bytes.
## Escape characters are not supported except newline '\n'

label_language:Portugues
label_advanced_ok:Advanced OK
label_command_checksum:Command checksum
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,10 +1,11 @@
#### Language Code:RU
## Language Version:20230821
## Language Version:20240203
## Maximum byte per keyword is 250 Bytes.
## Escape characters are not supported except newline '\n'

label_language:Русский
label_advanced_ok:Advanced OK
label_command_checksum:Command checksum
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,10 +1,11 @@
#### Language Code:SK
## Language Version:20230821
## Language Version:20240203
## Maximum byte per keyword is 250 Bytes.
## Escape characters are not supported except newline '\n'

label_language:Slovensky
label_advanced_ok:Advanced OK
label_command_checksum:Command checksum
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,10 +1,11 @@
#### Language Code:SL
## Language Version:20230821
## Language Version:20240203
## Maximum byte per keyword is 250 Bytes.
## Escape characters are not supported except newline '\n'

label_language:Slovenski
label_advanced_ok:Advanced OK
label_command_checksum:Command checksum
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,10 +1,11 @@
#### Language Code:TC
## Language Version:20230821
## Language Version:20240203
## Maximum byte per keyword is 250 Bytes.
## Escape characters are not supported except newline '\n'

label_language:正體中文
label_advanced_ok:Advanced OK
label_command_checksum:Command checksum
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,10 +1,11 @@
#### Language Code:TR
## Language Version:20230821
## Language Version:20240203
## 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_command_checksum:Command checksum
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,10 +1,11 @@
#### Language Code:UK
## Language Version:20230821
## Language Version:20240203
## Maximum byte per keyword is 250 Bytes.
## Escape characters are not supported except newline '\n'

label_language:Українська
label_advanced_ok:Advanced OK
label_command_checksum:Command checksum
label_emulated_m600:Emulated M600
label_emulated_m109_m190:Emulated M109 / M190
label_event_led:Event LED
Expand Down
2 changes: 1 addition & 1 deletion Copy to SD Card root directory to update/config.ini
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
# MKS_TFT32_V1_3 / MKS_TFT32_V1_4 / MKS_TFT32L_V3_0
# MKS_TFT35_V1_0
#
# MKS_GD_TFT28_V1_2-4
# MKS_GD_TFT28_V1_2_4
#
# Firmware source: https://github.com/bigtreetech/BIGTREETECH-TouchScreenFirmware

Expand Down
2 changes: 1 addition & 1 deletion Copy to SD Card root directory to update/config_rrf.ini
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
# MKS_TFT32_V1_3 / MKS_TFT32_V1_4 / MKS_TFT32L_V3_0
# MKS_TFT35_V1_0
#
# MKS_GD_TFT28_V1_2-4
# MKS_GD_TFT28_V1_2_4
#
# Firmware source: https://github.com/bigtreetech/BIGTREETECH-TouchScreenFirmware

Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ Only the TFTs listed below are currently supported. Trying to install the firmwa

**MKS TFT with GigaDevice MCUs**

MKS_GD_TFT28_V1_2-4
MKS_GD_TFT28_V1_2_4

**WARNING:** BTT does not officially provide MKS TFT hardware support. MKS TFT is maintained by open source contributors and BTT does not bear any risk of MKS TFT hardware using this firmware.

Expand Down Expand Up @@ -257,7 +257,7 @@ For **MKS TFTs**:

For MKS TFTs **GigaDevice MCUs** (like the newest version of Genious Pro):

1. rename the right binary (e.g. `MKS_GD_TFT28_V1_2-4.27.x.bin`) in `mkstft28evo.bin`
1. rename the right binary (e.g. `MKS_GD_TFT28_V1_2_4.27.x.bin`) in `mkstft28evo.bin`
2. create an empty `mkstft28.bin` file
3. create two empty directories `mks_font` and `mks_pic`

Expand Down Expand Up @@ -489,7 +489,7 @@ Please, see [Customization Guides](https://github.com/bigtreetech/BIGTREETECH-To
;MKS_TFT32_V1_4_NOBL
;MKS_TFT32L_V3_0
;MKS_TFT35_V1_0
;MKS_GD_TFT28_V1_2-4
;MKS_GD_TFT28_V1_2_4

[platformio]
src_dir = TFT
Expand Down
1 change: 1 addition & 0 deletions TFT/src/User/Hal/gd32f30x/Serial.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ typedef struct
} SERIAL_CFG;

extern DMA_CIRCULAR_BUFFER dmaL1DataRX[_UART_CNT];
extern DMA_CIRCULAR_BUFFER dmaL1DataTX[_UART_CNT];
extern const SERIAL_CFG Serial[_UART_CNT];

void Serial_Config(uint8_t port, uint32_t cacheSizeRX, uint32_t cacheSizeTX, uint32_t baudrate);
Expand Down
2 changes: 1 addition & 1 deletion TFT/src/User/config.ini
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
# MKS_TFT32_V1_3 / MKS_TFT32_V1_4 / MKS_TFT32L_V3_0
# MKS_TFT35_V1_0
#
# MKS_GD_TFT28_V1_2-4
# MKS_GD_TFT28_V1_2_4
#
# Firmware source: https://github.com/bigtreetech/BIGTREETECH-TouchScreenFirmware

Expand Down
2 changes: 1 addition & 1 deletion TFT/src/User/config_rrf.ini
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
# MKS_TFT32_V1_3 / MKS_TFT32_V1_4 / MKS_TFT32L_V3_0
# MKS_TFT35_V1_0
#
# MKS_GD_TFT28_V1_2-4
# MKS_GD_TFT28_V1_2_4
#
# Firmware source: https://github.com/bigtreetech/BIGTREETECH-TouchScreenFirmware

Expand Down
Loading

0 comments on commit de4f60f

Please sign in to comment.