Browse Source

Rover: move vehicle_initialised to be on GCS not GCS_MAVLink

mission-4.1.18
Peter Barker 6 years ago committed by Peter Barker
parent
commit
070b185d2a
  1. 2
      APMrover2/GCS_Mavlink.cpp
  2. 2
      APMrover2/GCS_Mavlink.h
  3. 2
      APMrover2/GCS_Rover.h

2
APMrover2/GCS_Mavlink.cpp

@ -285,7 +285,7 @@ uint32_t GCS_MAVLINK_Rover::telem_delay() const @@ -285,7 +285,7 @@ uint32_t GCS_MAVLINK_Rover::telem_delay() const
return static_cast<uint32_t>(rover.g.telem_delay);
}
bool GCS_MAVLINK_Rover::vehicle_initialised() const
bool GCS_Rover::vehicle_initialised() const
{
return rover.control_mode != &rover.mode_initializing;
}

2
APMrover2/GCS_Mavlink.h

@ -28,8 +28,6 @@ protected: @@ -28,8 +28,6 @@ protected:
bool persist_streamrates() const override { return true; }
bool vehicle_initialised() const override;
bool set_home_to_current_location(bool lock) override;
bool set_home(const Location& loc, bool lock) override;
uint64_t capabilities() const override;

2
APMrover2/GCS_Rover.h

@ -20,6 +20,8 @@ public: @@ -20,6 +20,8 @@ public:
uint32_t custom_mode() const override;
MAV_TYPE frame_type() const override;
bool vehicle_initialised() const override;
void update_sensor_status_flags(void) override;
private:

Loading…
Cancel
Save