diff --git a/App/StatorWorkpiecePosition/WorkpieceRotorApp/Version.h b/App/StatorWorkpiecePosition/WorkpieceRotorApp/Version.h index f205b1ab..569476ee 100644 --- a/App/StatorWorkpiecePosition/WorkpieceRotorApp/Version.h +++ b/App/StatorWorkpiecePosition/WorkpieceRotorApp/Version.h @@ -4,7 +4,7 @@ // 版本字符串 #define STATORWORKPIECEPOSITION_APP_NAME "转子钢芯定位" #define STATORWORKPIECEPOSITION_APP_KEY "WorkpieceRotorApp" -#define STATORWORKPIECEPOSITION_VERSION_STRING "1.2.0" +#define STATORWORKPIECEPOSITION_VERSION_STRING "1.2.2" #define STATORWORKPIECEPOSITION_BUILD_STRING "1" #define STATORWORKPIECEPOSITION_FULL_VERSION_STRING "V" STATORWORKPIECEPOSITION_VERSION_STRING "_" STATORWORKPIECEPOSITION_BUILD_STRING diff --git a/App/StatorWorkpiecePosition/WorkpieceRotorApp/Version.md b/App/StatorWorkpiecePosition/WorkpieceRotorApp/Version.md index 88d136f7..9a73b5fa 100644 --- a/App/StatorWorkpiecePosition/WorkpieceRotorApp/Version.md +++ b/App/StatorWorkpiecePosition/WorkpieceRotorApp/Version.md @@ -1,3 +1,12 @@ +# 1.2.2 +## build_1 20261012 +1. 更新模型 + +# 1.2.1 +## build_1 20261010 +1. 更新算法：解决误检 +2. 更新模型 + # 1.2.0 ## build_1 20261008 1. 增加了logo diff --git a/AppAlgo/WorkpieceRotorModel/Arm/models/model.rknn b/AppAlgo/WorkpieceRotorModel/Arm/models/model.rknn index bdb36a9b..4c3f1f51 100644 Binary files a/AppAlgo/WorkpieceRotorModel/Arm/models/model.rknn and b/AppAlgo/WorkpieceRotorModel/Arm/models/model.rknn differ diff --git a/AppAlgo/WorkpieceRotorModel/Arm/models/model.yaml b/AppAlgo/WorkpieceRotorModel/Arm/models/model.yaml index bb35b964..1c83b608 100644 --- a/AppAlgo/WorkpieceRotorModel/Arm/models/model.yaml +++ b/AppAlgo/WorkpieceRotorModel/Arm/models/model.yaml @@ -7,8 +7,8 @@ target_platform: "rk3588" model_family: "yolo8" output_contract: "task_specific" input: - width: 1280 - height: 1280 + width: 1568 + height: 1568 format: "rgb" layout: "nhwc" normalization: diff --git a/AppAlgo/WorkpieceRotorModel/Windows/models/model.onnx b/AppAlgo/WorkpieceRotorModel/Windows/models/model.onnx index f3765f45..617b1ae0 100644 Binary files a/AppAlgo/WorkpieceRotorModel/Windows/models/model.onnx and b/AppAlgo/WorkpieceRotorModel/Windows/models/model.onnx differ diff --git a/AppAlgo/WorkpieceRotorModel/Windows/models/model.yaml b/AppAlgo/WorkpieceRotorModel/Windows/models/model.yaml index 2c2e9a61..e25506f5 100644 --- a/AppAlgo/WorkpieceRotorModel/Windows/models/model.yaml +++ b/AppAlgo/WorkpieceRotorModel/Windows/models/model.yaml @@ -9,8 +9,8 @@ output_contract: "task_specific" runtime: backend_library: "../lib/yolo_backend_onnx_cpu.dll" input: - width: 1280 - height: 1280 + width: 1568 + height: 1568 format: "rgb" layout: "nhwc" normalization: diff --git a/AppAlgo/hybridPosePositioning/Arm/aarch64/libhybridPosePositioning.so b/AppAlgo/hybridPosePositioning/Arm/aarch64/libhybridPosePositioning.so index 55cef20e..cbf5c394 100644 Binary files a/AppAlgo/hybridPosePositioning/Arm/aarch64/libhybridPosePositioning.so and b/AppAlgo/hybridPosePositioning/Arm/aarch64/libhybridPosePositioning.so differ diff --git a/AppAlgo/hybridPosePositioning/Windows/x64/Debug/baseAlgorithm.dll b/AppAlgo/hybridPosePositioning/Windows/x64/Debug/baseAlgorithm.dll index 61c361b2..4bff86b9 100644 Binary files a/AppAlgo/hybridPosePositioning/Windows/x64/Debug/baseAlgorithm.dll and b/AppAlgo/hybridPosePositioning/Windows/x64/Debug/baseAlgorithm.dll differ diff --git a/AppAlgo/hybridPosePositioning/Windows/x64/Debug/baseAlgorithm.pdb b/AppAlgo/hybridPosePositioning/Windows/x64/Debug/baseAlgorithm.pdb index 3a6abafd..2e3af71a 100644 Binary files a/AppAlgo/hybridPosePositioning/Windows/x64/Debug/baseAlgorithm.pdb and b/AppAlgo/hybridPosePositioning/Windows/x64/Debug/baseAlgorithm.pdb differ diff --git a/AppAlgo/hybridPosePositioning/Windows/x64/Debug/hybridPosePositioning.dll b/AppAlgo/hybridPosePositioning/Windows/x64/Debug/hybridPosePositioning.dll index 38c351ae..cbe087f1 100644 Binary files a/AppAlgo/hybridPosePositioning/Windows/x64/Debug/hybridPosePositioning.dll and b/AppAlgo/hybridPosePositioning/Windows/x64/Debug/hybridPosePositioning.dll differ diff --git a/AppAlgo/hybridPosePositioning/Windows/x64/Debug/hybridPosePositioning.pdb b/AppAlgo/hybridPosePositioning/Windows/x64/Debug/hybridPosePositioning.pdb index f37f39a7..6a7daa57 100644 Binary files a/AppAlgo/hybridPosePositioning/Windows/x64/Debug/hybridPosePositioning.pdb and b/AppAlgo/hybridPosePositioning/Windows/x64/Debug/hybridPosePositioning.pdb differ diff --git a/AppAlgo/hybridPosePositioning/Windows/x64/Release/baseAlgorithm.dll b/AppAlgo/hybridPosePositioning/Windows/x64/Release/baseAlgorithm.dll index 18bbf526..3c32a33a 100644 Binary files a/AppAlgo/hybridPosePositioning/Windows/x64/Release/baseAlgorithm.dll and b/AppAlgo/hybridPosePositioning/Windows/x64/Release/baseAlgorithm.dll differ diff --git a/AppAlgo/hybridPosePositioning/Windows/x64/Release/baseAlgorithm.pdb b/AppAlgo/hybridPosePositioning/Windows/x64/Release/baseAlgorithm.pdb index 3a571d77..028e4b5c 100644 Binary files a/AppAlgo/hybridPosePositioning/Windows/x64/Release/baseAlgorithm.pdb and b/AppAlgo/hybridPosePositioning/Windows/x64/Release/baseAlgorithm.pdb differ diff --git a/AppAlgo/hybridPosePositioning/Windows/x64/Release/hybridPosePositioning.dll b/AppAlgo/hybridPosePositioning/Windows/x64/Release/hybridPosePositioning.dll index 69749270..1475e285 100644 Binary files a/AppAlgo/hybridPosePositioning/Windows/x64/Release/hybridPosePositioning.dll and b/AppAlgo/hybridPosePositioning/Windows/x64/Release/hybridPosePositioning.dll differ diff --git a/AppAlgo/hybridPosePositioning/Windows/x64/Release/hybridPosePositioning.pdb b/AppAlgo/hybridPosePositioning/Windows/x64/Release/hybridPosePositioning.pdb index 69630b8a..df5c9465 100644 Binary files a/AppAlgo/hybridPosePositioning/Windows/x64/Release/hybridPosePositioning.pdb and b/AppAlgo/hybridPosePositioning/Windows/x64/Release/hybridPosePositioning.pdb differ diff --git a/GrabBagPrj/AppList.md b/GrabBagPrj/AppList.md index 6c66148d..c3dc5542 100644 --- a/GrabBagPrj/AppList.md +++ b/GrabBagPrj/AppList.md @@ -7,7 +7,7 @@ | 1 | 自动拆包 | GrabBag | 1.3.6.2 | | 2 | 皮带撕裂 | BeltTearingServer | 3.0.0.1 | | 3 | 孔洞检测 | HoleDetection | 1.1.6.2 | -| 4 | 棒材定位 | RodAndBarPosition | 1.1.6.1 | +| 4 | 棒材定位 | RodAndBarPosition | 1.1.8.1 | | 5 | 车轮拱高测量 | WheelMeasure | 1.2.2.2 | | 6 | 定子定位 | StatorPosition | 1.0.0.1 | | 7 | 焊接 | LapWeld | 1.0.0.1 | @@ -26,4 +26,4 @@ | 20 | 砂轮盘孔定位 | DiscHolePose | 1.0.0.1 | | 21 | 玖瑞工件定位 | JiuruiWorkpiecePose | 1.0.0.1 | | 22 | 锥形工件定位 | WorkpieceTapered | 1.0.1.1 | -| 23 | 转子钢芯定位 | WorkpieceRotor | 1.0.3.1 | +| 23 | 转子钢芯定位 | WorkpieceRotor | 1.2.2.1 |