Skip to content

Commit

Permalink
Fixes for runout handling in touch UI.
Browse files Browse the repository at this point in the history
  • Loading branch information
marciot committed Apr 24, 2020
1 parent 9b2d023 commit 2f855f1
Show file tree
Hide file tree
Showing 17 changed files with 129 additions and 119 deletions.
10 changes: 10 additions & 0 deletions Marlin/src/feature/pause.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -613,8 +613,16 @@ void resume_print(const float &slow_load_length/*=0*/, const float &fast_load_le
thermalManager.reset_hotend_idle_timer(e);
}

#if ENABLED(TOUCH_UI_FILAMENT_RUNOUT_WORKAROUNDS)
ExtUI::onStatusChanged(GET_TEXT(MSG_FILAMENT_CHANGE_RESUME));
UNUSED(slow_load_length);
UNUSED(fast_load_length);
UNUSED(purge_length);
UNUSED(max_beep_count);
#else
if (nozzle_timed_out || thermalManager.hotEnoughToExtrude(active_extruder)) // Load the new filament
load_filament(slow_load_length, fast_load_length, purge_length, max_beep_count, true, nozzle_timed_out, PAUSE_MODE_SAME DXC_PASS);
#endif

#if HAS_LCD_MENU
lcd_pause_show_message(PAUSE_MESSAGE_RESUME);
Expand Down Expand Up @@ -654,7 +662,9 @@ void resume_print(const float &slow_load_length/*=0*/, const float &fast_load_le
host_action_resume();
#endif

#if DISABLED(TOUCH_UI_FILAMENT_RUNOUT_WORKAROUNDS)
--did_pause_print;
#endif

#if ENABLED(HOST_PROMPT_SUPPORT)
host_prompt_open(PROMPT_INFO, PSTR("Resuming"), DISMISS_STR);
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/gcode/feature/pause/M125.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ void GcodeSuite::M125() {
#endif

#if ENABLED(SDSUPPORT)
#if ENABLED(M125_FILAMENT_RUNOUT_WORKAROUND)
#if ENABLED(TOUCH_UI_FILAMENT_RUNOUT_WORKAROUNDS)
const bool sd_printing = card.isFileOpen();
#else
const bool sd_printing = IS_SD_PRINTING();
Expand Down
25 changes: 12 additions & 13 deletions config/default/Configuration.h
Original file line number Diff line number Diff line change
Expand Up @@ -2260,6 +2260,7 @@
* Extra parameters used by Drunken Octopus
*/
//#define SOURCE_CODE_URL
//#define SHORT_BUILD_VERSION
//#define TOOLHEAD_NAME
//#define TOOLHEAD_TYPE
//#define WIPE_SEQUENCE_COMMANDS
Expand All @@ -2270,29 +2271,27 @@
//#define AO_EXP1_DEPRECATED_PINMAP
//#define DISABLE_DUE_SD_MMC
//#define EXTRUDER_FAN_ON_PIN_6
//#define ACTION_ON_FILAMENT_RUNOUT
//#define ARCHIM2_SPI_FLASH_EEPROM_BACKUP_SIZE
//#define END_G29_ON_BACK_LEFT_CORNER
//#define USB_DEVICE_VENDOR_ID
//#define USB_DEVICE_PRODUCT_ID
//#define NO_PAUSE_FOR_REHEAT
//#define CURA_LE_RUNOUT_HANDLING_WORKAROUND
//#define E_MIN_PIN
//#define E_MIN_PIN_INVERTING
//#define E_MAX_POS
//#define NO_TOOLHEAD_HEATER_GCODE
//#define DEVELOPER_SCREENS
//#define TOUCH_UI_NO_BOOTSCREEN
//#define TOUCH_UI_LULZBOT_BIO
//#define TOUCH_UI_FROZEN_THEME
//#define TOUCH_UI_ROYAL_THEME
//#define SWAP_E0_AND_E1
//#define TOUCH_UI_VERSION
//#define TOUCH_UI_FILAMENT_RUNOUT_WORKAROUNDS
//#define CURA_LE_RUNOUT_HANDLING_WORKAROUND
//#define FILAMENT_RUNOUT_ENABLE_DEFAULT
//#define FIL_RUNOUT_PIN
//#define ACTION_ON_FILAMENT_RUNOUT
//#define SWAP_E0_AND_E1
//#define E_MIN_PIN
//#define E_MIN_PIN_INVERTING
//#define E_MAX_POS
//#define CONTROLLER_FAN_IGNORE_Z
//#define NO_PAUSE_FOR_REHEAT
//#define NO_MOTION_BEFORE_HOMING_WORKAROUND
//#define NO_TIME_AFTER_SD_PRINT
//#define EMI_MITIGATION
//#define SHORT_BUILD_VERSION
//#define TOUCH_UI_VERSION
//#define M125_FILAMENT_RUNOUT_WORKAROUND
//#define NO_TOOLHEAD_HEATER_GCODE
//#define EMI_MITIGATION
23 changes: 11 additions & 12 deletions config/default/Configuration_DrunkenOctopus.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
* Extra parameters used by Drunken Octopus
*/
//#define SOURCE_CODE_URL
//#define SHORT_BUILD_VERSION
//#define TOOLHEAD_NAME
//#define TOOLHEAD_TYPE
//#define WIPE_SEQUENCE_COMMANDS
Expand All @@ -13,29 +14,27 @@
//#define AO_EXP1_DEPRECATED_PINMAP
//#define DISABLE_DUE_SD_MMC
//#define EXTRUDER_FAN_ON_PIN_6
//#define ACTION_ON_FILAMENT_RUNOUT
//#define ARCHIM2_SPI_FLASH_EEPROM_BACKUP_SIZE
//#define END_G29_ON_BACK_LEFT_CORNER
//#define USB_DEVICE_VENDOR_ID
//#define USB_DEVICE_PRODUCT_ID
//#define NO_PAUSE_FOR_REHEAT
//#define CURA_LE_RUNOUT_HANDLING_WORKAROUND
//#define E_MIN_PIN
//#define E_MIN_PIN_INVERTING
//#define E_MAX_POS
//#define NO_TOOLHEAD_HEATER_GCODE
//#define DEVELOPER_SCREENS
//#define TOUCH_UI_NO_BOOTSCREEN
//#define TOUCH_UI_LULZBOT_BIO
//#define TOUCH_UI_FROZEN_THEME
//#define TOUCH_UI_ROYAL_THEME
//#define SWAP_E0_AND_E1
//#define TOUCH_UI_VERSION
//#define TOUCH_UI_FILAMENT_RUNOUT_WORKAROUNDS
//#define CURA_LE_RUNOUT_HANDLING_WORKAROUND
//#define FILAMENT_RUNOUT_ENABLE_DEFAULT
//#define FIL_RUNOUT_PIN
//#define ACTION_ON_FILAMENT_RUNOUT
//#define SWAP_E0_AND_E1
//#define E_MIN_PIN
//#define E_MIN_PIN_INVERTING
//#define E_MAX_POS
//#define CONTROLLER_FAN_IGNORE_Z
//#define NO_PAUSE_FOR_REHEAT
//#define NO_MOTION_BEFORE_HOMING_WORKAROUND
//#define NO_TIME_AFTER_SD_PRINT
//#define NO_TOOLHEAD_HEATER_GCODE
//#define EMI_MITIGATION
//#define SHORT_BUILD_VERSION
//#define TOUCH_UI_VERSION
//#define M125_FILAMENT_RUNOUT_WORKAROUND
6 changes: 3 additions & 3 deletions config/examples/AlephObjects/build-config.py
Original file line number Diff line number Diff line change
Expand Up @@ -1749,7 +1749,7 @@ def ENABLED(str):
MARLIN["FILAMENT_RUNOUT_ENABLE_DEFAULT"] = "false"
MARLIN["ACTION_ON_FILAMENT_RUNOUT"] = C_STRING("pause: filament_runout")
MARLIN["CURA_LE_RUNOUT_HANDLING_WORKAROUND"] = True
MARLIN["M125_FILAMENT_RUNOUT_WORKAROUND"] = USE_TOUCH_UI
MARLIN["TOUCH_UI_FILAMENT_RUNOUT_WORKAROUNDS"] = USE_TOUCH_UI

############################## MOTOR DRIVER TYPE ##############################

Expand Down Expand Up @@ -2354,15 +2354,15 @@ def DIGIPOT_CURRENT(mA):
MARLIN["STATUS_EXPIRE_SECONDS"] = 0

if USE_TOUCH_UI:
MARLIN["TOUCH_UI_FTDI_EVE"] = True
MARLIN["TOUCH_UI_FTDI_EVE"] = True
MARLIN["TOUCH_UI_USE_UTF8"] = True
MARLIN["TOUCH_UI_UTF8_COPYRIGHT"] = True
MARLIN["TOUCH_UI_UTF8_SUPERSCRIPTS"] = True
MARLIN["TOUCH_UI_DEVELOPER_MENU"] = True
MARLIN["LCD_SET_PROGRESS_MANUALLY"] = True
MARLIN["SCROLL_LONG_FILENAMES"] = False if USE_LESS_MEMORY else True
MARLIN["NO_PAUSE_FOR_REHEAT"] = True
MARLIN["NO_TIME_AFTER_SD_PRINT"] = True
MARLIN["DEVELOPER_SCREENS"] = True
MARLIN["LCD_TIMEOUT_TO_STATUS"] = 0

# Virtual joystick functionality
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2260,6 +2260,7 @@
* Extra parameters used by Drunken Octopus
*/
#define SOURCE_CODE_URL "https://github.com/marciot/drunken-octopus-marlin" // <-- changed
//#define SHORT_BUILD_VERSION
#define TOOLHEAD_NAME "Single Extruder" // <-- changed
#define TOOLHEAD_TYPE "SingleExtruder" // <-- changed
#define WIPE_SEQUENCE_COMMANDS "M117 Hot end heating...\nM104 S170\nG28 O1\nM117 Wiping nozzle\nT0\nG1 X115 Y174 Z10 F4000\nM109 R170\nG1 Z1\nM114\nG1 X115 Y174\nG1 X45 Y174\nG1 X115 Y174\nG1 X45 Y174\nG1 X115 Y174\nG1 X45 Y174\nG1 X115 Y174\nG1 X45 Y174\nG1 X115 Y174\nG1 X45 Y174\nG1 X115 Y174\nG1 X45 Y174\nG1 Z15\nM400\nM106 S255\nG0 X0 Y168M109 R160\nM107" // <-- changed
Expand All @@ -2270,29 +2271,28 @@
//#define AO_EXP1_DEPRECATED_PINMAP
//#define DISABLE_DUE_SD_MMC
//#define EXTRUDER_FAN_ON_PIN_6
//#define ACTION_ON_FILAMENT_RUNOUT
//#define ARCHIM2_SPI_FLASH_EEPROM_BACKUP_SIZE
//#define END_G29_ON_BACK_LEFT_CORNER
//#define USB_DEVICE_VENDOR_ID
//#define USB_DEVICE_PRODUCT_ID
//#define NO_PAUSE_FOR_REHEAT
//#define CURA_LE_RUNOUT_HANDLING_WORKAROUND
//#define E_MIN_PIN
//#define E_MIN_PIN_INVERTING
//#define E_MAX_POS
//#define NO_TOOLHEAD_HEATER_GCODE
//#define DEVELOPER_SCREENS
//#define TOUCH_UI_NO_BOOTSCREEN
//#define TOUCH_UI_LULZBOT_BIO
//#define TOUCH_UI_FROZEN_THEME
//#define TOUCH_UI_ROYAL_THEME
//#define SWAP_E0_AND_E1
//#define TOUCH_UI_VERSION
//#define TOUCH_UI_FILAMENT_RUNOUT_WORKAROUNDS
//#define CURA_LE_RUNOUT_HANDLING_WORKAROUND
//#define FILAMENT_RUNOUT_ENABLE_DEFAULT
//#define FIL_RUNOUT_PIN
//#define ACTION_ON_FILAMENT_RUNOUT
//#define SWAP_E0_AND_E1
//#define E_MIN_PIN
//#define E_MIN_PIN_INVERTING
//#define E_MAX_POS
//#define CONTROLLER_FAN_IGNORE_Z
//#define NO_PAUSE_FOR_REHEAT
//#define NO_MOTION_BEFORE_HOMING_WORKAROUND
//#define NO_TIME_AFTER_SD_PRINT
//#define NO_TOOLHEAD_HEATER_GCODE
//#define EMI_MITIGATION
//#define SHORT_BUILD_VERSION
//#define TOUCH_UI_VERSION
//#define M125_FILAMENT_RUNOUT_WORKAROUND
FILAMENT_RUNOUT_WORKAROUNDS
Original file line number Diff line number Diff line change
Expand Up @@ -2260,6 +2260,7 @@
* Extra parameters used by Drunken Octopus
*/
#define SOURCE_CODE_URL "https://github.com/marciot/drunken-octopus-marlin" // <-- changed
//#define SHORT_BUILD_VERSION
#define TOOLHEAD_NAME "SE 0.5mm AeroV2" // <-- changed
#define TOOLHEAD_TYPE "SingleExtruderAeroV2" // <-- changed
#define WIPE_SEQUENCE_COMMANDS "M117 Hot end heating...\nM104 S170\nG28 O1\nM117 Wiping nozzle\nT0\nG1 X115 Y174 Z10 F4000\nM109 R170\nG1 Z1\nM114\nG1 X115 Y174\nG1 X45 Y174\nG1 X115 Y174\nG1 X45 Y174\nG1 X115 Y174\nG1 X45 Y174\nG1 X115 Y174\nG1 X45 Y174\nG1 X115 Y174\nG1 X45 Y174\nG1 X115 Y174\nG1 X45 Y174\nG1 Z15\nM400\nM106 S255\nG0 X-3 Y168M109 R160\nM107" // <-- changed
Expand All @@ -2270,29 +2271,28 @@
//#define AO_EXP1_DEPRECATED_PINMAP
//#define DISABLE_DUE_SD_MMC
//#define EXTRUDER_FAN_ON_PIN_6
//#define ACTION_ON_FILAMENT_RUNOUT
//#define ARCHIM2_SPI_FLASH_EEPROM_BACKUP_SIZE
//#define END_G29_ON_BACK_LEFT_CORNER
//#define USB_DEVICE_VENDOR_ID
//#define USB_DEVICE_PRODUCT_ID
//#define NO_PAUSE_FOR_REHEAT
//#define CURA_LE_RUNOUT_HANDLING_WORKAROUND
//#define E_MIN_PIN
//#define E_MIN_PIN_INVERTING
//#define E_MAX_POS
//#define NO_TOOLHEAD_HEATER_GCODE
//#define DEVELOPER_SCREENS
//#define TOUCH_UI_NO_BOOTSCREEN
//#define TOUCH_UI_LULZBOT_BIO
//#define TOUCH_UI_FROZEN_THEME
//#define TOUCH_UI_ROYAL_THEME
//#define SWAP_E0_AND_E1
//#define TOUCH_UI_VERSION
//#define TOUCH_UI_FILAMENT_RUNOUT_WORKAROUNDS
//#define CURA_LE_RUNOUT_HANDLING_WORKAROUND
//#define FILAMENT_RUNOUT_ENABLE_DEFAULT
//#define FIL_RUNOUT_PIN
//#define ACTION_ON_FILAMENT_RUNOUT
//#define SWAP_E0_AND_E1
//#define E_MIN_PIN
//#define E_MIN_PIN_INVERTING
//#define E_MAX_POS
#define CONTROLLER_FAN_IGNORE_Z // <-- changed
//#define NO_PAUSE_FOR_REHEAT
//#define NO_MOTION_BEFORE_HOMING_WORKAROUND
//#define NO_TIME_AFTER_SD_PRINT
//#define NO_TOOLHEAD_HEATER_GCODE
//#define EMI_MITIGATION
//#define SHORT_BUILD_VERSION
//#define TOUCH_UI_VERSION
//#define M125_FILAMENT_RUNOUT_WORKAROUND
FILAMENT_RUNOUT_WORKAROUNDS
Original file line number Diff line number Diff line change
Expand Up @@ -2260,6 +2260,7 @@
* Extra parameters used by Drunken Octopus
*/
#define SOURCE_CODE_URL "https://github.com/marciot/drunken-octopus-marlin" // <-- changed
//#define SHORT_BUILD_VERSION
#define TOOLHEAD_NAME "Single Extruder" // <-- changed
#define TOOLHEAD_TYPE "SingleExtruder" // <-- changed
//#define WIPE_SEQUENCE_COMMANDS
Expand All @@ -2270,29 +2271,28 @@
//#define AO_EXP1_DEPRECATED_PINMAP
//#define DISABLE_DUE_SD_MMC
//#define EXTRUDER_FAN_ON_PIN_6
//#define ACTION_ON_FILAMENT_RUNOUT
//#define ARCHIM2_SPI_FLASH_EEPROM_BACKUP_SIZE
//#define END_G29_ON_BACK_LEFT_CORNER
//#define USB_DEVICE_VENDOR_ID
//#define USB_DEVICE_PRODUCT_ID
//#define NO_PAUSE_FOR_REHEAT
//#define CURA_LE_RUNOUT_HANDLING_WORKAROUND
//#define E_MIN_PIN
//#define E_MIN_PIN_INVERTING
//#define E_MAX_POS
//#define NO_TOOLHEAD_HEATER_GCODE
//#define DEVELOPER_SCREENS
//#define TOUCH_UI_NO_BOOTSCREEN
//#define TOUCH_UI_LULZBOT_BIO
//#define TOUCH_UI_FROZEN_THEME
//#define TOUCH_UI_ROYAL_THEME
//#define SWAP_E0_AND_E1
//#define TOUCH_UI_VERSION
//#define TOUCH_UI_FILAMENT_RUNOUT_WORKAROUNDS
//#define CURA_LE_RUNOUT_HANDLING_WORKAROUND
//#define FILAMENT_RUNOUT_ENABLE_DEFAULT
//#define FIL_RUNOUT_PIN
//#define ACTION_ON_FILAMENT_RUNOUT
//#define SWAP_E0_AND_E1
//#define E_MIN_PIN
//#define E_MIN_PIN_INVERTING
//#define E_MAX_POS
//#define CONTROLLER_FAN_IGNORE_Z
//#define NO_PAUSE_FOR_REHEAT
//#define NO_MOTION_BEFORE_HOMING_WORKAROUND
//#define NO_TIME_AFTER_SD_PRINT
//#define NO_TOOLHEAD_HEATER_GCODE
//#define EMI_MITIGATION
//#define SHORT_BUILD_VERSION
//#define TOUCH_UI_VERSION
//#define M125_FILAMENT_RUNOUT_WORKAROUND
FILAMENT_RUNOUT_WORKAROUNDS
Original file line number Diff line number Diff line change
Expand Up @@ -2260,6 +2260,7 @@
* Extra parameters used by Drunken Octopus
*/
#define SOURCE_CODE_URL "https://github.com/marciot/drunken-octopus-marlin" // <-- changed
//#define SHORT_BUILD_VERSION
#define TOOLHEAD_NAME "Goostruder" // <-- changed
#define TOOLHEAD_TYPE "SingleExtruder" // <-- changed
//#define WIPE_SEQUENCE_COMMANDS
Expand All @@ -2270,29 +2271,29 @@
//#define AO_EXP1_DEPRECATED_PINMAP
//#define DISABLE_DUE_SD_MMC
//#define EXTRUDER_FAN_ON_PIN_6
//#define ACTION_ON_FILAMENT_RUNOUT
//#define ARCHIM2_SPI_FLASH_EEPROM_BACKUP_SIZE
//#define END_G29_ON_BACK_LEFT_CORNER
//#define USB_DEVICE_VENDOR_ID
//#define USB_DEVICE_PRODUCT_ID
#define NO_PAUSE_FOR_REHEAT // <-- changed
//#define CURA_LE_RUNOUT_HANDLING_WORKAROUND
#define E_MIN_PIN X_MAX_PIN // <-- changed
#define E_MIN_PIN_INVERTING 0 // <-- changed
#define E_MAX_POS 60 // <-- changed
#define NO_TOOLHEAD_HEATER_GCODE // <-- changed
#define DEVELOPER_SCREENS // <-- changed
//#define TOUCH_UI_NO_BOOTSCREEN
#define TOUCH_UI_LULZBOT_BIO // <-- changed
#define TOUCH_UI_FROZEN_THEME // <-- changed
//#define TOUCH_UI_ROYAL_THEME
//#define SWAP_E0_AND_E1
//#define TOUCH_UI_VERSION
//#define TOUCH_UI_FILAMENT_RUNOUT_WORKAROUNDS
//#define CURA_LE_RUNOUT_HANDLING_WORKAROUND
//#define FILAMENT_RUNOUT_ENABLE_DEFAULT
//#define FIL_RUNOUT_PIN
//#define ACTION_ON_FILAMENT_RUNOUT
//#define SWAP_E0_AND_E1
#define E_MIN_PIN X_MAX_PIN // <-- changed
#define E_MIN_PIN_INVERTING 0 // <-- changed
#define E_MAX_POS 60 // <-- changed
#define CONTROLLER_FAN_IGNORE_Z // <-- changed
#define NO_PAUSE_FOR_REHEAT // <-- changed
//#define NO_MOTION_BEFORE_HOMING_WORKAROUND
#define NO_TIME_AFTER_SD_PRINT // <-- changed
#define NO_TOOLHEAD_HEATER_GCODE // <-- changed
//#define EMI_MITIGATION
//#define SHORT_BUILD_VERSION
//#define TOUCH_UI_VERSION
//#define M125_FILAMENT_RUNOUT_WORKAROUND
FILAMENT_RUNOUT_WORKAROUNDS
_WORKAROUNDS
Original file line number Diff line number Diff line change
Expand Up @@ -1417,7 +1417,7 @@
//#define TOUCH_UI_DEBUG

// Developer menu (accessed by touching "About Printer" copyright text)
//#define TOUCH_UI_DEVELOPER_MENU
#define TOUCH_UI_DEVELOPER_MENU // <-- changed
#endif

//
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
#define DEFAULT_bedKd 382
#define DEFAULT_bedKi 65
#define DEFAULT_bedKp 294
#define DEVELOPER_SCREENS
#define DISABLE_INACTIVE_Z false
#define E0_CURRENT 350
#define E0_DRIVER_TYPE TMC2130
Expand Down Expand Up @@ -155,6 +154,7 @@
#define TOOLHEAD_NAME "Goostruder"
#define TOOLHEAD_TYPE "SingleExtruder"
#define TOUCH_UI_480x272
#define TOUCH_UI_DEVELOPER_MENU
#define TOUCH_UI_FROZEN_THEME
#define TOUCH_UI_FTDI_EVE
#define TOUCH_UI_LULZBOT_BIO
Expand Down
Loading

0 comments on commit 2f855f1

Please sign in to comment.