Skip to content

Commit 8c851bd

Browse files
committed
update to gazebo harmonic message
1 parent 09d6725 commit 8c851bd

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

src/modules/simulation/gz_bridge/GZBridge.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -448,24 +448,24 @@ void GZBridge::barometerCallback(const gz::msgs::FluidPressure &air_pressure)
448448
}
449449

450450

451-
void GZBridge::airspeedCallback(const gz::msgs::AirSpeedSensor &air_speed_sensor)
451+
void GZBridge::airspeedCallback(const gz::msgs::AirSpeed &air_speed)
452452
{
453453
if (hrt_absolute_time() == 0) {
454454
return;
455455
}
456456

457457
pthread_mutex_lock(&_node_mutex);
458458

459-
const uint64_t time_us = (air_speed_sensor.header().stamp().sec() * 1000000)
460-
+ (air_speed_sensor.header().stamp().nsec() / 1000);
459+
const uint64_t time_us = (air_speed.header().stamp().sec() * 1000000)
460+
+ (air_speed.header().stamp().nsec() / 1000);
461461

462-
double air_speed_value = air_speed_sensor.diff_pressure();
462+
double air_speed_value = air_speed.diff_pressure();
463463

464464
differential_pressure_s report{};
465465
report.timestamp_sample = time_us;
466466
report.device_id = 1377548; // 1377548: DRV_DIFF_PRESS_DEVTYPE_SIM, BUS: 1, ADDR: 5, TYPE: SIMULATION
467467
report.differential_pressure_pa = static_cast<float>(air_speed_value); // hPa to Pa;
468-
report.temperature = static_cast<float>(air_speed_sensor.temperature()) + atmosphere::kAbsoluteNullCelsius; // K to C
468+
report.temperature = static_cast<float>(air_speed.temperature()) + atmosphere::kAbsoluteNullCelsius; // K to C
469469
report.timestamp = hrt_absolute_time();;
470470
_differential_pressure_pub.publish(report);
471471

src/modules/simulation/gz_bridge/GZBridge.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868

6969
#include <gz/msgs/imu.pb.h>
7070
#include <gz/msgs/fluid_pressure.pb.h>
71-
#include <gz/msgs/air_speed_sensor.pb.h>
71+
#include <gz/msgs/air_speed.pb.h>
7272
#include <gz/msgs/model.pb.h>
7373
#include <gz/msgs/odometry_with_covariance.pb.h>
7474
#include <gz/msgs/laserscan.pb.h>
@@ -107,7 +107,7 @@ class GZBridge : public ModuleBase<GZBridge>, public ModuleParams, public px4::S
107107

108108
void clockCallback(const gz::msgs::Clock &clock);
109109

110-
void airspeedCallback(const gz::msgs::AirSpeedSensor &air_speed_sensor);
110+
void airspeedCallback(const gz::msgs::AirSpeed &air_speed);
111111
void barometerCallback(const gz::msgs::FluidPressure &air_pressure);
112112
void imuCallback(const gz::msgs::IMU &imu);
113113
void poseInfoCallback(const gz::msgs::Pose_V &pose);

0 commit comments

Comments
 (0)