diff --git a/Copy to SD Card root directory to update - Unified Menu Material theme/BIGTREE_TFT24_V1.1.25.bin b/Copy to SD Card root directory to update - Unified Menu Material theme/BIGTREE_TFT24_V1.1.25.bin index 4a377c47de..b6cc8fb6c1 100644 Binary files a/Copy to SD Card root directory to update - Unified Menu Material theme/BIGTREE_TFT24_V1.1.25.bin and b/Copy to SD Card root directory to update - Unified Menu Material theme/BIGTREE_TFT24_V1.1.25.bin differ diff --git a/Copy to SD Card root directory to update - Unified Menu Material theme/BIGTREE_TFT35_V3.0.25.bin b/Copy to SD Card root directory to update - Unified Menu Material theme/BIGTREE_TFT35_V3.0.25.bin index acdddddcdd..ec161edee2 100644 Binary files a/Copy to SD Card root directory to update - Unified Menu Material theme/BIGTREE_TFT35_V3.0.25.bin and b/Copy to SD Card root directory to update - Unified Menu Material theme/BIGTREE_TFT35_V3.0.25.bin differ diff --git a/Copy to SD Card root directory to update - Unified Menu Material theme/BIQU_TFT28_V1.0.25.bin b/Copy to SD Card root directory to update - Unified Menu Material theme/BIQU_TFT28_V1.0.25.bin index e258862ee4..b2c675340d 100644 Binary files a/Copy to SD Card root directory to update - Unified Menu Material theme/BIQU_TFT28_V1.0.25.bin and b/Copy to SD Card root directory to update - Unified Menu Material theme/BIQU_TFT28_V1.0.25.bin differ diff --git a/Copy to SD Card root directory to update - Unified Menu Material theme/BIQU_TFT35_APP1_V2.0.25.bin b/Copy to SD Card root directory to update - Unified Menu Material theme/BIQU_TFT35_APP1_V2.0.25.bin index 0dda216c24..19672d1e2a 100644 Binary files a/Copy to SD Card root directory to update - Unified Menu Material theme/BIQU_TFT35_APP1_V2.0.25.bin and b/Copy to SD Card root directory to update - Unified Menu Material theme/BIQU_TFT35_APP1_V2.0.25.bin differ diff --git a/Copy to SD Card root directory to update - Unified Menu Material theme/BIQU_TFT35_V1.0.25.bin b/Copy to SD Card root directory to update - Unified Menu Material theme/BIQU_TFT35_V1.0.25.bin index 0f488853ca..28f03f220b 100644 Binary files a/Copy to SD Card root directory to update - Unified Menu Material theme/BIQU_TFT35_V1.0.25.bin and b/Copy to SD Card root directory to update - Unified Menu Material theme/BIQU_TFT35_V1.0.25.bin differ diff --git a/Copy to SD Card root directory to update - Unified Menu Material theme/BIQU_TFT35_V1.1.25.bin b/Copy to SD Card root directory to update - Unified Menu Material theme/BIQU_TFT35_V1.1.25.bin index 9ecf50c8d2..b7361566c2 100644 Binary files a/Copy to SD Card root directory to update - Unified Menu Material theme/BIQU_TFT35_V1.1.25.bin and b/Copy to SD Card root directory to update - Unified Menu Material theme/BIQU_TFT35_V1.1.25.bin differ diff --git a/Copy to SD Card root directory to update - Unified Menu Material theme/BIQU_TFT35_V1.2.25.bin b/Copy to SD Card root directory to update - Unified Menu Material theme/BIQU_TFT35_V1.2.25.bin index ca849cbe96..1e9eb58f05 100644 Binary files a/Copy to SD Card root directory to update - Unified Menu Material theme/BIQU_TFT35_V1.2.25.bin and b/Copy to SD Card root directory to update - Unified Menu Material theme/BIQU_TFT35_V1.2.25.bin differ diff --git a/Copy to SD Card root directory to update/BIGTREE_TFT24_V1.1.25.bin b/Copy to SD Card root directory to update/BIGTREE_TFT24_V1.1.25.bin index 86675b4973..ddb90501df 100644 Binary files a/Copy to SD Card root directory to update/BIGTREE_TFT24_V1.1.25.bin and b/Copy to SD Card root directory to update/BIGTREE_TFT24_V1.1.25.bin differ diff --git a/Copy to SD Card root directory to update/BIGTREE_TFT35_V3.0.25.bin b/Copy to SD Card root directory to update/BIGTREE_TFT35_V3.0.25.bin index 8a6c9d2512..abc1428a6e 100644 Binary files a/Copy to SD Card root directory to update/BIGTREE_TFT35_V3.0.25.bin and b/Copy to SD Card root directory to update/BIGTREE_TFT35_V3.0.25.bin differ diff --git a/Copy to SD Card root directory to update/BIQU_TFT28_V1.0.25.bin b/Copy to SD Card root directory to update/BIQU_TFT28_V1.0.25.bin index 89793839f6..b1b87289f5 100644 Binary files a/Copy to SD Card root directory to update/BIQU_TFT28_V1.0.25.bin and b/Copy to SD Card root directory to update/BIQU_TFT28_V1.0.25.bin differ diff --git a/Copy to SD Card root directory to update/BIQU_TFT35_APP1_V2.0.25.bin b/Copy to SD Card root directory to update/BIQU_TFT35_APP1_V2.0.25.bin index 2a6c20a550..c6a7fbc0d4 100644 Binary files a/Copy to SD Card root directory to update/BIQU_TFT35_APP1_V2.0.25.bin and b/Copy to SD Card root directory to update/BIQU_TFT35_APP1_V2.0.25.bin differ diff --git a/Copy to SD Card root directory to update/BIQU_TFT35_V1.0.25.bin b/Copy to SD Card root directory to update/BIQU_TFT35_V1.0.25.bin index 6d79e67eb4..6692b07c62 100644 Binary files a/Copy to SD Card root directory to update/BIQU_TFT35_V1.0.25.bin and b/Copy to SD Card root directory to update/BIQU_TFT35_V1.0.25.bin differ diff --git a/Copy to SD Card root directory to update/BIQU_TFT35_V1.1.25.bin b/Copy to SD Card root directory to update/BIQU_TFT35_V1.1.25.bin index be9e9e92bc..f5d12955a0 100644 Binary files a/Copy to SD Card root directory to update/BIQU_TFT35_V1.1.25.bin and b/Copy to SD Card root directory to update/BIQU_TFT35_V1.1.25.bin differ diff --git a/Copy to SD Card root directory to update/BIQU_TFT35_V1.2.25.bin b/Copy to SD Card root directory to update/BIQU_TFT35_V1.2.25.bin index 030b3bae88..9722f22041 100644 Binary files a/Copy to SD Card root directory to update/BIQU_TFT35_V1.2.25.bin and b/Copy to SD Card root directory to update/BIQU_TFT35_V1.2.25.bin differ diff --git a/Copy to SD Card root directory to update/README.md b/Copy to SD Card root directory to update/README.md deleted file mode 100644 index 6583574a78..0000000000 --- a/Copy to SD Card root directory to update/README.md +++ /dev/null @@ -1,34 +0,0 @@ -# how to update firmware -copy [these files](https://github.com/bigtreetech/BIGTREETECH-TouchScreenFirmware/tree/master/Copy%20to%20SD%20Card%20root%20directory%20to%20update) to SD Card root directory - -The structure of the files in SD Card should be as follows -![image](https://user-images.githubusercontent.com/25599056/61274462-75a77d80-a7de-11e9-8e86-04d3d2abfb4d.png) - -- the **.bin** file is the firmware of BIGTREETECH TFT24, this file needs to be updated every time for update function -- the **TFT24** folder contains the icons and fonts - - icons: If you want to customize icons, see [here](https://github.com/bigtreetech/BIGTREETECH-TFT35-V1.2/blob/master/TFT%2035%20screen%20customize.pdf), and update the folder by SD Card (don't need update every time) - - fonts: this is a bitmap fonts of ASCII and GBK. The font is Song typeface (don't need update every time) - -# software version -### Vx.x.24 -- add some settings (Before that, update your icons folder) -- Long Press Touch Screen or Rotary Encoder entry mode selection(Marlin's mode is SPI mode, touch mode is UART mode) -- setting -> more set -> Change 12864 background color -- setting -> more set -> Change 12864 font color -- setting -> more set -> GCODE -### Vx.x.23 -- add support TFT35 V3.0 (STM32F207) -- add filament runout on/off button -- replace Power off button with Rotate UI button -- improve the compatibility of smoothieware -- add manually leveling menu -- add multi-serial port function (Touch screen can be directly controlled by ESP3D) -### Vx.x.22 -- clean up framework -- add support TFT35 V2.0 (SDIO) -- add function filament runout detect, power supply control -### Vx.x.21 -- fix unable to print properly from U disk(Stop printing at random) -- fix busy popup with "Processing" in Printing and Stop Printing -### Vx.x.20 -- The first version of the Integration Project diff --git a/Copy to SD Card root directory to update/TFT28/Preheat_Both.bmp b/Copy to SD Card root directory to update/TFT28/Preheat_Both.bmp deleted file mode 100644 index 2edf76067d..0000000000 Binary files a/Copy to SD Card root directory to update/TFT28/Preheat_Both.bmp and /dev/null differ diff --git a/README.md b/README.md index aff34dc935..c93ed0da1a 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,50 @@ -### :point_right: For Unified Menu & Status Screen: -- **Please use icons from "Copy to SD Card root directory to update - Unified Menu Material theme" Folder only.** +# software version +### Vx.x.25 +- change character encoding from GBK to UTF-8, compatible with new languages +- add "Preheat" menu for one button preheating(PLA, PETG, ABS) +- add command for Bltouch in "ABL"(automatic leveling) menu +- add More "menu" in printing (set RGB color, extrude for change filament, etc...) +- Rearranged the "Settings" menu + - add silent mode(disable the buzzer) + - add automatic shutdown after printing feature(default disable, enable in menu "Settings->Feature->AutoPower" or "Printing->Feature->AutoPower") + - add smart filament detect feature (enable in menu "Settings->Feature->Smart ON", NEED Marlin to add "M114 E" command support, which will be merged into Mallin as soon as possible) + - New languages, currently supporting 11 languages: English, simplified Chinese, Russian, Japanese, Armenian, German, Czech, Spanish, French, Portuguese, Italian +- Added a Custom gcode menu +- Added unified menu + - [unified menu](https://github.com/bigtreetech/BIGTREETECH-TouchScreenFirmware/tree/master/Copy%20to%20SD%20Card%20root%20directory%20to%20update%20-%20Unified%20Menu%20Material%20theme) ![image](https://user-images.githubusercontent.com/38851044/69716869-efb12100-1145-11ea-9b4e-e50a215e2def.png) + - [classic menu](https://github.com/bigtreetech/BIGTREETECH-TouchScreenFirmware/tree/master/Copy%20to%20SD%20Card%20root%20directory%20to%20update) ![image](https://user-images.githubusercontent.com/38851044/69717274-b7f6a900-1146-11ea-94c4-4033f23215bb.png) + - Unified menu add status menu (hotend & bed temperature, fan speed, move speed, flow, XYZ position) + - Gcode file under classic menu is in icon mode, and model preview feature is added(Use with this [tool](https://github.com/bigtreetech/BiQU_Tool)) + - Gcode file under unified menu is in list mode, unable to preview the model, but more friendly for long filename +- Fixed the bug that tft35 V3.0 could not connect to printer when switching from LCD12864 mode to touch screen mode +- Fixed the bug of printing from SD card on board +### Vx.x.24 +- add some settings (Before that, update your icons folder) +- Long Press Touch Screen or Rotary Encoder entry mode selection(Marlin's mode is SPI mode, touch mode is UART mode) +- setting -> more set -> Change 12864 background color +- setting -> more set -> Change 12864 font color +- setting -> more set -> GCODE +### Vx.x.23 +- add support TFT35 V3.0 (STM32F207) +- add filament runout on/off button +- replace Power off button with Rotate UI button +- improve the compatibility of smoothieware +- add manually leveling menu +- add multi-serial port function (Touch screen can be directly controlled by ESP3D) +### Vx.x.22 +- clean up framework +- add support TFT35 V2.0 (SDIO) +- add function filament runout detect, power supply control +### Vx.x.21 +- fix unable to print properly from U disk(Stop printing at random) +- fix busy popup with "Processing" in Printing and Stop Printing +### Vx.x.20 +- The first version of the Integration Project -### How to install vscode and platformio for compile + +# How to install vscode and platformio for compile - Install the compilation environment, We recommend vscode + platformio. If you have already installed it, please skip this step. If not, please see [here](https://github.com/bigtreetech/Document/blob/master/How%20to%20install%20VScode+Platformio.md). -### how to compile firmware +# how to compile firmware - Please see the picture(①), which is the PlatformIO plugin, and then click ② Open Project to open the project. ![image](https://user-images.githubusercontent.com/25599056/56637513-6b258e00-669e-11e9-9fad-d0571e57499e.png) @@ -20,7 +61,7 @@ it depends on your hardware. ![image](https://user-images.githubusercontent.com/25599056/56637550-809ab800-669e-11e9-99d3-6b502e294688.png) - After the compilation is successful, a BIQU_TFT35_V1.x.x.bin file will be generated in the .pioenvs\BIGTREE_TFT35_V1_x directory. We need copy this file to the SD card, and insert this SD Card to TFT35 Touch Screen, then reset the Touch Screen, the firmware will be updated automatically. -### how to config firmware +# how to config firmware ![image](https://user-images.githubusercontent.com/25599056/61276962-b229a800-a7e3-11e9-83fe-ec5e944f1463.png) Modify the value of > #define TOOL_NUM 1 //set in 1~6 @@ -30,7 +71,7 @@ Modify the value of > #define FAN_NUM 1 //set in 1~6 to config hotend, extruder, fan number -### how to update firmware +# how to update firmware copy [these files](https://github.com/bigtreetech/BIGTREETECH-TouchScreenFirmware/tree/master/Copy%20to%20SD%20Card%20root%20directory%20to%20update) to SD Card root directory The structure of the files in SD Card should be as follows diff --git a/TFT/src/User/Configuration.h b/TFT/src/User/Configuration.h index 7cd04d455b..b126618b69 100644 --- a/TFT/src/User/Configuration.h +++ b/TFT/src/User/Configuration.h @@ -125,7 +125,7 @@ * It is friendly to display long file name, but the model preview feature is not available * Disable this if you want to use the model preview feature */ -#define GCODE_LIST_MODE +//#define GCODE_LIST_MODE // SD support #define ONBOARD_SD_SUPPORT @@ -163,10 +163,10 @@ * The format of the custom icon is as follows * Bit depth: 24 / 32 bit, Pixel size: 95*95(for TFT35), 70*70(for TFT28/TFT24) */ -#define CUSTOM_0_LABEL "Home" -#define CUSTOM_0_GCODE "G28\n" -#define CUSTOM_1_LABEL "Restore EEPROM" -#define CUSTOM_1_GCODE "M501\n" +#define CUSTOM_0_LABEL "Restore EEPROM" +#define CUSTOM_0_GCODE "M501\n" +//#define CUSTOM_1_LABEL "Custom2" +//#define CUSTOM_1_GCODE "M105\n" //#define CUSTOM_2_LABEL "Custom2" //#define CUSTOM_2_GCODE "M105\n" //#define CUSTOM_3_LABEL "Custom3" diff --git a/TFT/src/User/Menu/Print.c b/TFT/src/User/Menu/Print.c index a09d961d0e..bddb7c7fe9 100644 --- a/TFT/src/User/Menu/Print.c +++ b/TFT/src/User/Menu/Print.c @@ -5,14 +5,27 @@ MENUITEMS printItems = { // title LABEL_BACKGROUND, // icon label - {{ICONCHAR_BACKGROUND, LABEL_BACKGROUND}, - {ICONCHAR_BACKGROUND, LABEL_BACKGROUND}, - {ICONCHAR_BACKGROUND, LABEL_BACKGROUND}, - {ICONCHAR_BACKGROUND, LABEL_BACKGROUND}, - {ICONCHAR_BACKGROUND, LABEL_BACKGROUND}, - {ICONCHAR_PAGEUP, LABEL_BACKGROUND}, - {ICONCHAR_PAGEDOWN, LABEL_BACKGROUND}, - {ICONCHAR_BACK, LABEL_BACKGROUND},} + { + #ifdef GCODE_LIST_MODE + {ICONCHAR_BACKGROUND, LABEL_BACKGROUND}, + {ICONCHAR_BACKGROUND, LABEL_BACKGROUND}, + {ICONCHAR_BACKGROUND, LABEL_BACKGROUND}, + {ICONCHAR_BACKGROUND, LABEL_BACKGROUND}, + {ICONCHAR_BACKGROUND, LABEL_BACKGROUND}, + {ICONCHAR_PAGEUP, LABEL_BACKGROUND}, + {ICONCHAR_PAGEDOWN, LABEL_BACKGROUND}, + {ICONCHAR_BACK, LABEL_BACKGROUND}, + #else + {ICON_BACKGROUND, LABEL_BACKGROUND}, + {ICON_BACKGROUND, LABEL_BACKGROUND}, + {ICON_BACKGROUND, LABEL_BACKGROUND}, + {ICON_BACKGROUND, LABEL_BACKGROUND}, + {ICON_BACKGROUND, LABEL_BACKGROUND}, + {ICON_PAGE_UP, LABEL_PAGE_UP}, + {ICON_PAGE_DOWN, LABEL_PAGE_DOWN}, + {ICON_BACK, LABEL_BACK}, + #endif + } }; diff --git a/TFT/src/User/Menu/SendGcode.c b/TFT/src/User/Menu/SendGcode.c index 5f485a322c..25b5911743 100644 --- a/TFT/src/User/Menu/SendGcode.c +++ b/TFT/src/User/Menu/SendGcode.c @@ -38,9 +38,9 @@ const GUI_RECT rect_of_Gkey[]={ {5*GKEY_WIDTH, 3*GKEY_HEIGHT+TITLE_END_Y, 6*GKEY_WIDTH, 4*GKEY_HEIGHT+TITLE_END_Y}, // Back - {0*GKEY_WIDTH+10, 0*GKEY_HEIGHT+10, 1*GKEY_WIDTH-10, TITLE_END_Y-15}, + {0*GKEY_WIDTH+5, 0*GKEY_HEIGHT+5, 1*GKEY_WIDTH-5, TITLE_END_Y-5}, // Send - {5*GKEY_WIDTH+10, 0*GKEY_HEIGHT+10, 6*GKEY_WIDTH-10, TITLE_END_Y-15}, + {5*GKEY_WIDTH+5, 0*GKEY_HEIGHT+5, 6*GKEY_WIDTH-5, TITLE_END_Y-5}, }; const char * const softKeyValue[][26] = { diff --git a/TFT/src/User/Menu/Settings.c b/TFT/src/User/Menu/Settings.c index 86de28619c..855ee69afa 100644 --- a/TFT/src/User/Menu/Settings.c +++ b/TFT/src/User/Menu/Settings.c @@ -15,7 +15,6 @@ void infoSettingsReset(void) infoSettings.font_color = ST7920_FNCOLOR; infoSettings.silent = 0; infoSettings.auto_off = 0; - storePara(); } // Version infomation diff --git a/TFT/src/User/main.c b/TFT/src/User/main.c index 15c04e3bfa..9d39a49002 100644 --- a/TFT/src/User/main.c +++ b/TFT/src/User/main.c @@ -13,6 +13,7 @@ void Hardware_GenericInit(void) RCC_APB2PeriphClockCmd(RCC_APB2Periph_AFIO , ENABLE); GPIO_PinRemapConfig(GPIO_Remap_SWJ_Disable, ENABLE); //disable JTAG & SWD #endif + #ifdef DISABLE_JTAG RCC_APB2PeriphClockCmd(RCC_APB2Periph_AFIO , ENABLE); @@ -42,6 +43,7 @@ void Hardware_GenericInit(void) if(readStoredPara() == false) // Read settings parameter { TSC_Calibration(); + storePara(); } infoMenuSelect(); }