diff --git a/CAD/Pipettenspitzenhalter.FCStd b/CAD/Pipettenspitzenhalter.FCStd new file mode 100644 index 0000000..a8d68b0 Binary files /dev/null and b/CAD/Pipettenspitzenhalter.FCStd differ diff --git a/CAD/Pipettenspitzenhalter.FCStd1 b/CAD/Pipettenspitzenhalter.FCStd1 new file mode 100644 index 0000000..d444638 Binary files /dev/null and b/CAD/Pipettenspitzenhalter.FCStd1 differ diff --git a/CAD/Pipettenspitzenhalter.stl b/CAD/Pipettenspitzenhalter.stl new file mode 100644 index 0000000..8f695be Binary files /dev/null and b/CAD/Pipettenspitzenhalter.stl differ diff --git a/CAD/jfsslider-FDM-0011-00_x-gantry-front.FCStd b/CAD/jfsslider-FDM-0011-00_x-gantry-front.FCStd index 99f9e27..c20c54f 100644 Binary files a/CAD/jfsslider-FDM-0011-00_x-gantry-front.FCStd and b/CAD/jfsslider-FDM-0011-00_x-gantry-front.FCStd differ diff --git a/CAD/jfsslider-FDM-0011-00_x-gantry-front.FCStd1 b/CAD/jfsslider-FDM-0011-00_x-gantry-front.FCStd1 new file mode 100644 index 0000000..33bba83 Binary files /dev/null and b/CAD/jfsslider-FDM-0011-00_x-gantry-front.FCStd1 differ diff --git a/otto/otto.ino b/otto/otto.ino index 86b423b..c168860 100644 --- a/otto/otto.ino +++ b/otto/otto.ino @@ -194,7 +194,7 @@ int locP_in_steps; #ifdef jfs int locX_max = 27000; int locY_max = -31200; -int locZ_max = 4000; +int locZ_max = 4400; #endif // variables to hold LED data @@ -593,7 +593,32 @@ void coordinateMove(){ Serial.print("Z Position "); Serial.println( stepperZ.currentPosition()); } - + else if (strcmp(mode, "JZ") == 0){ + + //Homing Z at min + stepperZ.setMaxSpeed(5000); + stepperZ.setAcceleration(2000); + int initial_homing = stepperZ.currentPosition(); + homeZ = false; + while (homeZ == false){ + initial_homing--; + stepperZ.moveTo(initial_homing); + stepperZ.run(); + if (digitalRead(Z_LIMIT) != 1) { + delay(1); + if (digitalRead(Z_LIMIT) !=1){ + homeZ = true; + } + } + } + stepperZ.setMaxSpeed(10000); + stepperZ.setAcceleration(5000); + stepperZ.setCurrentPosition(0); + + stepperP.setCurrentPosition(0); + Serial.println(""); +} + //***** G28 - Homing Cycle ***** // For this code to work as written the limit switches must be located at // X - Mininum diff --git a/stepperTest/stepperTest.ino b/stepperTest/stepperTest.ino index 2437fc5..4744bcd 100644 --- a/stepperTest/stepperTest.ino +++ b/stepperTest/stepperTest.ino @@ -1,10 +1,10 @@ int stepCounter; int steps = 2000; - #define X_STEP_PIN 54 - #define X_DIR_PIN 55 - #define X_EN_PIN 38 - #define X_CS_PIN 53 // EXP2_07_PIN + #define X_STEP_PIN 26 // 54 + #define X_DIR_PIN 28 // 55 + #define X_EN_PIN 24 // 38 + #define X_CS_PIN 42 // EXP2_07_PIN #define X_LIMIT 3 // X_MIN_PIN void setup()