From a89f4bb1310bbdb4137da8b814c9a7b06d32d75a Mon Sep 17 00:00:00 2001
From: Bernd Reuther <bernd.reuther@jgz-energie.net>
Date: Fri, 5 Mar 2021 22:19:10 +0100
Subject: [PATCH] warten bis bewegung fertig

---
 kamera_server.py | 30 +++++++++++++++++++++---------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/kamera_server.py b/kamera_server.py
index a2f8fbe..d5a5f91 100644
--- a/kamera_server.py
+++ b/kamera_server.py
@@ -94,19 +94,31 @@ def action(changePin, action):
 @kamera_server.route("/position/<drehen>/<pos1>/<kippen>/<pos2>/<zoom>/<pos3>")
 def motor_test(drehen, pos1, kippen, pos2, zoom, pos3):
     if drehen == "drehen":
-        #m1.gehe_zu(int(position))
-        th1 = motor_bewegen(m1, (int(pos1)))
-        #th1.join()
+        p1 = int(pos1)
+    else:
+        p1 = m1.pos
 
     if kippen == "kippen":
-        #m1.gehe_zu(int(position))
-        th2 = motor_bewegen(m2, (int(pos2)))
-        #th2.join()
+        p2 = int(pos2)
+    else:
+        p2 = m2.pos
 
     if zoom == "zoom":
-        #m1.gehe_zu(int(position))
-        th3 = motor_bewegen(m3, (int(pos3)))
-        #th3.join()
+        p3 = int(pos3)
+    else:
+        p3 = m3.pos
+
+    while m1.aktiv == 1 or m2.aktiv == 1 or m3.aktiv == 1:
+        print('warten')
+        time.sleep(1)
+
+    th1 = motor_bewegen(m1, (int(pos1)))
+    th2 = motor_bewegen(m2, (int(pos2)))
+    th3 = motor_bewegen(m3, (int(pos3)))
+        
+    th1.join()
+    th2.join()
+    th3.join()
     
     return 'Drehen: ' + str(m1.pos) + ', Kippen: ' + str(m2.pos) + ', Zoom: ' + str(m3.pos)