From cc777a80ffe9326f96669f0d7bf9e6b874a54bdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beat=20K=C3=BCng?= Date: Thu, 15 Mar 2018 11:23:05 +0100 Subject: [PATCH] vehicle_roi.msg: remove unsupported fields --- msg/vehicle_roi.msg | 10 +++------- src/drivers/vmount/input_mavlink.cpp | 2 -- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/msg/vehicle_roi.msg b/msg/vehicle_roi.msg index d1e32ddd98..9c87901fea 100644 --- a/msg/vehicle_roi.msg +++ b/msg/vehicle_roi.msg @@ -2,16 +2,12 @@ uint8 ROI_NONE = 0 # No region of interest uint8 ROI_WPNEXT = 1 # Point toward next MISSION with optional offset -uint8 ROI_WPINDEX = 2 # Point toward given MISSION -uint8 ROI_LOCATION = 3 # Point toward fixed location -uint8 ROI_TARGET = 4 # Point toward target -uint8 ROI_ENUM_END = 5 +uint8 ROI_LOCATION = 2 # Point toward fixed location +uint8 ROI_TARGET = 3 # Point toward target +uint8 ROI_ENUM_END = 4 uint8 mode # ROI mode (see above) -uint32 mission_seq # mission sequence to point to -uint32 target_seq # target sequence to point to - float64 lat # Latitude to point to float64 lon # Longitude to point to float32 alt # Altitude to point to diff --git a/src/drivers/vmount/input_mavlink.cpp b/src/drivers/vmount/input_mavlink.cpp index ee6c1ce863..4e21a1fbfb 100644 --- a/src/drivers/vmount/input_mavlink.cpp +++ b/src/drivers/vmount/input_mavlink.cpp @@ -122,8 +122,6 @@ int InputMavlinkROI::update_impl(unsigned int timeout_ms, ControlData **control_ *control_data = &_control_data; - } else if (vehicle_roi.mode == vehicle_roi_s::ROI_WPINDEX) { - //TODO how to do this? } else if (vehicle_roi.mode == vehicle_roi_s::ROI_LOCATION) { control_data_set_lon_lat(vehicle_roi.lon, vehicle_roi.lat, vehicle_roi.alt);