YangOne/GrabBag
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

螺杆更新，发布拷贝文件更新

Browse Source
This commit is contained in:
杰仔 2026-07-15 14:42:02 +08:00
parent 028dd20c0e
commit b7b8789ff7
5 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
App/DroneScrewbolt/DroneScrewCtrlApp/Version.h
View File

@ -2,9 +2,9 @@
#define DRONESCREWCTRL_VERSION_H #define DRONESCREWCTRL_VERSION_H
#define DRONESCREWCTRL_APP_NAME "无人机螺杆控制端" #define DRONESCREWCTRL_APP_NAME "无人机螺杆控制端"
#define DRONESCREWCTRL_VERSION_STRING "1.0.0" #define DRONESCREWCTRL_VERSION_STRING "1.0.1"
#define DRONESCREWCTRL_BUILD_STRING "6" #define DRONESCREWCTRL_BUILD_STRING "1"
#define DRONESCREWCTRL_FULL_VERSION_STRING "V1.0.0_6" #define DRONESCREWCTRL_FULL_VERSION_STRING "V1.0.1_1"
inline const char* GetDroneScrewCtrlFullVersion() { return DRONESCREWCTRL_FULL_VERSION_STRING; } inline const char* GetDroneScrewCtrlFullVersion() { return DRONESCREWCTRL_FULL_VERSION_STRING; }

4
App/DroneScrewbolt/DroneScrewServer/Version.h
View File

@ -7,7 +7,7 @@
#define DRONESCREWSERVER_DESCRIPTION "Drone-mounted screw/bolt detection server (board 1)" #define DRONESCREWSERVER_DESCRIPTION "Drone-mounted screw/bolt detection server (board 1)"
#define DRONESCREWSERVER_COMPANY_NAME "VisionTech" #define DRONESCREWSERVER_COMPANY_NAME "VisionTech"
#define DRONESCREWSERVER_COPYRIGHT "Copyright (C) 2026" #define DRONESCREWSERVER_COPYRIGHT "Copyright (C) 2026"
#define DRONESCREWSERVER_VERSION_STRING "1.0.0" #define DRONESCREWSERVER_VERSION_STRING "1.0.1"
#define DRONESCREWSERVER_VERSION_BUILD "6" #define DRONESCREWSERVER_VERSION_BUILD "1"
#endif // DRONESCREW_VERSION_H #endif // DRONESCREW_VERSION_H

2
App/DroneScrewbolt/DroneScrewServer/setup_mvs_env.sh
View File

@ -10,7 +10,7 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
PROJECT_ROOT="$(cd "${SCRIPT_DIR}/../../.." && pwd)" PROJECT_ROOT="$(cd "${SCRIPT_DIR}/../../.." && pwd)"
# MVS SDK 路径 # 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 if [ ! -d "${MVS_SDK_PATH}" ]; then
echo "错误：MVS SDK 路径不存在: ${MVS_SDK_PATH}" echo "错误：MVS SDK 路径不存在: ${MVS_SDK_PATH}"

4
GrabBagPrj/AppList.md
View File

@ -21,8 +21,8 @@
| 15 | 轮胎孔定位 | TireHolePose | 1.0.2.1 | | 15 | 轮胎孔定位 | TireHolePose | 1.0.2.1 |
| 16 | 坑孔定位 | HolePitPosition | 无 | | 16 | 坑孔定位 | HolePitPosition | 无 |
| 17 | 钢筋焊缝定位 | RodWeldSeam | 1.0.0.1 | | 17 | 钢筋焊缝定位 | RodWeldSeam | 1.0.0.1 |
| 18 | 无人机螺杆检测服务端 | DroneScrewServer | 1.0.0.6 | | 18 | 无人机螺杆检测服务端 | DroneScrewServer | 1.0.1.1 |
| 19 | 无人机螺杆检测控制端 | DroneScrewCtrlApp | 1.0.0.6 | | 19 | 无人机螺杆检测控制端 | DroneScrewCtrlApp | 1.0.1.1 |
| 20 | 砂轮盘孔定位 | DiscHolePose | 1.0.0.1 | | 20 | 砂轮盘孔定位 | DiscHolePose | 1.0.0.1 |
| 21 | 玖瑞工件定位 | JiuruiWorkpiecePose | 1.0.0.1 | | 21 | 玖瑞工件定位 | JiuruiWorkpiecePose | 1.0.0.1 |

22
GrabBagPrj/project_registry.sh
View File

@ -87,7 +87,7 @@ DESKTOP_PROJECTS=(
extra_copy=${COPY_ALL_BUILD_LIBS}" extra_copy=${COPY_ALL_BUILD_LIBS}"
"BagThreadPosition;bagThreadPositioning;\ "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;\ "HoleDetection;holeDetection;\
algo_copy=globa|AppAlgo/holeDetection/arm/release/*.so*|usr/lib;\ algo_copy=globa|AppAlgo/holeDetection/arm/release/*.so*|usr/lib;\
@ -95,19 +95,19 @@ DESKTOP_PROJECTS=(
"TunnelChannel;channelSpaceMeasure;\ "TunnelChannel;channelSpaceMeasure;\
ld_conf=/usr/lib/HCNetSDKCom;\ ld_conf=/usr/lib/HCNetSDKCom;\
extra_copy=${COPY_ALL_BUILD_LIBS},globa|SDK/Device/HCNetSDK/Arm64/lib/*.so*|usr/lib;\ extra_copy=${COPY_ALL_BUILD_LIBS},globa|Device/SDK/HCNetSDK/Arm64/lib/*.so*|usr/lib;\
optional_copy=globa|SDK/Device/HCNetSDK/Arm64/lib/HCNetSDKCom/*.so*|usr/lib/HCNetSDKCom" optional_copy=globa|Device/SDK/HCNetSDK/Arm64/lib/HCNetSDKCom/*.so*|usr/lib/HCNetSDKCom"
"ParkingSpaceGuide;none;\ "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;\ 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;\ "WorkpiecePosition;binocularMark;\
app_dir=App/WorkpieceProject/WorkpiecePositionApp;\ app_dir=App/WorkpieceProject/WorkpiecePositionApp;\
version_macro=WORKPIECEPOSITION;\ version_macro=WORKPIECEPOSITION;\
opencv=opencv480;\ opencv=opencv480;\
device_copy=globa|SDK/Device/EpicEye/lib/arm/*.so*|usr/lib;\ device_copy=none;\
extra_copy=${COPY_ALL_BUILD_LIBS}" extra_copy=${COPY_ALL_BUILD_LIBS}"
"WorkpieceSplice;binocularMark;\ "WorkpieceSplice;binocularMark;\
@ -121,7 +121,7 @@ DESKTOP_PROJECTS=(
app_dir=App/DroneScrewbolt/DroneScrewCtrlApp;\ app_dir=App/DroneScrewbolt/DroneScrewCtrlApp;\
version_macro=DRONESCREWCTRL;\ version_macro=DRONESCREWCTRL;\
device_copy=none;\ 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)" description=DroneScrew Ctrl (board 2)"
) )
@ -132,7 +132,7 @@ SERVICE_PROJECTS=(
"BinocularMark;binocularMark;\ "BinocularMark;binocularMark;\
opencv=opencv480;\ 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}" extra_copy=${COPY_ALL_BUILD_LIBS}"
"DroneScrewServer;none;\ "DroneScrewServer;none;\
@ -140,9 +140,9 @@ SERVICE_PROJECTS=(
version_macro=DRONESCREWSERVER;\ version_macro=DRONESCREWSERVER;\
app_suffix=Server;\ app_suffix=Server;\
opencv=opencv450;\ 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;\ 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/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;\ 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|SDK/Device/MVS/MVS_STD_V3.0.1_251113/MVS-3.0.1_aarch64_20251113/lib/aarch64/ThirdParty/*.so*|usr/lib;\ 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)" description=DroneScrew Server (board 1)"
) )