fix merging

.gitignore

@@ -3,4 +3,5 @@ aio/.idea/
 aio/__pycache__/
 aio/dist/
 aio/build/
-aio/aio.spec
+aio/aio.spec
+aio/venv

aio/README.md

@@ -26,6 +26,9 @@ python.exe -m pip install --upgrade pip -i https://pypi.tuna.tsinghua.edu.cn/sim
 ```commandline
 pyinstaller.exe -F --version-file file_version_info.txt -i .\icon.ico .\aio.py 
 pyinstaller.exe -F --version-file file_version_info.txt -i .\icon.ico .\aio.py -p .\brake.py -p .\current.py
+<<<<<<< HEAD
+pyinstaller --noconfirm --onedir --windowed --add-data "C:/Users/Administrator/AppData/Local/Programs/Python/Python312/Lib/site-packages/customtkinter;customtkinter/" --version-file file_version_info.txt -i .\icon.ico .\aio.py -p .\brake.py .\iso.py
+pyinstaller --noconfirm --onedir --windowed --add-data "/opt/git/rokae/aio/venv/lib/python3.11/site-packages/customtkinter;customtkinter/" --version-file file_version_info.txt -i ./icon.ico ./aio.py -p ./brake.py -p ./iso.py -p ./current.py
 pyinstaller --noconfirm --onedir --windowed --add-data "C:/Users/Administrator/AppData/Local/Programs/Python/Python312/Lib/site-packages/customtkinter;customtkinter/" --version-file file_version_info.txt -i .\icon.ico .\aio.py -p .\brake.py -p .\iso.py -p .\current.py
 ```
 
@@ -178,4 +181,3 @@ v0.1.4(2024/06/06)
 4. 修改了layout.xlsx布局，增加了duration/trqH/STO字段，以及额外的RC行，整体扩展了区域
 5. 更改label/entry/optionmenu等控件的生成方式，使用循环实现，更加简洁和容易维护（暂未实现）
 6. 支持工业/协作两条产品线的电机电流数据处理，包括单轴，场景，max/avg计算
-

aio/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, 1, 3, 0),
+    filevers=(0, 1, 4, 0),
-    prodvers=(0, 1, 3, 0),
+    prodvers=(0, 1, 4, 0),
     # Contains a bitmask that specifies the valid bits 'flags'r
     mask=0x3f,
     # Contains a bitmask that specifies the Boolean attributes of the file.
@@ -31,13 +31,13 @@ VSVersionInfo(
         '040904b0',
         [StringStruct('CompanyName', 'Rokae - https://www.rokae.com/'),
         StringStruct('FileDescription', 'All in one automatic toolbox'),
-        StringStruct('FileVersion', '0.1.3 (2024-06-01)'),
+        StringStruct('FileVersion', '0.1.4 (2024-06-06)'),
         StringStruct('InternalName', 'AIO.exe'),
         StringStruct('LegalCopyright', '© 2024-2024 Manford Fan'),
         StringStruct('OriginalFilename', 'AIO.exe'),
         StringStruct('ProductName', 'AIO'),
-        StringStruct('ProductVersion', '0.1.3 (2024-06-01)')])
+        StringStruct('ProductVersion', '0.1.4 (2024-06-06)')])
-      ]), 
+      ]),
     VarFileInfo([VarStruct('Translation', [1033, 1200])])
   ]
-)
+)