From 9b1489fbf2ac888a7addd0298ac3483566830d40 Mon Sep 17 00:00:00 2001 From: Nav Date: Sat, 19 Oct 2024 14:22:43 +0100 Subject: [PATCH] Removed `WchLinkVariant::UNKNOWN` --- .../WCH/Protocols/WchLink/WchLinkInterface.cpp | 6 +++--- src/DebugToolDrivers/WCH/WchGeneric.hpp | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/DebugToolDrivers/WCH/Protocols/WchLink/WchLinkInterface.cpp b/src/DebugToolDrivers/WCH/Protocols/WchLink/WchLinkInterface.cpp index 1d9b58e8..5ca27464 100644 --- a/src/DebugToolDrivers/WCH/Protocols/WchLink/WchLinkInterface.cpp +++ b/src/DebugToolDrivers/WCH/Protocols/WchLink/WchLinkInterface.cpp @@ -43,12 +43,12 @@ namespace DebugToolDrivers::Wch::Protocols::WchLink {0x03, WchLinkVariant::LINK_S_CH32V203}, }; - return DeviceInfo( + return DeviceInfo{ WchFirmwareVersion{response.payload[0], response.payload[1]}, response.payload.size() >= 4 - ? std::optional{variantsById.valueAt(response.payload[2]).value_or(WchLinkVariant::UNKNOWN)} + ? std::optional{variantsById.valueAt(response.payload[2])} : std::nullopt - ); + }; } void WchLinkInterface::activate() { diff --git a/src/DebugToolDrivers/WCH/WchGeneric.hpp b/src/DebugToolDrivers/WCH/WchGeneric.hpp index 6a07d970..b5ee1bbc 100644 --- a/src/DebugToolDrivers/WCH/WchGeneric.hpp +++ b/src/DebugToolDrivers/WCH/WchGeneric.hpp @@ -11,7 +11,6 @@ namespace DebugToolDrivers::Wch LINK_CH549, LINK_E_CH32V307, LINK_S_CH32V203, - UNKNOWN, }; enum class WchLinkTargetClockSpeed: std::uint8_t