basically done again
This commit is contained in:
@ -159,13 +159,12 @@ class DoBrakeTest(QThread):
|
||||
prj_name = ".".join(prj_file.split("/")[-1].split(".")[:-1])
|
||||
wb = openpyxl.load_workbook(config_file, read_only=True)
|
||||
ws = wb["Target"]
|
||||
write_diagnosis = float(ws.cell(row=2, column=2).value)
|
||||
get_init_speed = float(ws.cell(row=3, column=2).value)
|
||||
single_brake = str(ws.cell(row=4, column=2).value)
|
||||
pon = ws.cell(row=5, column=2).value
|
||||
io_name = ws.cell(row=6, column=2).value.upper().strip()
|
||||
get_init_speed = float(ws.cell(row=2, column=2).value)
|
||||
single_brake = str(ws.cell(row=3, column=2).value).strip()
|
||||
pon = ws.cell(row=4, column=2).value
|
||||
io_name = ws.cell(row=5, column=2).value.upper().strip()
|
||||
wb.close()
|
||||
msg = f"基本参数配置:write_diagnosis(废弃) = {write_diagnosis}, get_init_speed = {get_init_speed}, single_brake = {single_brake}, pon = {pon}"
|
||||
msg = f"基本参数配置:get_init_speed = {get_init_speed}, single_brake = {single_brake}, pon = {pon}, IO = {io_name}"
|
||||
self.logger("INFO", "do_brake", msg)
|
||||
|
||||
if pon == "positive":
|
||||
@ -195,7 +194,7 @@ class DoBrakeTest(QThread):
|
||||
continue
|
||||
|
||||
clibs.c_md.write_axis(axis)
|
||||
self.logger("INFO", "brake-processing", "-" * 90, "purple", flag="signal")
|
||||
self.logger("INFO", "brake", "-" * 90, "purple", flag="signal")
|
||||
speed_max = 0
|
||||
for rounds in range(1, 4):
|
||||
count += 1
|
||||
@ -309,9 +308,9 @@ class DoBrakeTest(QThread):
|
||||
if clibs.c_md.w_program_state == 1:
|
||||
break
|
||||
else:
|
||||
time.sleep(5)
|
||||
time.sleep(2)
|
||||
if time.time() - t_start > 60:
|
||||
self.logger("ERROR", "do_brake","60s 内程序未能正常执行,需检查...", "red", "RlProgramStartTimeout")
|
||||
self.logger("ERROR", "do_brake", "60s 内程序未能正常执行,需检查...", "red", "RlProgramStartTimeout")
|
||||
|
||||
for i in range(16):
|
||||
if clibs.c_md.read_ready_to_go() == 1:
|
||||
@ -360,7 +359,7 @@ class DoBrakeTest(QThread):
|
||||
break
|
||||
|
||||
else:
|
||||
time.sleep(50) # why?
|
||||
time.sleep(clibs.INTERVAL*2)
|
||||
self.change_curve_state(False)
|
||||
msg = f"<br>{self.tool.removeprefix('tool')}%负载的制动性能测试执行完毕,如需采集其他负载,须切换负载类型,并更换其他负载,重新执行"
|
||||
self.logger("INFO", "do_brake", msg, "green")
|
||||
|
Reference in New Issue
Block a user