V1.7.25.A3 - Updates

- Fixed some misspelled defines :-(

Author: ClutchplateDude

Software/Arduino code/OpenAstroTracker/Mount.cpp

@@ -330,7 +330,7 @@ void Mount::configureDECStepper(byte stepMode, byte pin1, byte pin2, byte pin3,
   _maxDECSpeed = maxSpeed;
   _maxDECAcceleration = maxAcceleration;
 
-  #if AZIMUTH_MOTOR
+  #if AZIMUTH_MOTOR == 1
   _stepperAZ = new AccelStepper(FULLSTEP, 38, 42, 40, 44);
   _stepperAZ ->setSpeed(150);
   _stepperAZ ->setMaxSpeed(300);
@@ -994,7 +994,7 @@ void Mount::goHome()
 /////////////////////////////////
 void Mount::moveBy(int direction, float arcMinutes)
 {
-  #if AZIMUTH_MOTORS == 1
+  #if AZIMUTH_MOTOR == 1
     if (direction == AZIMUTH_STEPS){
       const float azimuthArcSecondsPerStep = 3.939f;
       const float azimuthStepsPerArcMinute = 60.0f / azimuthArcSecondsPerStep;
@@ -1381,7 +1381,7 @@ void Mount::interruptLoop()
 <<<<<<< HEAD
 =======
 
-  #if AZIMUTH_MOTOR
+  #if AZIMUTH_MOTOR == 1
   _stepperAZ->run();
   _stepperALT->run();
   #endif

Software/Arduino code/OpenAstroTracker/Mount.hpp

@@ -273,9 +273,16 @@ class Mount {
   AccelStepper* _stepperRA;
   AccelStepper* _stepperDEC;
   AccelStepper* _stepperTRK;
+<<<<<<< HEAD
   #if RA_DRIVER_TYPE == TMC2009_UART
     TMC2209Stepper* _driverRA;
     TMC2209Stepper* _driverDEC;
+=======
+  
+  #if AZIMUTH_MOTOR == 1
+  AccelStepper* _stepperAZ;
+  AccelStepper* _stepperALT;
+>>>>>>> cfb64d3... V1.7.25.A3 - Updates
   #endif
 
   unsigned long _guideEndTime;