From de4f60f69cb1a167be2ba5fb33839406c4fc1944 Mon Sep 17 00:00:00 2001 From: bigtreetech Date: Mon, 19 Feb 2024 11:43:57 +0800 Subject: [PATCH] sync gd32f30x serial.h --- .github/workflows/buildBinary.yml | 2 +- .github/workflows/buildTest.yml | 2 +- .../Language Packs/language_am.ini | 3 ++- .../Language Packs/language_br.ini | 3 ++- .../Language Packs/language_ca.ini | 3 ++- .../Language Packs/language_cn.ini | 3 ++- .../Language Packs/language_cz.ini | 3 ++- .../Language Packs/language_de.ini | 3 ++- .../Language Packs/language_en.ini | 3 ++- .../Language Packs/language_es.ini | 3 ++- .../Language Packs/language_fr.ini | 3 ++- .../Language Packs/language_gr.ini | 3 ++- .../Language Packs/language_hr.ini | 3 ++- .../Language Packs/language_hu.ini | 3 ++- .../Language Packs/language_it.ini | 3 ++- .../Language Packs/language_jp.ini | 3 ++- .../Language Packs/language_nl.ini | 3 ++- .../Language Packs/language_pl.ini | 3 ++- .../Language Packs/language_pt.ini | 3 ++- .../Language Packs/language_ru.ini | 3 ++- .../Language Packs/language_sk.ini | 3 ++- .../Language Packs/language_sl.ini | 3 ++- .../Language Packs/language_tc.ini | 3 ++- .../Language Packs/language_tr.ini | 3 ++- .../Language Packs/language_uk.ini | 3 ++- Copy to SD Card root directory to update/config.ini | 2 +- .../config_rrf.ini | 2 +- README.md | 6 +++--- TFT/src/User/Hal/gd32f30x/Serial.h | 1 + TFT/src/User/config.ini | 2 +- TFT/src/User/config_rrf.ini | 2 +- platformio.ini | 10 +++++----- 32 files changed, 61 insertions(+), 37 deletions(-) diff --git a/.github/workflows/buildBinary.yml b/.github/workflows/buildBinary.yml index e8f50efc18..fa070cca3f 100644 --- a/.github/workflows/buildBinary.yml +++ b/.github/workflows/buildBinary.yml @@ -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 diff --git a/.github/workflows/buildTest.yml b/.github/workflows/buildTest.yml index 2fa773cd89..195277f28d 100644 --- a/.github/workflows/buildTest.yml +++ b/.github/workflows/buildTest.yml @@ -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 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 4d7c921675..39d361ee93 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,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 diff --git a/Copy to SD Card root directory to update/Language Packs/language_br.ini b/Copy to SD Card root directory to update/Language Packs/language_br.ini index 104ebd4bb3..151e301b86 100644 --- a/Copy to SD Card root directory to update/Language Packs/language_br.ini +++ b/Copy to SD Card root directory to update/Language Packs/language_br.ini @@ -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 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 4da8f42f8d..6f4458971f 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,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 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 a3e308045e..f0315d809a 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,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 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 6e16bd8c32..2119d0239d 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,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 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 d3bfe0631d..ba71fbacff 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,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 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 850b8e90ad..40c51c67dd 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,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 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 0bf201e8b6..81a22f3da1 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,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 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 fe0d12826f..c6b071b360 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,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 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 0dd04bacf6..af547fd2a2 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,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 diff --git a/Copy to SD Card root directory to update/Language Packs/language_hr.ini b/Copy to SD Card root directory to update/Language Packs/language_hr.ini index edbf31993e..e037c058a4 100644 --- a/Copy to SD Card root directory to update/Language Packs/language_hr.ini +++ b/Copy to SD Card root directory to update/Language Packs/language_hr.ini @@ -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 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 0c9cd6b9c4..3a66ff6d49 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,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 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 b0f969adce..5ad5346ba4 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,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 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 bee2b7d01a..8d551f5457 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,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 diff --git a/Copy to SD Card root directory to update/Language Packs/language_nl.ini b/Copy to SD Card root directory to update/Language Packs/language_nl.ini index 2f562d7332..8bf472f56b 100644 --- a/Copy to SD Card root directory to update/Language Packs/language_nl.ini +++ b/Copy to SD Card root directory to update/Language Packs/language_nl.ini @@ -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 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 1665e7962e..37aa1ed818 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,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 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 d16d24ba61..a55ae605eb 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,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 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 907a7c6078..eb5bdbf38e 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,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 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 87508abf6f..cf07bb9b1f 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,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 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 6a0152ed6f..01b0301e20 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,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 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 30301cca75..effcde977e 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,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 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 2bbbb3a0e0..39c5dcc6c4 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,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 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 a209197f2f..4773c68acc 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,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 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 3e6c94bd00..b278f0ba4e 100644 --- a/Copy to SD Card root directory to update/config.ini +++ b/Copy to SD Card root directory to update/config.ini @@ -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 diff --git a/Copy to SD Card root directory to update/config_rrf.ini b/Copy to SD Card root directory to update/config_rrf.ini index f51b3f96b2..66df791838 100644 --- a/Copy to SD Card root directory to update/config_rrf.ini +++ b/Copy to SD Card root directory to update/config_rrf.ini @@ -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 diff --git a/README.md b/README.md index d29d01b69c..d726ac08e8 100644 --- a/README.md +++ b/README.md @@ -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. @@ -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` @@ -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 diff --git a/TFT/src/User/Hal/gd32f30x/Serial.h b/TFT/src/User/Hal/gd32f30x/Serial.h index d66960ba5a..43041be815 100644 --- a/TFT/src/User/Hal/gd32f30x/Serial.h +++ b/TFT/src/User/Hal/gd32f30x/Serial.h @@ -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); diff --git a/TFT/src/User/config.ini b/TFT/src/User/config.ini index 02b6ebd4e6..d30d31bcf8 100644 --- a/TFT/src/User/config.ini +++ b/TFT/src/User/config.ini @@ -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 diff --git a/TFT/src/User/config_rrf.ini b/TFT/src/User/config_rrf.ini index 8fe12cfe07..afad20553b 100644 --- a/TFT/src/User/config_rrf.ini +++ b/TFT/src/User/config_rrf.ini @@ -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 diff --git a/platformio.ini b/platformio.ini index 6a1820306e..0b4ce88f36 100644 --- a/platformio.ini +++ b/platformio.ini @@ -39,16 +39,16 @@ ;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 boards_dir = buildroot/boards ;Build only Target - BIGTREE_TFT35_V3_0 -default_envs = MKS_GD_TFT28_V1_2-4 +default_envs = MKS_GD_TFT28_V1_2_4 ;Build all Targets -;default_envs = BIGTREE_TFT24_V1_1, BIGTREE_TFT28_V1_0, BIGTREE_TFT28_V3_0, BIGTREE_TFT35_V1_0, BIGTREE_TFT35_V1_1, BIGTREE_TFT35_V1_2, 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_GD_TFT24_V1_1, BIGTREE_GD_TFT35_V2_0, BIGTREE_GD_TFT35_V3_0, BIGTREE_GD_TFT35_E3_V3_0, BIGTREE_GD_TFT35_B1_V3_0, BIGTREE_GD_TFT43_V3_0, BIGTREE_GD_TFT50_V3_0, BIGTREE_GD_TFT70_V3_0, MKS_TFT28_V3_0, MKS_TFT28_V4_0, MKS_TFT28_NEW_GENIUS, MKS_TFT32_V1_3, MKS_TFT32_V1_4, MKS_TFT32_V1_4_NOBL, MKS_TFT32L_V3_0, MKS_TFT35_V1_0, MKS_GD_TFT28_V1_2-4 +;default_envs = BIGTREE_TFT24_V1_1, BIGTREE_TFT28_V1_0, BIGTREE_TFT28_V3_0, BIGTREE_TFT35_V1_0, BIGTREE_TFT35_V1_1, BIGTREE_TFT35_V1_2, 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_GD_TFT24_V1_1, BIGTREE_GD_TFT35_V2_0, BIGTREE_GD_TFT35_V3_0, BIGTREE_GD_TFT35_E3_V3_0, BIGTREE_GD_TFT35_B1_V3_0, BIGTREE_GD_TFT43_V3_0, BIGTREE_GD_TFT50_V3_0, BIGTREE_GD_TFT70_V3_0, MKS_TFT28_V3_0, MKS_TFT28_V4_0, MKS_TFT28_NEW_GENIUS, MKS_TFT32_V1_3, MKS_TFT32_V1_4, MKS_TFT32_V1_4_NOBL, MKS_TFT32L_V3_0, MKS_TFT35_V1_0, MKS_GD_TFT28_V1_2_4 [common] default_src_filter = + - @@ -692,7 +692,7 @@ build_flags = ${stm32f4xx.build_flags} ${base64_png.build_flags} # # MKS GD TFT28 V4.0 # -[env:MKS_GD_TFT28_V1_2-4] +[env:MKS_GD_TFT28_V1_2_4] extends = common_gd32 board = GD32F305VC_0x7000 build_src_filter = ${gd32f30x.default_src_filter} ${base64_png.default_src_filter} @@ -707,7 +707,7 @@ build_flags = ${gd32f30x.build_flags} ${base64_png.build_flags} -DRAM_SIZE=64 ; Available RAM size in kbytes ; -DBINARY_FILENAME="mkstft28evo" ; To override the default binary filename provided by -DHARDWARE ; -DBINARY_DIRECTORY="mkstft28evo" ; To override the default release directory - -DHARDWARE="MKS_GD_TFT28_V1_2-4" + -DHARDWARE="MKS_GD_TFT28_V1_2_4" -DHARDWARE_SHORT="M28GDV2" -DMKS_GD_TFT28_V1_24= -DMKS_TFT=