From 15de13f107aec3e6253c9f2783d5a9ead2edb136 Mon Sep 17 00:00:00 2001
From: Mark Watkins <jedimark@users.sourceforge.net>
Date: Fri, 19 Sep 2014 12:07:28 +1000
Subject: [PATCH] Dump some serialport scanning information to help get the
 CMS50xW ports detected

---
 sleepyhead/Graphs/MinutesAtPressure.cpp       |  7 +++---
 .../loader_plugins/cms50f37_loader.cpp        |  7 +++++-
 sleepyhead/SleepLib/serialoximeter.cpp        | 23 +++++++++++++------
 sleepyhead/preferencesdialog.ui               |  2 +-
 4 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/sleepyhead/Graphs/MinutesAtPressure.cpp b/sleepyhead/Graphs/MinutesAtPressure.cpp
index e8e911d2..1f08ff87 100644
--- a/sleepyhead/Graphs/MinutesAtPressure.cpp
+++ b/sleepyhead/Graphs/MinutesAtPressure.cpp
@@ -429,9 +429,10 @@ void RecalcMAP::run()
 
     ChannelID prescode = CPAP_Pressure;
 
-    if (day->channelExists(CPAP_IPAP)) {
-        prescode = CPAP_IPAP;
-    } else if (day->channelExists(CPAP_EPAP)) {
+//    if (day->channelExists(CPAP_IPAP)) {
+//        prescode = CPAP_IPAP;
+//    } else
+    if (day->channelExists(CPAP_EPAP)) {
         prescode = CPAP_EPAP;
     }
 
diff --git a/sleepyhead/SleepLib/loader_plugins/cms50f37_loader.cpp b/sleepyhead/SleepLib/loader_plugins/cms50f37_loader.cpp
index 40b76f0d..34ca8aaf 100644
--- a/sleepyhead/SleepLib/loader_plugins/cms50f37_loader.cpp
+++ b/sleepyhead/SleepLib/loader_plugins/cms50f37_loader.cpp
@@ -67,8 +67,13 @@ CMS50F37Loader::~CMS50F37Loader()
 bool CMS50F37Loader::openDevice()
 {
     if (port.isEmpty()) {
-        if (!scanDevice("",m_vendorID, m_productID))
+        bool b = scanDevice("",m_vendorID, m_productID);
+        if (!b) {
+//            b = scanDevice("", 0, 0);
+        }
+        if (!b) {
             return false;
+        }
     }
     serial.setPortName(port);
     if (!serial.open(QSerialPort::ReadWrite))
diff --git a/sleepyhead/SleepLib/serialoximeter.cpp b/sleepyhead/SleepLib/serialoximeter.cpp
index ce7fbb32..5b9a11cb 100644
--- a/sleepyhead/SleepLib/serialoximeter.cpp
+++ b/sleepyhead/SleepLib/serialoximeter.cpp
@@ -34,24 +34,33 @@ bool SerialOximeter::scanDevice(QString keyword,quint16 vendor_id, quint16 produ
 
     // How does the mac detect this as a SPO2 device?
     for (int i=0;i<list.size();i++) {
-        const QSerialPortInfo * info=&list.at(i);
-        QString name=info->portName();
-        QString desc=info->description();
+        const QSerialPortInfo * info = &list.at(i);
+        QString name = info->portName();
+        QString desc = info->description();
 
         if ((!keyword.isEmpty() && desc.contains(keyword)) ||
-            ((info->hasVendorIdentifier() && (info->vendorIdentifier()==vendor_id))
-                && (info->hasProductIdentifier() && (info->productIdentifier()==product_id))))
+            ((info->hasVendorIdentifier() && (info->vendorIdentifier() == vendor_id))
+                && (info->hasProductIdentifier() && (info->productIdentifier() == product_id))))
         {
             ports.push_back(name);
             QString dbg=QString("Found Serial Port: %1 %2 %3 %4").arg(name).arg(desc).arg(info->manufacturer()).arg(info->systemLocation());
 
             if (info->hasProductIdentifier()) //60000
-                dbg+=QString(" PID: %1").arg(info->productIdentifier());
+                dbg += QString(" PID: %1").arg(info->productIdentifier());
             if (info->hasVendorIdentifier()) // 4292
-                dbg+=QString(" VID: %1").arg(info->vendorIdentifier());
+                dbg += QString(" VID: %1").arg(info->vendorIdentifier());
 
             qDebug() << dbg.toLocal8Bit().data();
             break;
+        } else {
+            QString dbg=QString("Other Serial Port: %1 %2 %3 %4").arg(name).arg(desc).arg(info->manufacturer()).arg(info->systemLocation());
+
+            if (info->hasProductIdentifier()) //60000
+                dbg += QString(" PID: %1").arg(info->productIdentifier());
+            if (info->hasVendorIdentifier()) // 4292
+                dbg += QString(" VID: %1").arg(info->vendorIdentifier());
+
+            qDebug() << dbg.toLocal8Bit().data();
         }
     }
     if (ports.isEmpty()) {
diff --git a/sleepyhead/preferencesdialog.ui b/sleepyhead/preferencesdialog.ui
index f694597e..ba2429da 100644
--- a/sleepyhead/preferencesdialog.ui
+++ b/sleepyhead/preferencesdialog.ui
@@ -51,7 +51,7 @@
    <item>
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
-      <number>0</number>
+      <number>1</number>
      </property>
      <widget class="QWidget" name="importTab">
       <attribute name="title">