LingxinMeng hai 1 ano
pai
achega
002b49568e

+ 4 - 4
aarch64/pji/common/config/yaml/pjibot-P1YNYD1M228000127-cloud-config.yaml

@@ -58,10 +58,10 @@ hosts:
         - "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_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
+      #      - /ob_camera_02/depth/points # /ob_camera_02/camera
       - /diagnostics # /amcl /node_diagnostics
       - /locate_info # /localization_monitor_node
       - /obstacle_detection # /move_base
@@ -73,7 +73,7 @@ hosts:
       - /scan # /ltme_node
       - /scan_map_icp_amcl_node/scan_point_transformed # /scan_map_icp_amcl_node
       - /sys_info
-#      - /cmd_vel
+      #      - /cmd_vel
       - /imu
       # 算法评价新增
       - /depth_scan_02

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

@@ -6,7 +6,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: 60
 config-refresh-interval: 60
 disk:
   name: /dev/mmcblk0p8 # 磁盘名称
@@ -58,7 +58,7 @@ hosts:
         - "CMAKE_PREFIX_PATH=/opt/ros/melodic"
     topics:
       - /amcl_pose # /amcl
-      #      - /ob_camera_01/color/image_raw # /ob_camera_01/camera
+      - /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

+ 2 - 0
aarch64/pji/master/main.go

@@ -42,6 +42,8 @@ func init() {
 	// 等待重启,接收到重启信号,会把信号分发给以下channel
 	go commonService.WaitKillSelf()
 	masterConfig.InitNacos()
+	// 先采集地图bag包
+	masterService.CollectMap()
 }
 
 func main() {

+ 32 - 0
aarch64/pji/master/package/service/collect_map.go

@@ -0,0 +1,32 @@
+package service
+
+import (
+	"cicv-data-closedloop/aarch64/pji/common/config"
+	"cicv-data-closedloop/common/config/c_log"
+	"cicv-data-closedloop/common/util"
+	"os"
+)
+
+func CollectMap() {
+
+	// rosbag record -O /root/cicv-data-closedloop/map_data.bag -l 1 /map
+	localMapBagPath := "/root/cicv-data-closedloop/map.bag"
+	ossMapBagObjectKey := config.LocalConfig.OssBasePrefix + config.LocalConfig.EquipmentNo + "/map.bag"
+
+	var command []string
+	command = append(command, "record")
+	command = append(command, "-O "+localMapBagPath)
+	command = append(command, "-l 1")
+	_, err := util.ExecuteWithEnvAndDirAsync(config.RosbagEnvs, config.CloudConfig.BagDataDir, config.RosbagPath, command...)
+	if err != nil {
+		c_log.GlobalLogger.Error("程序异常退出。采集地图", command, "出错:", err)
+		os.Exit(-1)
+	}
+	config.OssMutex.Lock()
+	err = config.OssBucket.PutObjectFromFile(ossMapBagObjectKey, localMapBagPath)
+	config.OssMutex.Unlock()
+	if err != nil {
+		c_log.GlobalLogger.Error("程序异常退出。上传地图包", ossMapBagObjectKey, "->", ossMapBagObjectKey, "出错:", err)
+		os.Exit(-1)
+	}
+}