forked from Archive/PX4-Autopilot
Added encoder uORB message/ fixedwing_backside working if enabled.
This commit is contained in:
parent
8f0b223c87
commit
eaef67f21d
|
@ -175,14 +175,14 @@ void BlockMultiModeBacksideAutopilot::update()
|
||||||
// the min/max velocity
|
// the min/max velocity
|
||||||
float v = _vLimit.update(sqrtf(
|
float v = _vLimit.update(sqrtf(
|
||||||
_pos.vel_n * _pos.vel_n +
|
_pos.vel_n * _pos.vel_n +
|
||||||
_pos.vy * _pos.vy +
|
_pos.vel_e * _pos.vel_e +
|
||||||
_pos.vel_d * _pos.vel_d));
|
_pos.vel_d * _pos.vel_d));
|
||||||
|
|
||||||
// limit velocity command between min/max velocity
|
// limit velocity command between min/max velocity
|
||||||
float vCmd = _vLimit.update(_vCmd.get());
|
float vCmd = _vLimit.update(_vCmd.get());
|
||||||
|
|
||||||
// altitude hold
|
// altitude hold
|
||||||
float dThrottle = _h2Thr.update(_missionCmd.current.altitude - _pos.alt);
|
float dThrottle = _h2Thr.update(_missionCmd.current.alt - _pos.alt);
|
||||||
|
|
||||||
// heading hold
|
// heading hold
|
||||||
float psiError = _wrap_pi(_guide.getPsiCmd() - _att.yaw);
|
float psiError = _wrap_pi(_guide.getPsiCmd() - _att.yaw);
|
||||||
|
@ -237,7 +237,7 @@ void BlockMultiModeBacksideAutopilot::update()
|
||||||
// the min/max velocity
|
// the min/max velocity
|
||||||
float v = _vLimit.update(sqrtf(
|
float v = _vLimit.update(sqrtf(
|
||||||
_pos.vel_n * _pos.vel_n +
|
_pos.vel_n * _pos.vel_n +
|
||||||
_pos.vy * _pos.vy +
|
_pos.vel_e * _pos.vel_e +
|
||||||
_pos.vel_d * _pos.vel_d));
|
_pos.vel_d * _pos.vel_d));
|
||||||
|
|
||||||
// pitch channel -> rate of climb
|
// pitch channel -> rate of climb
|
||||||
|
|
|
@ -41,6 +41,12 @@
|
||||||
#include "topics/vehicle_local_position.h"
|
#include "topics/vehicle_local_position.h"
|
||||||
#include "topics/vehicle_global_position.h"
|
#include "topics/vehicle_global_position.h"
|
||||||
#include "topics/debug_key_value.h"
|
#include "topics/debug_key_value.h"
|
||||||
|
#include "topics/actuator_controls.h"
|
||||||
|
#include "topics/vehicle_global_velocity_setpoint.h"
|
||||||
|
#include "topics/vehicle_attitude_setpoint.h"
|
||||||
|
#include "topics/vehicle_rates_setpoint.h"
|
||||||
|
#include "topics/actuator_outputs.h"
|
||||||
|
#include "topics/encoders.h"
|
||||||
|
|
||||||
namespace uORB {
|
namespace uORB {
|
||||||
|
|
||||||
|
@ -64,5 +70,11 @@ template class __EXPORT Publication<vehicle_attitude_s>;
|
||||||
template class __EXPORT Publication<vehicle_local_position_s>;
|
template class __EXPORT Publication<vehicle_local_position_s>;
|
||||||
template class __EXPORT Publication<vehicle_global_position_s>;
|
template class __EXPORT Publication<vehicle_global_position_s>;
|
||||||
template class __EXPORT Publication<debug_key_value_s>;
|
template class __EXPORT Publication<debug_key_value_s>;
|
||||||
|
template class __EXPORT Publication<actuator_controls_s>;
|
||||||
|
template class __EXPORT Publication<vehicle_global_velocity_setpoint_s>;
|
||||||
|
template class __EXPORT Publication<vehicle_attitude_setpoint_s>;
|
||||||
|
template class __EXPORT Publication<vehicle_rates_setpoint_s>;
|
||||||
|
template class __EXPORT Publication<actuator_outputs_s>;
|
||||||
|
template class __EXPORT Publication<encoders_s>;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -41,6 +41,16 @@
|
||||||
#include "topics/actuator_controls.h"
|
#include "topics/actuator_controls.h"
|
||||||
#include "topics/vehicle_gps_position.h"
|
#include "topics/vehicle_gps_position.h"
|
||||||
#include "topics/sensor_combined.h"
|
#include "topics/sensor_combined.h"
|
||||||
|
#include "topics/vehicle_attitude.h"
|
||||||
|
#include "topics/vehicle_global_position.h"
|
||||||
|
#include "topics/encoders.h"
|
||||||
|
#include "topics/position_setpoint_triplet.h"
|
||||||
|
#include "topics/vehicle_status.h"
|
||||||
|
#include "topics/manual_control_setpoint.h"
|
||||||
|
#include "topics/vehicle_local_position_setpoint.h"
|
||||||
|
#include "topics/vehicle_local_position.h"
|
||||||
|
#include "topics/vehicle_attitude_setpoint.h"
|
||||||
|
#include "topics/vehicle_rates_setpoint.h"
|
||||||
|
|
||||||
namespace uORB
|
namespace uORB
|
||||||
{
|
{
|
||||||
|
@ -79,5 +89,15 @@ template class __EXPORT Subscription<parameter_update_s>;
|
||||||
template class __EXPORT Subscription<actuator_controls_s>;
|
template class __EXPORT Subscription<actuator_controls_s>;
|
||||||
template class __EXPORT Subscription<vehicle_gps_position_s>;
|
template class __EXPORT Subscription<vehicle_gps_position_s>;
|
||||||
template class __EXPORT Subscription<sensor_combined_s>;
|
template class __EXPORT Subscription<sensor_combined_s>;
|
||||||
|
template class __EXPORT Subscription<vehicle_attitude_s>;
|
||||||
|
template class __EXPORT Subscription<vehicle_global_position_s>;
|
||||||
|
template class __EXPORT Subscription<encoders_s>;
|
||||||
|
template class __EXPORT Subscription<position_setpoint_triplet_s>;
|
||||||
|
template class __EXPORT Subscription<vehicle_status_s>;
|
||||||
|
template class __EXPORT Subscription<manual_control_setpoint_s>;
|
||||||
|
template class __EXPORT Subscription<vehicle_local_position_setpoint_s>;
|
||||||
|
template class __EXPORT Subscription<vehicle_local_position_s>;
|
||||||
|
template class __EXPORT Subscription<vehicle_attitude_setpoint_s>;
|
||||||
|
template class __EXPORT Subscription<vehicle_rates_setpoint_s>;
|
||||||
|
|
||||||
} // namespace uORB
|
} // namespace uORB
|
||||||
|
|
|
@ -190,3 +190,6 @@ ORB_DEFINE(navigation_capabilities, struct navigation_capabilities_s);
|
||||||
|
|
||||||
#include "topics/esc_status.h"
|
#include "topics/esc_status.h"
|
||||||
ORB_DEFINE(esc_status, struct esc_status_s);
|
ORB_DEFINE(esc_status, struct esc_status_s);
|
||||||
|
|
||||||
|
#include "topics/encoders.h"
|
||||||
|
ORB_DEFINE(encoders, struct encoders_s);
|
||||||
|
|
|
@ -0,0 +1,66 @@
|
||||||
|
/****************************************************************************
|
||||||
|
*
|
||||||
|
* Copyright (C) 2012 PX4 Development Team. All rights reserved.
|
||||||
|
*
|
||||||
|
* Redistribution and use in source and binary forms, with or without
|
||||||
|
* modification, are permitted provided that the following conditions
|
||||||
|
* are met:
|
||||||
|
*
|
||||||
|
* 1. Redistributions of source code must retain the above copyright
|
||||||
|
* notice, this list of conditions and the following disclaimer.
|
||||||
|
* 2. Redistributions in binary form must reproduce the above copyright
|
||||||
|
* notice, this list of conditions and the following disclaimer in
|
||||||
|
* the documentation and/or other materials provided with the
|
||||||
|
* distribution.
|
||||||
|
* 3. Neither the name PX4 nor the names of its contributors may be
|
||||||
|
* used to endorse or promote products derived from this software
|
||||||
|
* without specific prior written permission.
|
||||||
|
*
|
||||||
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||||
|
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||||
|
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
|
||||||
|
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
|
||||||
|
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
|
||||||
|
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
|
||||||
|
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
|
||||||
|
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
|
||||||
|
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||||
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
|
||||||
|
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||||
|
* POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
*
|
||||||
|
****************************************************************************/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @file encoders.h
|
||||||
|
*
|
||||||
|
* Encoders topic.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef TOPIC_ENCODERS_H
|
||||||
|
#define TOPIC_ENCODERS_H
|
||||||
|
|
||||||
|
#include <stdint.h>
|
||||||
|
#include "../uORB.h"
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @addtogroup topics
|
||||||
|
* @{
|
||||||
|
*/
|
||||||
|
|
||||||
|
#define NUM_ENCODERS 4
|
||||||
|
|
||||||
|
struct encoders_s {
|
||||||
|
uint64_t timestamp;
|
||||||
|
int64_t counts[NUM_ENCODERS]; // counts of encoder
|
||||||
|
float velocity[NUM_ENCODERS]; // counts of encoder/ second
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @}
|
||||||
|
*/
|
||||||
|
|
||||||
|
ORB_DECLARE(encoders);
|
||||||
|
|
||||||
|
#endif
|
Loading…
Reference in New Issue