Add missing variables to non-PCB settings files.

raacampbell · Sep 21, 2015 · b65105d · b65105d
1 parent 6a36541
commit b65105d
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 17 deletions.
diff --git a/OpenStage/c_userSettings_MEGA.ino.BAK b/OpenStage/c_userSettings_MEGA.ino.BAK
@@ -90,9 +90,6 @@ bool disableWhenStationary[maxAxes]={0,0,0,0};
 
 
 
-
-
-
 //------------------------------------------------------------------------------------------------
 // * Motor control DIO lines
 // Alter the following based on how your system is wired. 
@@ -112,12 +109,12 @@ byte enable[maxAxes]={28,29,30,0}; //Ordered X, Y, and Z
 
 // The microstep pins.
 // These pins define the microstep size. The MS pins on all axes are wired together.
-byte MS1=45;
-byte MS2=47;
-byte MS3=49;
-
-
-
+byte MS[4][3]={ 
+	{45,47,49},  //channel 1, MS pins 1,2,3
+	{45,47,49},  //channel 2, MS pins 1,2,3
+	{45,47,49},  //channel 3, MS pins 1,2,3
+	{45,47,49}   //channel 4, MS pins 1,2,3
+	};
 
 
 
@@ -203,8 +200,9 @@ float moveToStepSize=1.0/2.0;
 unsigned int moveToSpeed[maxAxes]={1600,1600,1200,1600}; 
 unsigned int moveToAccel[maxAxes]={1.0E4,1.0E4,1.0E4,1.0E4};
 
-
-
+// * Allow for inverting of hat-stick motions
+// to invert hat-stick motion direction set to -1, otherwise set to 1. 
+short hatInvert[maxAxes]={1,1,1,1};
 
 
 //---------------------------------UNLIKELY TO NEED TO CHANGE THESE-------------------------------

diff --git a/OpenStage/c_userSettings_SingleChannel_Mega_PS3.ino.BAK b/OpenStage/c_userSettings_SingleChannel_Mega_PS3.ino.BAK
@@ -115,9 +115,12 @@ byte enable[maxAxes]={28,29,30,0}; //Ordered X, Y, and Z
 
 // The microstep pins.
 // These pins define the microstep size. The MS pins on all axes are wired together.
-byte MS1=45;
-byte MS2=47;
-byte MS3=49;
+byte MS[4][3]={ 
+	{45,47,49},  //channel 1, MS pins 1,2,3
+	{45,47,49},  //channel 2, MS pins 1,2,3
+	{45,47,49},  //channel 3, MS pins 1,2,3
+	{45,47,49}   //channel 4, MS pins 1,2,3
+	};
 
 
 

diff --git a/OpenStage/c_userSettings_SingleChannel_Uno_Or_Mega.ino.BAK b/OpenStage/c_userSettings_SingleChannel_Uno_Or_Mega.ino.BAK
@@ -115,9 +115,12 @@ byte enable[maxAxes]={3,29,30,0}; //Ordered X, Y, and Z
 
 // The microstep pins.
 // These pins define the microstep size. The MS pins on all axes are wired together.
-byte MS1=4;
-byte MS2=5;
-byte MS3=6;
+byte MS[4][3]={ 
+	{45,47,49},  //channel 1, MS pins 1,2,3
+	{45,47,49},  //channel 2, MS pins 1,2,3
+	{45,47,49},  //channel 3, MS pins 1,2,3
+	{45,47,49}   //channel 4, MS pins 1,2,3
+	};