Merge pull request #419 from blurfl/Define-AUX-pins-at-runtime

Define aux pins at runtime

cnc_ctrl_v1/Config.h

@@ -9,18 +9,18 @@
     GNU General Public License for more details.
     You should have received a copy of the GNU General Public License
     along with the Maslow Control Software.  If not, see <http://www.gnu.org/licenses/>.
-    
+
     Copyright 2014-2017 Bar Smith*/
 
-// This file contains precompile configuration settings that apply to the 
+// This file contains precompile configuration settings that apply to the
 // whole system
 
 #ifndef config_h
 #define config_h
 
 // Debugging Options
 #define verboseDebug 0     // set to 0 for no debug messages, 1 for single-line messages, 2 to also output ring buffer contents
-#define misloopDebug 0     // set to 1 for a warning every time the movement loop fails 
+#define misloopDebug 0     // set to 1 for a warning every time the movement loop fails
                            // to complete before being interrupted, helpful for loop
                            // LOOPINTERVAL tuning
 #define KINEMATICSDBG 0    // set to 1 for additional kinematics debug messaging
@@ -35,30 +35,22 @@
 
 #define LOOPINTERVAL 10000 // What is the frequency of the PID loop in microseconds
 
-// Define extra pins
-#define AUX1 17
-#define AUX2 16
-#define AUX3 15
-#define AUX4 14
-#define SpindlePowerControlPin AUX1 // output for controlling spindle power
-#define ProbePin AUX4 // use this input for zeroing zAxis with G38.2 gcode
-
 // Serial variables
 #define INCBUFFERLENGTH 128 // The number of bytes(characters) allocated to the
                             // incoming buffer.
-#define EXPGCODELINE 60     // Maximum expected Gcode line length in characters 
-                            // including line ending character(s).  Assumes 
-                            // client will not send more than this.  Ground 
+#define EXPGCODELINE 60     // Maximum expected Gcode line length in characters
+                            // including line ending character(s).  Assumes
+                            // client will not send more than this.  Ground
                             // Control is currently set to 60.  NIST spec allows
                             // 256. This value must be <= INCBUFFERLENGTH
 #define MAXBUFFERLINES 4    // The maximum number of lines allowed in the buffer
-#define POSITIONTIMEOUT 200 // The minimum number of milliseconds between 
-                            // position reports sent to Ground Control.  This 
-                            // cannot be larger than the connection timout in 
+#define POSITIONTIMEOUT 200 // The minimum number of milliseconds between
+                            // position reports sent to Ground Control.  This
+                            // cannot be larger than the connection timout in
                             // Ground Control which is 2000, a smaller number
                             // takes more processing time for sending data
                             // a larger number make position updates in GC less
                             // smooth.  This is only a minimum, and the actual
-                            // timeout could be significantly larger. 
+                            // timeout could be significantly larger.
 
 #endif

cnc_ctrl_v1/Probe.cpp

@@ -19,6 +19,8 @@ Copyright 2014-2017 Bar Smith*/
 
 #include "Maslow.h"
 
+// the variable probePin is assigned in configAuxLow() in System.cpp
+
 bool checkForProbeTouch(const int& probePin) {
   /*
       Check to see if ProbePin has gone LOW
@@ -28,4 +30,4 @@ bool checkForProbeTouch(const int& probePin) {
     return 1;
   }
   return 0;
-}
+}

cnc_ctrl_v1/Spindle.cpp

@@ -9,35 +9,37 @@
     GNU General Public License for more details.
     You should have received a copy of the GNU General Public License
     along with the Maslow Control Software.  If not, see <http://www.gnu.org/licenses/>.
-    
+
     Copyright 2014-2017 Bar Smith*/
 
 // This contains all of the Spindle commands
 
 #include "Maslow.h"
 
+// the variable SpindlePowerControlPin is assigned in configAuxLow() in System.cpp 
+
 // Globals for Spindle control, both poorly named
-Servo myservo;  // create servo object to control a servo 
+Servo myservo;  // create servo object to control a servo
 
 void  setSpindlePower(bool powerState) {
     /*
      * Turn spindle on or off depending on powerState
-     */ 
+     */
     boolean useServo = !sysSettings.spindleAutomate;
     boolean activeHigh = true;
     int delayAfterChange = 1000;  // milliseconds
     int servoIdle =  90;  // degrees
     int servoOn   = 180;  // degrees
     int servoOff  =   0;  // degrees
     int servoDelay = 2000;  // milliseconds
-  
+
     // Now for the main code
-    #if defined (verboseDebug) && verboseDebug > 1              
+    #if defined (verboseDebug) && verboseDebug > 1
     Serial.print(F("Spindle control uses pin "));
     Serial.print(SpindlePowerControlPin);
     #endif
     if (useServo) {   // use a servo to control a standard wall switch
-        #if defined (verboseDebug) && verboseDebug > 1              
+        #if defined (verboseDebug) && verboseDebug > 1
         Serial.print(F(" with servo (idle="));
         Serial.print(servoIdle);
         Serial.print(F(", on="));
@@ -66,7 +68,7 @@ void  setSpindlePower(bool powerState) {
         myservo.detach();           // stop servo control
     }
     else {            // use a digital I/O pin to control a relay
-        #if defined (verboseDebug) && verboseDebug > 1              
+        #if defined (verboseDebug) && verboseDebug > 1
         Serial.print(F(" as digital output, active "));
         if (activeHigh) Serial.println(F("high"));
         else Serial.println(F("low"));
@@ -84,4 +86,4 @@ void  setSpindlePower(bool powerState) {
         }
     }
     maslowDelay(delayAfterChange);
-}
+}