diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-03-25 12:08:58 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-03-25 12:08:58 +0100 |
| commit | 5053575e2f3addbd03e7787f6647955e5af65ab0 (patch) | |
| tree | f42a11da416a582693f8a8bb1b63a37fa40c755d /src/modules/mavlink | |
| parent | 6c9a40b714bb311e2841289c9449f80effdf14ce (diff) | |
| parent | f35ea50c927c283e2929b8415a981880ee4fafa6 (diff) | |
| download | px4-firmware-5053575e2f3addbd03e7787f6647955e5af65ab0.tar.gz px4-firmware-5053575e2f3addbd03e7787f6647955e5af65ab0.tar.bz2 px4-firmware-5053575e2f3addbd03e7787f6647955e5af65ab0.zip | |
Merge branch 'master' of github.com:PX4/Firmware into hil_range_fix
Diffstat (limited to 'src/modules/mavlink')
| -rw-r--r-- | src/modules/mavlink/mavlink_receiver.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/modules/mavlink/mavlink_receiver.cpp b/src/modules/mavlink/mavlink_receiver.cpp index 489d2bdcb..d7e300670 100644 --- a/src/modules/mavlink/mavlink_receiver.cpp +++ b/src/modules/mavlink/mavlink_receiver.cpp @@ -634,13 +634,15 @@ MavlinkReceiver::handle_message_hil_sensor(mavlink_message_t *msg) hil_battery_status.timestamp = timestamp; hil_battery_status.voltage_v = 11.1f; + hil_battery_status.voltage_filtered_v = 11.1f; hil_battery_status.current_a = 10.0f; + hil_battery_status.discharged_mah = -1.0f; if (_battery_pub > 0) { orb_publish(ORB_ID(battery_status), _battery_pub, &hil_battery_status); } else { - _baro_pub = orb_advertise(ORB_ID(battery_status), &hil_battery_status); + _battery_pub = orb_advertise(ORB_ID(battery_status), &hil_battery_status); } } |