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

MavlinkLogHandler: remove MavlinkStream inheritance

Browse Source
This commit is contained in:
Beat Küng
2017-05-12 14:28:45 +02:00
committed by Lorenz Meier
parent e6c3b29aa6
commit 99b29777ba
2 changed files with 12 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/modules/mavlink/mavlink_log_handler.cpp
View File

@@ -79,17 +79,10 @@ stat_file(const char *file, time_t *date = nullptr, uint32_t *size = nullptr)
return false; return false;
} }
//-------------------------------------------------------------------
MavlinkLogHandler *
MavlinkLogHandler::new_instance(Mavlink *mavlink)
{
return new MavlinkLogHandler(mavlink);
}
//------------------------------------------------------------------- //-------------------------------------------------------------------
MavlinkLogHandler::MavlinkLogHandler(Mavlink *mavlink) MavlinkLogHandler::MavlinkLogHandler(Mavlink *mavlink)
: MavlinkStream(mavlink) : _pLogHandlerHelper(nullptr),
, _pLogHandlerHelper(nullptr) _mavlink(mavlink)
{ {
} }
@@ -117,20 +110,6 @@ MavlinkLogHandler::handle_message(const mavlink_message_t *msg)
} }
} }
//-------------------------------------------------------------------
const char *
MavlinkLogHandler::get_name() const
{
return "MAVLINK_LOG_HANDLER";
}
//-------------------------------------------------------------------
uint16_t
MavlinkLogHandler::get_id()
{
return MAVLINK_MSG_ID_LOG_ENTRY;
}
//------------------------------------------------------------------- //-------------------------------------------------------------------
unsigned unsigned
MavlinkLogHandler::get_size() MavlinkLogHandler::get_size()

21
src/modules/mavlink/mavlink_log_handler.h
View File

@@ -42,7 +42,7 @@
#include <stdio.h> #include <stdio.h>
#include <cstdbool> #include <cstdbool>
#include <v2.0/mavlink_types.h> #include <v2.0/mavlink_types.h>
#include "mavlink_stream.h" #include <drivers/drv_hrt.h>
class Mavlink; class Mavlink;
@@ -88,21 +88,21 @@ private:
}; };
// MAVLink LOG_* Message Handler // MAVLink LOG_* Message Handler
class MavlinkLogHandler : public MavlinkStream class MavlinkLogHandler
{ {
public: public:
MavlinkLogHandler(Mavlink *mavlink); MavlinkLogHandler(Mavlink *mavlink);
static MavlinkLogHandler *new_instance(Mavlink *mavlink);
// Handle possible LOG message // Handle possible LOG message
void handle_message(const mavlink_message_t *msg); void handle_message(const mavlink_message_t *msg);
// Overrides from MavlinkStream /**
const char *get_name(void) const; * Handle sending of messages. Call this regularly at a fixed frequency.
uint16_t get_id(void); * @param t current time
unsigned get_size(void); */
void send(const hrt_abstime t); void send(const hrt_abstime t);
unsigned get_size();
private: private:
void _log_message(const mavlink_message_t *msg); void _log_message(const mavlink_message_t *msg);
@@ -114,7 +114,6 @@ private:
size_t _log_send_listing(); size_t _log_send_listing();
size_t _log_send_data(); size_t _log_send_data();
private:
LogListHelper *_pLogHandlerHelper; LogListHelper *_pLogHandlerHelper;
Mavlink *_mavlink;
}; };