Skip to content

Commit

Permalink
Merge branch 'bigtreetech:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
Apie56 authored Mar 31, 2024
2 parents 9a2ce34 + 87b6fb3 commit b159600
Show file tree
Hide file tree
Showing 519 changed files with 53,162 additions and 8,005 deletions.
40 changes: 0 additions & 40 deletions .github/lock.yml

This file was deleted.

62 changes: 0 additions & 62 deletions .github/stale.yml

This file was deleted.

10 changes: 7 additions & 3 deletions .github/workflows/buildBinary.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,13 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Setup Python
uses: actions/setup-python@master
uses: actions/setup-python@v5
with:
python-version: '3.x'
python-version: '3.9'
architecture: 'x64'

- name: Install PlatformIO
run: |
Expand Down Expand Up @@ -117,6 +118,9 @@ jobs:
- name: Build MKS TFT35 V1.0
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

- name: Remove Old Binaries
run: find "Copy to SD Card root directory to update/" -name '*.bin' -print -delete

Expand Down
10 changes: 7 additions & 3 deletions .github/workflows/buildTest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,13 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Setup Python
uses: actions/setup-python@master
uses: actions/setup-python@v5
with:
python-version: '3.x'
python-version: '3.9'
architecture: 'x64'

- name: Install PlatformIO
run: |
Expand Down Expand Up @@ -113,3 +114,6 @@ jobs:

- name: Build MKS TFT35 V1.0
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
32 changes: 32 additions & 0 deletions .github/workflows/lockClosed.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
#
# lockClosed.yml
# Lock closed issues after a period of inactivity
#

name: Lock Closed Issues

on:
schedule:
- cron: '0 1/13 * * *'

jobs:
lock:
name: Lock Closed Issues
if: github.repository == 'bigtreetech/BIGTREETECH-TouchScreenFirmware'

runs-on: ubuntu-latest

steps:
- uses: dessant/lock-threads@v5
with:
github-token: ${{ github.token }}
process-only: 'issues'
issue-inactive-days: '90'
exclude-issue-created-before: ''
exclude-any-issue-labels: ''
add-issue-labels: ''
issue-comment: >
This issue has been automatically locked since there
has not been any recent activity after it was closed.
Please open a new issue for related bugs.
issue-lock-reason: ''
29 changes: 29 additions & 0 deletions .github/workflows/stale.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# This workflow warns and then closes issues and PRs that have had no activity for a specified amount of time.
#
# You can adjust the behavior by modifying this file.
# For more information, see:
# https://github.com/actions/stale
name: Mark Stale Issues and PRs

on:
schedule:
- cron: '30 1 * * *'

jobs:
stale:
name: Mark Stale Issues and PRs
if: github.repository == 'bigtreetech/BIGTREETECH-TouchScreenFirmware'

runs-on: ubuntu-latest
permissions:
issues: write
pull-requests: write

steps:
- uses: actions/stale@v9
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
stale-issue-message: 'This issue has been automatically marked as stale because it has had no activity for the last 60 days. It will be closed in 7 days if no further activity occurs. Thank you for your contribution.'
stale-pr-message: 'This PR has been automatically marked as stale because it has had no activity for the last 60 days. It will be closed in 7 days if no further activity occurs. Thank you for your contribution.'
days-before-stale: 60
days-before-close: 7
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ This patcher uploads a bootloader that changes the long beep of the bootloader o

Usage:
Put it on the SD card as any other regular FW file and boot your printer with the SD inserted.
During the update you'll see a red dot and a progress bar. The progress bar will let you know when the upload of the patched FW is finished. Also, at the end of the patched bootloader flash procedure the red dot will change into a blinking green dot. That's when you can eject the SD card and copy your favorite FW file to be flashed over this bootloader patcher FW.
During the update you'll see a red dot and a progress bar. The progress bar will let you know when the upload of the patched bootloaders is finished. Also, at the end of the patched bootloader flash procedure the red dot will change into a blinking green dot. That's when you can eject the SD card and copy to it your favorite FW file to be flashed over this bootloader patcher FW, reinsert the SD Card into the TFT and reboot it.

Attention!!! This is not a functional FW, it's only for uploading the patched bootloader, you must reupload your regular favorite FW after the bootloader patching FW has done its job.

Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# Dump of bootloader V3.0.5

This is the bootloader dumped from MKS TFT Controller V1.4. It is only suitable for TFTs with GD32F305VCT6 MCU.
Do not use on any other TFT !!!


## Usage

Require an ST-link tool attached to the SWD port of your TFT Controller (should be soldered).

#### Dump

Execute the command `st-flash read bootloader.bin 0x08000000 0x7000`

#### Flash

From this folder, execute the command `st-flash write MKSTFT28EVO.BIN 0x8000000`
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,11 @@
#### Language Code:AM
## Language Version:20230209
## 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 Expand Up @@ -307,7 +309,7 @@ label_tune_start_info:Autotune may take some time to complete.\nContinue?
label_tune_extruder:Tune steps
label_tune_ext_extrude_100:Ext. 100mm
label_tune_ext_temp:Extruder tuning | Heat
label_tune_ext_mark120mm:Mark 120 mm on your fillament.\nPress '%s' when ready.\nMeasure remaining length after extruding.
label_tune_ext_mark120mm:Mark 120 mm on your filament.\nPress '%s' when ready.\nMeasure remaining length after extruding.
label_tune_ext_adj_esteps:Adjust E-Steps
label_tune_ext_esteps_saved:New E-steps applied.\nDon't forget to save it in EEPROM.\nNew value: %0.2f
label_tune_ext_measured:Length remaining:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
#### Language Code:BR
## Language Version:20230209
## 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,9 +1,11 @@
#### Language Code:CA
## Language Version:20230209
## 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 Expand Up @@ -307,7 +309,7 @@ label_tune_start_info:Autotune may take some time to complete.\nContinue?
label_tune_extruder:Tune steps
label_tune_ext_extrude_100:Ext. 100mm
label_tune_ext_temp:Extruder tuning | Heat
label_tune_ext_mark120mm:Mark 120 mm on your fillament.\nPress '%s' when ready.\nMeasure remaining length after extruding.
label_tune_ext_mark120mm:Mark 120 mm on your filament.\nPress '%s' when ready.\nMeasure remaining length after extruding.
label_tune_ext_adj_esteps:Adjust E-Steps
label_tune_ext_esteps_saved:New E-steps applied.\nDon't forget to save it in EEPROM.\nNew value: %0.2f
label_tune_ext_measured:Length remaining:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
#### Language Code:CN
## Language Version:20230209
## 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,14 +1,16 @@
#### Language Code:CZ
## Language Version:20230209
## 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:Kontrolní součet
label_emulated_m600:Emulace M600
label_emulated_m109_m190:Emulace M109 / M190
label_event_led:LED události
label_file_comment_parsing:Analýzovat komentáře
label_rotated_ui:Otočit UI
label_rotated_ui:Otočit
label_ack_notification:Styl oznámení ACK
label_files_sort_by:Řazení souboru
label_files_list_mode:Soubory jako seznam
Expand Down Expand Up @@ -223,9 +225,9 @@ label_print:Tisknout
label_extrude:Filament
label_settings:Nastavení
label_screen_settings:Displej
label_ui_settings:UI
label_ui_settings:Parametry
label_sound:Zvuk
label_marlin_mode_settings:MarlinMode
label_marlin_mode_settings:Marlin Mod
label_machine_settings:Tiskárna
label_parameter_settings:Parametry
label_feature_settings:Vlastnosti
Expand Down Expand Up @@ -263,7 +265,7 @@ label_abl_slot2:Slot 2
label_abl_slot3:Slot 3
label_abl_slot_eeprom:Uložit síť do EEPROM a načíst po restartu?
label_abl_z:Z-Slábnutí
label_level_corner:L Rohu
label_level_corner:Sonda Rohu
label_level_corner_info:Vzdálenost od okraje je menší než offset sondy X/Y a některé body nemusí být dosažitelné.\nPoužít bezpečnou vzdálenost od okraje?
label_p_offset:P Offset
label_h_offset:H Offset
Expand Down
Loading

0 comments on commit b159600

Please sign in to comment.