Skip to content

Commit

Permalink
[1.1.x] G33 magic numbers (#8173)
Browse files Browse the repository at this point in the history 
* [1.1.x] G33 magic numbers

* oops

* comments

* oops

* warning

* better comment section

* remarks

* extra grids
  • Loading branch information
@LVD-AC @thinkyhead
LVD-AC authored and thinkyhead committed Nov 3, 2017
1 parent 193a0e9 commit 0e4b6b3
Show file tree
Hide file tree
Showing 7 changed files with 140 additions and 99 deletions.
215 changes: 128 additions & 87 deletions Marlin/Marlin_main.cpp
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -497,15 +497,15 @@
// set the default number of probe points : n*n (1 -> 7)
#define DELTA_CALIBRATION_DEFAULT_POINTS 4

// Enable and set these values based on results of 'G33 A1'
// Enable and set these values based on results of 'G33 A'
//#define H_FACTOR 1.01
//#define R_FACTOR 2.61
//#define A_FACTOR 0.87

#endif

#if ENABLED(DELTA_AUTO_CALIBRATION) || ENABLED(DELTA_CALIBRATION_MENU)
// Set the radius for the calibration probe points - max DELTA_PRINTABLE_RADIUS*0.869 for non-eccentric probes
// Set the radius for the calibration probe points - max DELTA_PRINTABLE_RADIUS for non-eccentric probes
#define DELTA_CALIBRATION_RADIUS 73.5 // mm
// Set the steprate for papertest probing
#define PROBE_MANUALLY_STEP 0.025
Expand Down
4 changes: 2 additions & 2 deletions Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -497,15 +497,15 @@
// set the default number of probe points : n*n (1 -> 7)
#define DELTA_CALIBRATION_DEFAULT_POINTS 4

// Enable and set these values based on results of 'G33 A1'
// Enable and set these values based on results of 'G33 A'
//#define H_FACTOR 1.01
//#define R_FACTOR 2.61
//#define A_FACTOR 0.87

#endif

#if ENABLED(DELTA_AUTO_CALIBRATION) || ENABLED(DELTA_CALIBRATION_MENU)
// Set the radius for the calibration probe points - max DELTA_PRINTABLE_RADIUS*0.869 for non-eccentric probes
// Set the radius for the calibration probe points - max DELTA_PRINTABLE_RADIUS for non-eccentric probes
#define DELTA_CALIBRATION_RADIUS 73.5 // mm
// Set the steprate for papertest probing
#define PROBE_MANUALLY_STEP 0.025
Expand Down
4 changes: 2 additions & 2 deletions Marlin/example_configurations/delta/generic/Configuration.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -487,15 +487,15 @@
// set the default number of probe points : n*n (1 -> 7)
#define DELTA_CALIBRATION_DEFAULT_POINTS 4

// Enable and set these values based on results of 'G33 A1'
// Enable and set these values based on results of 'G33 A'
//#define H_FACTOR 1.01
//#define R_FACTOR 2.61
//#define A_FACTOR 0.87

#endif

#if ENABLED(DELTA_AUTO_CALIBRATION) || ENABLED(DELTA_CALIBRATION_MENU)
// Set the radius for the calibration probe points - max DELTA_PRINTABLE_RADIUS*0.869 for non-eccentric probes
// Set the radius for the calibration probe points - max DELTA_PRINTABLE_RADIUS for non-eccentric probes
#define DELTA_CALIBRATION_RADIUS 121.5 // mm
// Set the steprate for papertest probing
#define PROBE_MANUALLY_STEP 0.025
Expand Down
4 changes: 2 additions & 2 deletions Marlin/example_configurations/delta/kossel_mini/Configuration.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -487,15 +487,15 @@
// set the default number of probe points : n*n (1 -> 7)
#define DELTA_CALIBRATION_DEFAULT_POINTS 4

// Enable and set these values based on results of 'G33 A1'
// Enable and set these values based on results of 'G33 A'
//#define H_FACTOR 1.01
//#define R_FACTOR 2.61
//#define A_FACTOR 0.87

#endif

#if ENABLED(DELTA_AUTO_CALIBRATION) || ENABLED(DELTA_CALIBRATION_MENU)
// Set the radius for the calibration probe points - max DELTA_PRINTABLE_RADIUS*0.869 for non-eccentric probes
// Set the radius for the calibration probe points - max DELTA_PRINTABLE_RADIUS for non-eccentric probes
#define DELTA_CALIBRATION_RADIUS 78.0 // mm
// Set the steprate for papertest probing
#define PROBE_MANUALLY_STEP 0.025
Expand Down
4 changes: 2 additions & 2 deletions Marlin/example_configurations/delta/kossel_pro/Configuration.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -473,15 +473,15 @@
// set the default number of probe points : n*n (1 -> 7)
#define DELTA_CALIBRATION_DEFAULT_POINTS 4

// Enable and set these values based on results of 'G33 A1'
// Enable and set these values based on results of 'G33 A'
//#define H_FACTOR 1.01
//#define R_FACTOR 2.61
//#define A_FACTOR 0.87

#endif

#if ENABLED(DELTA_AUTO_CALIBRATION) || ENABLED(DELTA_CALIBRATION_MENU)
// Set the radius for the calibration probe points - max DELTA_PRINTABLE_RADIUS*0.869 for non-eccentric probes
// Set the radius for the calibration probe points - max DELTA_PRINTABLE_RADIUS for non-eccentric probes
#define DELTA_CALIBRATION_RADIUS 110.0 // mm
// Set the steprate for papertest probing
#define PROBE_MANUALLY_STEP 0.025
Expand Down
4 changes: 2 additions & 2 deletions Marlin/example_configurations/delta/kossel_xl/Configuration.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -491,15 +491,15 @@
// set the default number of probe points : n*n (1 -> 7)
#define DELTA_CALIBRATION_DEFAULT_POINTS 4

// Enable and set these values based on results of 'G33 A1'
// Enable and set these values based on results of 'G33 A'
//#define H_FACTOR 1.01
//#define R_FACTOR 2.61
//#define A_FACTOR 0.87

#endif

#if ENABLED(DELTA_AUTO_CALIBRATION) || ENABLED(DELTA_CALIBRATION_MENU)
// Set the radius for the calibration probe points - max DELTA_PRINTABLE_RADIUS*0.869 for non-eccentric probes
// Set the radius for the calibration probe points - max DELTA_PRINTABLE_RADIUS for non-eccentric probes
#define DELTA_CALIBRATION_RADIUS 121.5 // mm
// Set the steprate for papertest probing
#define PROBE_MANUALLY_STEP 0.025
Expand Down

0 comments on commit 0e4b6b3

Please sign in to comment.