LingxinMeng 1 rok temu
rodzic
commit
a8d8cd1fbc

+ 33 - 0
aarch64/pji/README.md

@@ -0,0 +1,33 @@
+# 一、由于机器人由启用单个相机变成两个相机,所以话题有多变化
+1、只启用了单个相机的机器
+/amcl_pose
+/camera/color/image_raw
+/camera/depth/points
+/diagnostics
+/locate_info
+/obstacle_detection
+/odom
+/move_base/global_costmap/costmap
+/move_base/global_costmap/costmap_updates     
+/move_base/local_costmap/costmap
+/move_base/local_costmap/costmap_updates
+/scan
+/scan_map_icp_amcl_node/scan_point_transformed
+/sys_info
+# 2、启用了两个相机的机器
+/amcl_pose
+/ob_camera_01/color/image_raw(上边的摄像头)
+/ob_camera_01/depth/points(上边的摄像头)
+/ob_camera_02/color/image_raw(下边的摄像头)
+/ob_camera_02/depth/points(下边的摄像头)
+/diagnostics
+/locate_info
+/obstacle_detection(有引导任务的时候才会有)
+/odom
+/move_base/global_costmap/costmap
+/move_base/global_costmap/costmap_updates     
+/move_base/local_costmap/costmap
+/move_base/local_costmap/costmap_updates
+/scan
+/scan_map_icp_amcl_node/scan_point_transformed
+/sys_info

+ 23 - 35
aarch64/pji/common/config/yaml/pjirobot1-cloud-config.yaml

@@ -4,7 +4,7 @@ platform:
   url-task-poll: http://1.202.169.139:8081/device/task/poll
   url-task: http://1.202.169.139:8081/device/task
 full-collect: false
-bag-number: 10
+bag-number: 20
 config-refresh-interval: 60
 disk:
   name: /dev/mmcblk0p8 # 磁盘名称
@@ -17,31 +17,16 @@ rpc-port: 12341
 ros:
   master-address: 192.168.1.104:11311
   nodes:
-    - /adapters_nav
     - /amcl
-    - /auto_dock
-    - /camera/camera
-    - /engine
-    - /lidar_filter_bz
+    - /ob_camera_01/camera
+    - /ob_camera_02/camera
+    - /node_diagnostics
     - /localization_monitor_node
-    - /ltme_node
-    - /map_merge_node
-    - /mode_manage
-    - /monitor
     - /move_base
-    - /node_diagnostics
-    - /node_map_convert
-    - /node_ota
-    - /pointcloud_to_laserscan
-    - /robot_pose_publisher_node
-    - /robot_state_publisher
-    - /robot_static_node
-    - /rosout
-    - /scan_map_icp_amcl_node
     - /sensor_fusion_node
-    - /slip_check_node
-    - /srf_laser_odometry_node
-    - /trii_receive
+    - /ltme_node
+    - /scan_map_icp_amcl_node
+    - /monitor
 
 hosts:
   - name: node1
@@ -70,20 +55,23 @@ hosts:
         - "ROS_HOSTNAME=192.168.1.104"
         - "CMAKE_PREFIX_PATH=/opt/ros/melodic"
     topics:
-      - /amcl_pose
-      - /camera/color/image_raw
-      - /camera/depth/points
-      - /diagnostics
-      - /locate_info
-      - /obstacle_detection
-      - /odom
-      - /move_base/global_costmap/costmap
-      - /move_base/global_costmap/costmap_updates
-      - /move_base/local_costmap/costmap
-      - /move_base/local_costmap/costmap_updates
-      - /scan
-      - /scan_map_icp_amcl_node/scan_point_transformed
+      - /amcl_pose # /amcl
+      - /ob_camera_01/color/image_raw # /ob_camera_01/camera
+      - /ob_camera_01/depth/points # /ob_camera_01/camera
+      - /ob_camera_02/color/image_raw # /ob_camera_02/camera
+      - /ob_camera_02/depth/points # /ob_camera_02/camera
+      - /diagnostics # /amcl /node_diagnostics
+      - /locate_info # /localization_monitor_node
+      - /obstacle_detection # /move_base
+      - /odom # /sensor_fusion_node
+      - /move_base/global_costmap/costmap # /move_base
+      - /move_base/global_costmap/costmap_updates # /move_base
+      - /move_base/local_costmap/costmap # /move_base
+      - /move_base/local_costmap/costmap_updates # /move_base
+      - /scan # /ltme_node
+      - /scan_map_icp_amcl_node/scan_point_transformed # /scan_map_icp_amcl_node
       - /sys_info
+
 triggers:
   - label: detectfault
     topics:

+ 1 - 1
aarch64/pji/common/config/yaml/pjirobot1-local-config.yaml

@@ -7,7 +7,7 @@ secret-key: ZzI1MocN3M6evTaGuTQALuBXTmUnN5tV2XUwcwXU
 # 获取oss连接信息的接口url
 url-get-oss-config: http://36.110.106.156:18379/oss/config?token=nXonLUcMtGcrQqqKiyygIwyVbvizE0wD
 # 朴津机器人数据前缀
-oss-base-prefix: pji/
+oss-base-prefix: pji-double-camera/
 # oss上的配置文件的名称
 cloud-config-filename: cloud-config.yaml
 # 将oss上的配置文件下载到本地的路径

+ 164 - 0
aarch64/pji/common/config/yaml/单摄像头-cloud-config.yaml

@@ -0,0 +1,164 @@
+---
+platform:
+  url-device-auth: http://1.202.169.139:8081/device/auth
+  url-task-poll: http://1.202.169.139:8081/device/task/poll
+  url-task: http://1.202.169.139:8081/device/task
+full-collect: false
+bag-number: 10
+config-refresh-interval: 60
+disk:
+  name: /dev/mmcblk0p8 # 磁盘名称
+  used: 20000000000 # 磁盘占用阈值,单位bytes
+bag-data-dir: /root/cicv-data-closedloop/data/
+bag-copy-dir: /root/cicv-data-closedloop/copy/
+triggers-dir: /root/cicv-data-closedloop/triggers/
+time-window-send-gap: 6
+rpc-port: 12341
+ros:
+  master-address: 192.168.1.104:11311
+  nodes:
+    - /adapters_nav
+    - /amcl
+    - /auto_dock
+    - /camera/camera
+    - /engine
+    - /lidar_filter_bz
+    - /localization_monitor_node
+    - /ltme_node
+    - /map_merge_node
+    - /mode_manage
+    - /monitor
+    - /move_base
+    - /node_diagnostics
+    - /node_map_convert
+    - /node_ota
+    - /pointcloud_to_laserscan
+    - /robot_pose_publisher_node
+    - /robot_state_publisher
+    - /robot_static_node
+    - /rosout
+    - /scan_map_icp_amcl_node
+    - /sensor_fusion_node
+    - /slip_check_node
+    - /srf_laser_odometry_node
+    - /trii_receive
+
+hosts:
+  - name: node1
+    ip: 192.168.1.104
+    rosbag:
+      path: "/opt/ros/melodic/bin/rosbag"
+      envs:
+        - "C_INCLUDE_PATH=/usr/include/drm:"
+        - "USER=root"
+        - "ROS_PACKAGE_PATH=/opt/ros/melodic/share"
+        - "LD_LIBRARY_PATH=/opt/ros/melodic/lib:/opt/ros/melodic/lib/aarch64-linux-gnu"
+        - "ROS_ETC_DIR=/opt/ros/melodic/etc/ros"
+        - "SHLVL=1"
+        - "HOME=/root"
+        - "ROS_PYTHON_VERSION=2"
+        - "PCMANFM_OUTLINE_MODE=on"
+        - "CPLUS_INCLUDE_PATH=/usr/include/drm:"
+        - "ROS_DISTRO=melodic"
+        - "ROS_VERSION=1"
+        - "PKG_CONFIG_PATH=/opt/ros/melodic/lib/pkgconfig"
+        - "PATH=/opt/ros/melodic/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/usr/local/go/bin:/root/go/bin"
+        - "ROS_ROOT=/opt/ros/melodic/share/ros"
+        - "ROSLISP_PACKAGE_DIRECTORIES="
+        - "ROS_MASTER_URI=http://192.168.1.104:11311"
+        - "PYTHONPATH=/opt/ros/melodic/lib/python2.7/dist-packages"
+        - "ROS_HOSTNAME=192.168.1.104"
+        - "CMAKE_PREFIX_PATH=/opt/ros/melodic"
+    topics:
+      - /amcl_pose
+      - /camera/color/image_raw
+      - /camera/depth/points
+      - /diagnostics
+      - /locate_info
+      - /obstacle_detection
+      - /odom
+      - /move_base/global_costmap/costmap
+      - /move_base/global_costmap/costmap_updates
+      - /move_base/local_costmap/costmap
+      - /move_base/local_costmap/costmap_updates
+      - /scan
+      - /scan_map_icp_amcl_node/scan_point_transformed
+      - /sys_info
+triggers:
+  - label: detectfault
+    topics:
+      - /camera/color/image_raw
+      - /camera/depth/points
+      - /diagnostics
+      - /locate_info
+      - /obstacle_detection
+      - /odom
+      - /move_base/global_costmap/costmap
+      - /move_base/global_costmap/costmap_updates
+      - /scan_map_icp_amcl_node/scan_point_transformed
+  - label: unstabledriving
+    topics:
+      - /camera/color/image_raw
+      - /camera/depth/points
+      - /diagnostics
+      - /locate_info
+      - /obstacle_detection
+      - /odom
+      - /move_base/global_costmap/costmap
+      - /move_base/global_costmap/costmap_updates
+      - /scan_map_icp_amcl_node/scan_point_transformed
+  - label: locationfailed
+    topics:
+      - /camera/color/image_raw
+      - /camera/depth/points
+      - /diagnostics
+      - /locate_info
+      - /obstacle_detection
+      - /odom
+      - /move_base/global_costmap/costmap
+      - /move_base/global_costmap/costmap_updates
+      - /scan_map_icp_amcl_node/scan_point_transformed
+  - label: obstacledetection
+    topics:
+      - /camera/color/image_raw
+      - /camera/depth/points
+      - /diagnostics
+      - /locate_info
+      - /obstacle_detection
+      - /odom
+      - /move_base/global_costmap/costmap
+      - /move_base/global_costmap/costmap_updates
+      - /scan_map_icp_amcl_node/scan_point_transformed
+  - label: overspeed
+    topics:
+      - /camera/color/image_raw
+      - /camera/depth/points
+      - /diagnostics
+      - /locate_info
+      - /obstacle_detection
+      - /odom
+      - /move_base/global_costmap/costmap
+      - /move_base/global_costmap/costmap_updates
+      - /scan_map_icp_amcl_node/scan_point_transformed
+  - label: cpuoveroccupied
+    topics:
+      - /camera/color/image_raw
+      - /camera/depth/points
+      - /diagnostics
+      - /locate_info
+      - /obstacle_detection
+      - /odom
+      - /move_base/global_costmap/costmap
+      - /move_base/global_costmap/costmap_updates
+      - /scan_map_icp_amcl_node/scan_point_transformed
+  - label: memoveroccupied
+    topics:
+      - /camera/color/image_raw
+      - /camera/depth/points
+      - /diagnostics
+      - /locate_info
+      - /obstacle_detection
+      - /odom
+      - /move_base/global_costmap/costmap
+      - /move_base/global_costmap/costmap_updates
+      - /scan_map_icp_amcl_node/scan_point_transformed

+ 19 - 0
aarch64/pji/common/config/yaml/单摄像头-local-config.yaml

@@ -0,0 +1,19 @@
+node:
+  name: node1
+  ip: 192.168.1.104
+# 数据闭环平台参数
+equipment-no: pjirobot1
+secret-key: ZzI1MocN3M6evTaGuTQALuBXTmUnN5tV2XUwcwXU
+# 获取oss连接信息的接口url
+url-get-oss-config: http://36.110.106.156:18379/oss/config?token=nXonLUcMtGcrQqqKiyygIwyVbvizE0wD
+# 朴津机器人数据前缀
+oss-base-prefix: pji/
+# oss上的配置文件的名称
+cloud-config-filename: cloud-config.yaml
+# 将oss上的配置文件下载到本地的路径
+cloud-config-local-path: /root/cicv-data-closedloop/config/cloud-config.yaml
+restart-cmd:
+  dir: "/root/cicv-data-closedloop/"
+  name: "sh"
+  args:
+    - "start-master.sh"

+ 152 - 0
aarch64/pji/common/config/yaml/双摄像头-cloud-config.yaml

@@ -0,0 +1,152 @@
+---
+platform:
+  url-device-auth: http://1.202.169.139:8081/device/auth
+  url-task-poll: http://1.202.169.139:8081/device/task/poll
+  url-task: http://1.202.169.139:8081/device/task
+full-collect: false
+bag-number: 10
+config-refresh-interval: 60
+disk:
+  name: /dev/mmcblk0p8 # 磁盘名称
+  used: 20000000000 # 磁盘占用阈值,单位bytes
+bag-data-dir: /root/cicv-data-closedloop/data/
+bag-copy-dir: /root/cicv-data-closedloop/copy/
+triggers-dir: /root/cicv-data-closedloop/triggers/
+time-window-send-gap: 6
+rpc-port: 12341
+ros:
+  master-address: 192.168.1.104:11311
+  nodes:
+    - /amcl
+    - /ob_camera_01/camera
+    - /ob_camera_02/camera
+    - /node_diagnostics
+    - /localization_monitor_node
+    - /move_base
+    - /sensor_fusion_node
+    - /ltme_node
+    - /scan_map_icp_amcl_node
+    - /monitor
+
+hosts:
+  - name: node1
+    ip: 192.168.1.104
+    rosbag:
+      path: "/opt/ros/melodic/bin/rosbag"
+      envs:
+        - "C_INCLUDE_PATH=/usr/include/drm:"
+        - "USER=root"
+        - "ROS_PACKAGE_PATH=/opt/ros/melodic/share"
+        - "LD_LIBRARY_PATH=/opt/ros/melodic/lib:/opt/ros/melodic/lib/aarch64-linux-gnu"
+        - "ROS_ETC_DIR=/opt/ros/melodic/etc/ros"
+        - "SHLVL=1"
+        - "HOME=/root"
+        - "ROS_PYTHON_VERSION=2"
+        - "PCMANFM_OUTLINE_MODE=on"
+        - "CPLUS_INCLUDE_PATH=/usr/include/drm:"
+        - "ROS_DISTRO=melodic"
+        - "ROS_VERSION=1"
+        - "PKG_CONFIG_PATH=/opt/ros/melodic/lib/pkgconfig"
+        - "PATH=/opt/ros/melodic/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/usr/local/go/bin:/root/go/bin"
+        - "ROS_ROOT=/opt/ros/melodic/share/ros"
+        - "ROSLISP_PACKAGE_DIRECTORIES="
+        - "ROS_MASTER_URI=http://192.168.1.104:11311"
+        - "PYTHONPATH=/opt/ros/melodic/lib/python2.7/dist-packages"
+        - "ROS_HOSTNAME=192.168.1.104"
+        - "CMAKE_PREFIX_PATH=/opt/ros/melodic"
+    topics:
+      - /amcl_pose # /amcl
+      - /ob_camera_01/color/image_raw # /ob_camera_01/camera
+      - /ob_camera_01/depth/points # /ob_camera_01/camera
+      - /ob_camera_02/color/image_raw # /ob_camera_02/camera
+      - /ob_camera_02/depth/points # /ob_camera_02/camera
+      - /diagnostics # /amcl /node_diagnostics
+      - /locate_info # /localization_monitor_node
+      - /obstacle_detection # /move_base
+      - /odom # /sensor_fusion_node
+      - /move_base/global_costmap/costmap # /move_base
+      - /move_base/global_costmap/costmap_updates # /move_base
+      - /move_base/local_costmap/costmap # /move_base
+      - /move_base/local_costmap/costmap_updates # /move_base
+      - /scan # /ltme_node
+      - /scan_map_icp_amcl_node/scan_point_transformed # /scan_map_icp_amcl_node
+      - /sys_info
+
+triggers:
+  - label: detectfault
+    topics:
+      - /camera/color/image_raw
+      - /camera/depth/points
+      - /diagnostics
+      - /locate_info
+      - /obstacle_detection
+      - /odom
+      - /move_base/global_costmap/costmap
+      - /move_base/global_costmap/costmap_updates
+      - /scan_map_icp_amcl_node/scan_point_transformed
+  - label: unstabledriving
+    topics:
+      - /camera/color/image_raw
+      - /camera/depth/points
+      - /diagnostics
+      - /locate_info
+      - /obstacle_detection
+      - /odom
+      - /move_base/global_costmap/costmap
+      - /move_base/global_costmap/costmap_updates
+      - /scan_map_icp_amcl_node/scan_point_transformed
+  - label: locationfailed
+    topics:
+      - /camera/color/image_raw
+      - /camera/depth/points
+      - /diagnostics
+      - /locate_info
+      - /obstacle_detection
+      - /odom
+      - /move_base/global_costmap/costmap
+      - /move_base/global_costmap/costmap_updates
+      - /scan_map_icp_amcl_node/scan_point_transformed
+  - label: obstacledetection
+    topics:
+      - /camera/color/image_raw
+      - /camera/depth/points
+      - /diagnostics
+      - /locate_info
+      - /obstacle_detection
+      - /odom
+      - /move_base/global_costmap/costmap
+      - /move_base/global_costmap/costmap_updates
+      - /scan_map_icp_amcl_node/scan_point_transformed
+  - label: overspeed
+    topics:
+      - /camera/color/image_raw
+      - /camera/depth/points
+      - /diagnostics
+      - /locate_info
+      - /obstacle_detection
+      - /odom
+      - /move_base/global_costmap/costmap
+      - /move_base/global_costmap/costmap_updates
+      - /scan_map_icp_amcl_node/scan_point_transformed
+  - label: cpuoveroccupied
+    topics:
+      - /camera/color/image_raw
+      - /camera/depth/points
+      - /diagnostics
+      - /locate_info
+      - /obstacle_detection
+      - /odom
+      - /move_base/global_costmap/costmap
+      - /move_base/global_costmap/costmap_updates
+      - /scan_map_icp_amcl_node/scan_point_transformed
+  - label: memoveroccupied
+    topics:
+      - /camera/color/image_raw
+      - /camera/depth/points
+      - /diagnostics
+      - /locate_info
+      - /obstacle_detection
+      - /odom
+      - /move_base/global_costmap/costmap
+      - /move_base/global_costmap/costmap_updates
+      - /scan_map_icp_amcl_node/scan_point_transformed

+ 19 - 0
aarch64/pji/common/config/yaml/双摄像头-local-config.yaml

@@ -0,0 +1,19 @@
+node:
+  name: node1
+  ip: 192.168.1.104
+# 数据闭环平台参数
+equipment-no: pjirobot1
+secret-key: ZzI1MocN3M6evTaGuTQALuBXTmUnN5tV2XUwcwXU
+# 获取oss连接信息的接口url
+url-get-oss-config: http://36.110.106.156:18379/oss/config?token=nXonLUcMtGcrQqqKiyygIwyVbvizE0wD
+# 朴津机器人数据前缀
+oss-base-prefix: pji-double-camera/
+# oss上的配置文件的名称
+cloud-config-filename: cloud-config.yaml
+# 将oss上的配置文件下载到本地的路径
+cloud-config-local-path: /root/cicv-data-closedloop/config/cloud-config.yaml
+restart-cmd:
+  dir: "/root/cicv-data-closedloop/"
+  name: "sh"
+  args:
+    - "start-master.sh"