diff --git a/aio/README.md b/aio/README.md index 5d1d216..d886272 100644 --- a/aio/README.md +++ b/aio/README.md @@ -209,4 +209,7 @@ v0.1.5.2(2024/06/13) [brake.py]: 修改了速度计算逻辑,新版本的vel列数据遵循如下规则,av = vel * 180 / pi,根据av再计算speed [brake.py]: 将threshold修改为常量50 [brake.py]: 提高了输出提示语的明确性,删除了不必要的省略号 -[brake.py]: 更正了之前的数据copy错误,重新优化了estop处是否达到指定百分比的判定逻辑 \ No newline at end of file +[brake.py]: 更正了之前的数据copy错误,重新优化了estop处是否达到指定百分比的判定逻辑 + +v0.1.6.2(2024/06/16) +1. [current.py] 修改了max/avg相关功能中对于返回值的处理逻辑,并在输出框以行的形式打印出来 \ No newline at end of file diff --git a/aio/aio.py b/aio/aio.py index d613ae5..42480a2 100644 --- a/aio/aio.py +++ b/aio/aio.py @@ -72,7 +72,7 @@ class App(customtkinter.CTk): btns['log']['btn'].configure(command=lambda: self.thread_it(self.func_log_callback)) btns['end']['btn'].configure(command=lambda: self.thread_it(self.func_end_callback)) # create version info - self.label_version = customtkinter.CTkLabel(self.frame_func, justify='left', text="Vers: 0.1.5.2\nDate: 06/13/2024", font=self.my_font, text_color="#4F4F4F") + self.label_version = customtkinter.CTkLabel(self.frame_func, justify='left', text="Vers: 0.1.6.2\nDate: 06/16/2024", font=self.my_font, text_color="#4F4F4F") self.frame_func.rowconfigure(6, weight=1) self.label_version.grid(row=6, column=0, padx=20, pady=20, sticky='s') # ===================================================================== diff --git a/aio/current.py b/aio/current.py index fb5b01f..7d1a97d 100644 --- a/aio/current.py +++ b/aio/current.py @@ -81,7 +81,7 @@ def initialization(path, sub, w2t): def current_max(data_files, rcs, trqh, w2t): - current = {1: 0, 2: 0, 3: 0, 4: 0, 5: 0, 6: 0, 7: 0} + current = {1: [], 2: [], 3: [], 4: [], 5: [], 6: [], 7: []} for data_file in data_files: if data_file.endswith('.data'): df = read_csv(data_file, sep='\t') @@ -96,15 +96,23 @@ def current_max(data_files, rcs, trqh, w2t): scale = 1 if data_file.endswith('.csv') else 1000 _ = abs(c_max/scale*rca) - current[axis] = _ + current[axis].append(_) w2t(f"{data_file}: {_:.4f}") - w2t("【MAX】数据处理完毕......") + for axis, cur in current.items(): + if not cur: + continue + else: + w2t(f"{axis}轴数据:", 1, 0, 'purple') + for value in cur: + w2t(f"{value:.4f} ", 1, 0, 'purple') + w2t('') + w2t("\n【MAX】数据处理完毕......") return current def current_avg(data_files, rcs, trqh, w2t): - current = {1: 0, 2: 0, 3: 0, 4: 0, 5: 0, 6: 0, 7: 0} + current = {1: [], 2: [], 3: [], 4: [], 5: [], 6: [], 7: []} for data_file in data_files: if data_file.endswith('.data'): df = read_csv(data_file, sep='\t') @@ -120,10 +128,18 @@ def current_avg(data_files, rcs, trqh, w2t): scale = 1 if data_file.endswith('.csv') else 1000 _ = (abs(c_avg)+c_std)/scale*rca - current[axis] = _ + current[axis].append(_) w2t(f"{data_file}: {_:.4f}") - w2t("【AVG】数据处理完毕......") + for axis, cur in current.items(): + if not cur: + continue + else: + w2t(f"{axis}轴数据:", 1, 0, 'purple') + for value in cur: + w2t(f"{value:.4f} ", 1, 0, 'purple') + w2t('') + w2t("\n【AVG】数据处理完毕......") return current diff --git a/aio/file_version_info.txt b/aio/file_version_info.txt index bb0a29d..9a839c1 100644 --- a/aio/file_version_info.txt +++ b/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, 5, 2), - prodvers=(0, 1, 5, 2), + filevers=(0, 1, 6, 2), + prodvers=(0, 1, 6, 2), # Contains a bitmask that specifies the valid bits 'flags'r mask=0x3f, # Contains a bitmask that specifies the Boolean attributes of the file. @@ -31,12 +31,12 @@ VSVersionInfo( '040904b0', [StringStruct('CompanyName', 'Rokae - https://www.rokae.com/'), StringStruct('FileDescription', 'All in one automatic toolbox'), - StringStruct('FileVersion', '0.1.5.2 (2024-06-13)'), + StringStruct('FileVersion', '0.1.6.2 (2024-06-16)'), StringStruct('InternalName', 'AIO.exe'), StringStruct('LegalCopyright', '© 2024-2024 Manford Fan'), StringStruct('OriginalFilename', 'AIO.exe'), StringStruct('ProductName', 'AIO'), - StringStruct('ProductVersion', '0.1.5.2 (2024-06-13)')]) + StringStruct('ProductVersion', '0.1.6.2 (2024-06-16)')]) ]), VarFileInfo([VarStruct('Translation', [1033, 1200])]) ] diff --git a/aio/vers b/aio/vers index bb7d006..620fd71 100644 --- a/aio/vers +++ b/aio/vers @@ -1 +1 @@ -0.1.5.2 @ 06/13/2024 +0.1.6.2 @ 06/16/2024