forked from bigtreetech/BIGTREETECH-TouchScreenFirmware
-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into mks_32_V1_4
* master: fix bug in move.c, clean language keywords and add missing keyword, add knob led to list mode settings (bigtreetech#287) Dutch language added (bigtreetech#289) Update language_ru.h (bigtreetech#278) Fix compile error due to undefined references in move.c, Fix Custom gcode not working in List Mode, disable global info from showing on Status Screen and Move menu (bigtreetech#279) # Conflicts: # TFT/src/User/variants.h
- Loading branch information
Showing
47 changed files
with
766 additions
and
517 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
--- | ||
name: Ask a question | ||
about: Ask a question or request details | ||
title: '[Q] (Your Question?)' | ||
labels: 'question' | ||
assignees: '' | ||
|
||
--- | ||
|
||
**Your question or details you need. Please describe.** | ||
A clear and concise question or detail you would like to ask. Like Hardware related or firmware related. | ||
|
||
**specify the device variant related to your question.** | ||
|
||
**Additional context** | ||
Add any other context or screenshots about the question here. |
Binary file renamed
BIN
+30.1 KB
...aterial theme/TFT35/bmp/InfoBox_part1.bmp → ...Menu Material theme/TFT24/bmp/InfoBox.bmp
Binary file not shown.
Binary file removed
BIN
-15.6 KB
...D Card root directory to update - Unified Menu Material theme/TFT24/bmp/InfoBox_part1.bmp
Binary file not shown.
Binary file removed
BIN
-15.6 KB
...D Card root directory to update - Unified Menu Material theme/TFT24/bmp/InfoBox_part2.bmp
Binary file not shown.
Binary file modified
BIN
+0 Bytes
(100%)
...o SD Card root directory to update - Unified Menu Material theme/TFT24/bmp/global_bed.bmp
Binary file not shown.
Binary file modified
BIN
+0 Bytes
(100%)
...D Card root directory to update - Unified Menu Material theme/TFT24/bmp/global_nozzle.bmp
Binary file not shown.
Binary file renamed
BIN
+30.1 KB
...aterial theme/TFT35/bmp/InfoBox_part2.bmp → ...Menu Material theme/TFT28/bmp/InfoBox.bmp
Binary file not shown.
Binary file removed
BIN
-15.6 KB
...D Card root directory to update - Unified Menu Material theme/TFT28/bmp/InfoBox_part1.bmp
Binary file not shown.
Binary file removed
BIN
-15.6 KB
...D Card root directory to update - Unified Menu Material theme/TFT28/bmp/InfoBox_part2.bmp
Binary file not shown.
Binary file modified
BIN
+0 Bytes
(100%)
...o SD Card root directory to update - Unified Menu Material theme/TFT28/bmp/global_bed.bmp
Binary file not shown.
Binary file modified
BIN
+0 Bytes
(100%)
...D Card root directory to update - Unified Menu Material theme/TFT28/bmp/global_nozzle.bmp
Binary file not shown.
Binary file modified
BIN
+12.2 KB
(180%)
...ard root directory to update - Unified Menu Material theme/TFT28/bmp/parametersetting.bmp
Binary file not shown.
Binary file added
BIN
+60.2 KB
Copy to SD Card root directory to update - Unified Menu Material theme/TFT35/bmp/InfoBox.bmp
Binary file not shown.
Binary file modified
BIN
+0 Bytes
(100%)
...o SD Card root directory to update - Unified Menu Material theme/TFT35/bmp/global_bed.bmp
Binary file not shown.
Binary file modified
BIN
+0 Bytes
(100%)
...D Card root directory to update - Unified Menu Material theme/TFT35/bmp/global_nozzle.bmp
Binary file not shown.
Binary file modified
BIN
+2 Bytes
(100%)
...ard root directory to update - Unified Menu Material theme/TFT35/bmp/parametersetting.bmp
Binary file not shown.
Binary file modified
BIN
+0 Bytes
(100%)
...D Card root directory to update - Unified Menu Material theme/TFT35/font/word_unicode.fon
Binary file not shown.
Oops, something went wrong.