diff --git a/.gitignore b/.gitignore index b5405151..34419e4a 100644 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,8 @@ **/build* **/qbuild **/bin +**/GrabBagPrj/x64 +**/Test/**/x64 *.o *.d diff --git a/App/App.pro b/App/App.pro index 9332290f..fb378196 100644 --- a/App/App.pro +++ b/App/App.pro @@ -5,7 +5,8 @@ TEMPLATE = subdirs # 可用值:GrabBag, # BeltTearing, # LapWeld, Workpiece, ParticleSize, -# BinocularMark, WorkpieceProject, TunnelChannel, WheelMeasure, ScrewPosition, BagThreadPosition, FireBrickPosition, WorkpieceHole, StatorPosition, HoleDetection, RodAndBarPosition, RodWeldSeam +# BinocularMark, WorkpieceProject, TunnelChannel, WheelMeasure, ScrewPosition, BagThreadPosition, FireBrickPosition, WorkpieceHole, StatorPosition, HoleDetection, RodAndBarPosition, RodWeldSeam, +# DroneScrewServer (仅 Server), DroneScrewCtrlApp (仅 CtrlApp), DroneScrewbolt (Server + CtrlApp), DiscHolePose, TireHolePose isEmpty(TARGET_APP) { # 未指定则编译全部 @@ -26,6 +27,9 @@ isEmpty(TARGET_APP) { SUBDIRS += HolePitPosition/HolePitPosition.pro # 坑孔定位 SUBDIRS += RodAndBarPosition/RodAndBarPosition.pro # 棒材定位 SUBDIRS += RodWeldSeam/RodWeldSeam.pro # 钢筋焊缝定位 + SUBDIRS += DroneScrewbolt/DroneScrewbolt.pro # 无人机螺杆检测(双板:板一 Server + 板二 Ctrl) + SUBDIRS += DiscHolePose/DiscHolePose.pro # 砂轮盘孔定位 + SUBDIRS += TireHolePose/TireHolePose.pro # 轮胎孔定位 } else { equals(TARGET_APP, "GrabBag") { SUBDIRS += GrabBag/GrabBag.pro @@ -61,6 +65,16 @@ isEmpty(TARGET_APP) { SUBDIRS += RodAndBarPosition/RodAndBarPosition.pro } else:equals(TARGET_APP, "RodWeldSeam") { SUBDIRS += RodWeldSeam/RodWeldSeam.pro + } else:equals(TARGET_APP, "DroneScrewServer") { + SUBDIRS += DroneScrewbolt/DroneScrewbolt.pro + } else:equals(TARGET_APP, "DroneScrewCtrlApp") { + SUBDIRS += DroneScrewbolt/DroneScrewbolt.pro + } else:equals(TARGET_APP, "DroneScrewbolt") { + SUBDIRS += DroneScrewbolt/DroneScrewbolt.pro + } else:equals(TARGET_APP, "DiscHolePose") { + SUBDIRS += DiscHolePose/DiscHolePose.pro + } else:equals(TARGET_APP, "TireHolePose") { + SUBDIRS += TireHolePose/TireHolePose.pro } else { error("无效的 TARGET_APP: $$TARGET_APP") } diff --git a/App/NewApp.txt b/App/NewApp.txt index f90a0957..4be7d75e 100644 --- a/App/NewApp.txt +++ b/App/NewApp.txt @@ -1,10 +1,16 @@ -App下新建RodWeldSeam项目 - 1. 复制RodAndBarPosition进行修改 - 2. 使用的算法是 @AppAlgo/rodAndBarDetection +App下新建TireHolePose项目 + 1. 复制WorkpieceHole进行修改 参数配置方式要类比过来 + 2. 使用的算法是 @AppAlgo/workpieceHolePositioning 3. 使用VzNLSDK 设备 - 4. 结果参考算法目录下*test.cpp rodWeldSeamPosition_test接口的测试,参数也参考这个内容 - 5. 结果列表进行更新 - 6. 根据算法需要的参数进行修改config,并实现从页面进行修改参数 - 7. App.pro 中增加编译选项,并且在GrabBagPrj/buildArmPrj.sh编译选项 - 8. 增加arm下的pkg脚本 - 9. 项目的协议文档也给搞一份ModbusTCP的 \ No newline at end of file + 4. 算法接口是sx_getTireHolePose + 5. 结果参考算法目录下*test.cpp workpieceHolePositioning_test接口的测试,参数也参考这个内容,参数配置类比WorkpieceHole + 6. 结果列表进行更新 + 7. 根据算法需要的参数进行修改config,并实现从页面进行修改参数 + 8. App.pro 中增加编译选项,并且在GrabBagPrj/buildArmPrj.sh编译选项 + 9. 增加arm下的pkg脚本 + 10. 项目的协议文档也给搞一份ModbusTCP的 + 11. tcp 协议格式参考@App/DiscHolePose/DiscHolePoseApp 也给一份协议 + + + + App/DiscHolePose项目,使用的算法是 @AppAlgo/workpieceHolePositioning,算法接口是sx_getDiscHolePose 和 sx_getDiscRackCenterPosition.使用VzNLSDK设备,检查一遍完整的项目逻辑,可参考App/ScrewPosition \ No newline at end of file diff --git a/Test/Test.pro b/Test/Test.pro index 07edc0d4..6de5578d 100644 --- a/Test/Test.pro +++ b/Test/Test.pro @@ -6,5 +6,7 @@ TEMPLATE = subdirs win32-msvc { + # WDRemoteReceiver 模块测试 + SUBDIRS += WDRemoteReceiverTest/WDRemoteReceiverTest.pro SUBDIRS += RsLidarTest/RsLidarTest.pro }