yemai/bizhang_-obav
1
0
Fork 0
mirror of https://gitee.com/xiaohuolufeihua/bizhang_-obav.git synced 2026-05-21 01:12:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

variable rename

Browse Source
This commit is contained in:
Thomas Gubler
2014-12-30 12:27:45 +01:00
parent 6f425ca7fc
commit 838f860347
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/platforms/ros/nodes/manual_input/manual_input.cpp
View File

@@ -41,10 +41,11 @@
#include "manual_input.h"
#include <px4/manual_control_setpoint.h>
#include <platforms/px4_middleware.h>
ManualInput::ManualInput() :
_n(),
_sub_joy(_n.subscribe("joy", 10, &ManualInput::JoyCallback, this)),
joy_sub(_n.subscribe("joy", 10, &ManualInput::JoyCallback, this)),
_man_ctrl_sp_pub(_n.advertise<px4::manual_control_setpoint>("manual_control_setpoint", 10))
{
/* Load parameters, default values work for Microsoft XBox Controller */
@@ -87,6 +88,8 @@ void ManualInput::JoyCallback(const sensor_msgs::JoyConstPtr& msg)
msg_out.acro_switch = 0;
msg_out.offboard_switch = 0;
msg_out.timestamp = px4::get_time_micros();
_man_ctrl_sp_pub.publish(msg_out);
}
@@ -99,8 +102,6 @@ int main(int argc, char **argv)
{
ros::init(argc, argv, "manual_input");
ManualInput m;
ros::spin();
return 0;
}

2
src/platforms/ros/nodes/manual_input/manual_input.h
View File

@@ -59,7 +59,7 @@ protected:
void MapAxis(const sensor_msgs::JoyConstPtr& msg, int map_index, double scale, double offset, float &out);
ros::NodeHandle _n;
ros::Subscriber _sub_joy;
ros::Subscriber joy_sub;
ros::Publisher _man_ctrl_sp_pub;
/* Parameters */