diff --git a/rokae/brake/brake.py b/rokae/brake/brake.py index 392f0a0..cb35c20 100644 --- a/rokae/brake/brake.py +++ b/rokae/brake/brake.py @@ -271,10 +271,10 @@ def initialization(): warn_pause_exit(msg, 1, 2) DATA_DIR = ws_conf.cell(row=2, column=2).value - AV = int(ws_conf.cell(row=3, column=2).value) - RR = int(ws_conf.cell(row=4, column=2).value) - RC = float(ws_conf.cell(row=5, column=2).value) - AXIS = ws_conf.cell(row=6, column=2).value + AXIS = int(ws_conf.cell(row=3, column=2).value) + AV = int(ws_conf.cell(row=4, column=2).value.split(',')[AXIS-1].strip()) + RR = int(ws_conf.cell(row=5, column=2).value.split(',')[AXIS-1].strip()) + RC = float(ws_conf.cell(row=6, column=2).value.split(',')[AXIS-1].strip()) wb_conf.close() raw_data_dirs, result_files = traversal_files(DATA_DIR) @@ -313,7 +313,7 @@ def execution(args): time_end = time.time() time_total = time_end - time_start - msg = f"数据处理时间:{time_total//3600:02} h {time_total % 3600/60:05.2f} min" + msg = f"数据处理时间:{time_total // 3600:02} h {time_total % 3600 // 60:02} min {time_total % 60:02} s" warn_pause_exit(msg, 1, 0) diff --git a/rokae/brake/file_version_info.txt b/rokae/brake/file_version_info.txt index 05e1c53..1336045 100644 --- a/rokae/brake/file_version_info.txt +++ b/rokae/brake/file_version_info.txt @@ -6,8 +6,8 @@ VSVersionInfo( ffi=FixedFileInfo( # filevers and prodvers should be always a tuple with four items: (1, 2, 3, 4) # Set not needed items to zero 0. - filevers=(0, 0, 5, 0), - prodvers=(0, 0, 5, 0), + filevers=(0, 0, 5, 1), + prodvers=(0, 0, 5, 1), # Contains a bitmask that specifies the valid bits 'flags'r mask=0x3f, # Contains a bitmask that specifies the Boolean attributes of the file. diff --git a/rokae/brake/readme.txt b/rokae/brake/readme.txt index 28d8c3e..f53e8cc 100644 --- a/rokae/brake/readme.txt +++ b/rokae/brake/readme.txt @@ -98,6 +98,10 @@ v0.0.5(2024/05/23) 2. 调整了阈值和步长 3. 删除了just_open函数,以及对应的win32com库(Thank GOD!终于可以不用这个库了) 4. 重写了获取开始点位的代码,直接使用speed来判断,而不用角度,所以find_row_start_dp以及copy_data_to_excel_file函数也被一并删除 +5. 修改了配置文件configs.xlsx的初始参数顺序及结构,使程序通用性更强 +6. 将initialazation中的预定义变量赋值调整到try...except...之外,更方便排查问题 +7. 修改结束时间的格式,精确到秒 + v0.x.x(2024/05/xx)