From 56b7a82246b0ce53d65cc439026086953ba4b34d Mon Sep 17 00:00:00 2001 From: pifopi Date: Sat, 7 Nov 2026 15:57:36 +0100 Subject: [PATCH] Add support for serial to DeviceDropdownAliases --- .../CommonFramework/Options/DeviceDropdownAliases.cpp | 11 ++++++++++- .../CommonFramework/Options/DeviceDropdownAliases.h | 1 + .../PABotBase2/SerialPABotBase2_Descriptor.cpp | 6 ++++++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/SerialPrograms/Source/CommonFramework/Options/DeviceDropdownAliases.cpp b/SerialPrograms/Source/CommonFramework/Options/DeviceDropdownAliases.cpp index 81e0842d1e..03682603de 100644 --- a/SerialPrograms/Source/CommonFramework/Options/DeviceDropdownAliases.cpp +++ b/SerialPrograms/Source/CommonFramework/Options/DeviceDropdownAliases.cpp @@ -8,6 +8,9 @@ #include "CommonFramework/GlobalSettingsPanel.h" #include "CommonFramework/AudioPipeline/Backends/AudioDeviceInfo.h" #include "CommonFramework/VideoPipeline/Backends/CameraImplementations.h" +#ifdef QT_SERIALPORT_LIB +#include "Controllers/SerialPort/SerialPortPollerQt.h" +#endif #include "DeviceDropdownAliases.h" namespace PokemonAutomation{ @@ -15,6 +18,7 @@ namespace{ const EnumDropdownDatabase& categories(){ static const EnumDropdownDatabase database{ + {DeviceAliasType::SERIAL, "Serial", "Serial"}, {DeviceAliasType::VIDEO, "Video", "Video"}, {DeviceAliasType::AUDIO, "Audio", "Audio"}, }; @@ -48,7 +52,7 @@ std::unique_ptr DeviceAliasRow::clone() const{ DeviceDropdownAliases::DeviceDropdownAliases() : EditableTableOption_t( "Device Aliases:
" - "Choose names for cameras and audio devices. " + "Choose names for serial, cameras and audio devices." "Connected devices are added when Global Settings opens.
" "An empty alias uses the original name.", LockMode::UNLOCK_WHILE_RUNNING, @@ -96,6 +100,11 @@ void DeviceDropdownAliases::add_device(DeviceAliasType category, const std::stri } void DeviceDropdownAliases::add_connected_devices(){ +#ifdef QT_SERIALPORT_LIB + for (const QSerialPortInfo& info : SerialPortPoller::instance().ports()){ + add_device(DeviceAliasType::SERIAL, info.portName().toStdString(), info.description().toStdString()); + } +#endif for (const CameraInfo& info : get_all_cameras()){ add_device(DeviceAliasType::VIDEO, info.device_name(), get_camera_name(info)); } diff --git a/SerialPrograms/Source/CommonFramework/Options/DeviceDropdownAliases.h b/SerialPrograms/Source/CommonFramework/Options/DeviceDropdownAliases.h index b2daa88ab9..e5f8730b93 100644 --- a/SerialPrograms/Source/CommonFramework/Options/DeviceDropdownAliases.h +++ b/SerialPrograms/Source/CommonFramework/Options/DeviceDropdownAliases.h @@ -17,6 +17,7 @@ namespace PokemonAutomation{ enum class DeviceAliasType{ + SERIAL, VIDEO, AUDIO, }; diff --git a/SerialPrograms/Source/Controllers/PABotBase2/SerialPABotBase2_Descriptor.cpp b/SerialPrograms/Source/Controllers/PABotBase2/SerialPABotBase2_Descriptor.cpp index 068816d549..42ae9430b1 100644 --- a/SerialPrograms/Source/Controllers/PABotBase2/SerialPABotBase2_Descriptor.cpp +++ b/SerialPrograms/Source/Controllers/PABotBase2/SerialPABotBase2_Descriptor.cpp @@ -7,6 +7,7 @@ #include "Common/Cpp/Json/JsonValue.h" #include "Controllers/ControllerTypeStrings.h" #ifdef QT_CORE_LIB +#include "CommonFramework/Options/DeviceDropdownAliases.h" #include "Controllers/SerialPort/SerialPortPollerQt.h" #endif @@ -43,6 +44,11 @@ std::string SerialPABotBase2_Descriptor::display_name() const{ if (m_name.empty()){ return "(none)"; } +#ifdef QT_CORE_LIB + if (auto alias = device_dropdown_name(DeviceAliasType::SERIAL, m_name)){ + return *alias; + } +#endif return m_name; } JsonValue SerialPABotBase2_Descriptor::to_json() const{