From ac8b5d50fcbc12bc4ec2cdccc57872dc6e577970 Mon Sep 17 00:00:00 2001 From: Nav Date: Sun, 2 Feb 2025 16:16:10 +0000 Subject: [PATCH] Added WCH-Link alternative firmware version to logs --- src/DebugToolDrivers/Wch/WchFirmwareVersion.hpp | 4 ++++ src/DebugToolDrivers/Wch/WchLinkBase.cpp | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/DebugToolDrivers/Wch/WchFirmwareVersion.hpp b/src/DebugToolDrivers/Wch/WchFirmwareVersion.hpp index 8d2221bb..7782507f 100644 --- a/src/DebugToolDrivers/Wch/WchFirmwareVersion.hpp +++ b/src/DebugToolDrivers/Wch/WchFirmwareVersion.hpp @@ -15,6 +15,10 @@ namespace DebugToolDrivers::Wch return std::to_string(this->major) + "." + std::to_string(this->minor); } + [[nodiscard]] std::string toAlternativeString() const { + return "v" + std::to_string(this->major * 10 + this->minor); + } + bool operator == (const WchFirmwareVersion& other) const { return this->major == other.major && this->minor == other.minor; } diff --git a/src/DebugToolDrivers/Wch/WchLinkBase.cpp b/src/DebugToolDrivers/Wch/WchLinkBase.cpp index 66b3c22f..448f1e2d 100644 --- a/src/DebugToolDrivers/Wch/WchLinkBase.cpp +++ b/src/DebugToolDrivers/Wch/WchLinkBase.cpp @@ -92,7 +92,10 @@ namespace DebugToolDrivers::Wch ); } - Logger::info("WCH-Link firmware version: " + deviceInfo.firmwareVersion.toString()); + Logger::info( + "WCH-Link firmware version: " + deviceInfo.firmwareVersion.toString() + " (" + + deviceInfo.firmwareVersion.toAlternativeString() + ")" + ); } bool WchLinkBase::isInitialised() const {