fixed en operator precedence bug with step mask calculations

This commit is contained in:
Simen Svale Skogsrud 2010-01-05 23:06:47 +01:00
parent 2b0e19993d
commit df271c82da
2 changed files with 5 additions and 4 deletions

View File

@ -64,9 +64,9 @@
#define BAUD_RATE 9600 #define BAUD_RATE 9600
#define STEP_MASK (1<<X_STEP_BIT)|(1<<Y_STEP_BIT)|(1<<Z_STEP_BIT) #define STEP_MASK ((1<<X_STEP_BIT)|(1<<Y_STEP_BIT)|(1<<Z_STEP_BIT))
#define DIRECTION_MASK (1<<X_DIRECTION_BIT)|(1<<Y_DIRECTION_BIT)|(1<<Z_DIRECTION_BIT) #define DIRECTION_MASK ((1<<X_DIRECTION_BIT)|(1<<Y_DIRECTION_BIT)|(1<<Z_DIRECTION_BIT))
#define STEPPING_MASK STEP_MASK | DIRECTION_MASK #define STEPPING_MASK (STEP_MASK | DIRECTION_MASK)
#define LIMIT_MASK (1<<X_LIMIT_BIT)|(1<<Y_LIMIT_BIT)|(1<<Z_LIMIT_BIT) #define LIMIT_MASK ((1<<X_LIMIT_BIT)|(1<<Y_LIMIT_BIT)|(1<<Z_LIMIT_BIT))
#endif #endif

View File

@ -85,6 +85,7 @@ void st_init()
{ {
// Configure directions of interface pins // Configure directions of interface pins
STEPPING_DDR |= STEPPING_MASK; STEPPING_DDR |= STEPPING_MASK;
printInteger(STEPPING_DDR);
LIMIT_DDR &= ~(LIMIT_MASK); LIMIT_DDR &= ~(LIMIT_MASK);
STEPPERS_ENABLE_DDR |= 1<<STEPPERS_ENABLE_BIT; STEPPERS_ENABLE_DDR |= 1<<STEPPERS_ENABLE_BIT;