diff --git a/aio/README.md b/aio/README.md index 9869708..0b45b35 100644 --- a/aio/README.md +++ b/aio/README.md @@ -34,7 +34,7 @@ 打包时,只需要修改 clibs.py 中的 PREFIX 即可,调试时再修改回来 ``` -pyinstaller --noconfirm --onedir --windowed --optimize 2 --contents-directory . --upx-dir "D:/Syncthing/common/A_Program/upx-4.2.4-win64/" --add-data "C:/Users/Administrator/AppData/Local/Programs/Python/Python312/Lib/site-packages/customtkinter;customtkinter/" --add-data "D:/Syncthing/company/D-测试工作/X-自动化测试/01-AIO/rokae/aio/assets/templates:templates" --version-file ../assets/file_version_info.txt -i ../assets/templates/icon.ico ../code/aio.py -p ../code/data_process/brake.py -p ../code/data_process/iso.py -p ../code/data_process/current.py -p ../code/data_process/wavelogger.py -p ../code/commons/openapi.py -p ../code/commons/clibs.py -p ../code/automatic_test/btn_functions.py -p ../code/automatic_test/do_current.py -p ../code/automatic_test/do_brake.py -p ../code/durable_action/factory_test.py +pyinstaller --noconfirm --onedir --windowed --optimize 2 --contents-directory . --upx-dir "D:/Syncthing/common/A_Program/upx-4.2.4-win64/" --add-data "C:/Users/Administrator/AppData/Local/Programs/Python/Python312/Lib/site-packages/customtkinter;customtkinter/" --add-data "D:\Syncthing\company\D-测试工作\X-自动化测试\01-Gitea\aio\aio\assets\templates:templates" --version-file ../assets/file_version_info.txt -i ../assets/templates/icon.ico ../code/aio.py -p ../code/data_process/brake.py -p ../code/data_process/iso.py -p ../code/data_process/current.py -p ../code/data_process/wavelogger.py -p ../code/commons/openapi.py -p ../code/commons/clibs.py -p ../code/automatic_test/btn_functions.py -p ../code/automatic_test/do_current.py -p ../code/automatic_test/do_brake.py -p ../code/durable_action/factory_test.py ``` --- @@ -629,4 +629,4 @@ v0.2.0.8(2024/08/20) 5. [main: do_brake/do_current/factory_test.py]:在初始化运动时增加 `clibs.execution('rl_task.set_run_params', hr, w2t, tab_name, loop_mode=True, override=1.0)` v0.2.0.9(2024/10/09) -1. [main: do_brake.py] 采集完成后,pending 1s,使速度完全将为 0 \ No newline at end of file +1. [main: do_brake.py] 采集完成后,pending 3s,使速度完全将为 0 \ No newline at end of file diff --git a/aio/assets/templates/heartbeat b/aio/assets/templates/heartbeat index 56a6051..c227083 100644 --- a/aio/assets/templates/heartbeat +++ b/aio/assets/templates/heartbeat @@ -1 +1 @@ -1 \ No newline at end of file +0 \ No newline at end of file diff --git a/aio/code/automatic_test/do_brake.py b/aio/code/automatic_test/do_brake.py index 3a2d603..44bec9a 100644 --- a/aio/code/automatic_test/do_brake.py +++ b/aio/code/automatic_test/do_brake.py @@ -269,7 +269,7 @@ def run_rl(path, loadsel, hr, md, config_file, result_dirs, w2t): sleep(1) # 6. 保留数据并处理输出 - sleep(1) # 为了让速度降为 0,1s 足够 + sleep(3) # 为了让速度降为 0,3s 足够 curve_data = [] _c_msg = hr.c_msg.copy() for _msg in _c_msg: diff --git a/aio/code/commons/clibs.py b/aio/code/commons/clibs.py index c4b2a35..8f2dd0c 100644 --- a/aio/code/commons/clibs.py +++ b/aio/code/commons/clibs.py @@ -15,8 +15,8 @@ MAX_FRAME_SIZE = 1024 TIMEOUT = 5 setdefaulttimeout(TIMEOUT) tab_names = {'dp': 'Data Process', 'at': 'Automatic Test', 'da': 'Duration Action', 'op': 'openapi'} -# PREFIX = '' # for pyinstaller packaging -PREFIX = '../assets/' # for source code debug +PREFIX = '' # for pyinstaller packaging +# PREFIX = '../assets/' # for source code debug app_icon = f'{PREFIX}templates/icon.ico' log_path = f'{PREFIX}templates/logs/' log_data_hmi = f'{PREFIX}templates/logs/c_msg.log'