Skip to content

Commit 6b5915f

Browse files
author
andy
committed
add docs
1 parent 86458aa commit 6b5915f

File tree

12 files changed

+531
-95
lines changed

12 files changed

+531
-95
lines changed

‎dist/Productions-1.3.5.exe

32 Bytes
Binary file not shown.

‎docs/openratuid_guide/shipping.md

Lines changed: 282 additions & 0 deletions
Large diffs are not rendered by default.

‎modules_testing/thermocycle_diagnostic/tc_diagnostic.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -454,7 +454,7 @@ def show_responds():
454454
print(f"Responds: {ret}")
455455

456456
# 降温到4
457-
print("条件准备:开始降温 -> 4C")
457+
print("条件准备:开始降温 -> 4C,测试过程请盯着灯条")
458458
self.serail.write_and_get_buffer("M104 S4", delay=3)
459459
ret = get_tem_and_break(4)
460460
assert ret, 'set temperature timeout'
@@ -484,7 +484,7 @@ def show_responds():
484484
# 升温到95
485485
print("测试:开始升温 -> 23-95C")
486486
self.serail.write_and_get_buffer("M104 S95", delay=3)
487-
time.sleep(2)
487+
time.sleep(1)
488488
ret = input('是否红色灯条闪烁（Y/N）?')
489489
if ret.strip().upper() == 'Y':
490490
print('Pulsing red : Changing to hot temperature (>23 °C) TEST PASS')
@@ -515,12 +515,12 @@ def show_responds():
515515
else:
516516
print('Pulsing red : Changing to hot temperature (>23 °C) TEST FAIL')
517517
self.test_result.append('Fail')
518-
get_tem_and_break(95)
518+
get_tem_and_break(24)
519519
show_responds()
520520

521521
# 升温到23
522522
print("测试:开始升温 -> 24-4C")
523-
self.serail.write_and_get_buffer("M104 S23", delay=3)
523+
self.serail.write_and_get_buffer("M104 S4", delay=3)
524524
time.sleep(2)
525525
ret = input('是否蓝色灯条闪烁（Y/N）?')
526526
if ret.strip().upper() == 'Y':
@@ -529,7 +529,7 @@ def show_responds():
529529
else:
530530
print('Pulsing blue : Changing to cool temperature (<23 °C) TEST FAIL')
531531
self.test_result.append('Fail')
532-
get_tem_and_break(95)
532+
get_tem_and_break(4)
533533
show_responds()
534534

535535
self.serail.write_and_get_buffer("M18", delay=3)

‎oem_projects/bayOmics/Lib/BayOmicsLib.egg-info/PKG-INFO

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Metadata-Version: 2.1
22
Name: BayOmicsLib
3-
Version: 1.5.6
3+
Version: 1.5.7
44
Summary: UNKNOWN
55
Home-page: UNKNOWN
66
License: UNKNOWN

‎oem_projects/bayOmics/Lib/BayOmicsLib.py

Lines changed: 58 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import time
2+
13
from opentrons import protocol_api
24
import json
35
import serial
@@ -373,48 +375,82 @@ def home(self, y=True, z=True, r=True):
373375
:return:
374376
"""
375377
if r:
376-
def _r_move():
378+
def _r_move_rel():
377379
self.set_axis_speed('r')
380+
start_pos = self.get_axis_position('r')
378381
self.send_to_device("05 10 00 01 00 02 04 FD 9C FF FF", "Move Relative", verify="")
379382
self.send_to_device("050600000302", "Set R Axis Relative Position Mode", verify="")
380383
self.opentrons_delay(1)
381-
self.send_to_device("050600000300", "Set R Axis Speed Mode", verify="")
384+
end_pos = self.get_axis_position('r')
385+
if start_pos == end_pos:
386+
self.print_f("retry move r rel")
387+
return False
388+
else:
389+
return True
382390

383-
for i in range(30):
384-
_r_move()
385-
ret = self.judge_rel_pos('r')
391+
for _ in range(10):
392+
ret = _r_move_rel()
386393
if ret:
387394
break
395+
396+
self.send_to_device("050600000300", "Set R Axis Speed Mode", verify="")
397+
for _ in range(10):
398+
res = self.judge_rel_pos('r')
399+
if res:
400+
break
401+
self.print_f("retry to zero by r")
388402
self.judge_pos(60, 'r', "00000000")
389403
if z:
390-
def _z_move():
391-
# 相对运动模式向下走
404+
def _z_move_rel():
405+
self.set_axis_speed('z')
406+
start_pos = self.get_axis_position('z')
392407
self.send_to_device("070600000302", "Set Z Axis Relative Position Mode", verify="")
393408
self.send_to_device("07 10 00 01 00 02 04 AC FF FF FF", "move relative", verify="")
394409
self.opentrons_delay(0.5)
395-
self.send_to_device("070600000300", "Set Z Axis Speed Mode", verify="")
410+
end_pos = self.get_axis_position('z')
411+
if start_pos == end_pos:
412+
self.print_f("retry move z rel")
413+
return False
414+
else:
415+
return True
396416

397-
for i in range(30):
398-
_z_move()
399-
ret = self.judge_rel_pos('z')
400-
current = self.get_axis_position('z')
401-
if ret or current.strip() == '00000000':
417+
for _ in range(10):
418+
ret = _z_move_rel()
419+
if ret:
402420
break
403-
self.judge_pos(30, 'z', "00000000")
421+
422+
self.send_to_device("070600000300", "Set Z Axis Speed Mode", verify="")
423+
for _ in range(10):
424+
res = self.judge_rel_pos('z')
425+
if res:
426+
break
427+
self.print_f("retry to zero by z")
428+
self.judge_pos(30, 'r', "00000000")
404429
if y:
405-
def _y_move():
430+
def _y_move_rel():
406431
self.set_axis_speed('y')
432+
start_pos = self.get_axis_position('y')
407433
self.send_to_device("06 10 00 01 00 02 04 BA 24 FF FF", "Move Relative", verify="061000010002")
408434
self.send_to_device("060600000302", "Set Y Axis Relative Position Mode", verify="")
409-
self.opentrons_delay(0.5)
410-
self.send_to_device("060600000300", "Set Y Axis Speed Mode", verify="")
435+
self.opentrons_delay(1)
436+
end_pos = self.get_axis_position('y')
437+
if start_pos == end_pos:
438+
self.print_f("retry move y rel")
439+
return False
440+
else:
441+
return True
442+
443+
for _ in range(10):
444+
ret = _y_move_rel()
445+
if ret:
446+
break
411447

412-
for i in range(30):
413-
_y_move()
414-
ret = self.judge_rel_pos('y')
415-
current = self.get_axis_position('y')
416-
if ret or current.strip() == '00000000':
448+
self.send_to_device("060600000300", "Set Y Axis Speed Mode", verify="")
449+
for _ in range(10):
450+
res = self.judge_rel_pos('y')
451+
if res:
417452
break
453+
self.print_f("retry to zero by y")
418454
self.judge_pos(30, 'y', "00000000")
419455

420456
def init_motors(self, y=True, z=True, r=True):

‎oem_projects/bayOmics/Lib/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
## upload
88

99
```tex
10-
scp -i C:\Users\22192\.ssh\ot2_ssh_key .\BayOmicsLib-1.4.8-py3-none-any.whl [email protected]:/data
10+
scp -i C:\Users\22192\.ssh\ot2_ssh_key .\BayOmicsLib-1.5.7-py3-none-any.whl [email protected]:/data
1111
```
1212

1313

‎oem_projects/bayOmics/Lib/dist/BayOmicsLib-1.5.6-py3-none-any.whl

-10.2 KB
Binary file not shown.

‎oem_projects/bayOmics/Lib/dist/BayOmicsLib-1.5.7-py3-none-any.whl

10.3 KB
Binary file not shown.

‎oem_projects/bayOmics/Lib/setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from setuptools import setup
22

33
setup(name='BayOmicsLib',
4-
version='1.5.6',
4+
version='1.5.7',
55
py_modules=['BayOmicsLib'],
66
)

‎oem_projects/bayOmics/driver.py

Lines changed: 57 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -267,49 +267,82 @@ def home(self, y=True, z=True, r=True):
267267
:return:
268268
"""
269269
if r:
270-
def _r_move():
270+
def _r_move_rel():
271271
self.set_axis_speed('r')
272+
start_pos = self.get_axis_position('r')
272273
self.send_to_device("05 10 00 01 00 02 04 FD 9C FF FF", "Move Relative", verify="")
273274
self.send_to_device("050600000302", "Set R Axis Relative Position Mode", verify="")
274-
time.sleep(0.5)
275-
self.send_to_device("050600000300", "Set R Axis Speed Mode", verify="")
275+
time.sleep(1)
276+
end_pos = self.get_axis_position('r')
277+
if start_pos == end_pos:
278+
print("retry move r rel")
279+
return False
280+
else:
281+
return True
276282

277-
for i in range(30):
278-
_r_move()
279-
ret = self.judge_rel_pos('r')
283+
for _ in range(10):
284+
ret = _r_move_rel()
280285
if ret:
281286
break
282-
time.sleep(3)
287+
288+
self.send_to_device("050600000300", "Set R Axis Speed Mode", verify="")
289+
for _ in range(10):
290+
res = self.judge_rel_pos('r')
291+
if res:
292+
break
293+
print("retry to zero by r")
283294
self.judge_pos(60, 'r', "00000000")
284295
if z:
285-
def _z_move():
286-
# 相对运动模式向下走
296+
def _z_move_rel():
297+
self.set_axis_speed('z')
298+
start_pos = self.get_axis_position('z')
287299
self.send_to_device("070600000302", "Set Z Axis Relative Position Mode", verify="")
288300
self.send_to_device("07 10 00 01 00 02 04 AC FF FF FF", "move relative", verify="")
289301
time.sleep(0.5)
290-
self.send_to_device("070600000300", "Set Z Axis Speed Mode", verify="")
302+
end_pos = self.get_axis_position('z')
303+
if start_pos == end_pos:
304+
print("retry move z rel")
305+
return False
306+
else:
307+
return True
308+
309+
for _ in range(10):
310+
ret = _z_move_rel()
311+
if ret:
312+
break
291313

292-
for i in range(30):
293-
_z_move()
294-
ret = self.judge_rel_pos('z')
295-
current = self.get_axis_position('z')
296-
if ret or current.strip() == '00000000':
314+
self.send_to_device("070600000300", "Set Z Axis Speed Mode", verify="")
315+
for _ in range(10):
316+
res = self.judge_rel_pos('z')
317+
if res:
297318
break
298-
self.judge_pos(30, 'z', "00000000")
319+
print("retry to zero by z")
320+
self.judge_pos(30, 'r', "00000000")
299321
if y:
300-
def _y_move():
322+
def _y_move_rel():
301323
self.set_axis_speed('y')
324+
start_pos = self.get_axis_position('y')
302325
self.send_to_device("06 10 00 01 00 02 04 BA 24 FF FF", "Move Relative", verify="061000010002")
303326
self.send_to_device("060600000302", "Set Y Axis Relative Position Mode", verify="")
304-
time.sleep(0.5)
305-
self.send_to_device("060600000300", "Set Y Axis Speed Mode", verify="")
327+
time.sleep(1)
328+
end_pos = self.get_axis_position('y')
329+
if start_pos == end_pos:
330+
print("retry move y rel")
331+
return False
332+
else:
333+
return True
334+
335+
for _ in range(10):
336+
ret = _y_move_rel()
337+
if ret:
338+
break
306339

307-
for i in range(30):
308-
_y_move()
309-
ret = self.judge_rel_pos('y')
310-
current = self.get_axis_position('y')
311-
if ret or current.strip() == '00000000':
340+
self.send_to_device("060600000300", "Set Y Axis Speed Mode", verify="")
341+
for _ in range(10):
342+
res = self.judge_rel_pos('y')
343+
if res:
312344
break
345+
print("retry to zero by y")
313346
self.judge_pos(30, 'y', "00000000")
314347

315348
def init_motors(self):

0 commit comments

Comments
 (0)