Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,17 @@
#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{
namespace{

const EnumDropdownDatabase<DeviceAliasType>& categories(){
static const EnumDropdownDatabase<DeviceAliasType> database{
{DeviceAliasType::SERIAL, "Serial", "Serial"},
{DeviceAliasType::VIDEO, "Video", "Video"},
{DeviceAliasType::AUDIO, "Audio", "Audio"},
};
Expand Down Expand Up @@ -48,7 +52,7 @@ std::unique_ptr<EditableTableRow> DeviceAliasRow::clone() const{
DeviceDropdownAliases::DeviceDropdownAliases()
: EditableTableOption_t<DeviceAliasRow>(
"<b>Device Aliases:</b><br>"
"Choose names for cameras and audio devices. "
"Choose names for serial, cameras and audio devices."
"Connected devices are added when Global Settings opens.<br>"
"An empty alias uses the original name.",
LockMode::UNLOCK_WHILE_RUNNING,
Expand Down Expand Up @@ -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));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
namespace PokemonAutomation{

enum class DeviceAliasType{
SERIAL,
VIDEO,
AUDIO,
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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{
Expand Down
Loading