diff --git a/App/DroneScrewbolt/DroneScrewCtrlApp/Version.h b/App/DroneScrewbolt/DroneScrewCtrlApp/Version.h index db0412d9..5f5b1831 100644 --- a/App/DroneScrewbolt/DroneScrewCtrlApp/Version.h +++ b/App/DroneScrewbolt/DroneScrewCtrlApp/Version.h @@ -2,9 +2,9 @@ #define DRONESCREWCTRL_VERSION_H #define DRONESCREWCTRL_APP_NAME "无人机螺杆控制端" -#define DRONESCREWCTRL_VERSION_STRING "1.0.0" -#define DRONESCREWCTRL_BUILD_STRING "6" -#define DRONESCREWCTRL_FULL_VERSION_STRING "V1.0.0_6" +#define DRONESCREWCTRL_VERSION_STRING "1.0.1" +#define DRONESCREWCTRL_BUILD_STRING "1" +#define DRONESCREWCTRL_FULL_VERSION_STRING "V1.0.1_1" inline const char* GetDroneScrewCtrlFullVersion() { return DRONESCREWCTRL_FULL_VERSION_STRING; } diff --git a/App/DroneScrewbolt/DroneScrewServer/Version.h b/App/DroneScrewbolt/DroneScrewServer/Version.h index 3b989b83..372599f1 100644 --- a/App/DroneScrewbolt/DroneScrewServer/Version.h +++ b/App/DroneScrewbolt/DroneScrewServer/Version.h @@ -7,7 +7,7 @@ #define DRONESCREWSERVER_DESCRIPTION "Drone-mounted screw/bolt detection server (board 1)" #define DRONESCREWSERVER_COMPANY_NAME "VisionTech" #define DRONESCREWSERVER_COPYRIGHT "Copyright (C) 2026" -#define DRONESCREWSERVER_VERSION_STRING "1.0.0" -#define DRONESCREWSERVER_VERSION_BUILD "6" +#define DRONESCREWSERVER_VERSION_STRING "1.0.1" +#define DRONESCREWSERVER_VERSION_BUILD "1" #endif // DRONESCREW_VERSION_H diff --git a/App/DroneScrewbolt/DroneScrewServer/setup_mvs_env.sh b/App/DroneScrewbolt/DroneScrewServer/setup_mvs_env.sh index 5fa4d889..dc2941af 100644 --- a/App/DroneScrewbolt/DroneScrewServer/setup_mvs_env.sh +++ b/App/DroneScrewbolt/DroneScrewServer/setup_mvs_env.sh @@ -10,7 +10,7 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PROJECT_ROOT="$(cd "${SCRIPT_DIR}/../../.." && pwd)" # MVS SDK 路径 -MVS_SDK_PATH="${PROJECT_ROOT}/SDK/Device/MVS/MVS_STD_V3.0.1_251113/MVS-3.0.1_aarch64_20251113" +MVS_SDK_PATH="${PROJECT_ROOT}/Device/SDK/MVS/MVS_STD_V3.0.1_251113/MVS-3.0.1_aarch64_20251113" if [ ! -d "${MVS_SDK_PATH}" ]; then echo "错误：MVS SDK 路径不存在: ${MVS_SDK_PATH}" diff --git a/GrabBagPrj/AppList.md b/GrabBagPrj/AppList.md index cc1b5346..0f7cfe5b 100644 --- a/GrabBagPrj/AppList.md +++ b/GrabBagPrj/AppList.md @@ -21,8 +21,8 @@ | 15 | 轮胎孔定位 | TireHolePose | 1.0.2.1 | | 16 | 坑孔定位 | HolePitPosition | 无 | | 17 | 钢筋焊缝定位 | RodWeldSeam | 1.0.0.1 | -| 18 | 无人机螺杆检测服务端 | DroneScrewServer | 1.0.0.6 | -| 19 | 无人机螺杆检测控制端 | DroneScrewCtrlApp | 1.0.0.6 | +| 18 | 无人机螺杆检测服务端 | DroneScrewServer | 1.0.1.1 | +| 19 | 无人机螺杆检测控制端 | DroneScrewCtrlApp | 1.0.1.1 | | 20 | 砂轮盘孔定位 | DiscHolePose | 1.0.0.1 | | 21 | 玖瑞工件定位 | JiuruiWorkpiecePose | 1.0.0.1 | diff --git a/GrabBagPrj/project_registry.sh b/GrabBagPrj/project_registry.sh index aa813762..fa8a08b3 100644 --- a/GrabBagPrj/project_registry.sh +++ b/GrabBagPrj/project_registry.sh @@ -87,7 +87,7 @@ DESKTOP_PROJECTS=( extra_copy=${COPY_ALL_BUILD_LIBS}" "BagThreadPosition;bagThreadPositioning;\ - extra_copy=${COPY_ALL_BUILD_LIBS},glob|SDK/Device/gl_linelaser_sdk/aarch64_linux/*.so|usr/lib" + extra_copy=${COPY_ALL_BUILD_LIBS},glob|Device/SDK/gl_linelaser_sdk/aarch64_linux/*.so|usr/lib" "HoleDetection;holeDetection;\ algo_copy=globa|AppAlgo/holeDetection/arm/release/*.so*|usr/lib;\ @@ -95,19 +95,19 @@ DESKTOP_PROJECTS=( "TunnelChannel;channelSpaceMeasure;\ ld_conf=/usr/lib/HCNetSDKCom;\ - extra_copy=${COPY_ALL_BUILD_LIBS},globa|SDK/Device/HCNetSDK/Arm64/lib/*.so*|usr/lib;\ - optional_copy=globa|SDK/Device/HCNetSDK/Arm64/lib/HCNetSDKCom/*.so*|usr/lib/HCNetSDKCom" + extra_copy=${COPY_ALL_BUILD_LIBS},globa|Device/SDK/HCNetSDK/Arm64/lib/*.so*|usr/lib;\ + optional_copy=globa|Device/SDK/HCNetSDK/Arm64/lib/HCNetSDKCom/*.so*|usr/lib/HCNetSDKCom" "ParkingSpaceGuide;none;\ - device_copy=globa|SDK/Device/MVS/MVS_STD_V3.0.1_251113/MVS-3.0.1_aarch64_20251113/lib/aarch64/*.so*|usr/lib;\ + device_copy=globa|Device/SDK/MVS/MVS_STD_V3.0.1_251113/MVS-3.0.1_aarch64_20251113/lib/aarch64/*.so*|usr/lib;\ extra_copy=${COPY_ALL_BUILD_LIBS},globa|SDK/poco/Arm/aarch64/lib/libPocoNet.so*|usr/lib,globa|SDK/poco/Arm/aarch64/lib/libPocoFoundation.so*|usr/lib;\ - optional_copy=globa|SDK/Device/MVS/MVS_STD_V3.0.1_251113/MVS-3.0.1_aarch64_20251113/lib/aarch64/ThirdParty/*.so*|usr/lib" + optional_copy=globa|Device/SDK/MVS/MVS_STD_V3.0.1_251113/MVS-3.0.1_aarch64_20251113/lib/aarch64/ThirdParty/*.so*|usr/lib" "WorkpiecePosition;binocularMark;\ app_dir=App/WorkpieceProject/WorkpiecePositionApp;\ version_macro=WORKPIECEPOSITION;\ opencv=opencv480;\ - device_copy=globa|SDK/Device/EpicEye/lib/arm/*.so*|usr/lib;\ + device_copy=none;\ extra_copy=${COPY_ALL_BUILD_LIBS}" "WorkpieceSplice;binocularMark;\ @@ -121,7 +121,7 @@ DESKTOP_PROJECTS=( app_dir=App/DroneScrewbolt/DroneScrewCtrlApp;\ version_macro=DRONESCREWCTRL;\ device_copy=none;\ - extra_copy=${COPY_ALL_BUILD_LIBS},globa|SDK/ZeroMQ/Arm/aarch64/libzmq.so*|usr/lib;\ + extra_copy=${COPY_ALL_BUILD_LIBS},globa|Nets/SDK/ZeroMQ/Arm/aarch64/libzmq.so*|usr/lib;\ description=DroneScrew Ctrl (board 2)" ) @@ -132,7 +132,7 @@ SERVICE_PROJECTS=( "BinocularMark;binocularMark;\ opencv=opencv480;\ - device_copy=glob|SDK/Device/Galaxy/aarch64/lib/armv8/*|usr/lib;\ + device_copy=glob|Device/SDK/Galaxy/aarch64/lib/armv8/*|usr/lib;\ extra_copy=${COPY_ALL_BUILD_LIBS}" "DroneScrewServer;none;\ @@ -140,9 +140,9 @@ SERVICE_PROJECTS=( version_macro=DRONESCREWSERVER;\ app_suffix=Server;\ opencv=opencv450;\ - device_copy=globa|SDK/Device/MVS/MVS_STD_V3.0.1_251113/MVS-3.0.1_aarch64_20251113/lib/aarch64/*.so*|usr/lib;\ - extra_copy=${COPY_ALL_BUILD_LIBS},globa|SDK/ZeroMQ/Arm/aarch64/libzmq.so*|usr/lib,file|SDK/mediamtx/arm64/mediamtx|opt/dronescrewserver/bin/mediamtx,file|App/DroneScrewbolt/DroneScrewServer/service/mediamtx_dronescrew.yml|opt/dronescrewserver/etc/mediamtx_dronescrew.yml,file|App/DroneScrewbolt/DroneScrewServer/service/mediamtx-dronescrew.service|opt/dronescrewserver/etc/mediamtx-dronescrew.service,globa|AppAlgo/stereo_bolt_delivery/lib/*.so*|usr/lib,dir|AppAlgo/stereo_bolt_delivery/config|opt/dronescrewserver/config,dir|AppAlgo/stereo_bolt_delivery/calib|opt/dronescrewserver/calib,dir|AppAlgo/stereo_bolt_delivery/weights|opt/dronescrewserver/weights;\ - optional_copy=globa|SDK/Protobuf_3_20/Arm/aarch64/libprotobuf.so*|usr/lib,globa|SDK/Device/MVS/MVS_STD_V3.0.1_251113/MVS-3.0.1_aarch64_20251113/lib/aarch64/ThirdParty/*.so*|usr/lib;\ + device_copy=globa|Device/SDK/MVS/MVS_STD_V3.0.1_251113/MVS-3.0.1_aarch64_20251113/lib/aarch64/*.so*|usr/lib;\ + extra_copy=${COPY_ALL_BUILD_LIBS},globa|Nets/SDK/ZeroMQ/Arm/aarch64/libzmq.so*|usr/lib,file|SDK/mediamtx/arm64/mediamtx|opt/dronescrewserver/bin/mediamtx,file|App/DroneScrewbolt/DroneScrewServer/service/mediamtx_dronescrew.yml|opt/dronescrewserver/etc/mediamtx_dronescrew.yml,file|App/DroneScrewbolt/DroneScrewServer/service/mediamtx-dronescrew.service|opt/dronescrewserver/etc/mediamtx-dronescrew.service,globa|AppAlgo/stereo_bolt_delivery/lib/*.so*|usr/lib,dir|AppAlgo/stereo_bolt_delivery/config|opt/dronescrewserver/config,dir|AppAlgo/stereo_bolt_delivery/calib|opt/dronescrewserver/calib,dir|AppAlgo/stereo_bolt_delivery/weights|opt/dronescrewserver/weights;\ + optional_copy=globa|SDK/Protobuf_3_20/Arm/aarch64/libprotobuf.so*|usr/lib,globa|Device/SDK/MVS/MVS_STD_V3.0.1_251113/MVS-3.0.1_aarch64_20251113/lib/aarch64/ThirdParty/*.so*|usr/lib;\ description=DroneScrew Server (board 1)" )