From 8070c1396317a77b09e8092e6f2df1181acbb1ad Mon Sep 17 00:00:00 2001 From: murata <ma2maru@gmail.com> Date: Fri, 2 Feb 2018 09:41:18 +0900 Subject: [PATCH] AP_Soaring: delete \n from the log using gcs().send_text --- libraries/AP_Soaring/AP_Soaring.cpp | 4 ++-- libraries/AP_Soaring/Variometer.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/AP_Soaring/AP_Soaring.cpp b/libraries/AP_Soaring/AP_Soaring.cpp index 691d7ea559..59c5581005 100644 --- a/libraries/AP_Soaring/AP_Soaring.cpp +++ b/libraries/AP_Soaring/AP_Soaring.cpp @@ -182,10 +182,10 @@ bool SoaringController::check_cruise_criteria() float alt = _vario.alt; if (soar_active && (AP_HAL::micros64() - _thermal_start_time_us) > ((unsigned)min_thermal_s * 1e6) && thermalability < McCready(alt)) { - gcs().send_text(MAV_SEVERITY_INFO, "Thermal weak, recommend quitting: W %f R %f th %f alt %f Mc %f\n", (double)_ekf.X[0], (double)_ekf.X[1], (double)thermalability, (double)alt, (double)McCready(alt)); + gcs().send_text(MAV_SEVERITY_INFO, "Thermal weak, recommend quitting: W %f R %f th %f alt %f Mc %f", (double)_ekf.X[0], (double)_ekf.X[1], (double)thermalability, (double)alt, (double)McCready(alt)); return true; } else if (soar_active && (alt>alt_max || alt<alt_min)) { - gcs().send_text(MAV_SEVERITY_ALERT, "Out of allowable altitude range, beginning cruise. Alt = %f\n", (double)alt); + gcs().send_text(MAV_SEVERITY_ALERT, "Out of allowable altitude range, beginning cruise. Alt = %f", (double)alt); return true; } diff --git a/libraries/AP_Soaring/Variometer.cpp b/libraries/AP_Soaring/Variometer.cpp index fb25501c73..179ebeeb93 100644 --- a/libraries/AP_Soaring/Variometer.cpp +++ b/libraries/AP_Soaring/Variometer.cpp @@ -75,6 +75,6 @@ float Variometer::correct_netto_rate(float climb_rate, //float temp_netto = netto_rate; //float dVdt = SpdHgt_Controller->get_VXdot(); //netto_rate = netto_rate + aspd*dVdt/GRAVITY_MSS; - //gcs().send_text(MAV_SEVERITY_INFO, "%f %f %f %f\n",temp_netto,dVdt,netto_rate,barometer.get_altitude()); + //gcs().send_text(MAV_SEVERITY_INFO, "%f %f %f %f",temp_netto,dVdt,netto_rate,barometer.get_altitude()); return netto_rate; }