chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-06 19:20:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Track connections by name only, not by type as well.

Browse Source 
Also rename getAvailableSerialPorts for clarity.
This commit is contained in:
sawinglogz 2020-06-16 12:19:32 -04:00
parent 553cf59a95
commit d350e47382
2 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
oscar/SleepLib/deviceconnection.cpp
View File

@ -379,15 +379,15 @@ DeviceConnection* DeviceConnectionManager::openConnection(const QString & type,
qWarning() << "Unknown device connection type:" << type; qWarning() << "Unknown device connection type:" << type;
return nullptr; return nullptr;
} }
if (m_connections[type].contains(name)) { if (m_connections.contains(name)) {
qWarning() << type << "connection to" << name << "already open"; qWarning() << "connection to" << name << "already open";
return nullptr; return nullptr;
} }
DeviceConnection* conn = s_factories[type](name, m_record, m_replay); DeviceConnection* conn = s_factories[type](name, m_record, m_replay);
if (conn) { if (conn) {
if (conn->open()) { if (conn->open()) {
m_connections[type][name] = conn; m_connections[name] = conn;
} else { } else {
qWarning().noquote() << "unable to open" << type << "connection to" << name; qWarning().noquote() << "unable to open" << type << "connection to" << name;
delete conn; delete conn;
@ -406,12 +406,11 @@ void DeviceConnectionManager::connectionClosed(DeviceConnection* conn)
const QString & type = conn->type(); const QString & type = conn->type();
const QString & name = conn->name(); const QString & name = conn->name();
Q_ASSERT(s_factories.contains(type)); if (m_connections.contains(name)) {
if (m_connections[type].contains(name)) { if (m_connections[name] == conn) {
if (m_connections[type][name] == conn) { m_connections.remove(name);
m_connections[type].remove(name);
} else { } else {
qWarning() << type << "connection to" << name << "not created by openConnection!"; qWarning() << "connection to" << name << "not created by openConnection!";
} }
} else { } else {
qWarning() << type << "connection to" << name << "missing"; qWarning() << type << "connection to" << name << "missing";
@ -446,7 +445,7 @@ DeviceConnection* T::createInstance(const QString & name, XmlRecorder* record, X
// MARK: - // MARK: -
// MARK: Device manager events // MARK: Device manager events
class GetAvailablePortsEvent : public XmlReplayBase<GetAvailablePortsEvent> class GetAvailableSerialPortsEvent : public XmlReplayBase<GetAvailableSerialPortsEvent>
{ {
public: public:
QList<SerialPortInfo> m_ports; QList<SerialPortInfo> m_ports;
@ -461,19 +460,19 @@ protected:
xml >> m_ports; xml >> m_ports;
} }
}; };
REGISTER_XMLREPLAYEVENT("getAvailablePorts", GetAvailablePortsEvent); REGISTER_XMLREPLAYEVENT("getAvailableSerialPorts", GetAvailableSerialPortsEvent);
QList<SerialPortInfo> DeviceConnectionManager::getAvailablePorts() QList<SerialPortInfo> DeviceConnectionManager::getAvailableSerialPorts()
{ {
GetAvailablePortsEvent event; GetAvailableSerialPortsEvent event;
if (!m_replay) { if (!m_replay) {
for (auto & info : QSerialPortInfo::availablePorts()) { for (auto & info : QSerialPortInfo::availablePorts()) {
event.m_ports.append(SerialPortInfo(info)); event.m_ports.append(SerialPortInfo(info));
} }
} else { } else {
auto replayEvent = m_replay->getNextEvent<GetAvailablePortsEvent>(); auto replayEvent = m_replay->getNextEvent<GetAvailableSerialPortsEvent>();
if (replayEvent) { if (replayEvent) {
event.m_ports = replayEvent->m_ports; event.m_ports = replayEvent->m_ports;
} else { } else {
@ -527,7 +526,7 @@ SerialPortInfo::SerialPortInfo()
// TODO: This is a temporary wrapper until we begin refactoring. // TODO: This is a temporary wrapper until we begin refactoring.
QList<SerialPortInfo> SerialPortInfo::availablePorts() QList<SerialPortInfo> SerialPortInfo::availablePorts()
{ {
return DeviceConnectionManager::getInstance().getAvailablePorts(); return DeviceConnectionManager::getInstance().getAvailableSerialPorts();
} }
QXmlStreamWriter & operator<<(QXmlStreamWriter & xml, const SerialPortInfo & info) QXmlStreamWriter & operator<<(QXmlStreamWriter & xml, const SerialPortInfo & info)

4
oscar/SleepLib/deviceconnection.h
View File

@ -63,14 +63,14 @@ private:
m_serialPorts.clear(); m_serialPorts.clear();
} }
QHash<QString,QHash<QString,DeviceConnection*>> m_connections; QHash<QString,DeviceConnection*> m_connections;
public: public:
static DeviceConnectionManager & getInstance(); static DeviceConnectionManager & getInstance();
class DeviceConnection* openConnection(const QString & type, const QString & name); class DeviceConnection* openConnection(const QString & type, const QString & name);
static class SerialPortConnection* openSerialPortConnection(const QString & portName); // temporary static class SerialPortConnection* openSerialPortConnection(const QString & portName); // temporary
QList<class SerialPortInfo> getAvailablePorts(); QList<class SerialPortInfo> getAvailableSerialPorts();
// TODO: method to start a polling thread that maintains the list of ports // TODO: method to start a polling thread that maintains the list of ports
// TODO: emit signal when new port is detected // TODO: emit signal when new port is detected