孟令鑫 1 rok temu
rodzic
commit
870c9dedf7

+ 18 - 1
aarch64/pjisuv/common/config/yaml/cloud-config-pjisuv95.yaml

@@ -42,7 +42,24 @@ hosts:
       - /tpperception # /sensorfusion
       - /cicv_location  # /ins
     record-envs:
-      - ""
+      - "LD_LIBRARY_PATH=/opt/ros/melodic/lib:/usr/lib::/usr/lib:/userdata/third_lib"
+      - "OLDPWD=/mnt/media/sda1"
+      - "ROS_ETC_DIR=/opt/ros/melodic/etc/ros"
+      - "USER=root"
+      - "ROS_OS_OVERRIDE=openembedded"
+      - "PWD=/mnt/media/sda1/cicv-data-closedloop"
+      - "HOME=/home/root"
+      - "CMAKE_PREFIX_PATH=/opt/ros/melodic:/usr"
+      - "ROS_ROOT=/opt/ros/melodic/share/ros"
+      - "ROS_MASTER_URI=http://192.168.1.102:11311"
+      - "ROS_VERSION=1"
+      - "ROS_PYTHON_VERSION=2"
+      - "ROS_IP=192.168.1.103"
+      - "PYTHONPATH=/opt/ros/melodic/lib/python2.7/site-packages:/usr/lib/python2.7/site-packages"
+      - "ROS_PACKAGE_PATH=/opt/ros/melodic/share"
+      - "PATH=/opt/ros/melodic/bin:/usr/bin/cyber/tools/cyber_service:/usr/bin/cyber/tools/cyber_node:/usr/bin/cyber/tools/cyber_channel:/usr/bin/cyber/tools/cyber_launch:/usr/bin/cyber/tools/cyber_monitor:/usr/bin/cyber/tools/cyber_recorder:/apollo/bazel-bin/cyber:/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin "
+      - "PKG_CONFIG_PATH=/usr/lib/pkgconfig"
+      - "PKG_CONFIG_PATH=/usr/lib/pkgconfig"
 triggers:
   - label: rapidaccel
     topics:

+ 1 - 1
aarch64/pjisuv/master/package/config/master_trigger_config.go

@@ -38,7 +38,7 @@ func InitTriggerConfig() {
 		c_log.GlobalLogger.Info("下载触发器插件从 ", trigger.TriggerScriptPath, " 到 ", triggerLocalPath)
 		config.OssMutex.Lock()
 		err := config.OssBucket.GetObjectToFile(trigger.TriggerScriptPath, triggerLocalPath)
-		config.OssMutex.Lock()
+		config.OssMutex.Unlock()
 		if err != nil {
 			c_log.GlobalLogger.Error("下载 oss 上的触发器插件失败:", err)
 			continue