Merge pull request #15 from usdot-fhwa-stol/release/RX7

Release/rx7
usdot-fhwa-stol · Jul 17, 2019 · 04d280f · 04d280f
2 parents 3c3b934 + 62123c6
commit 04d280f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/cav_msgs/msg/DriverStatus.msg b/cav_msgs/msg/DriverStatus.msg
@@ -19,10 +19,13 @@ uint8  FAULT=3
 #					<other values reserved for future expansion>
 
 # These are the possible categories - at least one must be true
-bool    can_bus
-bool    sensor
-bool    position
+bool    can
+bool    radar
+bool    gnss
+bool    lidar
+bool    roadway_sensor
 bool    comms
-bool    lon_controller
-bool    lat_controller
+bool    controller
 bool    camera
+bool    imu
+
diff --git a/cav_srvs/srv/SetActiveRoute.srv b/cav_srvs/srv/SetActiveRoute.srv
@@ -19,4 +19,5 @@ uint8 errorStatus
 # enumeration values for errorStatus:
 uint8 NO_ERROR=0
 uint8 NO_ROUTE=1
-#					<other values reserved for future expansion>
+uint8 ALREADY_FOLLOWING_ROUTE=2
+#					<other values reserved for future expansion>