Ver Fonte

1.Modify v2x protobuf msg
2. add gitignore rules

lijinliang há 4 anos atrás
pai
commit
cd297271ae
2 ficheiros alterados com 13 adições e 15 exclusões
  1. 4 0
      .gitignore
  2. 9 15
      src/include/proto/v2x.proto

+ 4 - 0
.gitignore

@@ -216,3 +216,7 @@ qtcreator-*
 # Catkin custom files
 CATKIN_IGNORE
 
+# protobuf
+*.pb.cc
+*.pb.h
+*.swp

+ 9 - 15
src/include/proto/v2x.proto

@@ -2,24 +2,18 @@ syntax = "proto2";
 
 package iv.v2x;
 
-message stations
+message stationsGPS
 {
-	required uint32 lat		= 1;
-	required uint32	lon		= 2;
-};
-
-message stationID
-{
-	required uint32 id		= 1;
+	required double lat		= 1;
+	required double	lon		= 2;
 };
 
 message v2x
 {
-	optional uint32 carID 		= 1;
-	optional uint32 carMode		= 2;
-	optional uint32	emergencyStop	= 3;
-	optional uint32	stationStop	= 4;
-	repeated uint32 stationID	= 5;
-	repeated uint32 stations	= 6;
+	optional uint32 carID 		= 1;//车辆VIN
+	optional uint32 carMode		= 2;//车辆工作模式
+	optional uint32	emergencyStop	= 3;//急停命令
+	optional uint32	stationStop	= 4;//站点命令
+	repeated uint32 stationID	= 5;//站点索引数组
+	repeated stationsGPS stGPS 	= 6;//站点GPS坐标数组
 };
-