diff --git a/include/EggDuino.h b/include/EggDuino.h index f273198..591fe91 100644 --- a/include/EggDuino.h +++ b/include/EggDuino.h @@ -13,18 +13,18 @@ #define initSting "EBBv13_and_above Protocol emulated by Eggduino-Firmware V1.6a" // Rotational Stepper -#define step1 11 -#define dir1 10 -#define enableRotMotor 9 +#define step1 2 +#define dir1 5 +#define enableRotMotor 8 #define rotMicrostep 16 // Pen Stepper -#define step2 8 -#define dir2 7 -#define enablePenMotor 6 +#define step2 3 +#define dir2 6 +#define enablePenMotor 8 #define penMicrostep 16 -#define servoPin 3 +#define servoPin 4 #define penUpPosEEAddress ((uint16_t *)0) #define penDownPosEEAddress ((uint16_t *)2) diff --git a/lib/AccelStepper/src/AccelStepper.h b/lib/AccelStepper/src/AccelStepper.h index 26f9436..5760727 100644 --- a/lib/AccelStepper/src/AccelStepper.h +++ b/lib/AccelStepper/src/AccelStepper.h @@ -267,7 +267,7 @@ public: DRIVER = 1, ///< Stepper Driver, 2 driver pins required FULL2WIRE = 2, ///< 2 wire stepper, 2 motor pins required FULL3WIRE = 3, ///< 3 wire stepper, such as HDD spindle, 3 motor pins required - FULL4WIRE = 4, ///< 4 wire full stepper, 4 motor pins required + FULL4WIRE = 4, ///< 4 wire full stepper, 4 motor pins required HALF3WIRE = 6, ///< 3 wire half stepper, such as HDD spindle, 3 motor pins required HALF4WIRE = 8 ///< 4 wire half stepper, 4 motor pins required } MotorInterfaceType; diff --git a/src/main.cpp b/src/main.cpp index a77e19c..ae092ce 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -30,8 +30,8 @@ //----------------------------------------------------------------------------------------------------------- //make Objects -AccelStepper rotMotor(1, step1, dir1); -AccelStepper penMotor(1, step2, dir2); +AccelStepper rotMotor(AccelStepper::DRIVER, step1, dir1); +AccelStepper penMotor(AccelStepper::DRIVER, step2, dir2); Servo penServo; SerialCommand SCmd; //create Buttons @@ -70,10 +70,13 @@ void setup() { } void loop() { - moveOneStep(); + + moveOneStep(); SCmd.readSerial(); + + #ifdef penToggleButton penToggle.check(); #endif