From 882fae974735ca9334c01233b05cee4c165a6a04 Mon Sep 17 00:00:00 2001 From: guruathwal Date: Fri, 3 Jan 2020 00:15:45 +0530 Subject: [PATCH 01/11] Fix compile error due to undefined references in move.c Fix compile error due to undefined references in move.c and fix move menu. --- TFT/src/User/Menu/Move.c | 287 ++++++++++++++++++++++++++------------- 1 file changed, 191 insertions(+), 96 deletions(-) diff --git a/TFT/src/User/Menu/Move.c b/TFT/src/User/Menu/Move.c index be9719506c..3195d0809b 100644 --- a/TFT/src/User/Menu/Move.c +++ b/TFT/src/User/Menu/Move.c @@ -62,7 +62,17 @@ LABEL_MOVE, {ICON_X_INC, LABEL_X_INC}, {ICON_BACK, LABEL_BACK}, #endif - #else + #else + #ifdef MENU_LIST_MODE + {ICON_X_INC, LABEL_X_INC}, + {ICON_Y_INC, LABEL_Y_INC}, + {ICON_Z_INC, LABEL_Z_INC}, + {ICON_1_MM, LABEL_1_MM}, + {ICON_X_DEC, LABEL_X_DEC}, + {ICON_Y_DEC, LABEL_Y_DEC}, + {ICON_Z_DEC, LABEL_Z_DEC}, + {ICON_BACK, LABEL_BACK}, + #else {ICON_X_INC, LABEL_X_INC}, {ICON_Y_INC, LABEL_YAXIS_UP}, {ICON_Z_INC, LABEL_ZAXIS_UP}, @@ -71,6 +81,7 @@ LABEL_MOVE, {ICON_Y_DEC, LABEL_YAXIS_DOWN}, {ICON_Z_DEC, LABEL_ZAXIS_DOWN}, {ICON_BACK, LABEL_BACK}, + #endif #endif } }; @@ -92,24 +103,54 @@ static u32 update_time = 50; // 1 seconds is 100 void menuMove(void) { KEY_VALUES key_num = KEY_IDLE; - #ifdef MENU_LIST_MODE - if(infoSettings.invert_yaxis == 1){ - moveItems.items[1].label.index = LABEL_Y_DEC; - moveItems.items[5].label.index = LABEL_Y_INC; - } - else{ - moveItems.items[1].label.index = LABEL_Y_INC; - moveItems.items[5].label.index = LABEL_Y_DEC; - } - if(infoSettings.invert_zaxis == 1){ - moveItems.items[0].label.index = LABEL_Z_DEC; - moveItems.items[2].label.index = LABEL_Z_INC; - } - else{ - moveItems.items[0].label.index = LABEL_Z_INC; - moveItems.items[2].label.index = LABEL_Z_DEC; - } + uint32_t B0; + uint32_t B1; + uint32_t B2; + uint32_t B5; + uint32_t B6; + uint32_t B7; + + + #ifdef ALTERNATIVE_MOVE_MENU + #ifdef MENU_LIST_MODE + if(infoSettings.invert_yaxis == 1){ + moveItems.items[1].label.index = LABEL_Y_DEC; + moveItems.items[5].label.index = LABEL_Y_INC; + } + else{ + moveItems.items[1].label.index = LABEL_Y_INC; + moveItems.items[5].label.index = LABEL_Y_DEC; + } + if(infoSettings.invert_zaxis == 1){ + moveItems.items[0].label.index = LABEL_Z_INC; + moveItems.items[2].label.index = LABEL_Z_DEC; + } + else{ + moveItems.items[0].label.index = LABEL_Z_DEC; + moveItems.items[2].label.index = LABEL_Z_INC; + } + #endif + #else + #ifdef MENU_LIST_MODE + if(infoSettings.invert_yaxis == 1){ + moveItems.items[1].label.index = LABEL_Y_DEC; + moveItems.items[5].label.index = LABEL_Y_INC; + } + else{ + moveItems.items[1].label.index = LABEL_Y_INC; + moveItems.items[5].label.index = LABEL_Y_DEC; + } + if(infoSettings.invert_zaxis == 1){ + moveItems.items[2].label.index = LABEL_Z_DEC; + moveItems.items[6].label.index = LABEL_Z_INC; + } + else{ + moveItems.items[2].label.index = LABEL_Z_INC; + moveItems.items[6].label.index = LABEL_Z_DEC; + } + #endif #endif + menuDrawPage(&moveItems); mustStoreCmd("G91\n"); @@ -138,84 +179,138 @@ void menuMove(void) switch(key_num) { #ifdef ALTERNATIVE_MOVE_MENU - case KEY_ICON_0: - #ifdef MENU_LIST_MODE - if(infoSettings.invert_zaxis == 1){ - storeCmd(ZGCODE_DEC, item_move_len[item_move_len_i]); - } - else{ - storeCmd(ZGCODE_INC, item_move_len[item_move_len_i]); - } - #else - storeCmd(ZGCODE_DOWN, item_move_len[item_move_len_i]); break; - #endif - break; - - case KEY_ICON_1: - #ifdef MENU_LIST_MODE - if(infoSettings.invert_yaxis == 1){ - storeCmd(YGCODE_DEC, item_move_len[item_move_len_i]); - } - else{ - storeCmd(YGCODE_INC, item_move_len[item_move_len_i]); - } - #else - storeCmd(YGCODE_UP, item_move_len[item_move_len_i]); - #endif - break; - - case KEY_ICON_2: - #ifdef MENU_LIST_MODE - if(infoSettings.invert_zaxis == 1){ - storeCmd(ZGCODE_INC, item_move_len[item_move_len_i]); - } - else{ - storeCmd(ZGCODE_DEC, item_move_len[item_move_len_i]); - } - #else - storeCmd(ZGCODE_UP, item_move_len[item_move_len_i]); break; - #endif - break; - - case KEY_ICON_3: - item_move_len_i = (item_move_len_i+1)%ITEM_MOVE_LEN_NUM; - moveItems.items[key_num] = itemMoveLen[item_move_len_i]; - menuDrawItem(&moveItems.items[key_num], key_num); - break; - case KEY_ICON_4: storeCmd("G1 X-%.1f\n", item_move_len[item_move_len_i]); break; - - case KEY_ICON_5: - #ifdef MENU_LIST_MODE - if(infoSettings.invert_yaxis == 1){ - storeCmd(YGCODE_INC, item_move_len[item_move_len_i]); - } - else{ - storeCmd(YGCODE_DEC, item_move_len[item_move_len_i]); - } - #else - storeCmd(YGCODE_UP, item_move_len[item_move_len_i]); - #endif - break; - case KEY_ICON_6: storeCmd("G1 X%.1f\n", item_move_len[item_move_len_i]); break; - case KEY_ICON_7: infoMenu.cur--; break; - default:break; - - #else - - case KEY_ICON_0: storeCmd("G1 X%.1f\n", item_move_len[item_move_len_i]); break; - case KEY_ICON_1: storeCmd(YGCODE_UP, item_move_len[item_move_len_i]); break; - case KEY_ICON_2: storeCmd(ZGCODE_UP, item_move_len[item_move_len_i]); break; - case KEY_ICON_3: - item_move_len_i = (item_move_len_i+1)%ITEM_MOVE_LEN_NUM; - moveItems.items[key_num] = itemMoveLen[item_move_len_i]; - menuDrawItem(&moveItems.items[key_num], key_num); break; - case KEY_ICON_4: storeCmd("G1 X-%.1f\n", item_move_len[item_move_len_i]); break; - case KEY_ICON_5: storeCmd(YGCODE_DOWN, item_move_len[item_move_len_i]); break; - case KEY_ICON_6: storeCmd(ZGCODE_DOWN, item_move_len[item_move_len_i]); break; - case KEY_ICON_7: infoMenu.cur--; break; - default:break; - #endif - + + case KEY_ICON_0: + #ifdef MENU_LIST_MODE + if(infoSettings.invert_zaxis == 1){ + storeCmd(ZGCODE_INC, item_move_len[item_move_len_i]); + } + else{ + storeCmd(ZGCODE_DEC, item_move_len[item_move_len_i]); + } + #else + storeCmd(ZGCODE_DOWN, item_move_len[item_move_len_i]); break; + #endif + break; + + case KEY_ICON_1: + #ifdef MENU_LIST_MODE + if(infoSettings.invert_yaxis == 1){ + storeCmd(YGCODE_DEC, item_move_len[item_move_len_i]); + } + else{ + storeCmd(YGCODE_INC, item_move_len[item_move_len_i]); + } + #else + storeCmd(YGCODE_UP, item_move_len[item_move_len_i]); + #endif + break; + + case KEY_ICON_2: + #ifdef MENU_LIST_MODE + if(infoSettings.invert_zaxis == 1){ + storeCmd(ZGCODE_DEC, item_move_len[item_move_len_i]); + } + else{ + storeCmd(ZGCODE_INC, item_move_len[item_move_len_i]); + } + #else + storeCmd(ZGCODE_UP, item_move_len[item_move_len_i]); break; + #endif + break; + + case KEY_ICON_3: + item_move_len_i = (item_move_len_i+1)%ITEM_MOVE_LEN_NUM; + moveItems.items[key_num] = itemMoveLen[item_move_len_i]; + menuDrawItem(&moveItems.items[key_num], key_num); + break; + + case KEY_ICON_4: storeCmd("G1 X-%.1f\n", item_move_len[item_move_len_i]); break; + + case KEY_ICON_5: + #ifdef MENU_LIST_MODE + if(infoSettings.invert_yaxis == 1){ + storeCmd(YGCODE_INC, item_move_len[item_move_len_i]); + } + else{ + storeCmd(YGCODE_DEC, item_move_len[item_move_len_i]); + } + #else + storeCmd(YGCODE_UP, item_move_len[item_move_len_i]); + #endif + break; + + case KEY_ICON_6: storeCmd("G1 X%.1f\n", item_move_len[item_move_len_i]); break; + case KEY_ICON_7: infoMenu.cur--; break; + default:break; + + #else + + case KEY_ICON_0: storeCmd("G1 X%.1f\n", item_move_len[item_move_len_i]); break; + + case KEY_ICON_1: + #ifdef MENU_LIST_MODE + if(infoSettings.invert_yaxis == 1){ + storeCmd(YGCODE_DEC, item_move_len[item_move_len_i]); + } + else{ + storeCmd(YGCODE_INC, item_move_len[item_move_len_i]); + } + #else + storeCmd(YGCODE_UP, item_move_len[item_move_len_i]); + #endif + break; + + case KEY_ICON_2: + #ifdef MENU_LIST_MODE + if(infoSettings.invert_zaxis == 1){ + storeCmd(ZGCODE_DEC, item_move_len[item_move_len_i]); + } + else{ + storeCmd(ZGCODE_INC, item_move_len[item_move_len_i]); + } + #else + storeCmd(ZGCODE_DOWN, item_move_len[item_move_len_i]); break; + #endif + break; + + case KEY_ICON_3: + item_move_len_i = (item_move_len_i+1)%ITEM_MOVE_LEN_NUM; + moveItems.items[key_num] = itemMoveLen[item_move_len_i]; + menuDrawItem(&moveItems.items[key_num], key_num); + break; + + case KEY_ICON_4: storeCmd("G1 X-%.1f\n", item_move_len[item_move_len_i]); break; + + case KEY_ICON_5: + #ifdef MENU_LIST_MODE + if(infoSettings.invert_yaxis == 1){ + storeCmd(YGCODE_INC, item_move_len[item_move_len_i]); + } + else{ + storeCmd(YGCODE_DEC, item_move_len[item_move_len_i]); + } + #else + storeCmd(YGCODE_UP, item_move_len[item_move_len_i]); + #endif + break; + + case KEY_ICON_6: + #ifdef MENU_LIST_MODE + if(infoSettings.invert_zaxis == 1){ + storeCmd(ZGCODE_INC, item_move_len[item_move_len_i]); + } + else{ + storeCmd(ZGCODE_DEC, item_move_len[item_move_len_i]); + } + #else + storeCmd(ZGCODE_UP, item_move_len[item_move_len_i]); break; + #endif + break; + + case KEY_ICON_7: infoMenu.cur--; break; + default:break; + #endif } loopProcess(); update_gantry(); From e5072d740bc238c78d603835c97f4256fae0ad6c Mon Sep 17 00:00:00 2001 From: guruathwal Date: Fri, 3 Jan 2020 00:24:45 +0530 Subject: [PATCH 02/11] disable global info from showing on Status Screen and Move menu --- TFT/src/User/Menu/Parametersetting.c | 31 +++++++++++++--------------- TFT/src/User/Menu/Parametersetting.h | 1 + 2 files changed, 15 insertions(+), 17 deletions(-) diff --git a/TFT/src/User/Menu/Parametersetting.c b/TFT/src/User/Menu/Parametersetting.c index 39aae13687..f03c17f33c 100644 --- a/TFT/src/User/Menu/Parametersetting.c +++ b/TFT/src/User/Menu/Parametersetting.c @@ -311,25 +311,16 @@ void temp_Change(void) static int16_t compare [2]; if(infoHost.connected == false || infoMenu.menu[infoMenu.cur] == menuPrinting) return; - + if(infoMenu.menu[infoMenu.cur] == menuMove || infoMenu.menu[infoMenu.cur] == menuStatus) return; + if(heatGetCurrentTemp(NOZZLE0) != compare[0] || heatGetCurrentTemp(BED) != compare[1] ) //|| strcmp((char *)infoMenu.menu[infoMenu.cur],(char *)NUM)!=0) { //strcpy((char *)NUM ,(char *)infoMenu.menu[infoMenu.cur]); compare[0] = heatGetCurrentTemp(NOZZLE0); compare[1] = heatGetCurrentTemp(BED); - GUI_ClearRect(LCD_WIDTH/3, 0, LCD_WIDTH, BYTE_HEIGHT); - - - //global nozzle - lcd_frame_display(ICON_NOZZLE_X, 0, 2*BYTE_WIDTH, BYTE_HEIGHT, ICON_ADDR(ICON_GLOBAL_NOZZLE0)); - my_sprintf(tempstr, "%d/%d", heatGetCurrentTemp(NOZZLE0), heatGetTargetTemp(NOZZLE0)); - GUI_DispStringInRect(VALUE_NOZZLE_X,0,VALUE_NOZZLE_X+8*BYTE_WIDTH,BYTE_HEIGHT, (u8 *)tempstr); - - //global bed - lcd_frame_display(ICON_BED_X, 0, 2*BYTE_WIDTH, BYTE_HEIGHT, ICON_ADDR(ICON_GLOBAL_BED)); - my_sprintf(tempstr, "%d/%d", heatGetCurrentTemp(BED), heatGetTargetTemp(BED)); - GUI_DispStringInRect(VALUE_BED_X,0,VALUE_BED_X+8*BYTE_WIDTH,BYTE_HEIGHT, (u8 *)tempstr); + + drawGlobalInfo(); } return ; @@ -337,10 +328,18 @@ void temp_Change(void) void show_GlobalInfo(void) { - if(infoHost.connected == false || infoMenu.menu[infoMenu.cur] == menuPrinting) return; + if(infoHost.connected == false) return; + if(infoMenu.menu[infoMenu.cur] == menuMove || infoMenu.menu[infoMenu.cur] == menuStatus) return; + drawGlobalInfo(); + + return; +} +void drawGlobalInfo(void){ + + char tempstr[10]; - GUI_ClearRect(LCD_WIDTH/3, 0, LCD_WIDTH, BYTE_HEIGHT); + GUI_ClearRect(LCD_WIDTH/3, 0, LCD_WIDTH, BYTE_HEIGHT); //global nozzle lcd_frame_display(ICON_NOZZLE_X, 0, 2*BYTE_WIDTH, BYTE_HEIGHT, ICON_ADDR(ICON_GLOBAL_NOZZLE0)); @@ -351,6 +350,4 @@ void show_GlobalInfo(void) lcd_frame_display(ICON_BED_X, 0, 2*BYTE_WIDTH, BYTE_HEIGHT, ICON_ADDR(ICON_GLOBAL_BED)); my_sprintf(tempstr, "%d/%d", heatGetCurrentTemp(BED), heatGetTargetTemp(BED)); GUI_DispStringInRect(VALUE_BED_X,0,VALUE_BED_X+8*BYTE_WIDTH,BYTE_HEIGHT, (u8 *)tempstr); - - return; } diff --git a/TFT/src/User/Menu/Parametersetting.h b/TFT/src/User/Menu/Parametersetting.h index 0303c714e9..6961c646f2 100644 --- a/TFT/src/User/Menu/Parametersetting.h +++ b/TFT/src/User/Menu/Parametersetting.h @@ -65,6 +65,7 @@ typedef enum void parametersetting(void); void show_GlobalInfo(void); void temp_Change(void); +void drawGlobalInfo(void); extern bool getsetparameter; extern int cmd_getparameter_num; extern float Get_parameter_value[VALUE_NUM]; From 3e695b143dda89d12f1398c9f317fd6002cd9796 Mon Sep 17 00:00:00 2001 From: guruathwal Date: Fri, 3 Jan 2020 00:36:43 +0530 Subject: [PATCH 03/11] Fix custom gcodes not working in List Mode --- TFT/src/User/Configuration.h | 4 ++-- TFT/src/User/Menu/MachineSettings.c | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/TFT/src/User/Configuration.h b/TFT/src/User/Configuration.h index 1f8b1848e4..230fda77c0 100644 --- a/TFT/src/User/Configuration.h +++ b/TFT/src/User/Configuration.h @@ -195,8 +195,8 @@ */ #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_1_LABEL "Disable Steppers" +#define CUSTOM_1_GCODE "M84\n" //#define CUSTOM_2_LABEL "Custom2" //#define CUSTOM_2_GCODE "M105\n" //#define CUSTOM_3_LABEL "Custom3" diff --git a/TFT/src/User/Menu/MachineSettings.c b/TFT/src/User/Menu/MachineSettings.c index 7b56affe37..f9111fdf4a 100644 --- a/TFT/src/User/Menu/MachineSettings.c +++ b/TFT/src/User/Menu/MachineSettings.c @@ -227,7 +227,6 @@ void menuCustom(void) void sendCustomGcode(uint32_t key_val) { uint32_t item_index = gc_cur_page*LISTITEM_PER_PAGE+ key_val; - storeCmd("%d",item_index); if (item_index < CKEY_COUNT){ storeCmd(gcodelist[item_index][1]); } From a44eca063df03bef190cf9731270eb5278179b2b Mon Sep 17 00:00:00 2001 From: guruathwal Date: Fri, 3 Jan 2020 00:55:26 +0530 Subject: [PATCH 04/11] add more machine-nutral custom gcodes --- TFT/src/User/Configuration.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/TFT/src/User/Configuration.h b/TFT/src/User/Configuration.h index 230fda77c0..4d9d2f8ba2 100644 --- a/TFT/src/User/Configuration.h +++ b/TFT/src/User/Configuration.h @@ -197,10 +197,10 @@ #define CUSTOM_0_GCODE "M501\n" #define CUSTOM_1_LABEL "Disable Steppers" #define CUSTOM_1_GCODE "M84\n" -//#define CUSTOM_2_LABEL "Custom2" -//#define CUSTOM_2_GCODE "M105\n" -//#define CUSTOM_3_LABEL "Custom3" -//#define CUSTOM_3_GCODE "M105\n" +#define CUSTOM_2_LABEL "init SD Card" +#define CUSTOM_2_GCODE "M21\n" +#define CUSTOM_3_LABEL "Release Sd Card" +#define CUSTOM_3_GCODE "M22\n" //#define CUSTOM_4_LABEL "Custom4" //#define CUSTOM_4_GCODE "M105\n" //#define CUSTOM_5_LABEL "Custom5" From a38ffabfa5aaae296b0c7c75252a7909a6bd6338 Mon Sep 17 00:00:00 2001 From: guruathwal Date: Fri, 3 Jan 2020 16:33:48 +0530 Subject: [PATCH 05/11] update global info icons --- .../TFT24/bmp/global_bed.bmp | Bin 824 -> 824 bytes .../TFT24/bmp/global_nozzle.bmp | Bin 824 -> 824 bytes .../TFT28/bmp/global_bed.bmp | Bin 824 -> 824 bytes .../TFT28/bmp/global_nozzle.bmp | Bin 824 -> 824 bytes 4 files changed, 0 insertions(+), 0 deletions(-) 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 b4aa17c335fb8116993cf90599e90021d1a6ac23..c3d2c8462d8aeda66f21e8a7652a47df9443c482 100644 GIT binary patch literal 824 zcmZ?rwP0od12Z700mK4O%*Y@C7H0y=3voj*SO7?LOyip{j~|5Q;zeLJozwYRCb8wz zFyz)U z{qggI2TwLvw6io#U@UEAsO(^gwsP1NP4`=X!~j%N z-_OuDN3eY=Z`%~^=825;y{yk(JnEd{Q{K-0?8WV}CZ#D0EpFevoL4K_(9h65l^dw6 zV;Vm&JiBHHmbWvk+Y#~n#nX^9j{PUI?%jVEn#S<vHQDx@Vx6 z-!_G#x|{XQyBn*wWac+Ay#H{0=HkH4>9XH{yz857R?`DaW+>`Artx-650~l_d z(>eO)D78&t?wuvtJ4?QG3QOm7pe%}GfZ98!^8?LknamFK3y=ZS2t+mAK$Cepr=x`r QR4-5q#2icp+y$=CF5XH~e5uA^^L_|eJK_`gLH5ybBiH=64*X#9qwZG9XH@uu&bGO;uo0)wx z^WIIkT@;*X&A3OL*7xL`ZWPb+?$_)@0j}P-G(A*PZUbN5LCQ_pVOZYX8!0#7AFpg* zi0vOux0bWC)5{MAMYG|sy4I8B2r5qBPbc%4?uW~ zB;F)gF1?T-IY?NZncLr@f=I?STCUg0$I-YFNE}-Lis(Nm1v2ZKCl@lZ={4C@jwNK+~o5DA7zQB}40_{`z zfC!IiK-sPt0+SYS<-jo|ys(#SHUT zhr-n$GcH`Y=o`<_J&U1dCMcAE2)7|$U@4WwT8;(AFynFlJvFc8~mMKhd^%#$2iA(|o;R?_gQaY?y5t=eexX3Pnu<@HVEo!G)hzmTdD>C D6c%K^ 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 b4aa17c335fb8116993cf90599e90021d1a6ac23..c3d2c8462d8aeda66f21e8a7652a47df9443c482 100644 GIT binary patch literal 824 zcmZ?rwP0od12Z700mK4O%*Y@C7H0y=3voj*SO7?LOyip{j~|5Q;zeLJozwYRCb8wz zFyz)U z{qggI2TwLvw6io#U@UEAsO(^gwsP1NP4`=X!~j%N z-_OuDN3eY=Z`%~^=825;y{yk(JnEd{Q{K-0?8WV}CZ#D0EpFevoL4K_(9h65l^dw6 zV;Vm&JiBHHmbWvk+Y#~n#nX^9j{PUI?%jVEn#S<vHQDx@Vx6 z-!_G#x|{XQyBn*wWac+Ay#H{0=HkH4>9XH{yz857R?`DaW+>`Artx-650~l_d z(>eO)D78&t?wuvtJ4?QG3QOm7pe%}GfZ98!^8?LknamFK3y=ZS2t+mAK$Cepr=x`r QR4-5q#2icp+y$=CF5XH~e5uA^^L_|eJK_`gLH5ybBiH=64*X#9qwZG9XH@uu&bGO;uo0)wx z^WIIkT@;*X&A3OL*7xL`ZWPb+?$_)@0j}P-G(A*PZUbN5LCQ_pVOZYX8!0#7AFpg* zi0vOux0bWC)5{MAMYG|sy4I8B2r5qBPbc%4?uW~ zB;F)gF1?T-IY?NZncLr@f=I?STCUg0$I-YFNE}-Lis(Nm1v2ZKCl@lZ={4C@jwNK+~o5DA7zQB}40_{`z zfC!IiK-sPt0+SYS<-jo|ys(#SHUT zhr-n$GcH`Y=o`<_J&U1dCMcAE2)7|$U@4WwT8;(AFynFlJvFc8~mMKhd^%#$2iA(|o;R?_gQaY?y5t=eexX3Pnu<@HVEo!G)hzmTdD>C D6c%K^ From cf32ed8423f2d70c758d5c5697e77049188e40e0 Mon Sep 17 00:00:00 2001 From: guruathwal Date: Fri, 3 Jan 2020 16:34:49 +0530 Subject: [PATCH 06/11] update global info icon for tft35 --- .../TFT35/bmp/global_bed.bmp | Bin 1784 -> 1784 bytes .../TFT35/bmp/global_nozzle.bmp | Bin 1784 -> 1784 bytes 2 files changed, 0 insertions(+), 0 deletions(-) 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 141e4f6f9ba58f98f7999d06b095a7368f8b2768..2b11c39df4cbe89e48f009e125900f14ad7590e0 100644 GIT binary patch literal 1784 zcmd5+Yeb^A+oqdq z?qX_17qcw#0(PP7SD~Qfx?)$-lC-kCZ#}LULAdDhqmT2xJiOtn|)c z{=|@YOyeWhbJZ5^sx35g2?YfIwk-^yIZG)bh7^YJYV*{Z>$=Kn^Oah|?^^XW%h`+h z5dw}#Ia*`!xBuO|^(v&pmB6``f;O_K%<5;CyhX9R@F4 z{R8cAApjUB@OE^zW*7Knux`19Jf&f>vdDLMH%!(P^QHM?qxMp|e4@65&zdF(5-CB* z%`fI_OQyu8Qp|o&);NVVIpT|a8KW<28lPL}1ItuXrpjSzl4>a-odQ>QEDtB8k&>mf zGLo}6lq4)k)D*Rc2Vr-oz~$yl0fSsW{OO%0*K?AxsHvs0tIH-x9D`e5sM^!tKXh2K zAU>TK!>r!k9?R*p=tM%>IJ15RVun;aoG0KZuiA** z-r4HF%zw78+7)(d9-8IF~c0?)!tIdAMZEUWe9YhBuG%)xY z`UI_}buskh#R<3s@$*)0CT+@3Y zh&(7YTT8+`0#EJrOW`q;p`z|DtuJ47Zrn*p$LLyp8eFj{{wdj*O;S#oP^i8&_|~8Igm-uUe$p|sSn(BgsN`D17EI{ z>_{fVsoB6S5AVgLp`X27@Swwm3irDD!;SYXXnQf^URDv-WG%x$iJ8$VlV9_L(`6MQ zV%8l~>5_+=cbtc-p<`t_4*s`Uno((T+|C0yN9zSFQT;+0CqEcuI%nBFKVYr{W3)%? J!2icZ^c70!HJ1PY literal 1784 zcmc(eKWhR(5XH|BFTvAD6hu-bl_^XY6zpPSqp1YJE@`an)2Fw$x6X&ir%LIM+pr98 zMCCZ}*ga-v=e_y6;zudR7uyez5f94VWju1_4M>5Iq74F$D7DpyOuwY32O%&^%$A2{ zof8bP!DE3U<3jqv0C)%i%NPic@04c-a)ZJ+t^pGOBYr|J23&8I=ri zIs6M(bT@Xz%Na04W-?4$EC6&EF-8H^^v(t<<_gbXNG&qHbMNkdFj%^#Th)xg){mig zHqe~{czg%+J`hb>AlN*a!8?YbxhLh{KZqGn^1_upcD^EN77VrBT+^2d0)r0IG@vuO zX95l3Eofx$jb&K5eg=vWFwWO+uaff}q;(n6$`~gv;P0J{5?r0r_$Mt8iqB`zuwsZz zmpOm=I7}aQx^G&(k_m&EJ40nV7cjWsu42ehgHjDwwi8+??0cRswKeNcW9k!7{la+2=}y3X0PvKc>MeX0iCGQOIJ^G4q=$O z7-0_3J$1bdZ{FWRRY-uh|M2ptY=-{1h*)c%$^#6d#p~P_toFHnXFUP^|NlRI{;+d$ z;Jj5vz)(d_lfd}uoGwt=$&gUYu>V9oL36I&ylCyiP~O4NH(L-MS#U=CRNm57h7;!} z5H#oZz3ZVVj7<}nu$BYFn{)Hdb>A2UJmwTNFdG5hXpMx#FfGz|UGMM253}jLZYM^?|{7zmGjTvruMF9QI+P44z From 8ad8977136b516a881c44f50a1eb2ef428a8f9b2 Mon Sep 17 00:00:00 2001 From: guruathwal Date: Fri, 3 Jan 2020 16:37:02 +0530 Subject: [PATCH 07/11] add infobox icon to allow icon customization & fix parameter icon to match icon theme --- .../bmp/InfoBox.bmp} | Bin 30836 -> 31696 bytes .../TFT24/bmp/InfoBox_part1.bmp | Bin 16016 -> 0 bytes .../TFT24/bmp/InfoBox_part2.bmp | Bin 16016 -> 0 bytes .../bmp/InfoBox.bmp} | Bin 30836 -> 31696 bytes .../TFT28/bmp/InfoBox_part1.bmp | Bin 16016 -> 0 bytes .../TFT28/bmp/InfoBox_part2.bmp | Bin 16016 -> 0 bytes .../TFT28/bmp/parametersetting.bmp | Bin 14896 -> 27416 bytes .../TFT35/bmp/InfoBox.bmp | Bin 0 -> 61616 bytes .../TFT35/bmp/parametersetting.bmp | Bin 27414 -> 27416 bytes 9 files changed, 0 insertions(+), 0 deletions(-) rename Copy to SD Card root directory to update - Unified Menu Material theme/{TFT35/bmp/InfoBox_part1.bmp => TFT24/bmp/InfoBox.bmp} (80%) delete mode 100644 Copy to SD Card root directory to update - Unified Menu Material theme/TFT24/bmp/InfoBox_part1.bmp delete mode 100644 Copy to SD Card root directory to update - Unified Menu Material theme/TFT24/bmp/InfoBox_part2.bmp rename Copy to SD Card root directory to update - Unified Menu Material theme/{TFT35/bmp/InfoBox_part2.bmp => TFT28/bmp/InfoBox.bmp} (77%) delete mode 100644 Copy to SD Card root directory to update - Unified Menu Material theme/TFT28/bmp/InfoBox_part1.bmp delete mode 100644 Copy to SD Card root directory to update - Unified Menu Material theme/TFT28/bmp/InfoBox_part2.bmp create mode 100644 Copy to SD Card root directory to update - Unified Menu Material theme/TFT35/bmp/InfoBox.bmp 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 2244edb2b8f754f6087370ade038dd66ed8afd8a..703de802cf10b474e202d270313dea6e62ce27d8 100644 GIT binary patch literal 31696 zcmeI*Ax;EA5QX7FgF+!!BEfI~1PPm9(Rhx4;S>mtfL=v{;RGB92Mrtn@$%r?bdT6I zQ~#^K%gkiYuiozF`*XIg$7?^VeX;i59IfljFJd|NSf&L13D8qgN{T1*~hW!NkE8w9F`w8?{z(X1K6X>sihkqf%=iQT4 zO<+A=dU;}16Y#8l|Filsl%aQ~@&tIu!+aNd^@)c(#6idficG%pNjlX3I3u zXGcu=-nC!KMb@z|4gmrL2oNApiNIqB5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U zAV7cs0RjXF5FkL{R|1u+pZNv>0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7dXg#r;T DaqoqH 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 0f543252e0bb7dbfbc3a8e840cfc7c9792908531..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16016 zcmeI3p>D%K7=v##WkZ7pODbh#s;ViVlPWdUXhG3P!Bi=$mVrJ-pJOkq8#BYL1{BBFP+yU;(S< z2+ARn%#jEduv!Sm%kZl`Iak|ttvzv8HC~2;6wV0BA(G6I2o|tvj-VVO$sCDb0juT+ z${~`>kq8#BYL1{BBFP+yU;(S<2+ARn%#jEduxgH=93sgaiC_V%<_O9mlFX3^7O+|Z z$I9QWBz{vW;jI2N6?j@Tq|dI`2m(@+a8^smIImv;WeuqWj$g-x1}u=G>-96feeXd7 K8q#UjrE~*T=z~-M 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 0f543252e0bb7dbfbc3a8e840cfc7c9792908531..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16016 zcmeI3p>D%K7=v##WkZ7pODbh#s;ViVlPWdUXhG3P!Bi=$mVrJ-pJOkq8#BYL1{BBFP+yU;(S< z2+ARn%#jEduv!Sm%kZl`Iak|ttvzv8HC~2;6wV0BA(G6I2o|tvj-VVO$sCDb0juT+ z${~`>kq8#BYL1{BBFP+yU;(S<2+ARn%#jEduxgH=93sgaiC_V%<_O9mlFX3^7O+|Z z$I9QWBz{vW;jI2N6?j@Tq|dI`2m(@+a8^smIImv;WeuqWj$g-x1}u=G>-96feeXd7 K8q#UjrE~*T=z~-M 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 847dba5390bcdfeccf4c7ff89a65be08c6f33fab..703de802cf10b474e202d270313dea6e62ce27d8 100644 GIT binary patch literal 31696 zcmeI*Ax;EA5QX7FgF+!!BEfI~1PPm9(Rhx4;S>mtfL=v{;RGB92Mrtn@$%r?bdT6I zQ~#^K%gkiYuiozF`*XIg$7?^VeX;i59IfljFJd|NSf&L13D8qgN{T1*~hW!NkE8w9F`w8?{z(X1K6X>sihkqf%=iQT4 zO<+A=dU;}16Y#8l|Filsl%aQ~@&tIu!+aNd^@)c(Gjstjv_m)CZzqo|Uf51wiwpSE|Ni*&$l`@| k=mU6oeDcWRg?{ts1IRE#7w|$mbi>}KWat83m^&Qf4?5@ix&QzG 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 0f543252e0bb7dbfbc3a8e840cfc7c9792908531..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16016 zcmeI3p>D%K7=v##WkZ7pODbh#s;ViVlPWdUXhG3P!Bi=$mVrJ-pJOkq8#BYL1{BBFP+yU;(S< z2+ARn%#jEduv!Sm%kZl`Iak|ttvzv8HC~2;6wV0BA(G6I2o|tvj-VVO$sCDb0juT+ z${~`>kq8#BYL1{BBFP+yU;(S<2+ARn%#jEduxgH=93sgaiC_V%<_O9mlFX3^7O+|Z z$I9QWBz{vW;jI2N6?j@Tq|dI`2m(@+a8^smIImv;WeuqWj$g-x1}u=G>-96feeXd7 K8q#UjrE~*T=z~-M 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 0f543252e0bb7dbfbc3a8e840cfc7c9792908531..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16016 zcmeI3p>D%K7=v##WkZ7pODbh#s;ViVlPWdUXhG3P!Bi=$mVrJ-pJOkq8#BYL1{BBFP+yU;(S< z2+ARn%#jEduv!Sm%kZl`Iak|ttvzv8HC~2;6wV0BA(G6I2o|tvj-VVO$sCDb0juT+ z${~`>kq8#BYL1{BBFP+yU;(S<2+ARn%#jEduxgH=93sgaiC_V%<_O9mlFX3^7O+|Z z$I9QWBz{vW;jI2N6?j@Tq|dI`2m(@+a8^smIImv;WeuqWj$g-x1}u=G>-96feeXd7 K8q#UjrE~*T=z~-M 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 974311f48b68c120a7366cffd894911c5a810c5c..48bae0f941a93e24f896bc9cf71931993c148a69 100644 GIT binary patch literal 27416 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 TyHxK#IzDU!*rn({R#yK5a3Ocl literal 14896 zcmeI2%d1XN6u>`YGb4Y3p^;)}U__Z2m??(JNMxWWDW#}el9^DFJSHNE@+y(Xy(Q1o z71zK3<#I2-?$U0x_Ia%R_`2xazVEcpI_q0&{q|aCKhC*pH>_MUTKHSVaRuLXf4)mb z%NOLct4E_{OXa&D;IQ%h`v2@RF#Q`D9r85fX|aZ$q4tK_`&(=8^yJBjhesDHx;(#~ z_tUXQ6TcSzX1;wq^5F31%bW6?_d2zPx<SMyd$FCoZ&)1({Rm8eCeb?CMw6Wx< zPn2sg?YO?3t~~erto95R@?P^E1#MQ^Z9sCh*QO&+!3M6hf5xbCEG%f7w7Y>&=yjUH z1YC8jc(@B)7#c>0q6wE88;MNVI5Tz1)3c4J3>DYn#&1|ij8!VF8xcY-%Dr4Gxb7%ITK*!bv2z47h&Em%FRS>;+Fv? zsJ7DpByUMjlV=uGpy{D1SUx6w1Gfd%eARblO0S9^Np)*KbC%a+EC{t`_hVTH6Rzm8HlWbaq5M3r9(3Atux(fvXQ&F(G*iE}VA>8Q z1{^;Sn#P0Y)QJ_kt(b|MIlkd_6u}h@|A=c?wZV>T;X-CL^K*Ub$dgu=w)U@qh=ohB zzEh&jwqYUf{kM;FChge(#p!g?1T}43u=I>ClAzqyNMzDJH4sBzIgrGtT>!yH965n7 zlE_5hEGvQ^yiwf@M+DN=YZ-Ell?s&3lo4RwPc)W4L*gqjPk906{R%9mIzGLFg0cS> jGnq*JrvuaQ|K 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 0000000000000000000000000000000000000000..517723659b8d34f642a538b573230ca110641f28 GIT binary patch literal 61616 zcmeI)u}uR(7=+O!CL-30Xn@1Q3NmoWK%oH+3oFRLAp?a5I4rCn z1BVP08sM<7f(#roP-uX|!U{5Q$Uvb14ht*Dz##*L1~@FNAOnXC6dK^Lu!0QZ(4U@Z zV0!}`Zl6GaX@Elv3Jq{rSV0C387MTsVPORsIAoyE0EdMYWZ;m2LIWHYR*->11_}*u zSXe;@4jCvkz+qtp88~F1&;W;p6=dL$fkFcu7FLjfLk0>Ba9CJD1`Zi0G{9kD1sOPG zpwIw^g%xDrkby!292QoPfkOrg4RBakK?V*PC^W!fVFejDWT4OhhlLen;E;hr0~{7s zkby%63Jq{rSV0C387MTsVPORsIAoyE0EdMYWZ;m2LIWHYR*->11_}*uSXe;@4jCvk zz+qtp88~F1&;W;p6=dL$fkFcu7FLjfLk0>Ba9CJD1`Zi0G{9kD1sRUxP=W@wH{kbh a`vd|^0~}&dXn@1Q3NmoWK%s$gxYj?mQE7+( literal 0 HcmV?d00001 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 39a0c9bbf68d209c5681388d569f5d6a18001a6d..48bae0f941a93e24f896bc9cf71931993c148a69 100644 GIT binary patch literal 27416 zcmeHO2~bwo6{a&apnw{asOdPhNt3F{r0H}zX`5!!sb;3r%p^@SP1?p*V;VOEL`4Ps zSrh?T1XOlp6N7Am|y2$Wi`fD_+JE(_MNBnS;EIZVx;$4yMN64A${g8w>AXX^5CE(^9?1H75DHm=A%_oU6+^I{gS!kYU(A2*pAI$)+$KsP zLhq7we?aDtzz3MD3b$XfYQ$_;YpL(x{L68KyWg+UGu_HA9e()m0h~Hhv`s8I(`nd% zP{;~c0w4bf`;}q#ej6UGAo!MTmy?O=ZUMGpPsQ{c*YUogA8gC^DX%N~CEuu!ci`sKby61G)(%+ zWegc+M9guub`P+{>TJXpKmL2s3t_RJpDEhj)Z92A4h(^W^aZ3AuY(-tBvj*rks`D^ z!_jut+Nrq(n;UOkY42!iZn-H~d%dB&_WJqgq zx;v<%CIn_G%;#uY-AW1@ID48{3{mU+WfRgf-8;KlIlX9YyBnW2mmmVRUoUA zM>n9Gq2u-T_He2)NeojE+ETZ8!DSWrVBYxBdE~{*M^$)KT7D4mEmr4axk(L;RVI0= zPIzyQLB+I8ok0aY&W5oVFY2sCt?us5p5BM5tMgav>+5N5tq+cUiJVnIpgEIjAqqWm zGLAF+;P*va$=3E8l~=O%A9spKnPif8Qeji)=fJ36YU_(8+WPwYdV0FFeulxLK4}6q1qkacKO@{JwBXn$&-y)83N$ zg+Qg|S}~#>X_4hPm|Je#Dmk9-owW76u#FSeM2+I~*HkgMz+dH9o@ammqdjtOZ+BC3 zT|vptsN`ABhSw0lV6on{KcK6t&2pGPbJv5GYxO5{a@`|0P3AY-97$99&!~#(o!#B- z7~|PTX8Wz5^2PjN*f8du%Rv8e@^}@ojqA#{%-jwr!P|JdG$+>(pZ;!0>{xUBHMK76 z;jfao<=yaviIB(am%h^haUHpX^owE5Z-wwLGI1vHRTI6v4?8;VRMuqgI`p+y$T(!$ z1?9*r85xXZ2zIzeOsyVG=|4|5cmLV-q116~4MJo7DtO_uc8cm5sjcJYH&^#&A8`zf zd|R3@bT&Lqwj-xR8-FBEkRH(r7SaPZiRLE`ophDr0}eK)0zS)D+n*`Qkd={Tc6K#k zzAd^CmzMddA#lQMS6d8TL6!6yF&IA1p2i0jmVgM>^20)s#TOG~-MmzFLU3n8(ywpd zy(TMT#JpBtwquWPLdLXZzGJ1iM?u>RCp)B4r9eqJ4sJG{!CLkrb@*Iw$TMtIl4XNy=fvH^q)5lCqBd!!_ZR+Ng^{N!!#x3u0M zBdf0#AXSKTG0Z!4HjVg71R}|h=ue$JZGxi5V(i?!U85u^=C^m;M;=McAsUSuP3bEF zHCXhapN#{f)ZPEJ>e_QB@>2`}zoEB=_ltxfnXN=ztt&y)jb$ih>t{+brt&e+F!hlo zP|h%(v&i1chf`82h8H9lGkeK6K$N=OwdBG+ykG1Y*{-1*tlu~t=Vdq+&)nz77B;CA z0}ZglDsh-3wVa=W*7=2vBm<*IhsOP3=RSY*BDl=&NcN!+oS{S8l2xM-67W~#kqlV> zA@Grg*+#~5KB~s2swTUwUCqf0j%)&>ehl*#`wYkO&Eqn^40f`aYT;@WJ6Ym4aw#y;)VWXa6y$O*^K=r2RZ5?d{YZ9~?ODjJ+6k zWMWArx}&pMI4#u>AGAfzswS#y4=C9Tesjz9+`{k;N$vTbU zRO*{b1|Tn2Ql3b{N(2HV(vQdiVW;^a5ZY3*%2a-S(b|iZoA2Dae6Ojxp|SXKbq=mr zAlEV1^<~6?WI2e0bO+j7%_wYR&FM}W;zK?LMnAt~<%?oK zh(>gTw~T=x^Z`t#$Qt1^mg=&JO*^J`cF6}*0 zIB&&O0r6^%Q?THuPv$MNmQ|v}+`jK`NS( zB1esVeeLy9Bd2ms#REF*zm%X*;+K>s8L6Vj`i4tDDJ1GI!p@go)AtIW{NgZdAIN4| z0wYV9E>xszB2y+SjWTKr24o!!HXk2Lj4v{hK@=2c3dXCOJUQcvp^Hyk>Kws%bsGVM zNeu9*$b5XDN@wbyx9TP|m51;w}W*(Zj|&RB^A0X$m6|Vn_?fVh(2Ae=j0=o00W7 z3}8FXS!#*?BW`+K;wxuM*2%hq{V6s|MiAiOc~x;e`_A&It#wgeFrHOc6#T**814XoOTi?B6&bVg%%9Rz-oPIj zYZO!$ixrk8Q$yMkXhmCv3~hi2w=(eKtaGK2fQ2OSlY!g!D#ZRuY1}p!?q>?CHmXAj zR6!xsk}A!K!Ndo~V?{%1RO*G&9+rT@sUHFxqcjmzL7`NehMYmhN6GSxtUohu<)O$g z{EtYJn)6FirKZ{Z?+HF3apUecU!~q+M4%`*W>9~&L!b@H`o*>8<`o7T!9tHHB7+B+ zfDMD(;?QbN$A|sCbbNGt*a)yo_5P#d!$yEzs`noqA2tH)QoaA^_^=URm+JjT$A^so TyHxK#IzDU!*rn({R#yK5a3Ocl literal 27414 zcmeI4*K-s{8o+(e_jV6g_a|K4%e`G)U9ep^fC54UfkY5FM*|MnV4SgW;RE9%8}OL} zgz~PkP!>rblq1Rl6j49{r4{$v9jP^%nO)7!?&@5wRjpP%Ju}^3|N86hue-n2ocX`s z{)+AAFMR)z-_;Ypzj@^kw)lo^ue|cR-%7u>2)-J78@(Sjf!gkxG0PZyUc2^p??+AG z&zJvH*If&rz-WK(M@;}?O}&j?K58;jjF*o+GG0E8$$0sA`RF0w_!)2i+f=x?8%t8Az_a4prdQaMp(D)U^AR%e;7$0X7=Xw2nNdNo%e@Sq} zcXm_e;oL*ZOp6!A1V|NUKnBCFAQBp~Fna#xo zI3^&oF@2f<;}ch1gPlk39hn#Yrs0wrc#$Hbw`vQmxF67| zKgf?Tev$K9`&(q0PX#j?)7}Vs%|J1Yy#gG+h`DPMR^5GidrAmZsG+xhed220h_`v( zSVsE!*y_t?*UfDzDPCH}$I=>7U%&njV=@?ci^^JNT6FK}U9~VGroN|sL(*DT;2@ZO zK0HigUlJSmSUEB_Y#FEal-2jJHGfUQN*7gHjzS$q2Kd};NLE6b zysqg2&IaG`w-f{)I9$TNd23!h&n$kMU zM?&=WjX86!zd9%E)jerDu`v{)RzIu$AZx!=Uz(Y^5{dGBbN8#(fi^{^Tt4cm-kP#W z6HXv-3Qq}r|K{FT!0`|tQ93llKXUHg^j+-(tqN(|`di=2+{X~CQ;kKMGX}6C{!?=K z#pnw~j=UvVW&UL+V_8>co159c0yJA95pC8Vs+6`rQIl#7?rkQ@{fsHX>Tkq?EnH z{bPfpgK`-NzZe}nnSY#TP%~GsNbl0^Gnopjyr#~GybkAnG&lSWc`m?V>H(awaiw)_ zt}&6+?C?P(8WDLNe{gJIWI%zaf4J{d!AT})lujXbfDC8ftj73(32b+TokNdz`5f_|V zpQ1=veu-(ZH+?sX>KpNvPxzY@|9s(@5zC1D84-Rrb8kSTuJtQ-@qv;Jksl38h#>-4 zk8w376u^M>XoIs1TSBB}FHqQCKrh5>bbIQSizOF^$A&eZ>>KV2F$L-D72U`OL}VIl zT5PU~L1z@Qjao)h>yx&mY;;PC7_3*u1?M!+3`ffD`SA1hfwtCu<#;L==3?;$or4!8 zaxWheWQYkeEi^rf)ol3rtq-vLDYc%qZ-o;dlGB_eFP)2F=&g=lK|Lx)IwaTpxSbEV zpdm|R7ny5fHRq3oZ4a?3;o}$)a8|{KWV;m(>kLQke1Wa#IBPj5PwM!p5r4BZA!AMMO`nRVLdK2Et0Agp6oaz z)hB4Goc>6bhHgL3Wg3Fk*#W=BzR<7DPta~s`n+1=WS<|0MI9CQ;9<8#QtZu_waTc6e17Q-04O@-!dxe?heW(Yz!0xj87fo?DqsnK*|4hkcOn$&E0WvsrAN zb49pq&LvkNkMgm04pDwb?tbyK|A`&~4xTA!d$=)a9ZMDx9Qoouh;CF`5uruK7J1}A z6k*Ttv1*PDPD{UCM2+4s@DXLH#JxU#p5ViR7@n@U0O950xa>3DEp0E|lfDBxhfe;-qH}|j(|mRSPvn2c zZt||1+bcS!e5II+(MQo2xvQbMosYCfz*ab}Tr(Em@dGx^vBIILvTd#C;k#dS5lMr> zrM6s-s5!@th}^=5%A$U8FJW+bGwk(u(stslFb}&)IQvYh`DJNRXAu(1aDPH#ArH00;FBjSIP6ezmltm?~C#vEXqQlyt9n)h~m&8v$_~t9VPDekMvzG`H_4#B(1ss zRAbMYjiKo3NKRmFP2E)eYzoocC%0L8H9Y7W;DeBOiLXyuUDsVB|V z4kiK+MvF8}U!JFb*qgCi&!U8c2o!Qh&7rZOOT`xgqWmzGwGoY5;%m+9`%_Kw7K+Mo zicL?xurk1hZCo{<%%(KkI^MJ$Ok`ko+1{^lmV_aApVeJ?;yAXV*3_30A{GyGWRAYW zAS$`AAj%h)%Yrs7Es_vL%mawLh2lxFHF+bs&!|NP_^eRz;oPpYJf$cX4UN8tS(1V$ z-fkb~d_;$g{wrQ_a48VwHs^>0F-`H;rM;|*3n^?X5b+{_ZHX4Ko`5f(91#a;w?z&M7z&w+Te?E7Kcq3K=+Y5Latn61#Av zIoKYegt|C-IsAf>>l4M=;}^F-B|*n3?SdMKsJtQOH7E(bvW!;9R@`1F&r5_8YvcZT^{=rq-}SFK1s3gY zK2bhPV;2|O=85$^bxhkuhb#&Ru3%G;J?GxO;paHiG36J}I~$O+i2roK5-TS?1pzdf z1F*~EK%_B^#V%s-lApu+Ht!qEB=_nMsloiqJD>Hu=*BEj8+F92h|_LXQbAZZW1`Jt z&SFtKj~T-f?v0A;@`JA#Y4ttA=A8 z5u*KmEIvC;64}MrxFzOM6ib4RYfXW|-X+~Kx7h2MhNw9cM5Lck8*inc^@A=Q%09rm zQgQ61PrS2yq%`ST)q^83+&x=(8pk;;p{#Kgon@Po*3nfu5Xq@qQl=mp9h*AJgtfCc zb^*;iu`W)1QiijH2Xj6^b121()ntH=ru-7Fvqh)vks+Q19qJAIN@}2RsT#Ac7KFL?cp2 zLWj(WA^putXr}9Yq#=OiQ08BlXZ-Vo4>I?^pS7PsmJbsj$WUwgt4zpdAOIgm)yS#{ z1)ooI4@qs%SutGaLn&;CCjR}GBnC_fIIGMCfT&-gGvsr+@Dwh@4DqS;$sBFQ!DdEN zN1YTgZs8+OSyCrwt4W@M>tX5z(-D>CL(_IeB)9W%y>xC#0VYz9$G61CShBxXKE`OM z-}3TNGm*!5`N(Og!(KjWCh{0BA2|(m*vm)FL>}YiBd4Jbd-G Date: Fri, 3 Jan 2020 16:44:21 +0530 Subject: [PATCH 08/11] add status screen infobox background bmp to allow icon customization add status screen infobox background in one single bmp to allow icon customization --- .../TFT35/font/word_unicode.fon | Bin 4718592 -> 4718592 bytes TFT/src/User/API/UI/ui_draw.c | 6 ++++++ TFT/src/User/API/UI/ui_draw.h | 1 + TFT/src/User/API/boot.c | 5 +++++ TFT/src/User/API/boot.h | 14 ++++++++------ TFT/src/User/Menu/StatusScreen.c | 4 +--- TFT/src/User/variants.h | 9 ++++++++- 7 files changed, 29 insertions(+), 10 deletions(-) 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 e2ee0979c09e43e020e2e865cf4cb7bb18ca47ec..dcb0e7b07408100d8b9e96f0a5496506fce58c31 100644 GIT binary patch delta 2480 zcmZ{lO>Y}T7{~vcjdxwTcx_4&Cvjq@X(6udBz=Jv8k&~3UV7;TabqGO5K<0_K;o@5 zs}|8?6(TWGPxLc@1mZNkG$55q{Q!mG(o+S_i6TWY|Jj*cw;@E&&w6%Vo|k!^nIy@# z1Bu~#@5-UNfUi+cu!HacN`Vn7{4|5Umfo$PQ;mC?63vUgoKjI;$)jKUt@UzY%q^&j zD3elKg?}l3bE9&jmt6?@uv$ucUvt-{}xf89hoVZFdp z2!R@~;?#6}<6b3Ok$6gl5H*MuEGcXP*UdR`#ca*lm(+)@@VpdrOpv^Omcm;({%af0pv<% zW%hv0CaNNrl1$oOhs7JW98W?QL3-65;hXl}<)Zn&jH5Q#Ei65oq&(Fhkl<9!J0UL<5l*jPOFjmufppg?DZSPbV*Nn8-IM<8gKYogj+f|op%+dde3nP@*qdMQie6-J4!7$D>?Kxh?u~SKxDnPvz=&-m!`jW|~4J z71?{I(3wtOhHZqL5_sgM%mTYOe>ZA%U`=6JWznT!J`}j5uwXni4|3B#3|N^)4d4t= z;pbw4Eqazy@A4f~5DGd^lZwXQ3Lo;>m~&Y`!3Rp_{eiHi*b!#7$QKkU@DY>{@G1## z1m?NO_Hq|vJ)K}xL1`ocN$S_U6@_7siR_aKfdP`?QMN+T@9taC$pN#ACbVXKUWfdU^k-wY@~!x^J6zd_~^+ z@_co@JTlhh#0kCXtHlGF-=aF1G>$8i3IzL!J zts^BUac_s>Txu5Ab=$sL(lDcp=rk~ymWn5C0yM{caon48#|e>EF#9#3xy#!eWlYpr zi{LSFhw|ipn~}BU7PRZT2etEL#xox^mFCS~yPEytgioWaJn%9z`9!P`Ca`~*tKr?7 z1xjxJ{E*tCotNeH8-fX_F3_C39q+93{ud uadLvZKwcy#$tm&@d6}Fh3*;4YhAfh^0o94S|H%*f!v^8ie79SFV_z)q| z2nvD)rx7$SqTzz4pkP2jg!%yrf(>R%1*<4AZwd-4KKUS|58{H_^}k;UML54@cIM2z z=bkg3w^`?vd?wbqc+zN-dOozMZ?2^EQrzJC{Q;9*A=dbf9wECW#U!m5=DJx>k{$@N zSTKwKNU|i~O9^-XZM_+4;`Fvka{et}6F>a8uzBXZIKt6IVZ~iDXZy&m!&<5qF~=Cr z`2N}xzv5AaXtgv-z0QEeM`!+s(!UBDh*r|8wie+^!} zBI5jIQgoLSe)owiFWplSF5XdLz1bS(Eh&D~KZmCEX8Sz1JteFbirZx7NqA%sIVAIB z@~>|NvO*}#Z()jpI5iM=2zj3DZu_wZIrD?TZ znNsf#9p=ns;rL~pl9G47RtG26tA~R8@^U03i4^hm+oJ@Vzb`L61EFaz(TH*CK(Y35v? zhXL6}X%oHk+>l<3tICIwnGhD=_)fL+Yu~FNUz-wvc&QjPP2?S4VbvGT8ic!>^ixs9Q^uaF^DzwN^Fj=ofj#-vM3^Lqc+*)grp+GzzsTGpcp^K`FZDUp$s+OEBP*%VA>8RfM7H8}@+f8KVD6vNw z2N@D!E2~&URF8m@W*j~FN=IoM$qSe8Y2}l>`irghMm#I6S0J~6TyDM;?Bv`FeFj^P ziGZIxqIE7V1O{sbTFnP9l-om!e;60#l?}bUWhMUiyi|2{3t8EsRhEv!u`w~UVOy1U zT%8w<+&_j-Zui4#(`vUmH|&-cmnO;+sf+`^V~%z|sMN*CwDd$`kn7WGRzDpJ>WgP) zbaE>Dsy!m04tyZN4+fZ^AOQ6cga&AYCa}PUW(YwGw89~1gLZHr3=xPz3=Tsa65v7- zI-nD}pc{_BLvR#&pchim2gjfv(vX4UFaRfD5QbnFMqm`iU>r`u1e}7?P&)f0oPjAg Q3)3(I=RUVbX7}#?2WcXMTL1t6 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 Date: Fri, 3 Jan 2020 21:25:42 +0530 Subject: [PATCH 09/11] fix y move gcode --- TFT/src/User/Menu/Move.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TFT/src/User/Menu/Move.c b/TFT/src/User/Menu/Move.c index 3195d0809b..c39b6af154 100644 --- a/TFT/src/User/Menu/Move.c +++ b/TFT/src/User/Menu/Move.c @@ -236,7 +236,7 @@ void menuMove(void) storeCmd(YGCODE_DEC, item_move_len[item_move_len_i]); } #else - storeCmd(YGCODE_UP, item_move_len[item_move_len_i]); + storeCmd(YGCODE_DOWN, item_move_len[item_move_len_i]); #endif break; From 8b9be6c78f9d6c268368db05ee5a1be1f5a89683 Mon Sep 17 00:00:00 2001 From: guruathwal Date: Fri, 3 Jan 2020 21:52:28 +0530 Subject: [PATCH 10/11] add details to issue templates and add template for asking question --- .github/ISSUE_TEMPLATE/bug_report.md | 7 ++++++- .github/ISSUE_TEMPLATE/feature_request.md | 2 +- .github/ISSUE_TEMPLATE/question.md | 16 ++++++++++++++++ 3 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 .github/ISSUE_TEMPLATE/question.md diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 2526752987..8150b823c0 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. From b953c1f02e22d68e6f331a811810c3ebc8a0292a Mon Sep 17 00:00:00 2001 From: guruathwal Date: Sat, 4 Jan 2020 08:02:30 +0530 Subject: [PATCH 11/11] Change label to lower case --- .github/ISSUE_TEMPLATE/bug_report.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 8150b823c0..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: 'BUG' +labels: 'bug' assignees: '' ---