Skip to content

Commit d16f4ac

Browse files
authored
Merge pull request #436 from rosflight/ptt/pitotspeed
Changes pitot velocity to indicated air speed (ias)
2 parents 02c8779 + 05ef074 commit d16f4ac

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

include/sensors.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ class Sensors : public ParamListenerInterface
146146
float imu_temperature = 0;
147147
uint64_t imu_time = 0;
148148

149-
float diff_pressure_velocity = 0;
149+
float diff_pressure_ias = 0;
150150
float diff_pressure = 0;
151151
float diff_pressure_temp = 0;
152152

src/comm_manager.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@ void CommManager::send_rc_raw(void)
404404

405405
void CommManager::send_diff_pressure(void)
406406
{
407-
comm_link_.send_diff_pressure(sysid_, RF_.sensors_.data().diff_pressure_velocity,
407+
comm_link_.send_diff_pressure(sysid_, RF_.sensors_.data().diff_pressure_ias,
408408
RF_.sensors_.data().diff_pressure,
409409
RF_.sensors_.data().diff_pressure_temp);
410410
}

src/sensors.cpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -558,10 +558,9 @@ void Sensors::correct_diff_pressure()
558558
if (!diff_pressure_calibrated_) { calibrate_diff_pressure(); }
559559
data_.diff_pressure -= rf_.params_.get_param_float(PARAM_DIFF_PRESS_BIAS);
560560

561-
float atm = 101325.0f;
562-
if (data_.baro_present) { atm = data_.baro_pressure; }
563-
data_.diff_pressure_velocity = turbomath::fsign(data_.diff_pressure) * 24.574f
564-
/ turbomath::inv_sqrt((turbomath::fabs(data_.diff_pressure) * data_.diff_pressure_temp / atm));
561+
// compute indicated air speed
562+
data_.diff_pressure_ias = turbomath::fsign(data_.diff_pressure)
563+
* sqrt((fabs(data_.diff_pressure)/(0.5*1.225)));
565564
}
566565

567566
void Sensors::update_battery_monitor_multipliers()

0 commit comments

Comments
 (0)