From b86052405ddfd6f0b563ab155c4d0ddf93df93bd Mon Sep 17 00:00:00 2001 From: Jason Smith Date: Fri, 17 Apr 2020 07:01:52 -0700 Subject: [PATCH] Fix Huxley/Sanguinololu & TMC_MICROSTEP_IS_VALID name collision (#72) --- config/examples/RepRapPro/Huxley/Configuration.h | 12 ++++++------ config/examples/Sanguinololu/Configuration.h | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/config/examples/RepRapPro/Huxley/Configuration.h b/config/examples/RepRapPro/Huxley/Configuration.h index 96098c3a95..0f0fa77374 100644 --- a/config/examples/RepRapPro/Huxley/Configuration.h +++ b/config/examples/RepRapPro/Huxley/Configuration.h @@ -721,9 +721,9 @@ // Standard NEMA 17 with T2 belt and 20 tooth pulley // #define NEMA17_FULL_STEPS 200.0 -#define XY_MICROSTEPS 16.0 -#define E_MICROSTEPS 16.0 -#define Z_MICROSTEPS 16.0 +#define TEMP_XY_MICROSTEPS 16.0 +#define TEMP_E_MICROSTEPS 16.0 +#define TEMP_Z_MICROSTEPS 16.0 /* RepRapPro belts http://forums.reprap.org/read.php?1,391198 @@ -739,9 +739,9 @@ Black rubber belt(MXL), 18 - tooth aluminium pulley : 87.489 step per mm (Huxley // #define Z_RODS_PITCH 0.8 -#define XY_MOTOR_STEPS (NEMA17_FULL_STEPS * XY_MICROSTEPS) -#define Z_MOTOR_STEPS (NEMA17_FULL_STEPS * Z_MICROSTEPS) -#define E_MOTOR_STEPS (NEMA17_FULL_STEPS * E_MICROSTEPS) +#define XY_MOTOR_STEPS (NEMA17_FULL_STEPS * TEMP_XY_MICROSTEPS) +#define Z_MOTOR_STEPS (NEMA17_FULL_STEPS * TEMP_Z_MICROSTEPS) +#define E_MOTOR_STEPS (NEMA17_FULL_STEPS * TEMP_E_MICROSTEPS) // // MK7 Direct Drive diff --git a/config/examples/Sanguinololu/Configuration.h b/config/examples/Sanguinololu/Configuration.h index c39879f6c9..0d8a48b61a 100644 --- a/config/examples/Sanguinololu/Configuration.h +++ b/config/examples/Sanguinololu/Configuration.h @@ -722,9 +722,9 @@ // Standard NEMA 17 with T2 belt and 20 tooth pulley // #define NEMA17_FULL_STEPS 200.0 -#define XY_MICROSTEPS 16.0 -#define E_MICROSTEPS 16.0 -#define Z_MICROSTEPS 16.0 +#define TEMP_XY_MICROSTEPS 16.0 +#define TEMP_E_MICROSTEPS 16.0 +#define TEMP_Z_MICROSTEPS 16.0 #define XY_PULLEY_PITCH 2.0 #define XY_PULLEY_TEETH 20.0 @@ -734,9 +734,9 @@ // #define Z_RODS_PITCH 0.5 -#define XY_MOTOR_STEPS (NEMA17_FULL_STEPS * XY_MICROSTEPS) -#define Z_MOTOR_STEPS (NEMA17_FULL_STEPS * Z_MICROSTEPS) -#define E_MOTOR_STEPS (NEMA17_FULL_STEPS * E_MICROSTEPS) +#define XY_MOTOR_STEPS (NEMA17_FULL_STEPS * TEMP_XY_MICROSTEPS) +#define Z_MOTOR_STEPS (NEMA17_FULL_STEPS * TEMP_Z_MICROSTEPS) +#define E_MOTOR_STEPS (NEMA17_FULL_STEPS * TEMP_E_MICROSTEPS) // // MK7 Direct Drive