Browse Source

AP_UAVCAN: add missing override keywords

master
Peter Barker 6 years ago committed by Peter Barker
parent
commit
13c22c667d
  1. 6
      libraries/AP_UAVCAN/AP_UAVCAN_Servers.cpp
  2. 6
      libraries/AP_UAVCAN/examples/UAVCAN_sniffer/UAVCAN_sniffer.cpp

6
libraries/AP_UAVCAN/AP_UAVCAN_Servers.cpp

@ -77,7 +77,7 @@ public:
class AP_UAVCAN_FileEventTracer : public uavcan::dynamic_node_id_server::IEventTracer class AP_UAVCAN_FileEventTracer : public uavcan::dynamic_node_id_server::IEventTracer
{ {
protected: protected:
virtual void onEvent(uavcan::dynamic_node_id_server::TraceCode code, uavcan::int64_t argument) virtual void onEvent(uavcan::dynamic_node_id_server::TraceCode code, uavcan::int64_t argument) override
{ {
AP::logger().Write("UCEV", "TimeUS,code,arg", "s--", "F--", "Qhq", AP_HAL::micros64(), code, argument); AP::logger().Write("UCEV", "TimeUS,code,arg", "s--", "F--", "Qhq", AP_HAL::micros64(), code, argument);
} }
@ -129,7 +129,7 @@ class AP_UAVCAN_FileStorageBackend : public uavcan::dynamic_node_id_server::ISto
static uint8_t num_opens; static uint8_t num_opens;
protected: protected:
virtual String get(const String& key) const virtual String get(const String& key) const override
{ {
using namespace std; using namespace std;
PathString path = base_path.c_str(); PathString path = base_path.c_str();
@ -176,7 +176,7 @@ protected:
return value; return value;
} }
virtual void set(const String& key, const String& value) virtual void set(const String& key, const String& value) override
{ {
using namespace std; using namespace std;
PathString path = base_path.c_str(); PathString path = base_path.c_str();

6
libraries/AP_UAVCAN/examples/UAVCAN_sniffer/UAVCAN_sniffer.cpp

@ -68,19 +68,19 @@ private:
} }
uavcan::UtcDuration utc_adjustment; uavcan::UtcDuration utc_adjustment;
virtual void adjustUtc(uavcan::UtcDuration adjustment) virtual void adjustUtc(uavcan::UtcDuration adjustment) override
{ {
utc_adjustment = adjustment; utc_adjustment = adjustment;
} }
public: public:
virtual uavcan::MonotonicTime getMonotonic() const virtual uavcan::MonotonicTime getMonotonic() const override
{ {
uavcan::uint64_t usec = 0; uavcan::uint64_t usec = 0;
usec = AP_HAL::micros64(); usec = AP_HAL::micros64();
return uavcan::MonotonicTime::fromUSec(usec); return uavcan::MonotonicTime::fromUSec(usec);
} }
virtual uavcan::UtcTime getUtc() const virtual uavcan::UtcTime getUtc() const override
{ {
uavcan::UtcTime utc; uavcan::UtcTime utc;
uavcan::uint64_t usec = 0; uavcan::uint64_t usec = 0;

Loading…
Cancel
Save