Changeset 776 in ETALON

Timestamp:

Jun 11, 2018, 6:16:57 PM (6 years ago)

Author:

moutardier

Message:

correction of disable fonction

Location:

BPM

Files:

• initialise_motors.py (modified) (4 diffs)
• motor_control.py (modified) (2 diffs)
• print_datas.py (modified) (1 diff)

BPM/initialise_motors.py

@@ -52 +52 @@
     if motor == 2: # security to avoid issue with vertical motor
         print('are you sure to wanted to disable vertical motor ? \n yes or no')
-    x = raw_input()
-    while not (x == 'yes' or x == 'no' or x == 'y' or x == 'n' or x == 'YES' or x == 'NO' or x == 'Y' or x == 'N'):
-        print('Do you want to disable vertical motor ?')
         x = raw_input()
-    if (x == 'no' or x == 'n' or  x == 'NO' or x == 'N'):
-        print('Be carful with disable vertical motor')
-        exit()
+        while not (x == 'yes' or x == 'no' or x == 'y' or x == 'n' or x == 'YES' or x == 'NO' or x == 'Y' or x == 'N'):
+            print('Do you want to disable vertical motor ?')
+            x = raw_input()
+        if (x == 'no' or x == 'n' or  x == 'NO' or x == 'N'):
+            print('Be carful with disable vertical motor')
+            exit()
     msg = str(motor) + 'CD'
     motor_send(msg, verbose)
@@ -283 +283 @@
     time.sleep(1)
     motor_disable(1)
-    for i in range(4):
-         plt.plot(L[0],L[i+1])
-    plt.show()
     fichier.close()
+#    for i in range(4):
+#         plt.plot(L[0],L[i+1])
+#    plt.show()
+
 
 
@@ -318 +319 @@
         L[j].append(l[j])
     time.sleep(1)
-    for i in range(4):
-         plt.plot(L[0],L[i+1])
-    plt.show()
+#    for i in range(4):
+#         plt.plot(L[0],L[i+1])
+#    plt.show()
+    motor_disable(2)
     fichier.close()
 
 
-
-    def aquisition(begin1,end1,begin2,end2,pas1,pas2,bpm_name):
+"""
+def aquisition(begin1,end1,begin2,end2,pas1,pas2,bpm_name):
     idata = 0
     start_time_str=datetime.now().strftime("%Y%m%d_%H%M%S")
@@ -363 +365 @@
     plt.show()
     fichier.close()
-
+"""
 
 

BPM/motor_control.py

@@ -17 +17 @@
     
 move_motor_absolute(2,5000,0)
+while motor_get(1, 'status') != 'READY':
+    time.sleep(1)
 
 #controller_hello()
@@ -32 +34 @@
 
 
-
-
-"""
 turn_on()
 
-horizontal_aquisition(0,400000,4000,"ch1-3_bpm_ref_ch2-4_bpm_impr")
+vertical_aquisition(-110000,90000,4000,"ch1-3_bpm_ref_ch2-4_bpm_impr_vertical_acquisition")
+
+vertical_aquisition(90000,-110000,-4000,"ch1-3_bpm_ref_ch2-4_bpm_impr_vertical_acquisition")
+
+#vertical_aquisition(0,4000,2000,"test")
 
 #horizontal_aquisition(400000,0,-4000,"ch1-3_bpm_ref_ch2-4_bpm_impr")    
 
 turn_off()
-"""
+
 #fichier = open("24-05-2018_aquisition_from_0_to_400000_step_of_1000.txt", "r")
 """

BPM/print_datas.py

@@ -80 +80 @@
 
 
-print_data("data/position_vs_tension_ch1-3_bpm_ref_ch2-4_bpm_impr_20180528_115159_0.txt")
+print_data("data/position_vs_tension_ch1-3_bpm_ref_ch2-4_bpm_impr_20180611_160153_0.txt")
+print_data("data/position_vs_tension_ch1-3_bpm_ref_ch2-4_bpm_impr_20180611_163036_0.txt")