From f4c4e38f1f9687412f240d4c990c285ff39372b6 Mon Sep 17 00:00:00 2001 From: InsanityAutomation <38436470+InsanityAutomation@users.noreply.github.com> Date: Fri, 18 Apr 2025 09:50:26 -0400 Subject: [PATCH] Fill actual positions --- Marlin/Configuration.h | 16 ++++++++-------- Marlin/Configuration_adv.h | 24 ++++++++++++------------ Marlin/src/inc/SanityCheck.h | 8 ++++---- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index f8b3013f21..784a1445ae 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -392,7 +392,7 @@ * Enable and connect the power supply to the PS_ON_PIN. * Specify whether the power supply is active HIGH or active LOW. */ -//#define PSU_CONTROL +#define PSU_CONTROL //#define PSU_NAME "Power Supply" #if ENABLED(PSU_CONTROL) @@ -408,7 +408,7 @@ //#define PSU_OFF_REDUNDANT // Second pin for redundant power control //#define PSU_OFF_REDUNDANT_INVERTED // Redundant pin state is the inverse of PSU_ACTIVE_STATE - //#define PS_ON1_PIN 6 // Redundant pin required to enable power in combination with PS_ON_PIN + #define PS_ON_PIN P4_29 // Redundant pin required to enable power in combination with PS_ON_PIN //#define PS_ON_EDM_PIN 8 // External Device Monitoring pins for external power control relay feedback. Fault on mismatch. //#define PS_ON1_EDM_PIN 9 @@ -429,7 +429,7 @@ #define AUTO_POWER_COOLER_FAN // Turn on PSU for Cooler Fan #define AUTO_POWER_SPINDLE_LASER // Turn on PSU for Spindle/Laser #define POWER_TIMEOUT 30 // (s) Turn off power if the machine is idle for this duration - //#define POWER_OFF_DELAY 60 // (s) Delay of poweroff after M81 command. Useful to let fans run for extra time. + #define POWER_OFF_DELAY 120 // (s) Delay of poweroff after M81 command. Useful to let fans run for extra time. #endif #if ANY(AUTO_POWER_CONTROL, POWER_OFF_WAIT_FOR_COOLDOWN) //#define AUTO_POWER_E_TEMP 50 // (°C) PSU on if any extruder is over this temperature @@ -906,7 +906,7 @@ // MarkForged Kinematics // See https://reprap.org/forum/read.php?152,504042 // -//#define MARKFORGED_XY +#define MARKFORGED_XY //#define MARKFORGED_YX #if ANY(MARKFORGED_XY, MARKFORGED_YX) //#define MARKFORGED_INVERSE // Enable for an inverted Markforged kinematics belt path @@ -1236,7 +1236,7 @@ * Override with M92 (when enabled below) * X, Y, Z [, I [, J [, K...]]], E0 [, E1[, E2...]] */ -#define DEFAULT_AXIS_STEPS_PER_UNIT { 40, 40, 200, 425 } +#define DEFAULT_AXIS_STEPS_PER_UNIT { 80, 80, 400, 413, 413 } /** * Enable support for M92. Disable to save at least ~530 bytes of flash. @@ -1826,11 +1826,11 @@ // @section geometry // The size of the printable area -#define X_BED_SIZE 400 -#define Y_BED_SIZE 400 +#define X_BED_SIZE 355 +#define Y_BED_SIZE 350 // Travel limits (linear=mm, rotational=°) after homing, corresponding to endstop positions. -#define X_MIN_POS 0 +#define X_MIN_POS -20.93 #define Y_MIN_POS 0 #define Z_MIN_POS 0 #define X_MAX_POS X_BED_SIZE diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index 21d1a6fecd..db21284653 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -819,8 +819,8 @@ #if ENABLED(DUAL_X_CARRIAGE) #define X1_MIN_POS X_MIN_POS // Set to X_MIN_POS #define X1_MAX_POS X_BED_SIZE // A max coordinate so the X1 carriage can't hit the parked X2 carriage - #define X2_MIN_POS 80 // A min coordinate so the X2 carriage can't hit the parked X1 carriage - #define X2_MAX_POS 450 // The max position of the X2 carriage, typically also the home position + #define X2_MIN_POS 10 // A min coordinate so the X2 carriage can't hit the parked X1 carriage + #define X2_MAX_POS 369 // The max position of the X2 carriage, typically also the home position #define X2_HOME_POS X2_MAX_POS // Default X2 home position. Set to X2_MAX_POS. // NOTE: For Dual X Carriage use M218 T1 Xn to override the X2_HOME_POS. // This allows recalibration of endstops distance without a rebuild. @@ -830,7 +830,7 @@ #define DEFAULT_DUAL_X_CARRIAGE_MODE DXC_AUTO_PARK_MODE // Default x offset in duplication mode (typically set to half print bed width) - #define DEFAULT_DUPLICATION_X_OFFSET 200 + #define DEFAULT_DUPLICATION_X_OFFSET 175 // Default action to execute following M605 mode change commands. Typically G28X to apply new mode. #define EVENT_GCODE_IDEX_AFTER_MODECHANGE "G28X" @@ -868,7 +868,7 @@ #endif #if HAS_Y2_STEPPER - //#define INVERT_Y2_VS_Y_DIR // Y2 direction signal is the opposite of Y + #define INVERT_Y2_VS_Y_DIR // Y2 direction signal is the opposite of Y #define Y_DUAL_ENDSTOPS // Y2 has its own endstop #if ENABLED(Y_DUAL_ENDSTOPS) //#define Y2_STOP_PIN Y_MAX_PIN // Y2 endstop pin override @@ -1028,7 +1028,7 @@ * If not defined, probe limits will be used. * Override with 'M422 S X Y'. */ - //#define Z_STEPPER_ALIGN_XY { { 10, 190 }, { 100, 10 }, { 190, 190 } } + //#define Z_STEPPER_ALIGN_XY { { -44, 6.88 }, { 404, 6.88 }, { 209.3, 370.75 } } /** * Orientation for the automatically-calculated probe positions. @@ -1061,7 +1061,7 @@ * positions in the bed carriage, with one position per Z stepper in stepper * driver order. */ - //#define Z_STEPPER_ALIGN_STEPPER_XY { { 210.7, 102.5 }, { 152.6, 220.0 }, { 94.5, 102.5 } } + #define Z_STEPPER_ALIGN_STEPPER_XY { { -44, 6.88 }, { 404, 6.88 }, { 209.3, 370.75 } } #ifndef Z_STEPPER_ALIGN_STEPPER_XY // Amplification factor. Used to scale the correction step up or down in case @@ -2959,7 +2959,7 @@ */ #if HAS_TRINAMIC_CONFIG - #define HOLD_MULTIPLIER 0.7 // Scales down the holding current from run current + #define HOLD_MULTIPLIER 0.25 // Scales down the holding current from run current /** * Interpolate microsteps to 256 @@ -2968,7 +2968,7 @@ #define INTERPOLATE true #if AXIS_IS_TMC_CONFIG(X) - #define X_CURRENT 800 // (mA) RMS current. Multiply by 1.414 for peak current. + #define X_CURRENT 1800 // (mA) RMS current. Multiply by 1.414 for peak current. #define X_CURRENT_HOME X_CURRENT // (mA) RMS current for sensorless homing #define X_MICROSTEPS 16 // 0..256 #define X_RSENSE 0.022 // Multiplied x1000 for TMC26X @@ -2988,7 +2988,7 @@ #endif #if AXIS_IS_TMC_CONFIG(Y) - #define Y_CURRENT 800 + #define Y_CURRENT 1800 #define Y_CURRENT_HOME Y_CURRENT #define Y_MICROSTEPS 16 #define Y_RSENSE 0.022 @@ -3008,7 +3008,7 @@ #endif #if AXIS_IS_TMC_CONFIG(Z) - #define Z_CURRENT 800 + #define Z_CURRENT 1800 #define Z_CURRENT_HOME Z_CURRENT #define Z_MICROSTEPS 16 #define Z_RSENSE 0.11 @@ -3443,13 +3443,13 @@ /** * Step on both rising and falling edge signals (as with a square wave). */ - #define EDGE_STEPPING + //#define EDGE_STEPPING /** * Enable M122 debugging command for TMC stepper drivers. * M122 S0/1 will enable continuous reporting. */ - //#define TMC_DEBUG + #define TMC_DEBUG /** * You can set your own advanced settings by filling in predefined functions. diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h index 1a5a5f3771..740ab5bb35 100644 --- a/Marlin/src/inc/SanityCheck.h +++ b/Marlin/src/inc/SanityCheck.h @@ -1842,8 +1842,8 @@ static_assert(NUM_SERVOS <= NUM_SERVO_PLUGS, "NUM_SERVOS (or some servo index) i #if ENABLED(DUAL_X_CARRIAGE) #if EXTRUDERS < 2 #error "DUAL_X_CARRIAGE requires 2 (or more) extruders." - #elif ANY(CORE_IS_XY, CORE_IS_XZ, MARKFORGED_XY, MARKFORGED_YX) - #error "DUAL_X_CARRIAGE cannot be used with COREXY, COREYX, COREXZ, COREZX, MARKFORGED_YX, or MARKFORGED_XY." + //#elif ANY(CORE_IS_XY, CORE_IS_XZ, MARKFORGED_XY, MARKFORGED_YX) + //#error "DUAL_X_CARRIAGE cannot be used with COREXY, COREYX, COREXZ, COREZX, MARKFORGED_YX, or MARKFORGED_XY." #elif !GOOD_AXIS_PINS(X2) #error "DUAL_X_CARRIAGE requires X2 stepper pins to be defined." #elif !USE_X_MAX @@ -3383,8 +3383,8 @@ static_assert(NUM_SERVOS <= NUM_SERVO_PLUGS, "NUM_SERVOS (or some servo index) i #error "CoreXZ requires both X and Z to use sensorless homing if either one does." #elif CORE_IS_YZ && Y_SENSORLESS != Z_SENSORLESS && !HOMING_Z_WITH_PROBE #error "CoreYZ requires both Y and Z to use sensorless homing if either one does." -#elif ANY(MARKFORGED_XY, MARKFORGED_YX) && X_SENSORLESS != Y_SENSORLESS - #error "MARKFORGED requires both X and Y to use sensorless homing if either one does." +//#elif ANY(MARKFORGED_XY, MARKFORGED_YX) && X_SENSORLESS != Y_SENSORLESS + //#error "MARKFORGED requires both X and Y to use sensorless homing if either one does." #endif // TMC Hybrid Threshold