Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AP_HAL_ChibiOS: add missing uavcan-related override keywords

This commit is contained in:
Peter Barker 2019-08-14 11:00:17 +10:00 committed by Peter Barker
parent be173a9514
commit 54b200a777
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/AP_HAL_ChibiOS/CANClock.h
View File

@ -139,17 +139,17 @@ void setUtcSyncParams(const UtcSyncParams& params);
class SystemClock : public uavcan::ISystemClock, uavcan::Noncopyable { class SystemClock : public uavcan::ISystemClock, uavcan::Noncopyable {
SystemClock() { } SystemClock() { }
virtual void adjustUtc(uavcan::UtcDuration adjustment) virtual void adjustUtc(uavcan::UtcDuration adjustment) override
{ {
clock::adjustUtc(adjustment); clock::adjustUtc(adjustment);
} }
public: public:
virtual uavcan::MonotonicTime getMonotonic() const virtual uavcan::MonotonicTime getMonotonic() const override
{ {
return clock::getMonotonic(); return clock::getMonotonic();
} }
virtual uavcan::UtcTime getUtc() const virtual uavcan::UtcTime getUtc() const override
{ {
return clock::getUtc(); return clock::getUtc();
} }

16
libraries/AP_HAL_ChibiOS/CANIface.h
View File

@ -174,15 +174,15 @@ class CanIface : public uavcan::ICanIface, uavcan::Noncopyable {
int computeTimings(uavcan::uint32_t target_bitrate, Timings& out_timings); int computeTimings(uavcan::uint32_t target_bitrate, Timings& out_timings);
virtual uavcan::int16_t send(const uavcan::CanFrame& frame, uavcan::MonotonicTime tx_deadline, virtual uavcan::int16_t send(const uavcan::CanFrame& frame, uavcan::MonotonicTime tx_deadline,
uavcan::CanIOFlags flags); uavcan::CanIOFlags flags) override;
virtual uavcan::int16_t receive(uavcan::CanFrame& out_frame, uavcan::MonotonicTime& out_ts_monotonic, virtual uavcan::int16_t receive(uavcan::CanFrame& out_frame, uavcan::MonotonicTime& out_ts_monotonic,
uavcan::UtcTime& out_ts_utc, uavcan::CanIOFlags& out_flags); uavcan::UtcTime& out_ts_utc, uavcan::CanIOFlags& out_flags) override;
virtual uavcan::int16_t configureFilters(const uavcan::CanFilterConfig* filter_configs, virtual uavcan::int16_t configureFilters(const uavcan::CanFilterConfig* filter_configs,
uavcan::uint16_t num_configs); uavcan::uint16_t num_configs) override;
virtual uavcan::uint16_t getNumFilters() const virtual uavcan::uint16_t getNumFilters() const override
{ {
return NumFilters; return NumFilters;
} }
@ -252,7 +252,7 @@ public:
* Total number of hardware failures and other kinds of errors (e.g. queue overruns). * Total number of hardware failures and other kinds of errors (e.g. queue overruns).
* May increase continuously if the interface is not connected to the bus. * May increase continuously if the interface is not connected to the bus.
*/ */
virtual uavcan::uint64_t getErrorCount() const; virtual uavcan::uint64_t getErrorCount() const override;
/** /**
* Number of times the driver exercised library's requirement to abort transmission on first error. * Number of times the driver exercised library's requirement to abort transmission on first error.
@ -307,7 +307,7 @@ class CanDriver : public uavcan::ICanDriver, uavcan::Noncopyable {
virtual uavcan::int16_t select(uavcan::CanSelectMasks& inout_masks, virtual uavcan::int16_t select(uavcan::CanSelectMasks& inout_masks,
const uavcan::CanFrame* (& pending_tx)[uavcan::MaxCanIfaces], const uavcan::CanFrame* (& pending_tx)[uavcan::MaxCanIfaces],
uavcan::MonotonicTime blocking_deadline); uavcan::MonotonicTime blocking_deadline) override;
static void initOnce(); static void initOnce();
static void initOnce(uavcan::uint8_t can_number, bool enable_irqs); static void initOnce(uavcan::uint8_t can_number, bool enable_irqs);
@ -345,9 +345,9 @@ public:
int init(const uavcan::uint32_t bitrate, const CanIface::OperatingMode mode); int init(const uavcan::uint32_t bitrate, const CanIface::OperatingMode mode);
int init(const uavcan::uint32_t bitrate, const CanIface::OperatingMode mode, uavcan::uint8_t can_number); int init(const uavcan::uint32_t bitrate, const CanIface::OperatingMode mode, uavcan::uint8_t can_number);
virtual CanIface* getIface(uavcan::uint8_t iface_index); virtual CanIface* getIface(uavcan::uint8_t iface_index) override;
virtual uavcan::uint8_t getNumIfaces() const virtual uavcan::uint8_t getNumIfaces() const override
{ {
return num_ifaces_; return num_ifaces_;
} }

4
libraries/AP_HAL_ChibiOS/Util.h
View File

@ -36,8 +36,8 @@ public:
#ifdef ENABLE_HEAP #ifdef ENABLE_HEAP
// heap functions, note that a heap once alloc'd cannot be dealloc'd // heap functions, note that a heap once alloc'd cannot be dealloc'd
virtual void *allocate_heap_memory(size_t size); virtual void *allocate_heap_memory(size_t size) override;
virtual void *heap_realloc(void *heap, void *ptr, size_t new_size); virtual void *heap_realloc(void *heap, void *ptr, size_t new_size) override;
#endif // ENABLE_HEAP #endif // ENABLE_HEAP
/* /*