Diff: ST_SOLO.cpp

Revision:

41:1a2ba8849aa6

Parent:

40:117b324843ee

--- a/ST_SOLO.cpp	Tue May 14 20:30:07 2019 +0000
+++ b/ST_SOLO.cpp	Wed May 15 00:47:19 2019 +0000
@@ -291,32 +291,41 @@
 
 void Fkt_SOLO_Spleissen()
 {
+    Stepper_1_SetPara(PRECISIONSPEED, PRECISIONACC);
+    Stepper_1_Move('V', 0.11*400);
+    
+    Stepper_1_SetPara(PRECISIONSPEED, PRECISIONACC);
     Stepper_2_SetPara(PRECISIONSPEED, PRECISIONACC);
-    Stepper_2_Move('R', 0.11*400);
-
-    Stepper_1_Move('R', 0.08*400);
-    Stepper_2_Move('R', 0.08*400);
+    
+    motors[0]->move(StepperMotor::BWD, 128*400*0.25);
+    motors[1]->move(StepperMotor::BWD, 128*400*0.26);
 
     Set_Spleisser(ARConTIME, ARCoffTIME, REPETITONS);
-
-
+    
+    motors[0]->wait_while_active();
+    motors[1]->wait_while_active();
+    
+    motors[0]->move(StepperMotor::FWD, 128*400*0.13);
+    motors[1]->move(StepperMotor::FWD, 128*400*0.14);
+    
+    Set_Spleisser(ARConTIME, ARCoffTIME, REPETITONS+2);
+    
+    motors[0]->wait_while_active();
+    motors[1]->wait_while_active();
+    
+    
     Stepper_1_SetPara(FILSPEED, FILACC);
     Stepper_2_SetPara(FILSPEED, FILACC);
 
-    motors[0]->move(StepperMotor::BWD, 0.53*400*128);   // kein Move wegen whait!!!!
+    motors[0]->move(StepperMotor::BWD, 0.55*400*128);
     Thread::wait(10);
-    Stepper_2_Move('R', 0.70*400);
+    Stepper_2_Move('R', 0.65*400);
 }
 
 
 
 
 
-
-
-
-
-
 void EntrySOLO()
 {
 
@@ -376,7 +385,7 @@
             } else if (val_LS2 == 0 && val_LS3 == 0) {
                 Stepper_1_Stop();
                 Stepper_1_SetPara(PRECISIONSPEED, PRECISIONACC);
-                Stepper_1_Move('R', 0.1*400);
+                Stepper_1_Move('R', 0.11*400);
                 entry_SOLO_INtoSPLEISSER();
             }