Skip to content

Commit 86458aa

Browse files
author
andy
committed
store bayomics
1 parent b2c7075 commit 86458aa

File tree

4 files changed

+77
-14
lines changed

4 files changed

+77
-14
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.3.4'
4+
VERSION = '1.3.5'
55

66

77
def get_version():

‎dist/Productions-1.3.4.exe renamed to ‎dist/Productions-1.3.5.exe

79.9 MB
Binary file not shown.

‎modules_testing/thermocycle_diagnostic/tc_diagnostic.py

Lines changed: 70 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -454,37 +454,98 @@ 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'
461461

462462
input("Plate Temperature & Light 开始测试...")
463463
# 升温到23
464+
print("测试:开始升温 -> 4-23C")
464465
self.serail.write_and_get_buffer("M104 S23", delay=3)
465-
get_tem_and_break(23)
466+
time.sleep(1)
467+
ret = input('是否蓝色灯条闪烁（Y/N）?')
468+
if ret.strip().upper() == 'Y':
469+
print('Pulsing blue : Changing to cool temperature (<23 °C) TEST PASS')
470+
self.test_result.append('Pass')
471+
else:
472+
print('Pulsing blue : Changing to cool temperature (<23 °C) TEST FAIL')
473+
self.test_result.append('Fail')
474+
475+
ret = get_tem_and_break(23)
466476
show_responds()
467-
ret = input('是否亮蓝色灯条（Y/N）?')
477+
ret = input('是否亮蓝色灯条常亮（Y/N）?')
468478
if ret.strip().upper() == 'Y':
469-
print('TEST PASS')
479+
print('Solid blue : Holding at cool temperature (<23 °C) TEST PASS')
470480
self.test_result.append('Pass')
471481
else:
482+
print('Solid blue : Holding at cool temperature (<23 °C) TEST FAIL')
472483
self.test_result.append('Fail')
473484
# 升温到95
485+
print("测试:开始升温 -> 23-95C")
474486
self.serail.write_and_get_buffer("M104 S95", delay=3)
487+
time.sleep(2)
488+
ret = input('是否红色灯条闪烁（Y/N）?')
489+
if ret.strip().upper() == 'Y':
490+
print('Pulsing red : Changing to hot temperature (>23 °C) TEST PASS')
491+
self.test_result.append('Pass')
492+
else:
493+
print('Pulsing red : Changing to hot temperature (>23 °C) TEST FAIL')
494+
self.test_result.append('Fail')
495+
475496
get_tem_and_break(95)
476497
show_responds()
477-
ret = input('是否亮红色灯条（Y/N）?')
498+
ret = input('是否红色灯条常亮（Y/N）?')
499+
if ret.strip().upper() == 'Y':
500+
print('Solid red : Holding at hot temperature (>23 °C) TEST PASS')
501+
self.test_result.append('Pass')
502+
else:
503+
print('Solid red : Holding at hot temperature (>23 °C) TEST FAIL')
504+
self.test_result.append('Fail')
505+
506+
507+
# 降温到24
508+
print("测试:开始降温 -> 95-24C")
509+
self.serail.write_and_get_buffer("M104 S24", delay=3)
510+
time.sleep(2)
511+
ret = input('是否红色灯条闪烁（Y/N）?')
478512
if ret.strip().upper() == 'Y':
479-
print('TEST PASS')
513+
print('Pulsing red : Changing to hot temperature (>23 °C) TEST PASS')
480514
self.test_result.append('Pass')
481515
else:
482-
print('TEST FAIL')
516+
print('Pulsing red : Changing to hot temperature (>23 °C) TEST FAIL')
483517
self.test_result.append('Fail')
518+
get_tem_and_break(95)
519+
show_responds()
484520

521+
# 升温到23
522+
print("测试:开始升温 -> 24-4C")
485523
self.serail.write_and_get_buffer("M104 S23", delay=3)
486-
get_tem_and_break(23)
487-
print("结束测试失能...")
524+
time.sleep(2)
525+
ret = input('是否蓝色灯条闪烁（Y/N）?')
526+
if ret.strip().upper() == 'Y':
527+
print('Pulsing blue : Changing to cool temperature (<23 °C) TEST PASS')
528+
self.test_result.append('Pass')
529+
else:
530+
print('Pulsing blue : Changing to cool temperature (<23 °C) TEST FAIL')
531+
self.test_result.append('Fail')
532+
get_tem_and_break(95)
533+
show_responds()
534+
535+
self.serail.write_and_get_buffer("M18", delay=3)
536+
time.sleep(2)
537+
ret = input('是否白色灯条常亮（Y/N）?')
538+
if ret.strip().upper() == 'Y':
539+
print('Solid white : Idle TEST PASS')
540+
self.test_result.append('Pass')
541+
else:
542+
print('Solid white : Idle TEST FAIL')
543+
self.test_result.append('Fail')
544+
545+
# print("结束测试:恢复温度23C")
546+
# self.serail.write_and_get_buffer("M104 S23", delay=3)
547+
# get_tem_and_break(23)
548+
print("结束测试...")
488549
self.serail.write_and_get_buffer("M18", delay=3)
489550

490551

‎oem_projects/bayOmics/driver.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -271,14 +271,15 @@ def _r_move():
271271
self.set_axis_speed('r')
272272
self.send_to_device("05 10 00 01 00 02 04 FD 9C FF FF", "Move Relative", verify="")
273273
self.send_to_device("050600000302", "Set R Axis Relative Position Mode", verify="")
274-
time.sleep(1)
274+
time.sleep(0.5)
275275
self.send_to_device("050600000300", "Set R Axis Speed Mode", verify="")
276276

277277
for i in range(30):
278278
_r_move()
279279
ret = self.judge_rel_pos('r')
280280
if ret:
281281
break
282+
time.sleep(3)
282283
self.judge_pos(60, 'r', "00000000")
283284
if z:
284285
def _z_move():
@@ -302,6 +303,7 @@ def _y_move():
302303
self.send_to_device("060600000302", "Set Y Axis Relative Position Mode", verify="")
303304
time.sleep(0.5)
304305
self.send_to_device("060600000300", "Set Y Axis Speed Mode", verify="")
306+
305307
for i in range(30):
306308
_y_move()
307309
ret = self.judge_rel_pos('y')
@@ -588,9 +590,9 @@ def init_loop(self):
588590
# print(f"Round ---------------------------- {i + 1}")
589591
# bd.set_pressure((i + 1) * 0.01, 10)
590592
bd.init_device()
591-
bd.heat_incubation([{"temperature": 52, "time": 120}, {"temperature": 0, "time": 30}, {"temperature": 52, "time": 120}])
592-
593-
# bd.home()
593+
# bd.heat_incubation([{"temperature": 52, "time": 120}, {"temperature": 0, "time": 30}, {"temperature": 52, "time": 120}])
594+
for i in range(5):
595+
bd.home()
594596
# bd.set_led_rounds(9999)
595597
# while True:
596598
# bd.move_to_work_position()

0 commit comments

Comments
 (0)