blakeridgway/supercell-wx
1
0
Fork 0
mirror of https://github.com/ciphervance/supercell-wx.git synced 2025-11-01 05:30:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Store serial port information in member variables

Browse source
This commit is contained in:
Dan Paulat 2024-05-14 23:02:05 -05:00
parent cb14fba3b0
commit 27b0567753
1 changed files with 102 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

110
scwx-qt/source/scwx/qt/ui/serial_port_dialog.cpp
View file

@ -4,6 +4,9 @@
#include "ui_serial_port_dialog.h" #include "ui_serial_port_dialog.h"
#include <scwx/util/logger.hpp> #include <scwx/util/logger.hpp>
#include <scwx/util/strings.hpp>
#include <unordered_map>
#include <QPushButton> #include <QPushButton>
#include <QSerialPortInfo> #include <QSerialPortInfo>
@ -33,6 +36,25 @@ static const auto logger_ = scwx::util::Logger::Create(logPrefix_);
class SerialPortDialog::Impl class SerialPortDialog::Impl
{ {
public: public:
struct PortProperties
{
std::string busReportedDeviceDescription_ {};
};
struct PortSettings
{
int baudRate_ {-1}; // Positive
std::string parity_ {"n"}; // [e]ven, [o]dd, [m]ark, [s]pace, [n]one
int dataBits_ {8}; // [4-8]
float stopBits_ {1}; // 1, 1.5, 2
std::string
flowControl_ {}; // "" (none), "p" (hardware), "x" (Xon / Xoff)
};
typedef std::unordered_map<std::string, QSerialPortInfo> PortInfoMap;
typedef std::unordered_map<std::string, PortProperties> PortPropertiesMap;
typedef std::unordered_map<std::string, PortSettings> PortSettingsMap;
explicit Impl(SerialPortDialog* self) : explicit Impl(SerialPortDialog* self) :
self_ {self}, model_ {new QStandardItemModel(self)} self_ {self}, model_ {new QStandardItemModel(self)}
{ {
@ -40,10 +62,14 @@ public:
~Impl() = default; ~Impl() = default;
void LogSerialPortInfo(const QSerialPortInfo& info); void LogSerialPortInfo(const QSerialPortInfo& info);
void ReadComPortProperties();
void ReadComPortSettings();
void RefreshSerialDevices(); void RefreshSerialDevices();
static void ReadComPortProperties(PortPropertiesMap& portPropertiesMap);
static void ReadComPortSettings(PortSettingsMap& portSettingsMap);
static void StorePortSettings(const std::string& portName,
const std::string& settingsString,
PortSettingsMap& portSettingsMap);
#if defined(_WIN32) #if defined(_WIN32)
static std::string GetDevicePropertyString(HDEVINFO& deviceInfoSet, static std::string GetDevicePropertyString(HDEVINFO& deviceInfoSet,
SP_DEVINFO_DATA& deviceInfoData, SP_DEVINFO_DATA& deviceInfoData,
@ -55,6 +81,10 @@ public:
QStandardItemModel* model_; QStandardItemModel* model_;
std::string selectedSerialPort_ {"?"}; std::string selectedSerialPort_ {"?"};
PortInfoMap portInfoMap_ {};
PortPropertiesMap portPropertiesMap_ {};
PortSettingsMap portSettingsMap_ {};
}; };
SerialPortDialog::SerialPortDialog(QWidget* parent) : SerialPortDialog::SerialPortDialog(QWidget* parent) :
@ -95,16 +125,26 @@ void SerialPortDialog::Impl::RefreshSerialDevices()
{ {
QList<QSerialPortInfo> availablePorts = QSerialPortInfo::availablePorts(); QList<QSerialPortInfo> availablePorts = QSerialPortInfo::availablePorts();
PortInfoMap newPortInfoMap {};
PortPropertiesMap newPortPropertiesMap {};
PortSettingsMap newPortSettingsMap {};
for (auto& port : availablePorts) for (auto& port : availablePorts)
{ {
LogSerialPortInfo(port); LogSerialPortInfo(port);
newPortInfoMap.insert_or_assign(port.portName().toStdString(), port);
} }
ReadComPortProperties(); ReadComPortProperties(newPortPropertiesMap);
ReadComPortSettings(); ReadComPortSettings(newPortSettingsMap);
portInfoMap_.swap(newPortInfoMap);
portPropertiesMap_.swap(newPortPropertiesMap);
portSettingsMap_.swap(newPortSettingsMap);
} }
void SerialPortDialog::Impl::ReadComPortProperties() void SerialPortDialog::Impl::ReadComPortProperties(
PortPropertiesMap& portPropertiesMap)
{ {
#if defined(_WIN32) #if defined(_WIN32)
GUID classGuid = GUID_DEVCLASS_PORTS; GUID classGuid = GUID_DEVCLASS_PORTS;
@ -154,17 +194,22 @@ void SerialPortDialog::Impl::ReadComPortProperties()
continue; continue;
} }
std::string busReportedDeviceDesc = GetDevicePropertyString( PortProperties properties {};
properties.busReportedDeviceDescription_ = GetDevicePropertyString(
deviceInfoSet, deviceInfoData, DEVPKEY_Device_BusReportedDeviceDesc); deviceInfoSet, deviceInfoData, DEVPKEY_Device_BusReportedDeviceDesc);
logger_->debug("Port: {} ({})", portName, busReportedDeviceDesc); logger_->debug(
"Port: {} ({})", portName, properties.busReportedDeviceDescription_);
portPropertiesMap.emplace(portName, std::move(properties));
RegCloseKey(devRegKey); RegCloseKey(devRegKey);
} }
#endif #endif
} }
void SerialPortDialog::Impl::ReadComPortSettings() void SerialPortDialog::Impl::ReadComPortSettings(
PortSettingsMap& portSettingsMap)
{ {
#if defined(_WIN32) #if defined(_WIN32)
const LPCTSTR lpSubKey = const LPCTSTR lpSubKey =
@ -250,6 +295,8 @@ void SerialPortDialog::Impl::ReadComPortSettings()
std::string portData = buffer; std::string portData = buffer;
logger_->debug("Port Settings: {} ({})", portName, portData); logger_->debug("Port Settings: {} ({})", portName, portData);
StorePortSettings(portName, portData, portSettingsMap);
} }
valueNameSize = maxValueNameSize; valueNameSize = maxValueNameSize;
@ -266,6 +313,53 @@ void SerialPortDialog::Impl::ReadComPortSettings()
#endif #endif
} }
void SerialPortDialog::Impl::StorePortSettings(
const std::string& portName,
const std::string& settingsString,
PortSettingsMap& portSettingsMap)
{
PortSettings portSettings {};
std::vector<std::string> tokenList =
util::ParseTokens(settingsString, {",", ",", ",", ",", ","});
try
{
if (tokenList.size() >= 1)
{
// Positive integer
portSettings.baudRate_ = std::stoi(tokenList.at(0));
}
if (tokenList.size() >= 2)
{
// [e]ven, [o]dd, [m]ark, [s]pace, [n]one
portSettings.parity_ = tokenList.at(1);
}
if (tokenList.size() >= 3)
{
// [4-8]
portSettings.dataBits_ = std::stoi(tokenList.at(2));
}
if (tokenList.size() >= 4)
{
// 1, 1.5, 2
portSettings.stopBits_ = std::stof(tokenList.at(3));
}
if (tokenList.size() >= 5)
{
// "" (none), "p" (hardware), "x" (Xon / Xoff)
portSettings.flowControl_ = tokenList.at(4);
}
portSettingsMap.emplace(portName, std::move(portSettings));
}
catch (const std::exception&)
{
logger_->error(
"Could not parse {} port settings: {}", portName, settingsString);
}
}
#if defined(_WIN32) #if defined(_WIN32)
std::string std::string
SerialPortDialog::Impl::GetDevicePropertyString(HDEVINFO& deviceInfoSet, SerialPortDialog::Impl::GetDevicePropertyString(HDEVINFO& deviceInfoSet,