Renaming finished
Esse commit está contido em:
+1
-1
@@ -2,7 +2,7 @@
|
|||||||
\mainpage
|
\mainpage
|
||||||
\htmlinclude manifest.html
|
\htmlinclude manifest.html
|
||||||
|
|
||||||
\b ardrone_brown is ...
|
\b ardrone_autonomy is ...
|
||||||
|
|
||||||
<!--
|
<!--
|
||||||
Provide an overview of your package.
|
Provide an overview of your package.
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ ARDroneDriver::ARDroneDriver()
|
|||||||
image_pub = image_transport.advertiseCamera("ardrone/image_raw", 10);
|
image_pub = image_transport.advertiseCamera("ardrone/image_raw", 10);
|
||||||
hori_pub = image_transport.advertiseCamera("ardrone/front/image_raw", 10);
|
hori_pub = image_transport.advertiseCamera("ardrone/front/image_raw", 10);
|
||||||
vert_pub = image_transport.advertiseCamera("ardrone/bottom/image_raw", 10);
|
vert_pub = image_transport.advertiseCamera("ardrone/bottom/image_raw", 10);
|
||||||
navdata_pub = node_handle.advertise<ardrone_brown::Navdata>("ardrone/navdata", 10);
|
navdata_pub = node_handle.advertise<ardrone_autonomy::Navdata>("ardrone/navdata", 10);
|
||||||
toggleCam_service = node_handle.advertiseService("ardrone/togglecam", toggleCamCallback);
|
toggleCam_service = node_handle.advertiseService("ardrone/togglecam", toggleCamCallback);
|
||||||
toggleNavdataDemo_service = node_handle.advertiseService("ardrone/togglenavdatademo", toggleNavdataDemoCallback);
|
toggleNavdataDemo_service = node_handle.advertiseService("ardrone/togglenavdatademo", toggleNavdataDemoCallback);
|
||||||
setCamChannel_service = node_handle.advertiseService("ardrone/setcamchannel",setCamChannelCallback );
|
setCamChannel_service = node_handle.advertiseService("ardrone/setcamchannel",setCamChannelCallback );
|
||||||
@@ -264,7 +264,7 @@ void ARDroneDriver::publish_video()
|
|||||||
|
|
||||||
void ARDroneDriver::publish_navdata()
|
void ARDroneDriver::publish_navdata()
|
||||||
{
|
{
|
||||||
ardrone_brown::Navdata msg;
|
ardrone_autonomy::Navdata msg;
|
||||||
|
|
||||||
msg.batteryPercent = navdata.vbat_flying_percentage;
|
msg.batteryPercent = navdata.vbat_flying_percentage;
|
||||||
msg.state = (navdata.ctrl_state >> 16);
|
msg.state = (navdata.ctrl_state >> 16);
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
#include <ros/ros.h>
|
#include <ros/ros.h>
|
||||||
#include <image_transport/image_transport.h>
|
#include <image_transport/image_transport.h>
|
||||||
#include <sensor_msgs/Image.h>
|
#include <sensor_msgs/Image.h>
|
||||||
#include <ardrone_brown/Navdata.h>
|
#include <ardrone_autonomy/Navdata.h>
|
||||||
#include "ardrone_sdk.h"
|
#include "ardrone_sdk.h"
|
||||||
|
|
||||||
class ARDroneDriver
|
class ARDroneDriver
|
||||||
|
|||||||
@@ -32,7 +32,7 @@ bool toggleNavdataDemoCallback(std_srvs::Empty::Request& request, std_srvs::Empt
|
|||||||
|
|
||||||
//ros service callback to set the camera channel
|
//ros service callback to set the camera channel
|
||||||
//TODO: add input check
|
//TODO: add input check
|
||||||
bool setCamChannelCallback(ardrone_brown::CamSelect::Request& request, ardrone_brown::CamSelect::Response& response)
|
bool setCamChannelCallback(ardrone_autonomy::CamSelect::Request& request, ardrone_autonomy::CamSelect::Response& response)
|
||||||
{
|
{
|
||||||
cam_state = request.channel;
|
cam_state = request.channel;
|
||||||
ARDRONE_TOOL_CONFIGURATION_ADDEVENT (video_channel, &cam_state, NULL);
|
ARDRONE_TOOL_CONFIGURATION_ADDEVENT (video_channel, &cam_state, NULL);
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
#include <geometry_msgs/Twist.h>
|
#include <geometry_msgs/Twist.h>
|
||||||
#include <std_msgs/Empty.h>
|
#include <std_msgs/Empty.h>
|
||||||
#include <std_srvs/Empty.h>
|
#include <std_srvs/Empty.h>
|
||||||
#include <ardrone_brown/CamSelect.h>
|
#include <ardrone_autonomy/CamSelect.h>
|
||||||
|
|
||||||
#define _EPS 1.0e-6
|
#define _EPS 1.0e-6
|
||||||
|
|
||||||
@@ -17,7 +17,7 @@ void resetCallback(const std_msgs::Empty &msg);
|
|||||||
void takeoffCallback(const std_msgs::Empty &msg);
|
void takeoffCallback(const std_msgs::Empty &msg);
|
||||||
|
|
||||||
//void toggleCamCallback(const std_msgs::Empty &msg);
|
//void toggleCamCallback(const std_msgs::Empty &msg);
|
||||||
bool setCamChannelCallback(ardrone_brown::CamSelect::Request& request, ardrone_brown::CamSelect::Response& response);
|
bool setCamChannelCallback(ardrone_autonomy::CamSelect::Request& request, ardrone_autonomy::CamSelect::Response& response);
|
||||||
bool toggleCamCallback(std_srvs::Empty::Request& request, std_srvs::Empty::Response& response);
|
bool toggleCamCallback(std_srvs::Empty::Request& request, std_srvs::Empty::Response& response);
|
||||||
bool toggleNavdataDemoCallback(std_srvs::Empty::Request& request, std_srvs::Empty::Response& response);
|
bool toggleNavdataDemoCallback(std_srvs::Empty::Request& request, std_srvs::Empty::Response& response);
|
||||||
|
|
||||||
|
|||||||
Referência em uma Nova Issue
Bloquear um usuário