Diff: main.cpp

Revision:

3:dd2305e50390

Parent:

2:198becff12f4

Child:

4:c3f3fdde7eee

--- a/main.cpp	Wed Feb 15 11:52:10 2017 +0000
+++ b/main.cpp	Thu Mar 02 09:03:40 2017 +0000
@@ -131,11 +131,12 @@
     stepper2MS2 = 1;
 }
 
-void init()
+
+void init1()
 {
-    stepper1.setMaxSpeed(4000);
+    stepper1.setMaxSpeed(2000);
     stepper1.setAcceleration(20000);
-    stepper1.moveTo(-20000);
+    stepper1.moveTo(-30000);
 
     while(stepper1.currentPosition() != 0) {
         stepper1.run();
@@ -146,6 +147,25 @@
         stepper1.run();
     }
 
+    stepper1.setMaxSpeed(4500);
+
+    while(1) {
+        stepper1.moveTo(20000);                                                                                                                 
+        while(stepper1.distanceToGo() != 0) {
+            stepper1.run();
+            
+        }
+        stepper1.moveTo(500);
+        while(stepper1.distanceToGo() != 0) {
+            stepper1.run();
+        }
+    }
+
+}
+
+void init2()
+{
+
     stepper2.setMaxSpeed(4000);
     stepper2.setAcceleration(20000);
     stepper2.moveTo(-20000);
@@ -158,9 +178,9 @@
     while(stepper2.distanceToGo() != 0) {
         stepper2.run();
     }
-    silence();
 }
 
+
 void checkSafeBreak()
 {
     if(EndSW3.read() == 1) {
@@ -380,7 +400,10 @@
     stepper1.setCurrentPosition(-1);
     stepper2.setCurrentPosition(-1);
 
-    init();
+    silence();
+    init1();
+//    init2();
+
 
     stepper1.setMaxSpeed(25000);
     stepper1.setAcceleration(30000);
@@ -392,6 +415,7 @@
 
     myLED =1;
 
+
     readROMValue1();
     readROMValue2();