From 807cb9d22b817596ea1c02683f898b92b69c2bb0 Mon Sep 17 00:00:00 2001 From: Marcio Teixeira Date: Mon, 4 Sep 2023 16:03:08 -0600 Subject: [PATCH] Miscelaneous fixes and improvements - Hide edit mesh menu in leveling menu - Hide fan control in temperature screen - Change preheat timer - Change nozzle park point - Park nozzle after probe - Set version to 1.0 --- .../cocoa_press/leveling_menu.cpp | 31 +++++++++++++------ config/default/Configuration.h | 2 ++ config/default/Configuration_DrunkenOctopus.h | 2 ++ config/examples/build-config-cocoa-press.js | 10 +++--- 4 files changed, 32 insertions(+), 13 deletions(-) diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/leveling_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/leveling_menu.cpp index b4b48617f6ec..18aec4609dc4 100644 --- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/leveling_menu.cpp +++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/leveling_menu.cpp @@ -29,14 +29,27 @@ using namespace FTDI; using namespace ExtUI; using namespace Theme; -#define GRID_COLS 3 -#define GRID_ROWS 6 -#define BED_MESH_TITLE_POS BTN_POS(1,1), BTN_SIZE(3,1) -#define WARNING_POS BTN_POS(1,2), BTN_SIZE(3,2) -#define PROBE_BED_POS BTN_POS(1,4), BTN_SIZE(1,1) -#define SHOW_MESH_POS BTN_POS(2,4), BTN_SIZE(1,1) -#define EDIT_MESH_POS BTN_POS(3,4), BTN_SIZE(1,1) -#define BACK_POS BTN_POS(1,6), BTN_SIZE(3,1) +#if ANY(MESH_BED_LEVELING, AUTO_BED_LEVELING_UBL) + #define GRID_COLS 3 + #define GRID_ROWS 6 + #define BED_MESH_TITLE_POS BTN_POS(1,1), BTN_SIZE(3,1) + #define WARNING_POS BTN_POS(1,2), BTN_SIZE(3,2) + #define PROBE_BED_POS BTN_POS(1,4), BTN_SIZE(1,1) + #define SHOW_MESH_POS BTN_POS(2,4), BTN_SIZE(1,1) + #define EDIT_MESH_POS BTN_POS(3,4), BTN_SIZE(1,1) + #define BACK_POS BTN_POS(1,6), BTN_SIZE(3,1) +#else + #define GRID_COLS 2 + #define GRID_ROWS 6 + #define BED_MESH_TITLE_POS BTN_POS(1,1), BTN_SIZE(2,1) + #define WARNING_POS BTN_POS(1,2), BTN_SIZE(2,2) + #define PROBE_BED_POS BTN_POS(1,4), BTN_SIZE(1,1) + #define SHOW_MESH_POS BTN_POS(2,4), BTN_SIZE(1,1) + #define BACK_POS BTN_POS(1,6), BTN_SIZE(2,1) + + // Hide the editor button if motion to grid point not supported + #define EDIT_MESH_POS BTN_POS(4,7), BTN_SIZE(1,1) +#endif void LevelingMenu::onRedraw(draw_mode_t what) { if (what & BACKGROUND) { @@ -68,7 +81,7 @@ void LevelingMenu::onRedraw(draw_mode_t what) { bool LevelingMenu::onTouchEnd(uint8_t tag) { switch (tag) { case 1: GOTO_PREVIOUS(); break; - case 2: SaveSettingsDialogBox::settingsChanged(); /*BedMeshViewScreen::doProbe();*/ injectCommands(F(BED_LEVELING_COMMANDS)); break; + case 2: SaveSettingsDialogBox::settingsChanged(); injectCommands(F(BED_LEVELING_COMMANDS)); break; case 3: BedMeshViewScreen::show(); break; case 4: SaveSettingsDialogBox::settingsChanged(); BedMeshEditScreen::show(); break; default: return false; diff --git a/config/default/Configuration.h b/config/default/Configuration.h index cc7473c92132..5d993b4a32b8 100644 --- a/config/default/Configuration.h +++ b/config/default/Configuration.h @@ -3621,6 +3621,8 @@ //#define CURA_LE_RUNOUT_HANDLING_WORKAROUND //#define FIL_RUNOUT_PIN //#define SERVO0_PIN +//#define FAN0_PIN +//#define FAN1_PIN //#define ACTION_ON_FILAMENT_RUNOUT //#define SWAP_EXTRUDER_FANS //#define SWAP_E0_AND_E1 diff --git a/config/default/Configuration_DrunkenOctopus.h b/config/default/Configuration_DrunkenOctopus.h index f9ef1c68d145..4dc112222ff5 100644 --- a/config/default/Configuration_DrunkenOctopus.h +++ b/config/default/Configuration_DrunkenOctopus.h @@ -28,6 +28,8 @@ //#define CURA_LE_RUNOUT_HANDLING_WORKAROUND //#define FIL_RUNOUT_PIN //#define SERVO0_PIN +//#define FAN0_PIN +//#define FAN1_PIN //#define ACTION_ON_FILAMENT_RUNOUT //#define SWAP_EXTRUDER_FANS //#define SWAP_E0_AND_E1 diff --git a/config/examples/build-config-cocoa-press.js b/config/examples/build-config-cocoa-press.js index 6570cd4a58d9..0e5e6758a981 100644 --- a/config/examples/build-config-cocoa-press.js +++ b/config/examples/build-config-cocoa-press.js @@ -155,7 +155,7 @@ function make_config(PRINTER, TOOLHEAD) { /**************************** NOZZLE PARK FEATURE ****************************/ MARLIN["NOZZLE_PARK_FEATURE"] = true - MARLIN["NOZZLE_PARK_POINT"] = [0, 150, 20] + MARLIN["NOZZLE_PARK_POINT"] = [70, 5, 20] // Parking the head does not seem to quite work, so leaving off for now //MARLIN["ADVANCED_PAUSE_FEATURE"] = true @@ -210,7 +210,7 @@ function make_config(PRINTER, TOOLHEAD) { // Preheat options for chocolate MARLIN["PREHEAT_1_LABEL"] = C_STRING("Cocoa") - MARLIN["COCOA_PRESS_PREHEAT_SECONDS"] = 15*60 + MARLIN["COCOA_PRESS_PREHEAT_SECONDS"] = 20*60 MARLIN["COCOA_PRESS_PREHEAT_DARK_CHOCOLATE_SCRIPT"] = C_STRING("M104 S331 T0\nM104 S330 T1") MARLIN["COCOA_PRESS_PREHEAT_MILK_CHOCOLATE_SCRIPT"] = C_STRING("M104 S338 T0\nM104 S337 T1") MARLIN["COCOA_PRESS_PREHEAT_WHITE_CHOCOLATE_SCRIPT"] = C_STRING("M104 S328 T0\nM104 S326 T1") @@ -231,6 +231,8 @@ function make_config(PRINTER, TOOLHEAD) { MARLIN["CONTROLLERFAN_SPEED_MIN"] = 0 MARLIN["CONTROLLER_FAN_IGNORE_Z"] = true MARLIN["DISABLE_IDLE_Z"] = false + MARLIN["FAN0_PIN"] = -1 + MARLIN["FAN1_PIN"] = -1 /****************************** AXIS TRAVEL LIMITS ******************************/ @@ -257,7 +259,7 @@ function make_config(PRINTER, TOOLHEAD) { MARLIN["GRID_MAX_POINTS_Y"] = 5 MARLIN["PROBING_MARGIN"] = 0 MARLIN["Z_CLEARANCE_DEPLOY_PROBE"] = 5 - MARLIN["BED_LEVELING_COMMANDS"] = C_STRING("G28\nG29\n") + MARLIN["BED_LEVELING_COMMANDS"] = C_STRING("G28\nG29\nG27 P2\n") MARLIN["G26_MESH_VALIDATION"] = false } @@ -342,7 +344,7 @@ function make_config(PRINTER, TOOLHEAD) { MARLIN["SD_SPI_SPEED"] = 'SPI_SIXTEENTH_SPEED' MARLIN["LCD_TIMEOUT_TO_STATUS"] = 600000 // Ten Minutes - MARLIN["TOUCH_UI_VERSION"] = C_STRING('Version: BETA (\" __DATE__ \")'); + MARLIN["TOUCH_UI_VERSION"] = C_STRING('Version: 1.0 (\" __DATE__ \")'); MARLIN["TOUCH_UI_FTDI_EVE"] = true MARLIN["TOUCH_UI_COCOA_THEME"] = true MARLIN["TOUCH_UI_COCOA_PRESS"] = true