mirror of https://github.com/ArduPilot/ardupilot
Rover: move sending of WATER_DEPTH into Rover code
only compiled in on Rover at the moment. need to add an additional Rover-specific check for frame type, so move this code into Rover for now.
This commit is contained in:
parent
33a788ebb5
commit
9f2253a109
|
@ -185,6 +185,55 @@ void GCS_MAVLINK_Rover::send_rangefinder() const
|
||||||
distance,
|
distance,
|
||||||
voltage);
|
voltage);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void GCS_MAVLINK_Rover::send_water_depth() const
|
||||||
|
{
|
||||||
|
if (!HAVE_PAYLOAD_SPACE(chan, WATER_DEPTH)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
RangeFinder *rangefinder = RangeFinder::get_singleton();
|
||||||
|
|
||||||
|
if (rangefinder == nullptr || !rangefinder->has_orientation(ROTATION_PITCH_270)){
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// get position
|
||||||
|
const AP_AHRS &ahrs = AP::ahrs();
|
||||||
|
Location loc;
|
||||||
|
IGNORE_RETURN(ahrs.get_location(loc));
|
||||||
|
|
||||||
|
for (uint8_t i=0; i<rangefinder->num_sensors(); i++) {
|
||||||
|
const AP_RangeFinder_Backend *s = rangefinder->get_backend(i);
|
||||||
|
|
||||||
|
if (s == nullptr || s->orientation() != ROTATION_PITCH_270 || !s->has_data()) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
// get temperature
|
||||||
|
float temp_C;
|
||||||
|
if (!s->get_temp(temp_C)) {
|
||||||
|
temp_C = 0.0f;
|
||||||
|
}
|
||||||
|
|
||||||
|
const bool sensor_healthy = (s->status() == RangeFinder::Status::Good);
|
||||||
|
|
||||||
|
mavlink_msg_water_depth_send(
|
||||||
|
chan,
|
||||||
|
AP_HAL::millis(), // time since system boot TODO: take time of measurement
|
||||||
|
i, // rangefinder instance
|
||||||
|
sensor_healthy, // sensor healthy
|
||||||
|
loc.lat, // latitude of vehicle
|
||||||
|
loc.lng, // longitude of vehicle
|
||||||
|
loc.alt * 0.01f, // altitude of vehicle (MSL)
|
||||||
|
ahrs.get_roll(), // roll in radians
|
||||||
|
ahrs.get_pitch(), // pitch in radians
|
||||||
|
ahrs.get_yaw(), // yaw in radians
|
||||||
|
s->distance(), // distance in meters
|
||||||
|
temp_C); // temperature in degC
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
#endif // AP_RANGEFINDER_ENABLED
|
#endif // AP_RANGEFINDER_ENABLED
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -400,6 +449,13 @@ bool GCS_MAVLINK_Rover::try_send_message(enum ap_message id)
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if AP_RANGEFINDER_ENABLED
|
||||||
|
case MSG_WATER_DEPTH:
|
||||||
|
CHECK_PAYLOAD_SIZE(WATER_DEPTH);
|
||||||
|
send_water_depth();
|
||||||
|
break;
|
||||||
|
#endif // AP_RANGEFINDER_ENABLED
|
||||||
|
|
||||||
default:
|
default:
|
||||||
return GCS_MAVLINK::try_send_message(id);
|
return GCS_MAVLINK::try_send_message(id);
|
||||||
}
|
}
|
||||||
|
|
|
@ -44,6 +44,9 @@ protected:
|
||||||
// Index starts at 1
|
// Index starts at 1
|
||||||
uint8_t send_available_mode(uint8_t index) const override;
|
uint8_t send_available_mode(uint8_t index) const override;
|
||||||
|
|
||||||
|
// send WATER_DEPTH - metres and temperature
|
||||||
|
void send_water_depth() const;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
||||||
void handle_message(const mavlink_message_t &msg) override;
|
void handle_message(const mavlink_message_t &msg) override;
|
||||||
|
|
Loading…
Reference in New Issue