new status

Author: andy

__version__.py

@@ -1,7 +1,7 @@
 import os
 import subprocess
 
-VERSION = '1.2.1'
+VERSION = '1.2.4'
 
 
 def get_version():

devices/air_sensor2.py

@@ -40,14 +40,14 @@ def get_air_params(self):
 
 
 if __name__ == '__main__':
+    # sensor1 = AirSensor2(49846)
     sensor1 = AirSensor2(49846)
-    sensor2 = AirSensor2(49847)
     sensor1.connect()
-    sensor2.connect()
+    # sensor2.connect()
     while True:
         ret1 = sensor1.get_air_params()
-        ret2 = sensor2.get_air_params()
+        # ret2 = sensor2.get_air_params()
         print("RET - 1: ")
         print(ret1)
-        print("RET - 2: ")
-        print(ret2)
+        # print("RET - 2: ")
+        # print(ret2)

devices/wtvb01_bt50.py

@@ -94,25 +94,25 @@ def get_viration_hz(self, data) -> dict:
     while True:
         data = device.read_data()
 
-        result = device.get_vibration_velocity(data)
-        print("====震动速度====")
-        print(result)
-        print('\n')
-        result = device.get_vibration_angular(data)
-        print("====震动角度=====")
-        print(result)
-        print('\n')
-        result = device.get_temperature(data)
-        print("====温度====")
-        print(result)
-        print('\n')
+        # result = device.get_vibration_velocity(data)
+        # print("====震动速度====")
+        # print(result)
+        # print('\n')
+        # result = device.get_vibration_angular(data)
+        # print("====震动角度=====")
+        # print(result)
+        # print('\n')
+        # result = device.get_temperature(data)
+        # print("====温度====")
+        # print(result)
+        # print('\n')
         result = device.get_vibration_distance(data)
         print("====震动距离=====")
         print(result)
         print('\n')
-        result = device.get_viration_hz(data)
-        print("====震动频率=====")
-        print(result)
-        print('\n')
+        # result = device.get_viration_hz(data)
+        # print("====震动频率=====")
+        # print(result)
+        # print('\n')
 
         time.sleep(1)

dist/Productions.exe

@@ -8,10 +8,11 @@
 from ot3_testing.test_config.zstage_leveling_config import ZStagePoint
 from ot3_testing.test_config.gripper_leveling_config import Gripper_Position
 import asyncio
-from tools.inquirer import prompt_flex_name, prompt_test_name, prompt_exit
+from tools.inquirer import prompt_flex_name, prompt_test_name, prompt_exit, prompt_ip
 from tools import heat_96ch
 from __version__ import get_version
 from gravimetric_testing.openwebapp import openweb
+from tools.reading_laser import ReadLaser
 
 addpathpat = os.path.dirname(__file__)
 addpath = os.path.dirname(os.path.dirname(__file__))
@@ -49,7 +50,12 @@
             asyncio.run(pipette_leveling.run_8ch_test(flex_name, project_path=project_path))
         elif "grav-openweb" in test_name:
             openweb()
-
+        elif 'leveling-reading-sensor' in test_name:
+            add_height = float(input("请输入增加的高度: ").strip())
+            reader = ReadLaser(add_height)
+            reader.robot_ip = prompt_ip()
+            reader.add_height = add_height
+            asyncio.run(reader.run_test("RIGHT-D1", project_path))
         else:
             pass
 

production_scripts.py

@@ -1,7 +1,7 @@
 from PyInquirer import prompt
 
 test_choices = ['leveling-8ch', 'leveling-96ch', 'leveling-gantry', 'leveling-z-stage', 'leveling-gripper',
-                'heat-96ch', 'grav-openweb']
+                'leveling-reading-sensor', 'heat-96ch', 'grav-openweb']
 
 question_flex = {
     'type': 'input',

tools/inquirer.py

@@ -23,7 +23,7 @@
 class ReadLaser(TestBase):
     def __init__(self):
         super(ReadLaser).__init__()
-        self.robot_ip = "192.168.6.54"
+        self.robot_ip = "192.168.6.84"
         self.laser_sensor = None
         self.mount = Mount.RIGHT
         self.high_laser_sensor = None

tools/reading_difference_by_laser.py

@@ -7,27 +7,28 @@
 import asyncio
 from utils import Utils
 from devices.laser_stj_10_m0 import LaserSensor as HighAccuracySensor
+import os
 
 # _point = Point(195, 195, 357)  # C2 - Right
 Rounds = 30
 KeepReading = False
 UseHighAccuracy = False
 
-WaitTime = 60
+WaitTime = 15
 
-
-_point = Point(30, 90, 357)   # D1 - Right
+_point = Point(20, 90, 357)  # D1 - Right
 
 
 # _point = Point(55, 92, 356.5)
 
 class ReadLaser(TestBase):
-    def __init__(self):
+    def __init__(self, add_height):
         super(ReadLaser).__init__()
-        self.robot_ip = "192.168.6.33"
+        self.robot_ip = "192.168.6.84"
         self.laser_sensor = None
         self.mount = Mount.RIGHT
         self.high_laser_sensor = None
+        self.point = _point + Point(0, 0, add_height)
 
     def init_laser_sensor(self, send=False):
         """
@@ -69,14 +70,14 @@ async def move_to_test_point(self, p: Point):
         """
         await self.api.move_to(self.mount, p, target="pipette", )
 
-    async def run_test(self, slot_name):
+    async def run_test(self, slot_name, project_path):
         await self.build_reading()
         if KeepReading:
-            await self.move_to_test_point(_point)
+            await self.move_to_test_point(self.point)
         for i in range(Rounds):
-            print(f"Round --------------------------------- {i+1}")
+            print(f"Round --------------------------------- {i + 1}")
             if not KeepReading:
-                await self.move_to_test_point(_point)
+                await self.move_to_test_point(self.point)
 
             result = {}
             for _wait in range(WaitTime):
@@ -94,13 +95,16 @@ async def run_test(self, slot_name):
             if UseHighAccuracy:
                 result.update({"high": high_res})
             print(result)
-
-            file_path = '../testing_data/reading_sensor.csv'
+            if project_path is not None:
+                file_path = os.path.join(project_path, 'testing_data', 'reading_laser.csv')
+            else:
+                file_path = '../../testing_data/reading_laser.csv'
             self.save_csv(file_path, [slot_name], list(result.values()))
             if KeepReading is not True:
                 await self.api.home()
 
 
 if __name__ == '__main__':
-    re = ReadLaser()
-    asyncio.run(re.run_test("RIGHT-D1"))
+    pass
+    re = ReadLaser(4)
+    asyncio.run(re.run_test("RIGHT-D1", project_path=None))