release 1.1.2

Opentrons · Apr 25, 2024 · b2b3ac9 · b2b3ac9
1 parent ef8e2f2
commit b2b3ac9
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 55 deletions.
diff --git a/README.md b/README.md
@@ -9,32 +9,25 @@ Pushing some Opentrons productions test scripts in SZ team, including Flex and M
 ## Struction
 
 - ot3-testing：
-
+  
   - tests:
-
     mainly test scripts for pruction
-
+  
   - server:
-
     test platform for test management
-
+  
   - vue-ui:
-
     frontend for test management
 
-## Others
-
-Any question please be free to contact our test engineer in SZ.
-
-
-
-
-
-
-
-
-
-
+## Verison
 
+- build
+  please run below command to build total project
+
+  ```python
+  python3 -m __verison__
+  ```
 
+## Others
 
+Any question please be free to contact our test engineer in SZ.
diff --git a/__version__.py b/__version__.py
@@ -1,7 +1,7 @@
 import os
 import subprocess
 
-VERSION = '1.1.1'
+VERSION = '1.1.2'
 
 
 def get_version():

diff --git a/dist/Productions.exe b/dist/Productions.exe
diff --git a/ot3_testing/test_config/pipette_leveling_config.py b/ot3_testing/test_config/pipette_leveling_config.py
@@ -16,7 +16,7 @@ class CalibrateMethod(enum.Enum):
                     "D1-Z": {"Point": Point(51, 99, 318), "compensation": 0.5},
                     # "B2-Z": Point(213, 324, 317),
                     "D3-Z": {"Point": Point(377, 99, 318), "compensation": 0.44},
-                    "C2-Z": {"Point": Point(214, 210, 318), "compensation": 0.40},
+                    "C2-Z": {"Point": Point(214, 210, 318), "compensation": 0.46},
                     "A2-Z": {"Point": Point(218, 424, 390.5), "compensation": 0.31},
                     "UninstallPos": {"Point": Point(223, 203, 500)}
                     }
@@ -40,19 +40,10 @@ class CalibrateMethod(enum.Enum):
                         "right_rear": {"device_addr": 1, "channel": 5, "offset": 0},
                         }
 
-SlotLocationCH8 = {"Y-C1-Left": {"Point": Point(198.42, 198.33, 299.16), "compensation": 0.0464},
+SlotLocationCH8 = {"Y-C1-Left": {"Point": Point(198.42, 198.33, 299.16), "compensation": -0.015},
                    "Y-C1-Right": {"Point": Point(172.07, 197.18, 299.16), "compensation": -0.03},
                    "Y-C3-Right": {"Point": Point(499.83, 197.18, 299.16), "compensation": -0.03},
                    "Y-A2-Right": {"Point": Point(335.94, 412.22, 299.16), "compensation": -0.03},
                    "UninstallPos": {"Point": Point(223, 203, 500), "compensation": 0}
                    }
 
-# ChannelOffsetsCH8 = {"left_front": 0,
-#                      "left_rear": -0.05074,
-#                      "right_front": 0,
-#                      "right_rear": 0.01876}
-
-ChannelOffsetsCH8 = {"left_front": 0,
-                     "left_rear": 0,
-                     "right_front": 0,
-                     "right_rear": 0}
diff --git a/ot3_testing/tests/pipette_leveling.py b/ot3_testing/tests/pipette_leveling.py
@@ -281,7 +281,7 @@ async def run_8ch_test(self, flex_name: str, project_path=None):
                 else:
                     csv_list.append(item_value)
             csv_title.append(key + "-Result")
-            csv_list.append(difference)
+            csv_list.append(abs(difference))
 
         # save csv
         if project_path is not None:
@@ -376,8 +376,8 @@ async def run_96ch_test(self, flex_name: str, project_path=None):
             if ApplyCompensationFlag:
                 print(f"apply offset {compensation} to {difference}, difference -> {difference - compensation}")
                 difference = abs(difference - compensation)
-                max_value_idx = self.get_max_index(distance_list)
-                distance_list[max_value_idx] = distance_list[max_value_idx] - compensation
+                # max_value_idx = self.get_max_index(distance_list)
+                # distance_list[max_value_idx] = distance_list[max_value_idx] - compensation
             print(f"{key} --> {value} (mm) --> difference: {round(difference, 3)}(mm)")
             for item_key, item_value in value.items():
                 csv_title.append(key + " " + item_key)
@@ -412,15 +412,4 @@ async def run_96ch_test(self, flex_name: str, project_path=None):
 
 
 if __name__ == '__main__':
-    # import asyncio
-
-    # pipette_leveling = PipetteLeveling(SlotLocationCH96, ChannelDefinitionCH96, robot_ip='192.168.6.29')
-    # pipette_leveling.select_default = True
-    # for i in range(1):
-    #     asyncio.run(pipette_leveling.run_96ch_test("FLXA1020240203003"))
-    # pipette_leveling = PipetteLeveling(SlotLocationCH8, ChannelDefinitionCH8, robot_ip='192.168.6.58')
-    # pipette_leveling.select_default = True
-    # pipette_leveling.test_name = '8ch'
-    # for i in range(3):
-    #     asyncio.run(pipette_leveling.run_8ch_test("FLXA1020240203003"))
     pass
diff --git a/production_scripts.py b/production_scripts.py
@@ -1,4 +1,14 @@
-import os,sys
+import os, sys
+
+from ot3_testing.tests.pipette_leveling import PipetteLeveling
+from ot3_testing.test_config.pipette_leveling_config import SlotLocationCH96, ChannelDefinitionCH96, \
+    SlotLocationCH8, ChannelDefinitionCH8
+import asyncio
+from tools.inquirer import prompt_flex_name, prompt_test_name, prompt_exit
+from tools import heat_96ch
+from __version__ import get_version
+from gravimetric_testing.openwebapp import openweb
+
 addpathpat = os.path.dirname(__file__)
 addpath = os.path.dirname(os.path.dirname(__file__))
 addpath2 = os.path.dirname(addpath)
@@ -8,14 +18,6 @@
     sys.path.append(addpath2)
 if addpathpat not in sys.path:
     sys.path.append(addpathpat)
-from ot3_testing.tests.pipette_leveling import PipetteLeveling
-from ot3_testing.test_config.pipette_leveling_config import SlotLocationCH96, ChannelDefinitionCH96, \
-    SlotLocationCH8,  ChannelDefinitionCH8
-import asyncio
-from tools.inquirer import prompt_flex_name, prompt_test_name, prompt_exit
-from tools import heat_96ch
-from __version__ import get_version
-from gravimetric_testing.openwebapp import openweb
 
 if __name__ == '__main__':
     get_version()
@@ -46,4 +48,3 @@
             break
         else:
             pass
-