diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2015-01-26 13:39:30 +0100 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2015-01-26 13:39:30 +0100 |
| commit | bcfcc3e9cca996bddbfc8ae8bbdf082746645826 (patch) | |
| tree | f293ea3791e8a00a96a3292f820f3496393410c8 | |
| parent | 7a63992a9711bc29797650d2741ebbb4507580e9 (diff) | |
| download | px4-firmware-ros_messagelayer_merge_attctl_stdbind_nuttx_bringup.tar.gz px4-firmware-ros_messagelayer_merge_attctl_stdbind_nuttx_bringup.tar.bz2 px4-firmware-ros_messagelayer_merge_attctl_stdbind_nuttx_bringup.zip | |
WIP, reenable code bitsros_messagelayer_merge_attctl_stdbind_nuttx_bringup
| -rw-r--r-- | src/examples/subscriber/subscriber_example.cpp | 6 | ||||
| -rw-r--r-- | src/modules/mc_att_control_multiplatform/mc_att_control.cpp | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/examples/subscriber/subscriber_example.cpp b/src/examples/subscriber/subscriber_example.cpp index 723923205..255a97b42 100644 --- a/src/examples/subscriber/subscriber_example.cpp +++ b/src/examples/subscriber/subscriber_example.cpp @@ -63,7 +63,7 @@ SubscriberExample::SubscriberExample() : /* Do some subscriptions */ /* Function */ - // _n.subscribe<px4_rc_channels>(std::bind(rc_channels_callback_function, std::placeholders::_1), _interval); + _n.subscribe<px4_rc_channels>(std::bind(rc_channels_callback_function, std::placeholders::_1), _interval); /* No callback */ _sub_rc_chan = _n.subscribe<px4_rc_channels>(500); @@ -74,8 +74,8 @@ SubscriberExample::SubscriberExample() : /* Class Method 3 */ _n.subscribe<px4_vehicle_rates_setpoint>(std::bind(&SubscriberExample::vehicle_rates_setpoint_callback, this, std::placeholders::_1), 1000); - // [> Class Method <] - // _n.subscribe<px4_rc_channels>(std::bind(&SubscriberExample::rc_channels_callback, this, std::placeholders::_1), 1000); + /* Class Method */ + _n.subscribe<px4_rc_channels>(std::bind(&SubscriberExample::rc_channels_callback, this, std::placeholders::_1), 1000); PX4_INFO("subscribed"); diff --git a/src/modules/mc_att_control_multiplatform/mc_att_control.cpp b/src/modules/mc_att_control_multiplatform/mc_att_control.cpp index 30a8de228..0b135736f 100644 --- a/src/modules/mc_att_control_multiplatform/mc_att_control.cpp +++ b/src/modules/mc_att_control_multiplatform/mc_att_control.cpp @@ -110,8 +110,8 @@ MulticopterAttitudeControl::MulticopterAttitudeControl() : _v_att_sp = _n.subscribe<px4_vehicle_attitude_setpoint>(0); _v_rates_sp = _n.subscribe<px4_vehicle_rates_setpoint>(0); _v_control_mode = _n.subscribe<px4_vehicle_control_mode>(0); - // _parameter_update = _n.subscribe<px4_parameter_update>( - // std::bind(&MulticopterAttitudeControl::handle_parameter_update, this, std::placeholders::_1), 1000); + _parameter_update = _n.subscribe<px4_parameter_update>( + std::bind(&MulticopterAttitudeControl::handle_parameter_update, this, std::placeholders::_1), 1000); _manual_control_sp = _n.subscribe<px4_manual_control_setpoint>(0); _armed = _n.subscribe<px4_actuator_armed>(0); _v_status = _n.subscribe<px4_vehicle_status>(0); |