From 907761e2bb2d1b89f1c924194c91389c79ce2aa9 Mon Sep 17 00:00:00 2001 From: InsanityAutomation Date: Wed, 10 Apr 2024 15:08:15 -0400 Subject: [PATCH] Merge commit followup --- Marlin/Configuration.h | 9 +++--- Marlin/Configuration_adv.h | 6 ++-- .../src/lcd/extui/ia_dwin/Creality_DWIN.cpp | 26 +++++++++++++--- Marlin/src/lcd/marlinui.cpp | 31 ------------------- Marlin/src/module/settings.cpp | 4 --- 5 files changed, 30 insertions(+), 46 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index c5b90de20b..f49849854e 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -1356,7 +1356,8 @@ #define DEFAULT_XJERK 20.0 #define DEFAULT_YJERK 5.0 #define DEFAULT_ZJERK 0.2 - #define DEFAULT_ZJERK 5.0 + #define DEFAULT_EJERK 5.0 + //#define DEFAULT_ZJERK 5.0 //#define DEFAULT_IJERK 0.3 //#define DEFAULT_JJERK 0.3 //#define DEFAULT_KJERK 0.3 @@ -1753,8 +1754,8 @@ //#define PROBE_OFFSET_XMAX 50 // (mm) //#define PROBE_OFFSET_YMIN -50 // (mm) //#define PROBE_OFFSET_YMAX 50 // (mm) -#define PROBE_OFFSET_ZMIN -9 // (mm) -#define PROBE_OFFSET_ZMAX 9 // (mm) +#define PROBE_OFFSET_Z_MIN -9 // (mm) +#define PROBE_OFFSET_Z_MAX 9 // (mm) // Enable the M48 repeatability test to test probe accuracy //#define Z_MIN_PROBE_REPEATABILITY_TEST @@ -1841,7 +1842,7 @@ //#define INVERT_U_DIR false //#define INVERT_V_DIR false //#define INVERT_W_DIR false - +#define INVERT_X2_DIR INVERT_X_DIR // @section extruder // For direct drive extruder v9 set to true, for geared extruder set to false. diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index d485d0d52e..806bd7496f 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -1257,7 +1257,7 @@ #define SHAPING_FREQ_Y 0.0 // (Hz) The default dominant resonant frequency on the Y axis. #define SHAPING_ZETA_Y 0.15 // Damping ratio of the Y axis (range: 0.0 = no damping to 1.0 = critical damping). #endif - //#define SHAPING_MIN_FREQ 20.0 // (Hz) By default the minimum of the shaping frequencies. Override to affect SRAM usage. + #define SHAPING_MIN_FREQ 20.0 // (Hz) By default the minimum of the shaping frequencies. Override to affect SRAM usage. //#define SHAPING_MAX_STEPRATE 10000 // By default the maximum total step rate of the shaped axes. Override to affect SRAM usage. //#define SHAPING_MENU // Add a menu to the LCD to set shaping parameters. #endif @@ -2821,7 +2821,7 @@ // Z raise distance for tool-change, as needed for some extruders #define TOOLCHANGE_ZRAISE 2 // (mm) //#define TOOLCHANGE_ZRAISE_BEFORE_RETRACT // Apply raise before swap retraction (if enabled) - #define TOOLCHANGE_NO_RETURN // Never return to previous position on tool-change + //#define TOOLCHANGE_NO_RETURN // Never return to previous position on tool-change #if ENABLED(TOOLCHANGE_NO_RETURN) #define EVENT_GCODE_AFTER_TOOLCHANGE "G12X" // Extra G-code to run after tool-change #endif @@ -4318,7 +4318,7 @@ /** * Instant freeze / unfreeze functionality - * Potentially useful for emergency stop that allows being resumed. + * Potentially useful for rapid stop that allows being resumed. * @section interface */ //#define FREEZE_FEATURE diff --git a/Marlin/src/lcd/extui/ia_dwin/Creality_DWIN.cpp b/Marlin/src/lcd/extui/ia_dwin/Creality_DWIN.cpp index 93570c4061..f26b3bfd08 100644 --- a/Marlin/src/lcd/extui/ia_dwin/Creality_DWIN.cpp +++ b/Marlin/src/lcd/extui/ia_dwin/Creality_DWIN.cpp @@ -1215,7 +1215,7 @@ void RTSSHOW::RTS_HandleData() tmp_zprobe_offset = ((float)recdat.data[0]) / 100; } SERIAL_ECHOLNPGM("Requested Offset ", tmp_zprobe_offset); - if (WITHIN((tmp_zprobe_offset), Z_PROBE_OFFSET_RANGE_MIN, Z_PROBE_OFFSET_RANGE_MAX)) + if (WITHIN((tmp_zprobe_offset), PROBE_OFFSET_Z_MIN, PROBE_OFFSET_Z_MAX)) { int16_t tmpSteps = mmToWholeSteps(getZOffset_mm() - tmp_zprobe_offset, (axis_t)Z); if(tmpSteps==0) @@ -1672,7 +1672,7 @@ void RTSSHOW::RTS_HandleData() case 2: // Z-axis to Up { SERIAL_ECHOLNPGM("Requested Offset ", tmp_zprobe_offset); - if (WITHIN((getZOffset_mm()+tmp_zprobe_adjust), Z_PROBE_OFFSET_RANGE_MIN, Z_PROBE_OFFSET_RANGE_MAX)) + if (WITHIN((getZOffset_mm()+tmp_zprobe_adjust), PROBE_OFFSET_Z_MIN, PROBE_OFFSET_Z_MAX)) { int16_t tmpSteps = mmToWholeSteps(tmp_zprobe_adjust, (axis_t)Z); if(tmpSteps==0) @@ -1697,7 +1697,7 @@ void RTSSHOW::RTS_HandleData() case 3: // Z-axis to Down { SERIAL_ECHOLNPGM("Requested Offset ", tmp_zprobe_offset); - if (WITHIN((getZOffset_mm()-tmp_zprobe_adjust), Z_PROBE_OFFSET_RANGE_MIN, Z_PROBE_OFFSET_RANGE_MAX)) + if (WITHIN((getZOffset_mm()-tmp_zprobe_adjust), PROBE_OFFSET_Z_MIN, PROBE_OFFSET_Z_MAX)) { int16_t tmpSteps = mmToWholeSteps((tmp_zprobe_adjust), (axis_t)Z); if(tmpSteps==0) @@ -2862,7 +2862,7 @@ void onSettingsLoaded(bool success) #endif #if HAS_PID_HEATING - void onPidTuning(const result_t rst) { + void onPIDTuning(const pidresult_t rst) { // Called for temperature PID tuning result rtscheck.RTS_SndData(pid_hotendAutoTemp, HotendPID_AutoTmp); rtscheck.RTS_SndData(pid_bedAutoTemp, BedPID_AutoTmp); @@ -2949,6 +2949,24 @@ void onPowerLoss() } +void onHeatingError(signed char) +{ + +} + +void onStartM303(int, signed char, int) { + +} + +void onAxisEnabled(ExtUI::axis_t) { + +} +void onAxisDisabled(ExtUI::axis_t){} +void onSetMinExtrusionTemp(int){} +void onMinTempError(signed char){} +void onMaxTempError(signed char){} + +void onPauseMode(PauseMessage, PauseMode, unsigned char) {} } // namespace ExtUI diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp index ea2d07f8c0..aaa8fb65e8 100644 --- a/Marlin/src/lcd/marlinui.cpp +++ b/Marlin/src/lcd/marlinui.cpp @@ -1885,37 +1885,6 @@ void MarlinUI::host_notify(const char * const cstr) { #endif -#if ALL(EXTENSIBLE_UI, ADVANCED_PAUSE_FEATURE) - - void MarlinUI::pause_show_message( - const PauseMessage message, - const PauseMode mode/*=PAUSE_MODE_SAME*/, - const uint8_t extruder/*=active_extruder*/ - ) { - SERIAL_ECHOLNPGM("PauseMsg=", message); - pause_mode = mode; - ExtUI::pauseModeStatus = message; - switch (message) { - case PAUSE_MESSAGE_PARKING: ExtUI::onUserConfirmRequired(GET_TEXT_F(MSG_PAUSE_PRINT_PARKING)); break; - case PAUSE_MESSAGE_CHANGING: ExtUI::onUserConfirmRequired(GET_TEXT_F(MSG_FILAMENT_CHANGE_INIT)); break; - case PAUSE_MESSAGE_UNLOAD: ExtUI::onUserConfirmRequired(GET_TEXT_F(MSG_FILAMENT_CHANGE_UNLOAD)); break; - case PAUSE_MESSAGE_WAITING: ExtUI::onUserConfirmRequired(GET_TEXT_F(MSG_ADVANCED_PAUSE_WAITING)); break; - case PAUSE_MESSAGE_INSERT: ExtUI::onUserConfirmRequired(GET_TEXT_F(MSG_FILAMENT_CHANGE_INSERT)); break; - case PAUSE_MESSAGE_LOAD: ExtUI::onUserConfirmRequired(GET_TEXT_F(MSG_FILAMENT_CHANGE_LOAD)); break; - case PAUSE_MESSAGE_PURGE: - ExtUI::onUserConfirmRequired(GET_TEXT_F(TERN(ADVANCED_PAUSE_CONTINUOUS_PURGE, MSG_FILAMENT_CHANGE_CONT_PURGE, MSG_FILAMENT_CHANGE_PURGE))); - break; - case PAUSE_MESSAGE_RESUME: ExtUI::onUserConfirmRequired(GET_TEXT_F(MSG_FILAMENT_CHANGE_RESUME)); break; - case PAUSE_MESSAGE_HEAT: ExtUI::onUserConfirmRequired(GET_TEXT_F(MSG_FILAMENT_CHANGE_HEAT)); break; - case PAUSE_MESSAGE_HEATING: ExtUI::onUserConfirmRequired(GET_TEXT_F(MSG_FILAMENT_CHANGE_HEATING)); break; - case PAUSE_MESSAGE_OPTION: ExtUI::onUserConfirmRequired(GET_TEXT_F(MSG_FILAMENT_CHANGE_OPTION_HEADER)); break; - case PAUSE_MESSAGE_STATUS: break; - default: break; - } - } - -#endif - #if ENABLED(EEPROM_SETTINGS) #if HAS_MARLINUI_MENU diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp index 4bb64d7388..1fabb41323 100644 --- a/Marlin/src/module/settings.cpp +++ b/Marlin/src/module/settings.cpp @@ -1929,10 +1929,6 @@ void MarlinSettings::postprocess() { // #if HAS_FILAMENT_SENSOR { - int8_t runout_sensor_enabled; - _FIELD_TEST(runout_sensor_enabled); - EEPROM_READ(runout_sensor_enabled); - bool runout_enabled[NUM_RUNOUT_SENSORS]; float runout_distance_mm[NUM_RUNOUT_SENSORS]; RunoutMode runout_mode[NUM_RUNOUT_SENSORS];