From 96f6bffb055a85e6828240fc7bec1122c8eab4cc Mon Sep 17 00:00:00 2001
From: Mark Watkins <jedimark@users.sourceforge.net>
Date: Mon, 23 Jan 2012 03:13:15 +1000
Subject: [PATCH] Turn on some more oximeter port debugging

---
 SleepLib/loader_plugins/icon_loader.cpp | 36 ++++++++++++++++++++++---
 oximetry.cpp                            | 10 +++----
 2 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/SleepLib/loader_plugins/icon_loader.cpp b/SleepLib/loader_plugins/icon_loader.cpp
index 892ab5d1..593908e8 100644
--- a/SleepLib/loader_plugins/icon_loader.cpp
+++ b/SleepLib/loader_plugins/icon_loader.cpp
@@ -170,10 +170,15 @@ bool FPIconLoader::OpenFLW(Machine * mach,QString filename, Profile * profile)
 
     quint16 t1,t2;
     quint32 ts;
+    qint64 ti;
+    qint8 b;
     //QByteArray line;
 
-    char * buf=data.data();
+    char * buf=data.data()+4;
 
+    EventList * flow=NULL;
+    qint16 dat[0x34];
+    EventDataType rate=200;
     do {
         in >> t1;
         in >> t2;
@@ -182,12 +187,37 @@ bool FPIconLoader::OpenFLW(Machine * mach,QString filename, Profile * profile)
 
         ts+=epoch;
 
-        if (!Sessions.contains(ts))
+        if (!Sessions.contains(ts)) {
+            // Skip until ends in 0xFF FF FF 7F
+            // skip 0
             break;
+        }
+        Session *sess=Sessions[ts];
 
-        // ends in 0xFF FF FF 7F
+        flow=sess->AddEventList(CPAP_FlowRate,EVL_Waveform,1.0,0,0,0,rate);
 
+        ti=qint64(ts)*1000L;
+        int i;
+        do {
+            in >> t1;
+            for (i=0;i<0x34;i++) {
+                if (t1==0xffff)
+                    break;
+                dat[i]=t1;
+                in >> t1;
+            }
+            flow->AddWaveform(ti,dat,i,i*rate);
+        } while ((t1!=0xff7f) && !in.atEnd());
 
+        if (in.atEnd()) break;
+
+        do {
+            in >> b;
+        } while (!b);
+
+        t1=b << 8;
+        in >> b;
+        t1|=b;
     } while (!in.atEnd());
 
     return true;
diff --git a/oximetry.cpp b/oximetry.cpp
index f0293d39..9b492fa6 100644
--- a/oximetry.cpp
+++ b/oximetry.cpp
@@ -960,11 +960,11 @@ void Oximetry::on_RefreshPortsButton_clicked()
                 z++;
             }
         }
-        //qDebug() << "Serial Port:" << ports.at(i).qesPORTNAME << ports.at(i).friendName;
-        //qDebug() << "port name:" << ports.at(i).portName;
-        //qDebug() << "phys name:" << ports.at(i).physName;
-        //qDebug() << "friendly name:" << ports.at(i).friendName;
-        //qDebug() << "enumerator name:" << ports.at(i).enumName;
+        qDebug() << "Serial Port:" << ports.at(i).qesPORTNAME << ports.at(i).friendName;
+        qDebug() << "port name:" << ports.at(i).portName;
+        qDebug() << "phys name:" << ports.at(i).physName;
+        qDebug() << "friendly name:" << ports.at(i).friendName;
+        qDebug() << "enumerator name:" << ports.at(i).enumName;
     }
     if (z>0) {
         ui->RunButton->setEnabled(true);