From c128fd74d9b314a07a0f20d978a0d11580567618 Mon Sep 17 00:00:00 2001 From: kliment Date: Wed, 6 Jul 2011 22:08:20 +0200 Subject: Transform if into #if, move axis aviable assignments to loops in startup --- Sprinter/Sprinter.h | 42 +++++++++++++++++++++++++++++------------- 1 file changed, 29 insertions(+), 13 deletions(-) (limited to 'Sprinter/Sprinter.h') diff --git a/Sprinter/Sprinter.h b/Sprinter/Sprinter.h index 1a324a0..10318ae 100644 --- a/Sprinter/Sprinter.h +++ b/Sprinter/Sprinter.h @@ -33,6 +33,34 @@ int analog2tempu(int raw, const short table[][2], int numtemps, int source); #define temp2analogBed( c ) temp2analogu((c),bedtemptable,BNUMTEMPS,BEDSOURCE) #define analog2temp( c ) analog2tempu((c),temptable,NUMTEMPS,HEATERSOURCE) #define analog2tempBed( c ) analog2tempu((c),bedtemptable,BNUMTEMPS,BEDSOURCE) +#if X_ENABLE_PIN > -1 +#define enable_x() digitalWrite(X_ENABLE_PIN, X_ENABLE_ON) +#define disable_x() digitalWrite(X_ENABLE_PIN,!X_ENABLE_ON) +#else +#define enable_x() ; +#define disable_x() ; +#endif +#if Y_ENABLE_PIN > -1 +#define enable_y() digitalWrite(Y_ENABLE_PIN, Y_ENABLE_ON) +#define disable_y() digitalWrite(Y_ENABLE_PIN,!Y_ENABLE_ON) +#else +#define enable_y() ; +#define disable_y() ; +#endif +#if Z_ENABLE_PIN > -1 +#define enable_z() digitalWrite(Z_ENABLE_PIN, Z_ENABLE_ON) +#define disable_z() digitalWrite(Z_ENABLE_PIN,!Z_ENABLE_ON) +#else +#define enable_z() ; +#define disable_z() ; +#endif +#if E_ENABLE_PIN > -1 +#define enable_e() digitalWrite(E_ENABLE_PIN, E_ENABLE_ON) +#define disable_e() digitalWrite(E_ENABLE_PIN,!E_ENABLE_ON) +#else +#define enable_e() ; +#define disable_e() ; +#endif void FlushSerialRequestResend(); void ClearToSend(); @@ -40,18 +68,6 @@ void ClearToSend(); void get_coordinates(); void prepare_move(); void linear_move(unsigned long x_steps_remaining, unsigned long y_steps_remaining, unsigned long z_steps_remaining, unsigned long e_steps_remaining); -void disable_x(); -void disable_y(); -void disable_z(); -void disable_e(); -void enable_x(); -void enable_y(); -void enable_z(); -void enable_e(); -void do_x_step(); -void do_y_step(); -void do_z_step(); -void do_e_step(); - +void do_step(int axis); void kill(byte debug); -- cgit v1.2.1