Skip to content

Commit

Permalink
Assisted tramming
Browse files Browse the repository at this point in the history
  • Loading branch information
dbuezas committed Feb 5, 2024
1 parent afc1d7f commit c0c9bd4
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 10 deletions.
6 changes: 3 additions & 3 deletions Marlin/Configuration.h
Original file line number Diff line number Diff line change
Expand Up @@ -1218,7 +1218,7 @@

// Enable this feature if all enabled endstop pins are interrupt-capable.
// This will remove the need to poll the interrupt pins, saving many CPU cycles.
//#define ENDSTOP_INTERRUPTS_FEATURE
#define ENDSTOP_INTERRUPTS_FEATURE

/**
* Endstop Noise Threshold
Expand Down Expand Up @@ -1347,7 +1347,7 @@
* https://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
#if DISABLED(CLASSIC_JERK)
#define JUNCTION_DEVIATION_MM 0.03 // (mm) Distance from real junction edge
#define JUNCTION_DEVIATION_MM 0.08 // (mm) Distance from real junction edge
#define JD_HANDLE_SMALL_SEGMENTS // Use curvature estimation instead of just the junction angle
// for small segments (< 1mm) with large junction angles (> 135°).
#endif
Expand Down Expand Up @@ -1711,7 +1711,7 @@
//#define PROBE_OFFSET_ZMAX 20 // (mm)

// Enable the M48 repeatability test to test probe accuracy
//#define Z_MIN_PROBE_REPEATABILITY_TEST
#define Z_MIN_PROBE_REPEATABILITY_TEST

// Before deploy/stow pause for user confirmation
//#define PAUSE_BEFORE_DEPLOY_STOW
Expand Down
13 changes: 6 additions & 7 deletions Marlin/Configuration_adv.h
Original file line number Diff line number Diff line change
Expand Up @@ -1082,22 +1082,21 @@
//
// Add the G35 command to read bed corners to help adjust screws. Requires a bed probe.
//
//#define ASSISTED_TRAMMING
#define ASSISTED_TRAMMING
#if ENABLED(ASSISTED_TRAMMING)

// Define from 3 to 9 points to probe.
#define TRAMMING_POINT_XY { { 20, 20 }, { 180, 20 }, { 180, 180 }, { 20, 180 } }
#define TRAMMING_POINT_XY { { 20, 20 }, { 200, 20 }, { 226/2, 224-20 } }

// Define position names for probe points.
#define TRAMMING_POINT_NAME_1 "Front-Left"
#define TRAMMING_POINT_NAME_2 "Front-Right"
#define TRAMMING_POINT_NAME_3 "Back-Right"
#define TRAMMING_POINT_NAME_4 "Back-Left"
#define TRAMMING_POINT_NAME_3 "Back-Center"

#define RESTORE_LEVELING_AFTER_G35 // Enable to restore leveling setup after operation
//#define REPORT_TRAMMING_MM // Report Z deviation (mm) for each point relative to the first
#define REPORT_TRAMMING_MM // Report Z deviation (mm) for each point relative to the first

//#define ASSISTED_TRAMMING_WIZARD // Add a Tramming Wizard to the LCD menu
#define ASSISTED_TRAMMING_WIZARD // Add a Tramming Wizard to the LCD menu
//#define ASSISTED_TRAMMING_WAIT_POSITION { X_CENTER, Y_CENTER, 30 } // Move the nozzle out of the way for adjustment
Expand Down Expand Up @@ -1479,7 +1478,7 @@
#endif

// Change values more rapidly when the encoder is rotated faster
#define ENCODER_RATE_MULTIPLIER
// #define ENCODER_RATE_MULTIPLIER
#if ENABLED(ENCODER_RATE_MULTIPLIER)
#define ENCODER_10X_STEPS_PER_SEC 60 // (steps/s) Encoder rate for 10x speed
#define ENCODER_100X_STEPS_PER_SEC 120 // (steps/s) Encoder rate for 100x speed
Expand Down

0 comments on commit c0c9bd4

Please sign in to comment.