fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-14 02:53:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

mavlink: move ESC_INFO stream to separate file

Browse Source
This commit is contained in:
Daniel Agar
2020-10-09 10:30:30 -04:00
parent 1ddfd61d34
commit 9c4abf334b
2 changed files with 101 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/mavlink/mavlink_messages.cpp
+3 -90
View File
@@ -72,7 +72,6 @@
#include <uORB/topics/debug_vect.h>
#include <uORB/topics/differential_pressure.h>
#include <uORB/topics/distance_sensor.h>
#include <uORB/topics/esc_status.h>
#include <uORB/topics/estimator_sensor_bias.h>
#include <uORB/topics/estimator_status.h>
#include <uORB/topics/geofence_result.h>
@@ -119,6 +118,7 @@ using matrix::Vector3f;
using matrix::wrap_2pi;
#include "streams/AUTOPILOT_VERSION.hpp"
#include "streams/ESC_INFO.hpp"
#include "streams/ESC_STATUS.hpp"
#include "streams/EXTENDED_SYS_STATE.hpp"
#include "streams/FLIGHT_INFORMATION.hpp"
@@ -5293,95 +5293,6 @@ protected:
}
};
class MavlinkStreamESCInfo : public MavlinkStream
{
public:
const char *get_name() const override
{
return MavlinkStreamESCInfo::get_name_static();
}
static constexpr const char *get_name_static()
{
return "ESC_INFO";
}
static constexpr uint16_t get_id_static()
{
return MAVLINK_MSG_ID_ESC_INFO;
}
uint16_t get_id() override
{
return get_id_static();
}
static MavlinkStream *new_instance(Mavlink *mavlink)
{
return new MavlinkStreamESCInfo(mavlink);
}
unsigned get_size() override
{
static constexpr unsigned size_per_batch = MAVLINK_MSG_ID_ESC_INFO_LEN + MAVLINK_NUM_NON_PAYLOAD_BYTES;
return _esc_status_sub.advertised() ? size_per_batch * _number_of_batches : 0;
}
private:
uORB::Subscription _esc_status_sub{ORB_ID(esc_status)};
/* do not allow top copying this class */
MavlinkStreamESCInfo(MavlinkStreamESCInfo &) = delete;
MavlinkStreamESCInfo &operator = (const MavlinkStreamESCInfo &) = delete;
protected:
uint8_t _number_of_batches{0};
explicit MavlinkStreamESCInfo(Mavlink *mavlink) : MavlinkStream(mavlink)
{}
bool send(const hrt_abstime t) override
{
esc_status_s esc_status;
uint8_t batch_size = MAVLINK_MSG_ESC_INFO_FIELD_TEMPERATURE_LEN;
if (_esc_status_sub.update(&esc_status)) {
mavlink_esc_info_t msg = {};
msg.time_usec = esc_status.timestamp;
msg.counter = esc_status.counter;
msg.count = esc_status.esc_count;
msg.connection_type = esc_status.esc_connectiontype;
msg.info = esc_status.esc_online_flags;
// Ceil value of integer division. For 1-4 esc => 1 batch, 5-8 esc => 2 batches etc
_number_of_batches = ceilf((float)esc_status.esc_count / batch_size);
for (int batch_number = 0; batch_number < _number_of_batches; batch_number++) {
msg.index = batch_number * batch_size;
for (int esc_index = 0; esc_index < batch_size ; esc_index++) {
msg.failure_flags[esc_index] = esc_status.esc[esc_index].failures;
msg.error_count[esc_index] = esc_status.esc[esc_index].esc_errorcount;
msg.temperature[esc_index] = esc_status.esc[esc_index].esc_temperature;
}
mavlink_msg_esc_info_send_struct(_mavlink->get_channel(), &msg);
}
return true;
}
return false;
}
};
static const StreamListItem streams_list[] = {
create_stream_list_item<MavlinkStreamHeartbeat>(),
create_stream_list_item<MavlinkStreamStatustext>(),
@@ -5445,7 +5356,9 @@ static const StreamListItem streams_list[] = {
create_stream_list_item<MavlinkStreamPing>(),
create_stream_list_item<MavlinkStreamOrbitStatus>(),
create_stream_list_item<MavlinkStreamObstacleDistance>(),
#if defined(ESC_INFO_HPP)
create_stream_list_item<MavlinkStreamESCInfo>(),
#endif // ESC_INFO_HPP
#if defined(ESC_STATUS_HPP)
create_stream_list_item<MavlinkStreamESCStatus>(),
#endif // ESC_STATUS_HPP
src/modules/mavlink/streams/ESC_INFO.hpp
+98
View File
@@ -0,0 +1,98 @@
/****************************************************************************
*
* Copyright (c) 2020 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.
*
****************************************************************************/
#ifndef ESC_INFO_HPP
#define ESC_INFO_HPP
#include <uORB/topics/esc_status.h>
class MavlinkStreamESCInfo : public MavlinkStream
{
public:
static MavlinkStream *new_instance(Mavlink *mavlink) { return new MavlinkStreamESCInfo(mavlink); }
static constexpr const char *get_name_static() { return "ESC_INFO"; }
static constexpr uint16_t get_id_static() { return MAVLINK_MSG_ID_ESC_INFO; }
const char *get_name() const override { return get_name_static(); }
uint16_t get_id() override { return get_id_static(); }
unsigned get_size() override
{
static constexpr unsigned size_per_batch = MAVLINK_MSG_ID_ESC_INFO_LEN + MAVLINK_NUM_NON_PAYLOAD_BYTES;
return _esc_status_sub.advertised() ? size_per_batch * _number_of_batches : 0;
}
private:
explicit MavlinkStreamESCInfo(Mavlink *mavlink) : MavlinkStream(mavlink) {}
uORB::Subscription _esc_status_sub{ORB_ID(esc_status)};
uint8_t _number_of_batches{0};
bool send(const hrt_abstime t) override
{
static constexpr uint8_t batch_size = MAVLINK_MSG_ESC_INFO_FIELD_TEMPERATURE_LEN;
esc_status_s esc_status;
if (_esc_status_sub.update(&esc_status)) {
mavlink_esc_info_t msg{};
msg.time_usec = esc_status.timestamp;
msg.counter = esc_status.counter;
msg.count = esc_status.esc_count;
msg.connection_type = esc_status.esc_connectiontype;
msg.info = esc_status.esc_online_flags;
// Ceil value of integer division. For 1-4 esc => 1 batch, 5-8 esc => 2 batches etc
_number_of_batches = ceilf((float)esc_status.esc_count / batch_size);
for (int batch_number = 0; batch_number < _number_of_batches; batch_number++) {
msg.index = batch_number * batch_size;
for (int esc_index = 0; esc_index < batch_size ; esc_index++) {
msg.failure_flags[esc_index] = esc_status.esc[esc_index].failures;
msg.error_count[esc_index] = esc_status.esc[esc_index].esc_errorcount;
msg.temperature[esc_index] = esc_status.esc[esc_index].esc_temperature;
}
mavlink_msg_esc_info_send_struct(_mavlink->get_channel(), &msg);
}
return true;
}
return false;
}
};
#endif // ESC_INFO_HPP