孟令鑫 1 éve
szülő
commit
1e22327034

+ 1 - 1
aarch64/pjisuv/common/config/yaml/local-config-soc1.yaml → aarch64/pjisuv/common/config/yaml/local-config-pjisuv95-soc1.yaml

@@ -3,7 +3,7 @@ node:
   ip: 192.168.1.102
 # 数据闭环平台参数
 equipment-no: pjisuv95
-secret-key: BGigOTVenfu07xp7db0LEWlKCzPlrWIk0AWWMGWi
+secret-key: FxTjEs5nkF3OPtTknftEqBUvenkdgphalGzbRT9T
 # 获取oss连接信息的接口url
 url-get-oss-config: http://36.110.106.156:18379/oss/config?token=nXonLUcMtGcrQqqKiyygIwyVbvizE0wD
 # 金龙车数据前缀

+ 1 - 1
aarch64/pjisuv/common/config/yaml/local-config-soc2.yaml → aarch64/pjisuv/common/config/yaml/local-config-pjisuv95-soc2.yaml

@@ -3,7 +3,7 @@ node:
   ip: 192.168.1.103
 # 数据闭环平台参数
 equipment-no: pjisuv95
-secret-key: BGigOTVenfu07xp7db0LEWlKCzPlrWIk0AWWMGWi
+secret-key: FxTjEs5nkF3OPtTknftEqBUvenkdgphalGzbRT9T
 # 获取oss连接信息的接口url
 url-get-oss-config: http://36.110.106.156:18379/oss/config?token=nXonLUcMtGcrQqqKiyygIwyVbvizE0wD
 # 金龙车数据前缀

+ 80 - 0
pjisuv_msgs/autoware_msgs.go

@@ -251,3 +251,83 @@ type ImageObj struct {
 	Type        string          `rosname:"type"`
 	Obj         []ImageRect     `rosname:"obj"`
 }
+type ImageObjects struct {
+	msg.Package `ros:"autoware_msgs"`
+	Header      std_msgs.Header `rosname:"header"`
+	CarNum      uint8           `rosname:"car_num"`
+	CarType     []int32         `rosname:"car_type"`
+	Score       []float32       `rosname:"score"`
+	CornerPoint []int32         `rosname:"corner_point"`
+}
+type ImageRectRanged struct {
+	msg.Package `ros:"autoware_msgs"`
+	Rect        ImageRect `rosname:"rect"`
+	Range       float32   `rosname:"range"`
+	MinHeight   float32   `rosname:"min_height"`
+	MaxHeight   float32   `rosname:"max_height"`
+}
+type ImageObjRanged struct {
+	msg.Package `ros:"autoware_msgs"`
+	Header      std_msgs.Header   `rosname:"header"`
+	Type        string            `rosname:"type"`
+	Obj         []ImageRectRanged `rosname:"obj"`
+}
+
+type ImageObjTracked struct {
+	msg.Package `ros:"autoware_msgs"`
+	Header      std_msgs.Header   `rosname:"header"`
+	Type        string            `rosname:"type"`
+	TotalNum    uint8             `rosname:"total_num"`
+	ObjId       []int32           `rosname:"obj_id"`
+	RectRanged  []ImageRectRanged `rosname:"rect_ranged"`
+	RealData    []int32           `rosname:"real_data"`
+	Lifespan    []int32           `rosname:"lifespan"`
+}
+type IndicatorCmd struct {
+	msg.Package `ros:"autoware_msgs"`
+	Header      std_msgs.Header `rosname:"header"`
+	L           int32           `rosname:"l"`
+	R           int32           `rosname:"r"`
+}
+type LampCmd struct {
+	msg.Package `ros:"autoware_msgs"`
+	Header      std_msgs.Header `rosname:"header"`
+	L           int32           `rosname:"l"`
+	R           int32           `rosname:"r"`
+}
+type NDTStat struct {
+	msg.Package    `ros:"autoware_msgs"`
+	Header         std_msgs.Header `rosname:"header"`
+	ExeTime        float32         `rosname:"exe_time"`
+	Iteration      int32           `rosname:"iteration"`
+	Score          float32         `rosname:"score"`
+	Velocity       float32         `rosname:"velocity"`
+	Acceleration   float32         `rosname:"acceleration"`
+	UsePredictPose int32           `rosname:"use_predict_pose"`
+}
+type ObjLabel struct {
+	msg.Package    `ros:"autoware_msgs"`
+	Header         std_msgs.Header       `rosname:"header"`
+	Type           string                `rosname:"type"`
+	ObjId          []int32               `rosname:"obj_id"`
+	ReprojectedPos []geometry_msgs.Point `rosname:"reprojected_pos"`
+}
+type ObjPose struct {
+	msg.Package `ros:"autoware_msgs"`
+	Header      std_msgs.Header           `rosname:"header"`
+	Type        string                    `rosname:"type"`
+	ObjId       []int32                   `rosname:"obj_id"`
+	Obj         []geometry_msgs.PoseArray `rosname:"obj"`
+}
+type PointsImage struct {
+	msg.Package `ros:"autoware_msgs"`
+	Header      std_msgs.Header `rosname:"header"`
+	Distance    []float32       `rosname:"distance"`
+	Intensity   []float32       `rosname:"intensity"`
+	MinHeight   []float32       `rosname:"min_height"`
+	MaxHeight   []float32       `rosname:"max_height"`
+	MaxY        int32           `rosname:"max_y"`
+	MinY        int32           `rosname:"min_y"`
+	ImageHeight int32           `rosname:"image_height"`
+	ImageWidth  int32           `rosname:"image_width"`
+}

+ 0 - 3
pjisuv_msgs/原始msg文件/autoware_msgs/msg/ImageObjRanged.msg

@@ -1,3 +0,0 @@
-Header header
-string type
-ImageRectRanged[] obj

+ 0 - 7
pjisuv_msgs/原始msg文件/autoware_msgs/msg/ImageObjTracked.msg

@@ -1,7 +0,0 @@
-Header header
-string type
-uint8 total_num
-int32[] obj_id
-ImageRectRanged[] rect_ranged
-int32[] real_data
-int32[] lifespan

+ 0 - 5
pjisuv_msgs/原始msg文件/autoware_msgs/msg/ImageObjects.msg

@@ -1,5 +0,0 @@
-Header header
-uint8 car_num
-int32[] car_type
-float32[] score
-int32[] corner_point

+ 0 - 4
pjisuv_msgs/原始msg文件/autoware_msgs/msg/ImageRectRanged.msg

@@ -1,4 +0,0 @@
-ImageRect rect
-float32 range
-float32 min_height
-float32 max_height

+ 0 - 3
pjisuv_msgs/原始msg文件/autoware_msgs/msg/IndicatorCmd.msg

@@ -1,3 +0,0 @@
-Header header
-int32 l
-int32 r

+ 0 - 3
pjisuv_msgs/原始msg文件/autoware_msgs/msg/LampCmd.msg

@@ -1,3 +0,0 @@
-Header header
-int32 l
-int32 r

+ 0 - 7
pjisuv_msgs/原始msg文件/autoware_msgs/msg/NDTStat.msg

@@ -1,7 +0,0 @@
-Header header
-float32 exe_time
-int32 iteration
-float32 score
-float32 velocity
-float32 acceleration
-int32 use_predict_pose

+ 0 - 4
pjisuv_msgs/原始msg文件/autoware_msgs/msg/ObjLabel.msg

@@ -1,4 +0,0 @@
-Header header
-string type
-int32[] obj_id
-geometry_msgs/Point[] reprojected_pos

+ 0 - 4
pjisuv_msgs/原始msg文件/autoware_msgs/msg/ObjPose.msg

@@ -1,4 +0,0 @@
-Header header
-string type
-int32[] obj_id
-geometry_msgs/PoseArray[] obj

+ 0 - 9
pjisuv_msgs/原始msg文件/autoware_msgs/msg/PointsImage.msg

@@ -1,9 +0,0 @@
-Header header
-float32[] distance
-float32[] intensity
-float32[] min_height
-float32[] max_height
-int32 max_y
-int32 min_y
-int32 image_height
-int32 image_width