Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-18 06:38:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

SITL: fixed build with no GCS

Browse Source
This commit is contained in:
Andrew Tridgell 2020-11-06 10:36:08 +11:00
parent 0700ca4882
commit 32bda36908
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/SITL/SIM_Aircraft.cpp
View File

@ -565,7 +565,7 @@ void Aircraft::update_dynamics(const Vector3f &rot_accel)
// constrain height to the ground // constrain height to the ground
if (on_ground()) { if (on_ground()) {
if (!was_on_ground && AP_HAL::millis() - last_ground_contact_ms > 1000) { if (!was_on_ground && AP_HAL::millis() - last_ground_contact_ms > 1000) {
gcs().send_text(MAV_SEVERITY_INFO, "SIM Hit ground at %f m/s", velocity_ef.z); GCS_SEND_TEXT(MAV_SEVERITY_INFO, "SIM Hit ground at %f m/s", velocity_ef.z);
last_ground_contact_ms = AP_HAL::millis(); last_ground_contact_ms = AP_HAL::millis();
} }
position.z = -(ground_level + frame_height - home.alt * 0.01f + ground_height_difference()); position.z = -(ground_level + frame_height - home.alt * 0.01f + ground_height_difference());

2
libraries/SITL/SIM_Parachute.cpp
View File

@ -54,7 +54,7 @@ void Parachute::update(const struct sitl_input &input)
if (pwm >= 1250) { if (pwm >= 1250) {
if (!deployed_ms) { if (!deployed_ms) {
deployed_ms = AP_HAL::millis(); deployed_ms = AP_HAL::millis();
gcs().send_text(MAV_SEVERITY_WARNING, "BANG! Parachute deployed"); GCS_SEND_TEXT(MAV_SEVERITY_WARNING, "BANG! Parachute deployed");
} }
} }
last_update_us = now; last_update_us = now;

2
libraries/SITL/SIM_RF_LightWareSerial.cpp
View File

@ -32,7 +32,7 @@ bool RF_LightWareSerial::check_synced()
ssize_t n = read_from_autopilot(buffer, ARRAY_SIZE(buffer) - 1); ssize_t n = read_from_autopilot(buffer, ARRAY_SIZE(buffer) - 1);
if (n > 0) { if (n > 0) {
if (!strncmp(buffer, "www\r\n", ARRAY_SIZE(buffer))) { if (!strncmp(buffer, "www\r\n", ARRAY_SIZE(buffer))) {
gcs().send_text(MAV_SEVERITY_INFO, "Slurped a sync thing\n"); GCS_SEND_TEXT(MAV_SEVERITY_INFO, "Slurped a sync thing\n");
synced = true; synced = true;
} }
} }

2
libraries/SITL/SIM_RF_Wasp.cpp
View File

@ -94,7 +94,7 @@ void RF_Wasp::check_configuration()
} }
} }
if (!set) { if (!set) {
gcs().send_text(MAV_SEVERITY_INFO, "Wasp: unknown setting (%s)", &_buffer[0]); GCS_SEND_TEXT(MAV_SEVERITY_INFO, "Wasp: unknown setting (%s)", &_buffer[0]);
} }
} }