commit

aarch64/pji/common/config/yaml/cloud-config.yaml → aarch64/pji/common/config/yaml/cloud-config-pji1.yaml

@@ -7,8 +7,8 @@ full-collect: false
 bag-number: 10
 config-refresh-interval: 60
 disk:
-  name: /dev/vdb # 磁盘名称
-  used: 5242880 # 磁盘占用阈值，单位bytes
+  name: /dev/mmcblk0p8 # 磁盘名称
+  used: 5000000 # 磁盘占用阈值，单位bytes
 bag-data-dir: /root/rosbag-handle/data/
 bag-copy-dir: /root/rosbag-handle/copy/
 triggers-dir: /root/rosbag-handle/triggers/

aarch64/pji/common/service/rosbag_record.go

@@ -57,9 +57,11 @@ func BagRecord(nodeName string) {
 		var recordProcessPid int
 		var recordSubProcessPid int
 		var cmd *exec.Cmd
+		systemEnv := os.Environ()
+		c_log.GlobalLogger.Info("系统环境变量为：", systemEnv)
 	parent:
 		for {
-			allEnv := append(os.Environ(), recordEnv...)
+			allEnv := append(systemEnv, recordEnv...)
 			c_log.GlobalLogger.Info("全部环境变量为：", allEnv)
 			cmd, err = util.ExecuteWithEnvAndDirAsync(allEnv, config.CloudConfig.BagDataDir, "/opt/ros/melodic/bin/rosbag", command...)
 			if err != nil {

aarch64/pjisuv/common/config/sh/remove.sh

@@ -1 +1,3 @@
+#!/bin/bash
+
 rm -rf ./*.log ./log/* ./timeToLabel.json ./data/* ./copy /*

aarch64/pjisuv/common/config/sh/start-soc1.sh

@@ -1,2 +1,4 @@
+#!/bin/bash
+
 chmod 777 /mnt/media/sda1/cicv-data-closedloop/pjisuv-master.exe
 nohup /mnt/media/sda1/cicv-data-closedloop/pjisuv-master.exe > /mnt/media/sda1/cicv-data-closedloop/log/pjisuv-master.out 2>&1 &

aarch64/pjisuv/common/config/sh/start-soc2.sh

@@ -1,2 +1,4 @@
+#!/bin/bash
+
 chmod 777 /mnt/media/sda1/cicv-data-closedloop/pjisuv-slave.exe
 nohup /mnt/media/sda1/cicv-data-closedloop/pjisuv-slave.exe > /mnt/media/sda1/cicv-data-closedloop/log/pjisuv-slave.out 2>&1 &

build-pji.sh

@@ -1,3 +1,5 @@
+#!/bin/bash
+
 # 朴津机器人
 go build -o ./exe/pji-master.exe ./aarch64/pji/master/main/master.go
 go build -o ./exe/pji-control.exe ./aarch64/pji/control/main/control.go

build-pjisuv.sh

@@ -1,3 +1,5 @@
+#!/bin/bash
+
 # 朴津多功能车
 go build -o ./exe/pjisuv-master.exe ./aarch64/pjisuv/master/main/master.go
 go build -o ./exe/pjisuv-slave.exe ./aarch64/pjisuv/slave/main/slave.go

build-topic-echo.sh

@@ -1,2 +1,4 @@
+#!/bin/bash
+
 # 话题echo程序
 go build -o ./exe/topic-echo.exe ./aarch64/topic-echo/main/main.go

build.sh

@@ -1,3 +1,5 @@
+#!/bin/bash
+
 # 金龙车
 go build -o ./exe/kinglong-master.exe ./aarch64/kinglong/master/main/master.go
 go build -o ./exe/kinglong-slave.exe ./aarch64/kinglong/slave/main/slave.go