Skip to content

Commit f2ffac9

Browse files
author
andy
committed
debug complete for z-stage
1 parent 10aaf5d commit f2ffac9

File tree

5 files changed

+8
-13
lines changed

5 files changed

+8
-13
lines changed

__version__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import os
22
import subprocess
33

4-
VERSION = '1.1.3'
4+
VERSION = '1.1.4'
55

66

77
def get_version():

dist/Productions.exe

-4 Bytes
Binary file not shown.

ot3_testing/test_config/pipette_leveling_config.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ class CalibrateMethod(enum.Enum):
77
Dichotomy = "dichotomy"
88

99

10-
SlotLocationCH96 = {"C1-Y": {"Point": Point(223, 203, 318), "compensation": {"left_rear": 0.038, "left_front": 0},
10+
SlotLocationCH96 = {"C1-Y": {"Point": Point(223, 203, 318), "compensation": {"left_rear": 0, "left_front": 0.005},
1111
"definition": ["left_front", "left_rear"]},
1212
"C3-Y": {"Point": Point(207, 203, 318), "compensation": {"right_rear": 0, "right_front": 0},
1313
"definition": ["left_front", "left_rear"]},
@@ -20,23 +20,23 @@ class CalibrateMethod(enum.Enum):
2020
"A2-X": {"Point": Point(213, 305, 300), "compensation": {"left": 0, "right": 0},
2121
"definition": ["rear_left", "rear_right"]},
2222
"D1-Z": {"Point": Point(51, 99, 318),
23-
"compensation": {"rear_left": 0.001, "rear_right": -0.005, "front_left": 0.018,
23+
"compensation": {"rear_left": 0.075, "rear_right": 0.018, "front_left": 0.002,
2424
"front_right": 0}, "definition": ["below_rear_left", "below_rear_right",
2525
"below_front_left",
2626
"below_front_right"]},
2727

2828
"D3-Z": {"Point": Point(377, 99, 318),
29-
"compensation": {"rear_left": 0.003, "rear_right": -0.021, "front_left": -0.037,
29+
"compensation": {"rear_left": 0.019, "rear_right": -0.048, "front_left": 0.015,
3030
"front_right": 0}, "definition": ["below_rear_left", "below_rear_right",
3131
"below_front_left",
3232
"below_front_right"]},
3333
"C2-Z": {"Point": Point(214, 210, 318),
34-
"compensation": {"rear_left": 0.025, "rear_right": -0.007, "front_left": 0.046,
34+
"compensation": {"rear_left": 0.025, "rear_right": -0.012, "front_left": 0.082,
3535
"front_right": 0}, "definition": ["below_rear_left", "below_rear_right",
3636
"below_front_left",
3737
"below_front_right"]},
3838
"A2-Z": {"Point": Point(218, 424, 390.5),
39-
"compensation": {"rear_left": 0, "rear_right": 0, "front_left": 0,
39+
"compensation": {"rear_left": 0.065, "rear_right": -0.028, "front_left": 0.051,
4040
"front_right": 0}, "definition": ["below_rear_left", "below_rear_right",
4141
"below_front_left",
4242
"below_front_right"]},

ot3_testing/tests/pipette_leveling.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@
1313
MountDefinition = Mount.LEFT
1414
RequestReadyFlag = False
1515
DoCalibrate = True
16-
Test_8CH_SIDE = "Left_Right"
17-
ApplyCompensationFlag = False
16+
ApplyCompensationFlag = True
1817

1918

2019
class PipetteLeveling(TestBase):

ot3_testing/tests/zstage_leveling.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -161,9 +161,7 @@ async def th_reading_c2(self):
161161
def run_th_reading_c2(self):
162162
loop = asyncio.new_event_loop()
163163
asyncio.set_event_loop(loop)
164-
future = asyncio.run_coroutine_threadsafe(self.th_reading_c2(), loop)
165-
future.running()
166-
# return future.result()
164+
loop.run_until_complete(self.th_reading_c2())
167165

168166
async def adjust_leveling(self, slot_name: str, mount: Mount):
169167
"""
@@ -177,8 +175,6 @@ async def adjust_leveling(self, slot_name: str, mount: Mount):
177175

178176
th = threading.Thread(target=self.run_th_reading_c2)
179177
th.start()
180-
th.join()
181-
182178
input("Judging complete ? (完成校准回车)")
183179
self.judge_complete = True
184180

0 commit comments

Comments
 (0)