diff options
| author | Julian Oes <julian@oes.ch> | 2014-02-11 14:38:18 +0100 |
|---|---|---|
| committer | Julian Oes <julian@oes.ch> | 2014-02-11 14:38:18 +0100 |
| commit | a5045ccee663c500011b8a5a94554f4cbb263352 (patch) | |
| tree | 392b792ba4e23f0e548a7a4494a6a727ac2f568c /src/modules/mavlink/mavlink_orb_listener.cpp | |
| parent | 8d2d171bb83c4f24f709c20ce8c89b6d1f529616 (diff) | |
| download | px4-firmware-a5045ccee663c500011b8a5a94554f4cbb263352.tar.gz px4-firmware-a5045ccee663c500011b8a5a94554f4cbb263352.tar.bz2 px4-firmware-a5045ccee663c500011b8a5a94554f4cbb263352.zip | |
Mavlink: get rid of some warnings, initialize channel
Diffstat (limited to 'src/modules/mavlink/mavlink_orb_listener.cpp')
| -rw-r--r-- | src/modules/mavlink/mavlink_orb_listener.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/modules/mavlink/mavlink_orb_listener.cpp b/src/modules/mavlink/mavlink_orb_listener.cpp index ffff1838c..6d64569de 100644 --- a/src/modules/mavlink/mavlink_orb_listener.cpp +++ b/src/modules/mavlink/mavlink_orb_listener.cpp @@ -276,9 +276,9 @@ MavlinkOrbListener::l_vehicle_status(const struct listener *l) /* enable or disable HIL */ if (l->listener->v_status.hil_state == HIL_STATE_ON) - l->mavlink->set_hil_on_off(true); + l->mavlink->set_hil_enabled(true); else if (l->listener->v_status.hil_state == HIL_STATE_OFF) - l->mavlink->set_hil_on_off(false); + l->mavlink->set_hil_enabled(false); /* translate the current syste state to mavlink state and mode */ uint8_t mavlink_state = 0; @@ -464,7 +464,7 @@ MavlinkOrbListener::l_actuator_outputs(const struct listener *l) act_outputs.output[7]); /* only send in HIL mode and only send first group for HIL */ - if (l->mavlink->hil_enabled() && l->listener->armed.armed && ids[l->arg] == ORB_ID(actuator_outputs_0)) { + if (l->mavlink->get_hil_enabled() && l->listener->armed.armed && ids[l->arg] == ORB_ID(actuator_outputs_0)) { /* translate the current syste state to mavlink state and mode */ uint8_t mavlink_state = 0; @@ -683,7 +683,6 @@ MavlinkOrbListener::uorb_receive_thread(void *arg) struct listener* next = _listeners; unsigned i = 0; - while (next != nullptr) { fds[i].fd = *next->subp; @@ -708,7 +707,7 @@ MavlinkOrbListener::uorb_receive_thread(void *arg) } else { - unsigned i = 0; + i = 0; struct listener* cb = _listeners; while (cb != nullptr) { |