Compare commits
1 Commits
0.21.1
...
take_off_s
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
749e34b3c4 |
@@ -1,8 +0,0 @@
|
|||||||
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
|
||||||
Changelog for package aruco_pose
|
|
||||||
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
|
||||||
|
|
||||||
0.21.1 (2020-11-17)
|
|
||||||
-------------------
|
|
||||||
* First release of aruco_pose package to ROS
|
|
||||||
* Contributors: Alamoris, Alexey Rogachevskiy, Arthur Golubtsov, Ilya Petrov, Oleg Kalachev
|
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
<?xml version="1.0"?>
|
<?xml version="1.0"?>
|
||||||
<package format="2">
|
<package format="2">
|
||||||
<name>aruco_pose</name>
|
<name>aruco_pose</name>
|
||||||
<version>0.21.1</version>
|
<version>0.0.1</version>
|
||||||
<description>Positioning with ArUco markers</description>
|
<description>Positioning with ArUco markers</description>
|
||||||
|
|
||||||
<maintainer email="okalachev@gmail.com">Oleg Kalachev</maintainer>
|
<maintainer email="okalachev@gmail.com">Oleg Kalachev</maintainer>
|
||||||
|
|||||||
@@ -1,8 +0,0 @@
|
|||||||
^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
|
||||||
Changelog for package clover
|
|
||||||
^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
|
||||||
|
|
||||||
0.21.1 (2020-11-17)
|
|
||||||
-------------------
|
|
||||||
* First release of clover package to ROS
|
|
||||||
* Contributors: Alexey Rogachevskiy, Arthur Golubtsov, Oleg Kalachev
|
|
||||||
@@ -82,6 +82,7 @@ add_service_files(
|
|||||||
GetTelemetry.srv
|
GetTelemetry.srv
|
||||||
Navigate.srv
|
Navigate.srv
|
||||||
NavigateGlobal.srv
|
NavigateGlobal.srv
|
||||||
|
TakeOff.srv
|
||||||
SetPosition.srv
|
SetPosition.srv
|
||||||
SetVelocity.srv
|
SetVelocity.srv
|
||||||
SetAttitude.srv
|
SetAttitude.srv
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
<?xml version="1.0"?>
|
<?xml version="1.0"?>
|
||||||
<package format="2">
|
<package format="2">
|
||||||
<name>clover</name>
|
<name>clover</name>
|
||||||
<version>0.21.1</version>
|
<version>0.0.1</version>
|
||||||
<description>The Clover package</description>
|
<description>The Clover package</description>
|
||||||
|
|
||||||
<maintainer email="okalachev@gmail.com">Oleg Kalachev</maintainer>
|
<maintainer email="okalachev@gmail.com">Oleg Kalachev</maintainer>
|
||||||
|
|||||||
@@ -41,6 +41,7 @@
|
|||||||
#include <clover/GetTelemetry.h>
|
#include <clover/GetTelemetry.h>
|
||||||
#include <clover/Navigate.h>
|
#include <clover/Navigate.h>
|
||||||
#include <clover/NavigateGlobal.h>
|
#include <clover/NavigateGlobal.h>
|
||||||
|
#include <clover/TakeOff.h>
|
||||||
#include <clover/SetPosition.h>
|
#include <clover/SetPosition.h>
|
||||||
#include <clover/SetVelocity.h>
|
#include <clover/SetVelocity.h>
|
||||||
#include <clover/SetAttitude.h>
|
#include <clover/SetAttitude.h>
|
||||||
@@ -781,6 +782,10 @@ bool navigateGlobal(NavigateGlobal::Request& req, NavigateGlobal::Response& res)
|
|||||||
return serve(NAVIGATE_GLOBAL, NAN, NAN, req.z, NAN, NAN, NAN, NAN, NAN, req.yaw, NAN, NAN, req.yaw_rate, req.lat, req.lon, NAN, req.speed, req.frame_id, req.auto_arm, res.success, res.message);
|
return serve(NAVIGATE_GLOBAL, NAN, NAN, req.z, NAN, NAN, NAN, NAN, NAN, req.yaw, NAN, NAN, req.yaw_rate, req.lat, req.lon, NAN, req.speed, req.frame_id, req.auto_arm, res.success, res.message);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool takeOff(TakeOff::Request& req, TakeOff::Response& res) {
|
||||||
|
return serve(NAVIGATE, 0, 0, req.alt, NAN, NAN, NAN, NAN, NAN, NAN, NAN, NAN, 0, NAN, NAN, NAN, req.speed, body.child_frame_id, true, res.success, res.message);
|
||||||
|
}
|
||||||
|
|
||||||
bool setPosition(SetPosition::Request& req, SetPosition::Response& res) {
|
bool setPosition(SetPosition::Request& req, SetPosition::Response& res) {
|
||||||
return serve(POSITION, req.x, req.y, req.z, NAN, NAN, NAN, NAN, NAN, req.yaw, NAN, NAN, req.yaw_rate, NAN, NAN, NAN, NAN, req.frame_id, req.auto_arm, res.success, res.message);
|
return serve(POSITION, req.x, req.y, req.z, NAN, NAN, NAN, NAN, NAN, req.yaw, NAN, NAN, req.yaw_rate, NAN, NAN, NAN, NAN, req.frame_id, req.auto_arm, res.success, res.message);
|
||||||
}
|
}
|
||||||
@@ -905,6 +910,7 @@ int main(int argc, char **argv)
|
|||||||
auto gt_serv = nh.advertiseService("get_telemetry", &getTelemetry);
|
auto gt_serv = nh.advertiseService("get_telemetry", &getTelemetry);
|
||||||
auto na_serv = nh.advertiseService("navigate", &navigate);
|
auto na_serv = nh.advertiseService("navigate", &navigate);
|
||||||
auto ng_serv = nh.advertiseService("navigate_global", &navigateGlobal);
|
auto ng_serv = nh.advertiseService("navigate_global", &navigateGlobal);
|
||||||
|
auto to_serv = nh.advertiseService("take_off", &takeOff);
|
||||||
auto sp_serv = nh.advertiseService("set_position", &setPosition);
|
auto sp_serv = nh.advertiseService("set_position", &setPosition);
|
||||||
auto sv_serv = nh.advertiseService("set_velocity", &setVelocity);
|
auto sv_serv = nh.advertiseService("set_velocity", &setVelocity);
|
||||||
auto sa_serv = nh.advertiseService("set_attitude", &setAttitude);
|
auto sa_serv = nh.advertiseService("set_attitude", &setAttitude);
|
||||||
|
|||||||
5
clover/srv/TakeOff.srv
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
float32 alt
|
||||||
|
float32 speed
|
||||||
|
---
|
||||||
|
bool success
|
||||||
|
string message
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
|
||||||
Changelog for package clover_blocks
|
|
||||||
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
|
||||||
|
|
||||||
0.21.1 (2020-11-17)
|
|
||||||
-------------------
|
|
||||||
* First release of clover_blocks package to ROS
|
|
||||||
* Contributors: Oleg Kalachev
|
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
<?xml version="1.0"?>
|
<?xml version="1.0"?>
|
||||||
<package format="2">
|
<package format="2">
|
||||||
<name>clover_blocks</name>
|
<name>clover_blocks</name>
|
||||||
<version>0.21.1</version>
|
<version>0.0.0</version>
|
||||||
<description>Blockly programming support for Clover</description>
|
<description>Blockly programming support for Clover</description>
|
||||||
<maintainer email="okalachev@gmail.com">Oleg Kalachev</maintainer>
|
<maintainer email="okalachev@gmail.com">Oleg Kalachev</maintainer>
|
||||||
<license>MIT</license>
|
<license>MIT</license>
|
||||||
|
|||||||
@@ -1,9 +0,0 @@
|
|||||||
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
|
||||||
Changelog for package clover_description
|
|
||||||
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
|
||||||
|
|
||||||
0.21.1 (2020-11-17)
|
|
||||||
-------------------
|
|
||||||
* First release of clover_description package to ROS
|
|
||||||
* Contributors: Alexey Rogachevskiy
|
|
||||||
|
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
<package format="2">
|
<package format="2">
|
||||||
<name>clover_description</name>
|
<name>clover_description</name>
|
||||||
<version>0.21.1</version>
|
<version>0.0.1</version>
|
||||||
<description>The clover_description package provides URDF models of the Clover series of quadcopters.</description>
|
<description>The clover_description package provides URDF models of the Clover series of quadcopters.</description>
|
||||||
|
|
||||||
<maintainer email="sfalexrog@gmail.com">Alexey Rogachevskiy</maintainer>
|
<maintainer email="sfalexrog@gmail.com">Alexey Rogachevskiy</maintainer>
|
||||||
|
|||||||
@@ -1,8 +0,0 @@
|
|||||||
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
|
||||||
Changelog for package clover_simulation
|
|
||||||
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
|
||||||
|
|
||||||
0.21.1 (2020-11-17)
|
|
||||||
-------------------
|
|
||||||
* First release of clover_simulation package to ROS
|
|
||||||
* Contributors: Alexey Rogachevskiy
|
|
||||||
@@ -14,7 +14,7 @@
|
|||||||
<!-- Workaround for crashes in VMware -->
|
<!-- Workaround for crashes in VMware -->
|
||||||
<env name="SVGA_VGPU10" value="0"/>
|
<env name="SVGA_VGPU10" value="0"/>
|
||||||
<arg name="gui" value="true"/>
|
<arg name="gui" value="true"/>
|
||||||
<arg name="world_name" value="$(find clover_simulation)/resources/worlds/clover_aruco.world"/>
|
<arg name="world_name" value="$(find clover_simulation)/resources/worlds/clover.world"/>
|
||||||
<arg name="verbose" value="true"/>
|
<arg name="verbose" value="true"/>
|
||||||
</include>
|
</include>
|
||||||
|
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 94 B |
|
Before Width: | Height: | Size: 93 B |
|
Before Width: | Height: | Size: 94 B |
|
Before Width: | Height: | Size: 94 B |
|
Before Width: | Height: | Size: 93 B |
|
Before Width: | Height: | Size: 93 B |
|
Before Width: | Height: | Size: 94 B |
|
Before Width: | Height: | Size: 94 B |
|
Before Width: | Height: | Size: 94 B |
|
Before Width: | Height: | Size: 94 B |
|
Before Width: | Height: | Size: 94 B |
|
Before Width: | Height: | Size: 94 B |
|
Before Width: | Height: | Size: 94 B |
|
Before Width: | Height: | Size: 93 B |
|
Before Width: | Height: | Size: 94 B |
|
Before Width: | Height: | Size: 94 B |
|
Before Width: | Height: | Size: 94 B |
|
Before Width: | Height: | Size: 94 B |
|
Before Width: | Height: | Size: 94 B |
|
Before Width: | Height: | Size: 93 B |
|
Before Width: | Height: | Size: 94 B |
|
Before Width: | Height: | Size: 94 B |
|
Before Width: | Height: | Size: 94 B |
|
Before Width: | Height: | Size: 94 B |
|
Before Width: | Height: | Size: 94 B |
|
Before Width: | Height: | Size: 94 B |
|
Before Width: | Height: | Size: 93 B |
|
Before Width: | Height: | Size: 93 B |
|
Before Width: | Height: | Size: 93 B |
|
Before Width: | Height: | Size: 94 B |
|
Before Width: | Height: | Size: 93 B |
|
Before Width: | Height: | Size: 93 B |
|
Before Width: | Height: | Size: 94 B |
|
Before Width: | Height: | Size: 94 B |
|
Before Width: | Height: | Size: 94 B |
|
Before Width: | Height: | Size: 94 B |
|
Before Width: | Height: | Size: 94 B |
|
Before Width: | Height: | Size: 94 B |
|
Before Width: | Height: | Size: 94 B |
|
Before Width: | Height: | Size: 94 B |
|
Before Width: | Height: | Size: 94 B |
|
Before Width: | Height: | Size: 94 B |
|
Before Width: | Height: | Size: 93 B |
|
Before Width: | Height: | Size: 93 B |
|
Before Width: | Height: | Size: 94 B |
|
Before Width: | Height: | Size: 94 B |
|
Before Width: | Height: | Size: 94 B |
|
Before Width: | Height: | Size: 94 B |
|
Before Width: | Height: | Size: 94 B |
|
Before Width: | Height: | Size: 93 B |
|
Before Width: | Height: | Size: 94 B |
|
Before Width: | Height: | Size: 94 B |
|
Before Width: | Height: | Size: 94 B |
|
Before Width: | Height: | Size: 94 B |
|
Before Width: | Height: | Size: 94 B |
|
Before Width: | Height: | Size: 94 B |
|
Before Width: | Height: | Size: 94 B |
|
Before Width: | Height: | Size: 94 B |
|
Before Width: | Height: | Size: 93 B |
|
Before Width: | Height: | Size: 94 B |
|
Before Width: | Height: | Size: 94 B |
|
Before Width: | Height: | Size: 94 B |
|
Before Width: | Height: | Size: 94 B |
|
Before Width: | Height: | Size: 94 B |
|
Before Width: | Height: | Size: 94 B |
|
Before Width: | Height: | Size: 94 B |
|
Before Width: | Height: | Size: 94 B |
|
Before Width: | Height: | Size: 94 B |
|
Before Width: | Height: | Size: 94 B |
|
Before Width: | Height: | Size: 93 B |
|
Before Width: | Height: | Size: 93 B |
|
Before Width: | Height: | Size: 94 B |
|
Before Width: | Height: | Size: 93 B |
|
Before Width: | Height: | Size: 94 B |
|
Before Width: | Height: | Size: 94 B |
|
Before Width: | Height: | Size: 93 B |
|
Before Width: | Height: | Size: 93 B |
|
Before Width: | Height: | Size: 94 B |
|
Before Width: | Height: | Size: 94 B |
|
Before Width: | Height: | Size: 93 B |
|
Before Width: | Height: | Size: 94 B |
|
Before Width: | Height: | Size: 93 B |
|
Before Width: | Height: | Size: 94 B |
|
Before Width: | Height: | Size: 93 B |
|
Before Width: | Height: | Size: 94 B |