Add initial device connection classes to eventually support recording/playback.

This initial commit is designed to change as little existing code as possible.
Once regression tests are in place that can play back previously recorded
data, we can move on to more significant changes.

oscar/SleepLib/deviceconnection.cpp

@@ -0,0 +1,28 @@
+/* Device Connection Class Implementation
+ *
+ * Copyright (c) 2020 The OSCAR Team
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License. See the file COPYING in the main directory of the source code
+ * for more details. */
+
+#include "deviceconnection.h"
+
+SerialPortInfo::SerialPortInfo(const QSerialPortInfo & other)
+    : QSerialPortInfo(other)
+{
+}
+
+SerialPortInfo::SerialPortInfo(const SerialPortInfo & other)
+    : QSerialPortInfo(dynamic_cast<const SerialPortInfo &>(other))
+{
+}
+
+QList<SerialPortInfo> SerialPortInfo::availablePorts()
+{
+    QList<SerialPortInfo> out;
+    for (auto & info : QSerialPortInfo::availablePorts()) {
+        out.append(SerialPortInfo(info));
+    }
+    return out;
+}

oscar/SleepLib/deviceconnection.h

@@ -0,0 +1,38 @@
+/* Device Connection Class Header
+ *
+ * Copyright (c) 2020 The OSCAR Team
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License. See the file COPYING in the main directory of the source code
+ * for more details. */
+
+#ifndef DEVICECONNECTION_H
+#define DEVICECONNECTION_H
+
+// TODO: This file will eventually abstract serial port or bluetooth (or other)
+// connections to devices. For now it just supports serial ports.
+
+#include <QtSerialPort/QSerialPort>
+#include <QtSerialPort/QSerialPortInfo>
+
+// TODO: This class may eventually be internal to a DeviceConnection class,
+// but for now it is used to provide support for recording and playback of
+// serial port connections before refactoring.
+class SerialPort : public QSerialPort
+{
+};
+
+// TODO: This class's functionality will eventually be internal to a
+// DeviceConnection class, but for now it is needed to support recording
+// and playback of serial port scanning before refactoring.
+class SerialPortInfo : public QSerialPortInfo
+{
+public:
+    static QList<SerialPortInfo> availablePorts();
+    SerialPortInfo(const SerialPortInfo & other);
+
+protected:
+    SerialPortInfo(const QSerialPortInfo & other);
+};
+
+#endif // DEVICECONNECTION_H

oscar/SleepLib/serialoximeter.cpp

@@ -1,13 +1,12 @@
 /* SleepLib Machine Loader Class Implementation
  *
  * Copyright (c) 2011-2018 Mark Watkins <mark@jedimark.net>
+ * Copyright (c) 2020 The OSCAR Team
  *
  * This file is subject to the terms and conditions of the GNU General Public
  * License. See the file COPYING in the main directory of the source code
  * for more details. */
 
-#include <QtSerialPort/QSerialPortInfo>
-
 #include "serialoximeter.h"
 
 // Possibly need to replan this to include oximetry
@@ -31,11 +30,11 @@ bool SerialOximeter::scanDevice(QString keyword, quint16 vendor_id, quint16 prod
     QStringList ports;
 
     qDebug() << "seroxi - Scanning for USB Serial devices";
-    QList<QSerialPortInfo> list=QSerialPortInfo::availablePorts();
+    QList<SerialPortInfo> list=SerialPortInfo::availablePorts();
 
     // How does the mac detect this as a SPO2 device?
     for (int i=0;i<list.size();i++) {
-        const QSerialPortInfo * info = &list.at(i);
+        const SerialPortInfo * info = &list.at(i);
         QString name = info->portName();
         QString desc = info->description();
 

oscar/SleepLib/serialoximeter.h

@@ -1,6 +1,7 @@
-/* SleepLib MachineLoader Base Class Header
+/* SleepLib MachineLoader Base Class Header
  *
  * Copyright (C) 2011-2018 Mark Watkins <mark@jedimark.net>
+ * Copyright (c) 2020 The OSCAR Team
  *
  * This file is subject to the terms and conditions of the GNU General Public
  * License. See the file COPYING in the main directory of the source code
@@ -10,7 +11,7 @@
 #define SERIALOXIMETER_H
 
 #include <QTimer>
-#include <QtSerialPort/QSerialPort>
+#include "SleepLib/deviceconnection.h"
 
 #include "SleepLib/machine_loader.h"
 
@@ -126,7 +127,7 @@ protected:
     virtual void requestData() {}
 
     QString port;
-    QSerialPort serial;
+    SerialPort serial;
 
     QTimer startTimer;
     QTimer resetTimer;

oscar/oscar.pro

@@ -302,6 +302,7 @@ SOURCES += \
     translation.cpp \
     statistics.cpp \
     oximeterimport.cpp \
+    SleepLib/deviceconnection.cpp \
     SleepLib/serialoximeter.cpp \
     SleepLib/loader_plugins/md300w1_loader.cpp \
     Graphs/gSessionTimesChart.cpp \
@@ -381,6 +382,7 @@ HEADERS  += \
     translation.h \
     statistics.h \
     oximeterimport.h \
+    SleepLib/deviceconnection.h \
     SleepLib/serialoximeter.h \
     SleepLib/loader_plugins/md300w1_loader.h \
     Graphs/gSessionTimesChart.h \