Skip to content

Commit a80de90

Browse files
author
andy
committed
re-set leveling offset
1 parent 656e85e commit a80de90

File tree

6 files changed

+13
-11
lines changed

6 files changed

+13
-11
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.2.4'
4+
VERSION = '1.2.7'
55

66

77
def get_version():

devices/laser_stj_10_m0.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,16 @@ def read_sensor_high(self):
4747
value = primary_value + secondary_value
4848
return value
4949

50-
def read_sensor_low(self):
50+
def read_sensor_low(self, show_distance=False):
5151
multi_value = {}
5252
result = self.serial.write_and_get_buffer(LOW_MEASURE_CODE)
5353
result = result.decode('utf-8')
5454
print(f"Result: {result}")
5555
for index, item in enumerate(result.split(',')):
5656
_value = float(item.split(':')[1].strip()) / 1000
5757
_value = round(_value, 3)
58+
if show_distance:
59+
_value = round(-2*_value + 35, 3)
5860
multi_value.update({index: _value})
5961
return multi_value
6062

@@ -64,5 +66,5 @@ def read_sensor_low(self):
6466
ls.init_device()
6567
# ls.accuracy = "low"
6668
while True:
67-
ret = ls.read_sensor_high()
69+
ret = ls.read_sensor_low(show_distance=True)
6870
print(ret)

dist/Productions.exe

20 Bytes
Binary file not shown.

ot3_testing/test_config/pipette_leveling_config.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,18 @@ 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.075, "rear_right": 0.018, "front_left": 0.002,
23+
"compensation": {"rear_left": 0.016, "rear_right": -0.018, "front_left": 0.02,
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.019, "rear_right": -0.048, "front_left": 0.015,
29+
"compensation": {"rear_left": -0.004, "rear_right": -0.052, "front_left": 0.026,
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.012, "front_left": 0.082,
34+
"compensation": {"rear_left": 0.0, "rear_right": -0.0, "front_left": 0.0,
3535
"front_right": 0}, "definition": ["below_rear_left", "below_rear_right",
3636
"below_front_left",
3737
"below_front_right"]},
@@ -73,9 +73,9 @@ class CalibrateMethod(enum.Enum):
7373

7474
}
7575

76-
SlotLocationCH8 = {"Y-C1-Left": {"Point": Point(215.42, 198.33, 299.16), "compensation": {"rear": 0, "front": 0}},
77-
"Y-C1-Right": {"Point": Point(172.07, 197.18, 299.16), "compensation": {"rear": 0, "front": 0.045}},
78-
"Y-C3-Right": {"Point": Point(499.83, 197.18, 299.16), "compensation": {"rear": 0, "front": 0.029}},
76+
SlotLocationCH8 = {"Y-C1-Left": {"Point": Point(215.42, 198.33, 299.16), "compensation": {"rear": 0, "front": -0.12}},
77+
"Y-C1-Right": {"Point": Point(172.07, 197.18, 299.16), "compensation": {"rear": 0, "front": -0.12}},
78+
"Y-C3-Right": {"Point": Point(499.83, 197.18, 299.16), "compensation": {"rear": 0, "front": -0.018}},
7979
"Y-A2-Right": {"Point": Point(335.94, 412.22, 299.16), "compensation": {"rear": 0, "front": 0.050}},
8080
"UninstallPos": {"Point": Point(223, 203, 500), "compensation": 0}
8181
}

ot3_testing/tests/pipette_leveling.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
ApplyCompensationFlag = True
1717

1818
TEST_SPEC = 0.45
19-
WAIT_TIME = 30
19+
WAIT_TIME = 15
2020

2121

2222
class PipetteLeveling(TestBase):

ot3_testing/tests/zstage_leveling.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
DefaultPort = False
1919
AdjustBeforeTest = True
2020

21-
WAIT_TIME = 30
21+
WAIT_TIME = 15
2222
DEBUGGING_READING = True
2323

2424

0 commit comments

Comments
 (0)