From 048200063a1a3e576717311380a6b9eef314c0cd Mon Sep 17 00:00:00 2001 From: David Crocker Date: Sun, 19 Dec 2021 15:42:33 +0000 Subject: Removed function hiding + other minor changes for eCv --- src/Hardware/IoPorts.cpp | 6 +++--- src/Hardware/IoPorts.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/Hardware') diff --git a/src/Hardware/IoPorts.cpp b/src/Hardware/IoPorts.cpp index 07484371..eed56846 100644 --- a/src/Hardware/IoPorts.cpp +++ b/src/Hardware/IoPorts.cpp @@ -394,7 +394,7 @@ void IoPort::ToggleInvert(bool pInvert) noexcept } } -void IoPort::AppendDetails(const StringRef& str) const noexcept +void IoPort::AppendBasicDetails(const StringRef& str) const noexcept { if (IsValid()) { @@ -654,9 +654,9 @@ void PwmPort::AppendFrequency(const StringRef& str) const noexcept } } -void PwmPort::AppendDetails(const StringRef& str) const noexcept +void PwmPort::AppendFullDetails(const StringRef& str) const noexcept { - IoPort::AppendDetails(str); + AppendBasicDetails(str); AppendFrequency(str); } diff --git a/src/Hardware/IoPorts.h b/src/Hardware/IoPorts.h index b5c0d29f..e47e3935 100644 --- a/src/Hardware/IoPorts.h +++ b/src/Hardware/IoPorts.h @@ -22,7 +22,7 @@ public: bool SetMode(PinAccess access) noexcept; void Release() noexcept; - void AppendDetails(const StringRef& str) const noexcept; + void AppendBasicDetails(const StringRef& str) const noexcept; static size_t AssignPorts(GCodeBuffer& gb, const StringRef& reply, PinUsedBy neededFor, size_t numPorts, IoPort * const ports[], const PinAccess access[]) THROWS(GCodeException); bool AssignPort(GCodeBuffer& gb, const StringRef& reply, PinUsedBy neededFor, PinAccess access) THROWS(GCodeException); @@ -102,7 +102,7 @@ class PwmPort : public IoPort public: PwmPort() noexcept; - void AppendDetails(const StringRef& str) const noexcept; // hides the one in IoPort + void AppendFullDetails(const StringRef& str) const noexcept; void AppendFrequency(const StringRef& str) const noexcept; // append the frequency if the port is valid void SetFrequency(PwmFrequency freq) noexcept { frequency = freq; } PwmFrequency GetFrequency() const noexcept { return frequency; } -- cgit v1.2.3