diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 2526752987..aae58f8854 100755 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -2,7 +2,7 @@ name: Bug report about: Create a report to help us improve title: '[BUG] (short description)' -labels: '' +labels: 'bug' assignees: '' --- @@ -25,6 +25,11 @@ Do you want to ask a question? Are you looking for support? Please don't post he **Actual behavior** +### Hardware Variant + +### TFT Firmware Version & Main Board Firmware details + + ### Additional Information * Include a ZIP file containing your `Configuration.h` or use [Pastebin](https://pastebin.com/) and paste a link in this issue. * Provide pictures or links to videos that clearly demonstrate the issue. diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md index 4e7e92aaa4..c040a4cbd4 100755 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -2,7 +2,7 @@ name: Feature request about: Suggest an idea for this project title: '[FR] (feature request title)' -labels: '' +labels: 'enhancement' assignees: '' --- diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md new file mode 100644 index 0000000000..0aaa523e50 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/question.md @@ -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. diff --git a/Copy to SD Card root directory to update - Unified Menu Material theme/TFT35/bmp/InfoBox_part1.bmp b/Copy to SD Card root directory to update - Unified Menu Material theme/TFT24/bmp/InfoBox.bmp similarity index 80% rename from Copy to SD Card root directory to update - Unified Menu Material theme/TFT35/bmp/InfoBox_part1.bmp rename to Copy to SD Card root directory to update - Unified Menu Material theme/TFT24/bmp/InfoBox.bmp index 2244edb2b8..703de802cf 100644 Binary files a/Copy to SD Card root directory to update - Unified Menu Material theme/TFT35/bmp/InfoBox_part1.bmp and b/Copy to SD Card root directory to update - Unified Menu Material theme/TFT24/bmp/InfoBox.bmp differ diff --git a/Copy to SD Card root directory to update - Unified Menu Material theme/TFT24/bmp/InfoBox_part1.bmp b/Copy to SD Card root directory to update - Unified Menu Material theme/TFT24/bmp/InfoBox_part1.bmp deleted file mode 100644 index 0f543252e0..0000000000 Binary files a/Copy to SD Card root directory to update - Unified Menu Material theme/TFT24/bmp/InfoBox_part1.bmp and /dev/null differ diff --git a/Copy to SD Card root directory to update - Unified Menu Material theme/TFT24/bmp/InfoBox_part2.bmp b/Copy to SD Card root directory to update - Unified Menu Material theme/TFT24/bmp/InfoBox_part2.bmp deleted file mode 100644 index 0f543252e0..0000000000 Binary files a/Copy to SD Card root directory to update - Unified Menu Material theme/TFT24/bmp/InfoBox_part2.bmp and /dev/null differ diff --git a/Copy to SD Card root directory to update - Unified Menu Material theme/TFT24/bmp/global_bed.bmp b/Copy to SD Card root directory to update - Unified Menu Material theme/TFT24/bmp/global_bed.bmp index b4aa17c335..c3d2c8462d 100644 Binary files a/Copy to SD Card root directory to update - Unified Menu Material theme/TFT24/bmp/global_bed.bmp and b/Copy to SD Card root directory to update - Unified Menu Material theme/TFT24/bmp/global_bed.bmp differ diff --git a/Copy to SD Card root directory to update - Unified Menu Material theme/TFT24/bmp/global_nozzle.bmp b/Copy to SD Card root directory to update - Unified Menu Material theme/TFT24/bmp/global_nozzle.bmp index df8b410856..db2d675196 100644 Binary files a/Copy to SD Card root directory to update - Unified Menu Material theme/TFT24/bmp/global_nozzle.bmp and b/Copy to SD Card root directory to update - Unified Menu Material theme/TFT24/bmp/global_nozzle.bmp differ diff --git a/Copy to SD Card root directory to update - Unified Menu Material theme/TFT35/bmp/InfoBox_part2.bmp b/Copy to SD Card root directory to update - Unified Menu Material theme/TFT28/bmp/InfoBox.bmp similarity index 77% rename from Copy to SD Card root directory to update - Unified Menu Material theme/TFT35/bmp/InfoBox_part2.bmp rename to Copy to SD Card root directory to update - Unified Menu Material theme/TFT28/bmp/InfoBox.bmp index 847dba5390..703de802cf 100644 Binary files a/Copy to SD Card root directory to update - Unified Menu Material theme/TFT35/bmp/InfoBox_part2.bmp and b/Copy to SD Card root directory to update - Unified Menu Material theme/TFT28/bmp/InfoBox.bmp differ diff --git a/Copy to SD Card root directory to update - Unified Menu Material theme/TFT28/bmp/InfoBox_part1.bmp b/Copy to SD Card root directory to update - Unified Menu Material theme/TFT28/bmp/InfoBox_part1.bmp deleted file mode 100644 index 0f543252e0..0000000000 Binary files a/Copy to SD Card root directory to update - Unified Menu Material theme/TFT28/bmp/InfoBox_part1.bmp and /dev/null differ diff --git a/Copy to SD Card root directory to update - Unified Menu Material theme/TFT28/bmp/InfoBox_part2.bmp b/Copy to SD Card root directory to update - Unified Menu Material theme/TFT28/bmp/InfoBox_part2.bmp deleted file mode 100644 index 0f543252e0..0000000000 Binary files a/Copy to SD Card root directory to update - Unified Menu Material theme/TFT28/bmp/InfoBox_part2.bmp and /dev/null differ diff --git a/Copy to SD Card root directory to update - Unified Menu Material theme/TFT28/bmp/global_bed.bmp b/Copy to SD Card root directory to update - Unified Menu Material theme/TFT28/bmp/global_bed.bmp index b4aa17c335..c3d2c8462d 100644 Binary files a/Copy to SD Card root directory to update - Unified Menu Material theme/TFT28/bmp/global_bed.bmp and b/Copy to SD Card root directory to update - Unified Menu Material theme/TFT28/bmp/global_bed.bmp differ diff --git a/Copy to SD Card root directory to update - Unified Menu Material theme/TFT28/bmp/global_nozzle.bmp b/Copy to SD Card root directory to update - Unified Menu Material theme/TFT28/bmp/global_nozzle.bmp index df8b410856..db2d675196 100644 Binary files a/Copy to SD Card root directory to update - Unified Menu Material theme/TFT28/bmp/global_nozzle.bmp and b/Copy to SD Card root directory to update - Unified Menu Material theme/TFT28/bmp/global_nozzle.bmp differ diff --git a/Copy to SD Card root directory to update - Unified Menu Material theme/TFT28/bmp/parametersetting.bmp b/Copy to SD Card root directory to update - Unified Menu Material theme/TFT28/bmp/parametersetting.bmp index 974311f48b..48bae0f941 100644 Binary files a/Copy to SD Card root directory to update - Unified Menu Material theme/TFT28/bmp/parametersetting.bmp and b/Copy to SD Card root directory to update - Unified Menu Material theme/TFT28/bmp/parametersetting.bmp differ diff --git a/Copy to SD Card root directory to update - Unified Menu Material theme/TFT35/bmp/InfoBox.bmp b/Copy to SD Card root directory to update - Unified Menu Material theme/TFT35/bmp/InfoBox.bmp new file mode 100644 index 0000000000..517723659b Binary files /dev/null and b/Copy to SD Card root directory to update - Unified Menu Material theme/TFT35/bmp/InfoBox.bmp differ diff --git a/Copy to SD Card root directory to update - Unified Menu Material theme/TFT35/bmp/global_bed.bmp b/Copy to SD Card root directory to update - Unified Menu Material theme/TFT35/bmp/global_bed.bmp index 141e4f6f9b..2b11c39df4 100644 Binary files a/Copy to SD Card root directory to update - Unified Menu Material theme/TFT35/bmp/global_bed.bmp and b/Copy to SD Card root directory to update - Unified Menu Material theme/TFT35/bmp/global_bed.bmp differ diff --git a/Copy to SD Card root directory to update - Unified Menu Material theme/TFT35/bmp/global_nozzle.bmp b/Copy to SD Card root directory to update - Unified Menu Material theme/TFT35/bmp/global_nozzle.bmp index 6dc26735ee..ed0c31c35d 100644 Binary files a/Copy to SD Card root directory to update - Unified Menu Material theme/TFT35/bmp/global_nozzle.bmp and b/Copy to SD Card root directory to update - Unified Menu Material theme/TFT35/bmp/global_nozzle.bmp differ diff --git a/Copy to SD Card root directory to update - Unified Menu Material theme/TFT35/bmp/parametersetting.bmp b/Copy to SD Card root directory to update - Unified Menu Material theme/TFT35/bmp/parametersetting.bmp index 39a0c9bbf6..48bae0f941 100644 Binary files a/Copy to SD Card root directory to update - Unified Menu Material theme/TFT35/bmp/parametersetting.bmp and b/Copy to SD Card root directory to update - Unified Menu Material theme/TFT35/bmp/parametersetting.bmp differ diff --git a/Copy to SD Card root directory to update - Unified Menu Material theme/TFT35/font/word_unicode.fon b/Copy to SD Card root directory to update - Unified Menu Material theme/TFT35/font/word_unicode.fon index e2ee0979c0..dcb0e7b074 100644 Binary files a/Copy to SD Card root directory to update - Unified Menu Material theme/TFT35/font/word_unicode.fon and b/Copy to SD Card root directory to update - Unified Menu Material theme/TFT35/font/word_unicode.fon differ diff --git a/TFT/src/User/API/UI/ui_draw.c b/TFT/src/User/API/UI/ui_draw.c index 5c8683fb37..3d23ed44cf 100644 --- a/TFT/src/User/API/UI/ui_draw.c +++ b/TFT/src/User/API/UI/ui_draw.c @@ -45,6 +45,12 @@ void ICON_ReadDisplay(u16 sx,u16 sy, u8 icon) lcd_frame_display(sx, sy, ICON_WIDTH, ICON_HEIGHT, ICON_ADDR(icon)); } +//draw icon with different length and width (sx & sy cordinates for top left of icon, w width, h height, addr flash byte address) +void ICON_CustomReadDisplay(u16 sx,u16 sy,u16 w, u16 h, u32 addr) +{ + lcd_frame_display(sx, sy, w, h, addr); +} + void SMALLICON_ReadDisplay(u16 sx,u16 sy, u8 icon) { lcd_frame_display(sx, sy, SMALLICON_WIDTH, SMALLICON_HEIGHT, SMALL_ICON_ADDR(icon)); diff --git a/TFT/src/User/API/UI/ui_draw.h b/TFT/src/User/API/UI/ui_draw.h index efa0a91c25..7c4c7b5dcc 100644 --- a/TFT/src/User/API/UI/ui_draw.h +++ b/TFT/src/User/API/UI/ui_draw.h @@ -23,6 +23,7 @@ void LCD_DMA_Config(void); void LOGO_ReadDisplay(void); void ICON_ReadDisplay(uint16_t sx, uint16_t sy, uint8_t icon); +void ICON_CustomReadDisplay(u16 sx,u16 sy,u16 w, u16 h, u32 addr); void ICON_PressedDisplay(uint16_t sx, uint16_t sy, uint8_t icon); #endif diff --git a/TFT/src/User/API/boot.c b/TFT/src/User/API/boot.c index 1d0fa8a406..d6ea367163 100644 --- a/TFT/src/User/API/boot.c +++ b/TFT/src/User/API/boot.c @@ -124,6 +124,7 @@ void updateIcon(void) { LOGO_ReadDisplay(); } + GUI_Clear(BACKGROUND_COLOR); for(int i=0; i