diff --git a/Copy to SD Card root directory to update/BIGTREE_TFT24_V1.1.26.x.bin b/Copy to SD Card root directory to update/BIGTREE_TFT24_V1.1.26.x.bin old mode 100755 new mode 100644 diff --git a/Copy to SD Card root directory to update/BIGTREE_TFT28_V3.0.26.x.bin b/Copy to SD Card root directory to update/BIGTREE_TFT28_V3.0.26.x.bin old mode 100755 new mode 100644 diff --git a/Copy to SD Card root directory to update/BIGTREE_TFT35_V3.0.26.x.bin b/Copy to SD Card root directory to update/BIGTREE_TFT35_V3.0.26.x.bin old mode 100755 new mode 100644 diff --git a/Copy to SD Card root directory to update/BIGTREE_TFT35_V3.0_B1.26.x.bin b/Copy to SD Card root directory to update/BIGTREE_TFT35_V3.0_B1.26.x.bin old mode 100755 new mode 100644 diff --git a/Copy to SD Card root directory to update/BIGTREE_TFT35_V3.0_E3.26.x.bin b/Copy to SD Card root directory to update/BIGTREE_TFT35_V3.0_E3.26.x.bin old mode 100755 new mode 100644 diff --git a/Copy to SD Card root directory to update/BIGTREE_TFT43_V3.0.26.x.bin b/Copy to SD Card root directory to update/BIGTREE_TFT43_V3.0.26.x.bin old mode 100755 new mode 100644 diff --git a/Copy to SD Card root directory to update/BIGTREE_TFT50_V3.0.26.x.bin b/Copy to SD Card root directory to update/BIGTREE_TFT50_V3.0.26.x.bin old mode 100755 new mode 100644 diff --git a/Copy to SD Card root directory to update/BIGTREE_TFT70_V3.0.26.x.bin b/Copy to SD Card root directory to update/BIGTREE_TFT70_V3.0.26.x.bin old mode 100755 new mode 100644 diff --git a/Copy to SD Card root directory to update/BIQU_TFT28_V1.0.26.x.bin b/Copy to SD Card root directory to update/BIQU_TFT28_V1.0.26.x.bin old mode 100755 new mode 100644 diff --git a/Copy to SD Card root directory to update/BIQU_TFT35_APP1_V2.0.26.x.bin b/Copy to SD Card root directory to update/BIQU_TFT35_APP1_V2.0.26.x.bin old mode 100755 new mode 100644 diff --git a/Copy to SD Card root directory to update/BIQU_TFT35_V1.0.26.x.bin b/Copy to SD Card root directory to update/BIQU_TFT35_V1.0.26.x.bin old mode 100755 new mode 100644 diff --git a/Copy to SD Card root directory to update/BIQU_TFT35_V1.1.26.x.bin b/Copy to SD Card root directory to update/BIQU_TFT35_V1.1.26.x.bin old mode 100755 new mode 100644 diff --git a/Copy to SD Card root directory to update/BIQU_TFT35_V1.2.26.x.bin b/Copy to SD Card root directory to update/BIQU_TFT35_V1.2.26.x.bin old mode 100755 new mode 100644 diff --git a/Copy to SD Card root directory to update/Language Packs/language_en.ini b/Copy to SD Card root directory to update/Language Packs/language_en.ini index 856750bc6c..72330d410f 100755 --- a/Copy to SD Card root directory to update/Language Packs/language_en.ini +++ b/Copy to SD Card root directory to update/Language Packs/language_en.ini @@ -179,7 +179,7 @@ label_filament_sensor:Filament sensor label_filament_runout:Filament runout! label_preheat:Preheat label_preheat_both:Both -label_is_pause:Unable to extrude when\nprinting.\nPause printing? +label_is_pause:Action not allowed while printing.\n \nPause printing? label_auto_shut_down:Auto Power label_unifiedmove:Movement label_unifiedheat:Heat/Fan diff --git a/Copy to SD Card root directory to update/Language Packs/language_hu.ini b/Copy to SD Card root directory to update/Language Packs/language_hu.ini index d8700b67e0..73358e9466 100755 --- a/Copy to SD Card root directory to update/Language Packs/language_hu.ini +++ b/Copy to SD Card root directory to update/Language Packs/language_hu.ini @@ -179,7 +179,7 @@ label_filament_sensor:Filament érzékelő label_filament_runout:Filament kifutás! label_preheat:Előfűtés label_preheat_both:Mindkettő -label_is_pause:Nem sikerült az adagolás\na nyomtatás alatt.\nSzünetelteted a nyomtatást? +label_is_pause:A művelet tiltva van\na nyomtatás alatt.\nSzünetelteted a nyomtatást? label_auto_shut_down:Automata kikapcsolás label_unifiedmove:Mozgás label_unifiedheat:Fűt/Hűt diff --git a/Copy to SD Card root directory to update/MKSTFT28.bin b/Copy to SD Card root directory to update/MKSTFT28.bin old mode 100755 new mode 100644 diff --git a/Copy to SD Card root directory to update/MKS_32_V1_4.26.x.bin b/Copy to SD Card root directory to update/MKS_32_V1_4.26.x.bin old mode 100755 new mode 100644 diff --git a/TFT/src/User/API/Language/language_en.h b/TFT/src/User/API/Language/language_en.h index b756279807..fc4d0a572a 100644 --- a/TFT/src/User/API/Language/language_en.h +++ b/TFT/src/User/API/Language/language_en.h @@ -177,7 +177,7 @@ #define STRING_FILAMENT_RUNOUT "Filament runout!" #define STRING_PREHEAT "Preheat" #define STRING_PREHEAT_BOTH "Both" - #define STRING_IS_PAUSE "Unable to extrude when\nprinting.\nPause printing?" + #define STRING_IS_PAUSE "Action not allowed while printing.\n \nPause printing?" #define STRING_AUTO_SHUT_DOWN "Auto Power" #define STRING_UNIFIEDMOVE "Movement" #define STRING_UNIFIEDHEAT "Heat/Fan" diff --git a/TFT/src/User/API/Language/language_hu.h b/TFT/src/User/API/Language/language_hu.h index c572886f58..f7e5b2543a 100644 --- a/TFT/src/User/API/Language/language_hu.h +++ b/TFT/src/User/API/Language/language_hu.h @@ -177,7 +177,7 @@ #define STRING_FILAMENT_RUNOUT "Filament kifutás!" #define STRING_PREHEAT "Előfűtés" #define STRING_PREHEAT_BOTH "Mindkettő" - #define STRING_IS_PAUSE "Nem sikerült az adagolás\na nyomtatás alatt.\nSzünetelteted a nyomtatást?" + #define STRING_IS_PAUSE "A művelet tiltva van\na nyomtatás alatt.\nSzünetelteted a nyomtatást?" #define STRING_AUTO_SHUT_DOWN "Automata kikapcsolás" #define STRING_UNIFIEDMOVE "Mozgás" #define STRING_UNIFIEDHEAT "Fűt/Hűt" diff --git a/TFT/src/User/Menu/Extrude.c b/TFT/src/User/Menu/Extrude.c index 272df8c237..f3805f9a14 100644 --- a/TFT/src/User/Menu/Extrude.c +++ b/TFT/src/User/Menu/Extrude.c @@ -40,12 +40,15 @@ void menuExtrude(void) {ICON_BACKGROUND, LABEL_BACKGROUND}, {ICON_BACKGROUND, LABEL_BACKGROUND}, {ICON_LOAD, LABEL_LOAD}, - {ICON_NOZZLE, LABEL_NOZZLE}, + {ICON_BACKGROUND, LABEL_BACKGROUND}, {ICON_E_5_MM, LABEL_5_MM}, {ICON_NORMAL_SPEED, LABEL_NORMAL_SPEED}, {ICON_BACK, LABEL_BACK},} }; + extrudeItems.items[KEY_ICON_4].icon = (infoSettings.ext_count > 1) ? ICON_NOZZLE : ICON_HEAT; + extrudeItems.items[KEY_ICON_4].label.index = (infoSettings.ext_count > 1) ? LABEL_NOZZLE : LABEL_HEAT; + while (infoCmd.count != 0) { loopProcess(); @@ -94,8 +97,15 @@ void menuExtrude(void) break; case KEY_ICON_4: - curExtruder_index = (curExtruder_index + 1) % infoSettings.ext_count; - extrudeCoordinateReDraw(false); + if (infoSettings.ext_count > 1) + { + curExtruder_index = (curExtruder_index + 1) % infoSettings.ext_count; + extrudeCoordinateReDraw(false); + } + else + { + infoMenu.menu[++infoMenu.cur] = menuHeat; + } break; case KEY_ICON_5: @@ -111,6 +121,18 @@ void menuExtrude(void) break; case KEY_ICON_7: + if (!isPrinting()) + { + for (uint8_t i = 0; i < infoSettings.hotend_count; i++) + { + if (heatGetTargetTemp(i) > 0) + { + setDialogText(LABEL_WARNING, LABEL_HEATERS_ON, LABEL_CONFIRM, LABEL_CANCEL); + showDialog(DIALOG_TYPE_QUESTION, heatCoolDown, NULL, NULL); + break; + } + } + } infoMenu.cur--; break; @@ -130,11 +152,15 @@ void menuExtrude(void) storeCmd("%s\n", tool_change[curExtruder_index]); if (heatGetCurrentTemp(curExtruder_index) < infoSettings.min_ext_temp) - { + { // low temperature warning char tempMsg[120]; LABELCHAR(tempStr, LABEL_EXT_TEMPLOW); sprintf(tempMsg, tempStr, infoSettings.min_ext_temp); - popupReminder(DIALOG_TYPE_ERROR, LABEL_COLD_EXT, (u8 *)tempMsg); + strcat(tempMsg, "\n"); + sprintf(tempStr, (char *)textSelect(LABEL_HEAT_HOTEND), infoSettings.min_ext_temp); + strcat(tempMsg, tempStr); + setDialogText(LABEL_WARNING, (uint8_t *)tempMsg, LABEL_CONFIRM, LABEL_CANCEL); + showDialog(DIALOG_TYPE_ERROR, setHotendMinExtTemp, NULL, NULL); } else { diff --git a/TFT/src/User/Menu/LoadUnload.c b/TFT/src/User/Menu/LoadUnload.c index 3754ee3788..00c6fde590 100644 --- a/TFT/src/User/Menu/LoadUnload.c +++ b/TFT/src/User/Menu/LoadUnload.c @@ -81,7 +81,6 @@ void menuLoadUnload(void) setDialogText(LABEL_WARNING, (uint8_t *)tempMsg, LABEL_CONFIRM, LABEL_CANCEL); showDialog(DIALOG_TYPE_ERROR, setHotendMinExtTemp, NULL, NULL); - // popupReminder(DIALOG_TYPE_ERROR, LABEL_COLD_EXT, (u8 *)tempMsg); } else if (key_num == KEY_ICON_0) { // unload @@ -112,13 +111,16 @@ void menuLoadUnload(void) break; case KEY_ICON_7: - for (uint8_t i = 0; i < infoSettings.hotend_count; i++) + if (!isPrinting()) { - if (heatGetTargetTemp(i) > 0) + for (uint8_t i = 0; i < infoSettings.hotend_count; i++) { - setDialogText(LABEL_WARNING, LABEL_HEATERS_ON, LABEL_CONFIRM, LABEL_CANCEL); - showDialog(DIALOG_TYPE_QUESTION, heatCoolDown, NULL, NULL); - break; + if (heatGetTargetTemp(i) > 0) + { + setDialogText(LABEL_WARNING, LABEL_HEATERS_ON, LABEL_CONFIRM, LABEL_CANCEL); + showDialog(DIALOG_TYPE_QUESTION, heatCoolDown, NULL, NULL); + break; + } } } infoMenu.cur--; diff --git a/TFT/src/User/Menu/LoadUnload.h b/TFT/src/User/Menu/LoadUnload.h index ff8a702e67..2eb93f78b8 100644 --- a/TFT/src/User/Menu/LoadUnload.h +++ b/TFT/src/User/Menu/LoadUnload.h @@ -6,6 +6,7 @@ extern "C" { #endif void menuLoadUnload(void); +void setHotendMinExtTemp(void); #ifdef __cplusplus diff --git a/TFT/src/User/Menu/MainPage.c b/TFT/src/User/Menu/MainPage.c index 68db10e991..05819ac68a 100644 --- a/TFT/src/User/Menu/MainPage.c +++ b/TFT/src/User/Menu/MainPage.c @@ -10,7 +10,11 @@ void menuMain(void) // icon label {{ICON_HEAT_FAN, LABEL_UNIFIEDHEAT}, {ICON_HOME_MOVE, LABEL_UNIFIEDMOVE}, - {ICON_EXTRUDE, LABEL_EXTRUDE}, + #ifdef LOAD_UNLOAD_M701_M702 + {ICON_EXTRUDE, LABEL_LOAD_UNLOAD_SHORT}, + #else + {ICON_EXTRUDE, LABEL_EXTRUDE}, + #endif {ICON_STOP, LABEL_EMERGENCYSTOP}, {ICON_GCODE, LABEL_TERMINAL}, {ICON_CUSTOM, LABEL_CUSTOM}, @@ -42,7 +46,11 @@ void menuMain(void) break; case KEY_ICON_2: - infoMenu.menu[++infoMenu.cur] = menuExtrude; + #ifdef LOAD_UNLOAD_M701_M702 + infoMenu.menu[++infoMenu.cur] = menuLoadUnload; + #else + infoMenu.menu[++infoMenu.cur] = menuExtrude; + #endif break; case KEY_ICON_3: diff --git a/TFT/src/User/Menu/More.c b/TFT/src/User/Menu/More.c index 4f92970fcc..d31f4c2d23 100644 --- a/TFT/src/User/Menu/More.c +++ b/TFT/src/User/Menu/More.c @@ -11,16 +11,26 @@ const MENUITEMS moreItems = { {ICON_PERCENTAGE, LABEL_PERCENTAGE}, {ICON_FEATURE_SETTINGS, LABEL_FEATURE_SETTINGS}, {ICON_MACHINE_SETTINGS, LABEL_MACHINE_SETTINGS}, - {ICON_GCODE, LABEL_TERMINAL}, + #ifdef LOAD_UNLOAD_M701_M702 + {ICON_EXTRUDE, LABEL_LOAD_UNLOAD_SHORT}, + #else + {ICON_GCODE, LABEL_TERMINAL}, + #endif {ICON_BACK, LABEL_BACK},} }; -void isPauseConfirm(void) +void isPauseExtrude(void) { if(setPrintPause(true,false)) infoMenu.menu[infoMenu.cur] = menuExtrude; } +void isPauseLoadUnload(void) +{ + if(setPrintPause(true,false)) + infoMenu.menu[infoMenu.cur] = menuLoadUnload; +} + void menuMore(void) { KEY_VALUES key_num; @@ -44,7 +54,7 @@ void menuMore(void) if (isPrinting() && !isPause()) // need paused before extrude { setDialogText(LABEL_WARNING, LABEL_IS_PAUSE, LABEL_CONFIRM, LABEL_CANCEL); - showDialog(DIALOG_TYPE_ALERT, isPauseConfirm, NULL, NULL); + showDialog(DIALOG_TYPE_ALERT, isPauseExtrude, NULL, NULL); } else { @@ -65,7 +75,19 @@ void menuMore(void) break; case KEY_ICON_6: - infoMenu.menu[++infoMenu.cur] = menuSendGcode; + #ifdef LOAD_UNLOAD_M701_M702 + if (isPrinting() && !isPause()) // need paused before extrude + { + setDialogText(LABEL_WARNING, LABEL_IS_PAUSE, LABEL_CONFIRM, LABEL_CANCEL); + showDialog(DIALOG_TYPE_ALERT, isPauseLoadUnload, NULL, NULL); + } + else + { + infoMenu.menu[++infoMenu.cur] = menuLoadUnload; + } + #else + infoMenu.menu[++infoMenu.cur] = menuSendGcode; + #endif break; case KEY_ICON_7: diff --git a/TFT/src/User/Menu/UnifiedMove.c b/TFT/src/User/Menu/UnifiedMove.c index f4fdb55752..8babf54aff 100644 --- a/TFT/src/User/Menu/UnifiedMove.c +++ b/TFT/src/User/Menu/UnifiedMove.c @@ -10,15 +10,11 @@ void menuUnifiedMove(void) // icon label {{ICON_HOME, LABEL_HOME}, {ICON_MOVE, LABEL_MOVE}, + {ICON_EXTRUDE, LABEL_EXTRUDE}, + {ICON_DISABLE_STEPPERS, LABEL_DISABLE_STEPPERS}, + {ICON_BABYSTEP, LABEL_BABYSTEP}, {ICON_MANUAL_LEVEL, LABEL_LEVELING}, {ICON_BACKGROUND, LABEL_BACKGROUND}, - {ICON_BABYSTEP, LABEL_BABYSTEP}, - {ICON_DISABLE_STEPPERS, LABEL_DISABLE_STEPPERS}, - #ifdef LOAD_UNLOAD_M701_M702 - {ICON_EXTRUDE, LABEL_LOAD_UNLOAD_SHORT}, - #else - {ICON_EXTRUDE, LABEL_EXTRUDE}, - #endif {ICON_BACK, LABEL_BACK}} }; @@ -26,8 +22,8 @@ void menuUnifiedMove(void) if (infoMachineSettings.leveling != BL_DISABLED) { - UnifiedMoveItems.items[3].icon = ICON_LEVELING; - UnifiedMoveItems.items[3].label.index = LABEL_BED_LEVELING; + UnifiedMoveItems.items[6].icon = ICON_LEVELING; + UnifiedMoveItems.items[6].label.index = LABEL_BED_LEVELING; } menuDrawPage(&UnifiedMoveItems); @@ -46,12 +42,11 @@ void menuUnifiedMove(void) break; case KEY_ICON_2: - infoMenu.menu[++infoMenu.cur] = menuManualLeveling; + infoMenu.menu[++infoMenu.cur] = menuExtrude; break; case KEY_ICON_3: - if (infoMachineSettings.leveling != BL_DISABLED) - infoMenu.menu[++infoMenu.cur] = menuBedLeveling; + storeCmd("M84\n"); break; case KEY_ICON_4: @@ -59,15 +54,12 @@ void menuUnifiedMove(void) break; case KEY_ICON_5: - storeCmd("M84\n"); + infoMenu.menu[++infoMenu.cur] = menuManualLeveling; break; case KEY_ICON_6: - #ifdef LOAD_UNLOAD_M701_M702 - infoMenu.menu[++infoMenu.cur] = menuLoadUnload; - #else - infoMenu.menu[++infoMenu.cur] = menuExtrude; - #endif + if (infoMachineSettings.leveling != BL_DISABLED) + infoMenu.menu[++infoMenu.cur] = menuBedLeveling; break; case KEY_ICON_7: