From 56258a390882f81e846d9fd1515d265611f3dfef Mon Sep 17 00:00:00 2001 From: Markus Hitter Date: Tue, 13 Dec 2011 03:27:17 +0100 Subject: [PATCH] Configuration samples: don't use preprocessor math for STEPS_PER_M. Since the introduction of STEPS_PER_M instead of STEPS_PER_MM it's no longer allowed. Unfortunately. --- config.gen6.h | 8 ++++---- config.ramps-v1.2.h | 13 ++++--------- config.ramps-v1.3.h | 13 ++++--------- config.sanguinololu-v1.1.h | 13 ++++--------- config.sanguinololu-v1.2.h | 13 ++++--------- 5 files changed, 20 insertions(+), 40 deletions(-) diff --git a/config.gen6.h b/config.gen6.h index 04ed635..1963dc1 100644 --- a/config.gen6.h +++ b/config.gen6.h @@ -65,12 +65,12 @@ valid range = 20 to 4'0960'000 (0.02 to 40960 steps/mm) */ -#define STEPS_PER_M_X (5000*8) -#define STEPS_PER_M_Y (5000*8) -#define STEPS_PER_M_Z (160000*8) +#define STEPS_PER_M_X 40000 +#define STEPS_PER_M_Y 40000 +#define STEPS_PER_M_Z 1280000 /// http://blog.arcol.hu/?p=157 may help with this one -#define STEPS_PER_M_E (160000*8) +#define STEPS_PER_M_E 1280000 /* diff --git a/config.ramps-v1.2.h b/config.ramps-v1.2.h index 02f0da8..1780a1b 100644 --- a/config.ramps-v1.2.h +++ b/config.ramps-v1.2.h @@ -65,17 +65,12 @@ valid range = 20 to 4'0960'000 (0.02 to 40960 steps/mm) */ -#define MICROSTEPPING_X 16.0 -#define MICROSTEPPING_Y 16.0 -#define MICROSTEPPING_Z 16.0 -#define MICROSTEPPING_E 4.0 - -#define STEPS_PER_M_X (5023*MICROSTEPPING_X) -#define STEPS_PER_M_Y (5023*MICROSTEPPING_Y) -#define STEPS_PER_M_Z (416699*MICROSTEPPING_Z) +#define STEPS_PER_M_X 80368 +#define STEPS_PER_M_Y 80368 +#define STEPS_PER_M_Z 3333592 /// http://blog.arcol.hu/?p=157 may help with this one -#define STEPS_PER_M_E (2759*MICROSTEPPING_E) +#define STEPS_PER_M_E 11036 /* diff --git a/config.ramps-v1.3.h b/config.ramps-v1.3.h index 43862e0..1dda1d9 100644 --- a/config.ramps-v1.3.h +++ b/config.ramps-v1.3.h @@ -65,17 +65,12 @@ valid range = 20 to 4'0960'000 (0.02 to 40960 steps/mm) */ -#define MICROSTEPPING_X 16.0 -#define MICROSTEPPING_Y 16.0 -#define MICROSTEPPING_Z 16.0 -#define MICROSTEPPING_E 4.0 - -#define STEPS_PER_M_X (5023*MICROSTEPPING_X) -#define STEPS_PER_M_Y (5023*MICROSTEPPING_Y) -#define STEPS_PER_M_Z (416699*MICROSTEPPING_Z) +#define STEPS_PER_M_X 80368 +#define STEPS_PER_M_Y 80368 +#define STEPS_PER_M_Z 3333592 /// http://blog.arcol.hu/?p=157 may help with this one -#define STEPS_PER_M_E (2759*MICROSTEPPING_E) +#define STEPS_PER_M_E 11036 /* diff --git a/config.sanguinololu-v1.1.h b/config.sanguinololu-v1.1.h index 26aeaa1..1156cd4 100644 --- a/config.sanguinololu-v1.1.h +++ b/config.sanguinololu-v1.1.h @@ -64,17 +64,12 @@ valid range = 20 to 4'0960'000 (0.02 to 40960 steps/mm) */ -#define MICROSTEPPING_X 16.0 -#define MICROSTEPPING_Y 16.0 -#define MICROSTEPPING_Z 16.0 -#define MICROSTEPPING_E 4.0 - -#define STEPS_PER_M_X (5023*MICROSTEPPING_X) -#define STEPS_PER_M_Y (5023*MICROSTEPPING_Y) -#define STEPS_PER_M_Z (416699*MICROSTEPPING_Z) +#define STEPS_PER_M_X 80368 +#define STEPS_PER_M_Y 80368 +#define STEPS_PER_M_Z 3333592 /// http://blog.arcol.hu/?p=157 may help with this one -#define STEPS_PER_M_E (2759*MICROSTEPPING_E) +#define STEPS_PER_M_E 11036 /* diff --git a/config.sanguinololu-v1.2.h b/config.sanguinololu-v1.2.h index 342aa1f..404e08f 100644 --- a/config.sanguinololu-v1.2.h +++ b/config.sanguinololu-v1.2.h @@ -64,17 +64,12 @@ valid range = 20 to 4'0960'000 (0.02 to 40960 steps/mm) */ -#define MICROSTEPPING_X 16.0 -#define MICROSTEPPING_Y 16.0 -#define MICROSTEPPING_Z 16.0 -#define MICROSTEPPING_E 4.0 - -#define STEPS_PER_M_X (5023*MICROSTEPPING_X) -#define STEPS_PER_M_Y (5023*MICROSTEPPING_Y) -#define STEPS_PER_M_Z (416699*MICROSTEPPING_Z) +#define STEPS_PER_M_X 80368 +#define STEPS_PER_M_Y 80368 +#define STEPS_PER_M_Z 3333592 /// http://blog.arcol.hu/?p=157 may help with this one -#define STEPS_PER_M_E (2759*MICROSTEPPING_E) +#define STEPS_PER_M_E 11036 /*