diff --git a/msg/versioned/AirspeedValidated.msg b/msg/versioned/AirspeedValidated.msg index c9d9eb2a61..4e44d3e9e2 100644 --- a/msg/versioned/AirspeedValidated.msg +++ b/msg/versioned/AirspeedValidated.msg @@ -18,10 +18,10 @@ int8 SOURCE_GROUND_MINUS_WIND = 0 # Ground speed minus wind int8 SOURCE_SENSOR_1 = 1 # Sensor 1 int8 SOURCE_SENSOR_2 = 2 # Sensor 2 int8 SOURCE_SENSOR_3 = 3 # Sensor 3 -int8 SOURCE_SYNTHETIC = 4 # Synthetic airspeed +int8 SOURCE_SYNTHETIC = 4 # Synthetic airspeed float32 calibrated_ground_minus_wind_m_s # [m/s] [@invalid NaN] CAS calculated from groundspeed - windspeed, where windspeed is estimated based on a zero-sideslip assumption -float32 calibraded_airspeed_synth_m_s # [m/s] [@invalid NaN] Synthetic airspeed -float32 airspeed_derivative_filtered # [m/s^2] Filtered indicated airspeed derivative -float32 throttle_filtered # [-] Filtered fixed-wing throttle -float32 pitch_filtered # [rad] Filtered pitch +float32 calibrated_airspeed_synth_m_s # [m/s] [@invalid NaN] Synthetic airspeed +float32 airspeed_derivative_filtered # [m/s^2] Filtered indicated airspeed derivative +float32 throttle_filtered # [-] Filtered fixed-wing throttle +float32 pitch_filtered # [rad] Filtered pitch diff --git a/src/modules/airspeed_selector/airspeed_selector_main.cpp b/src/modules/airspeed_selector/airspeed_selector_main.cpp index 07d5fc66b3..d51875a6e0 100644 --- a/src/modules/airspeed_selector/airspeed_selector_main.cpp +++ b/src/modules/airspeed_selector/airspeed_selector_main.cpp @@ -742,7 +742,7 @@ void AirspeedModule::select_airspeed_and_publish() airspeed_validated_s airspeed_validated = {}; airspeed_validated.timestamp = _time_now_usec; airspeed_validated.calibrated_ground_minus_wind_m_s = NAN; - airspeed_validated.calibraded_airspeed_synth_m_s = NAN; + airspeed_validated.calibrated_airspeed_synth_m_s = NAN; airspeed_validated.indicated_airspeed_m_s = NAN; airspeed_validated.calibrated_airspeed_m_s = NAN; airspeed_validated.true_airspeed_m_s = NAN; @@ -764,7 +764,7 @@ void AirspeedModule::select_airspeed_and_publish() airspeed_validated.calibrated_airspeed_m_s = _ground_minus_wind_CAS; airspeed_validated.true_airspeed_m_s = _ground_minus_wind_TAS; airspeed_validated.calibrated_ground_minus_wind_m_s = _ground_minus_wind_CAS; - airspeed_validated.calibraded_airspeed_synth_m_s = get_synthetic_airspeed(airspeed_validated.throttle_filtered); + airspeed_validated.calibrated_airspeed_synth_m_s = get_synthetic_airspeed(airspeed_validated.throttle_filtered); break; @@ -774,7 +774,7 @@ void AirspeedModule::select_airspeed_and_publish() float synthetic_airspeed = get_synthetic_airspeed(airspeed_validated.throttle_filtered); airspeed_validated.calibrated_airspeed_m_s = synthetic_airspeed; airspeed_validated.indicated_airspeed_m_s = synthetic_airspeed; - airspeed_validated.calibraded_airspeed_synth_m_s = synthetic_airspeed; + airspeed_validated.calibrated_airspeed_synth_m_s = synthetic_airspeed; airspeed_validated.true_airspeed_m_s = calc_true_from_calibrated_airspeed(synthetic_airspeed, _vehicle_air_data.rho); break; @@ -785,7 +785,7 @@ void AirspeedModule::select_airspeed_and_publish() airspeed_validated.calibrated_airspeed_m_s = _airspeed_validator[valid_airspeed_index - 1].get_CAS(); airspeed_validated.true_airspeed_m_s = _airspeed_validator[valid_airspeed_index - 1].get_TAS(); airspeed_validated.calibrated_ground_minus_wind_m_s = _ground_minus_wind_CAS; - airspeed_validated.calibraded_airspeed_synth_m_s = get_synthetic_airspeed(airspeed_validated.throttle_filtered); + airspeed_validated.calibrated_airspeed_synth_m_s = get_synthetic_airspeed(airspeed_validated.throttle_filtered); break; }