From a327a7ed1c99d16c2ea0f740260ee5b224a32f68 Mon Sep 17 00:00:00 2001
From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com>
Date: Fri, 31 May 2019 16:58:58 -0400
Subject: [PATCH 01/42] Add logging of unexpected data to ParseCompliance,
 disable broken 200X compliance.

---
 oscar/SleepLib/loader_plugins/prs1_loader.cpp | 54 +++++++++++++++----
 oscar/SleepLib/loader_plugins/prs1_loader.h   |  6 +--
 oscar/tests/prs1tests.cpp                     |  4 ++
 3 files changed, 51 insertions(+), 13 deletions(-)

diff --git a/oscar/SleepLib/loader_plugins/prs1_loader.cpp b/oscar/SleepLib/loader_plugins/prs1_loader.cpp
index 0b9af0b9..fe415e8a 100644
--- a/oscar/SleepLib/loader_plugins/prs1_loader.cpp
+++ b/oscar/SleepLib/loader_plugins/prs1_loader.cpp
@@ -978,6 +978,10 @@ void PRS1Loader::ScanFiles(const QStringList & paths, int sessionid_base, Machin
             QString path = fi.canonicalFilePath();
             bool ok;
 
+            if (fi.fileName() == ".DS_Store") {
+                continue;
+            }
+
             QString ext_s = fi.fileName().section(".", -1);
             ext = ext_s.toInt(&ok);
             if (!ok) {
@@ -3156,7 +3160,7 @@ bool PRS1DataChunk::ParseEventsF0(CPAPMode mode)
 }
 
 
-bool PRS1Import::ParseCompliance()
+bool PRS1Import::ImportCompliance()
 {
     bool ok;
     ok = compliance->ParseCompliance();
@@ -3218,18 +3222,29 @@ bool PRS1Import::ParseCompliance()
 }
 
 
+#define CHECK_VALUE(SRC, VAL) if ((SRC) != (VAL)) qWarning() << this->sessionid << QString("%1: %2 = %3 != %4").arg(__func__).arg(#SRC).arg(SRC).arg(VAL);
+
 bool PRS1DataChunk::ParseCompliance(void)
 {
-    const unsigned char * data = (unsigned char *)this->m_data.constData();
-
-    if (data[0x00] > 0) {
+    // This parser doesn't seem right for 200X series, so bail for now.
+    if (this->family != 0 || this->familyVersion != 2) {
         return false;
     }
+    const unsigned char * data = (unsigned char *)this->m_data.constData();
+
+    CHECK_VALUE(data[0x00], 0);
+    if (data[0x00] != 0) {
+        return false;
+    }
+    CHECK_VALUE(data[0x01], 1);
+    CHECK_VALUE(data[0x02], 0);
 
     this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_CPAP_MODE, (int) MODE_CPAP));
 
     int min_pressure = data[0x03];
    // EventDataType max_pressure = EventDataType(data[0x04]) / 10.0;
+    CHECK_VALUE(data[0x04], 0);
+    CHECK_VALUE(data[0x05], 0);
 
     this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_PRESSURE, min_pressure));
 
@@ -3240,15 +3255,24 @@ bool PRS1DataChunk::ParseCompliance(void)
     this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_RAMP_TIME, ramp_time));
     this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_RAMP_PRESSURE, ramp_pressure));
 
+    CHECK_VALUE(data[0x08], 0);
 
     quint8 flex = data[0x09];
     this->ParseFlexSetting(flex, MODE_CPAP);
 
+    // Something isn't right here, it keeps setting status 1 level 0 for both
+    // humidier on at level 1.0 and humidifer off/passive.
     int humid = data[0x0A];
     this->ParseHumidifierSetting(humid, false);
 
+    CHECK_VALUE(data[0x0b], 1);
+    CHECK_VALUE(data[0x0c], 0);
+    CHECK_VALUE(data[0x0d], 0);
+    CHECK_VALUE(data[0x0e], 2);
+    CHECK_VALUE(data[0x0f], 0);
+    CHECK_VALUE(data[0x10], 0);
+    
     // TODO: What are slices, and why would only bricks have them? That seems very weird.
-    // TODO: The below seems not to work on 200X models.
     
     // need to parse a repeating structure here containing lengths of mask on/off..
     // 0x03 = mask on
@@ -3279,6 +3303,15 @@ bool PRS1DataChunk::ParseCompliance(void)
         tt += duration;
     } while (pos < len);
 
+    // also seems to be a trailing 01 00 81 after the slices?
+    if (pos == len) {
+        CHECK_VALUE(data[pos], 1);
+        CHECK_VALUE(data[pos+1], 0);  // sometimes 1
+        CHECK_VALUE(data[pos+2], 0x81);  // 0x80 when humidifier is off?
+    } else {
+        qWarning() << this->sessionid << (this->size() - pos) << "trailing bytes";
+    }
+
     this->duration = tt;
 
     // Bleh!! There is probably 10 different formats for these useless piece of junk machines
@@ -3876,11 +3909,13 @@ bool PRS1Import::ImportSummary()
 
 bool PRS1DataChunk::ParseSummary()
 {
+    const unsigned char * data = (unsigned char *)this->m_data.constData();
+    
     // All machines have a first byte zero for clean summary
-    if (this->m_data.constData()[0] != 0) {
-        qDebug() << "Non zero hblock[0] indicator";
+    CHECK_VALUE(data[0], 0);  // sometimes 5 with a short file?
+    if (data[0] != 0) {
         return false;
-    }    
+    }
 
     // TODO: The below mainblock creation is probably wrong. It should move to to its own function when it gets fixed.
     /* Example data block
@@ -3894,7 +3929,6 @@ bool PRS1DataChunk::ParseSummary()
     000000c6@0070: 1a 00 38 04]  */
     if (this->fileVersion == 3) {
         // Parse summary structures into bytearray map according to size given in header block
-        const unsigned char * data = (unsigned char *)this->m_data.constData();
         int size = this->m_data.size();
 
         int pos = 0;
@@ -4300,7 +4334,7 @@ bool PRS1Import::ParseSession(void)
     bool save = false;
     session = new Session(mach, sessionid);
 
-    if ((compliance && ParseCompliance()) || (summary && ImportSummary())) {
+    if ((compliance && ImportCompliance()) || (summary && ImportSummary())) {
         if (event && !ParseEvents()) {
         }
 
diff --git a/oscar/SleepLib/loader_plugins/prs1_loader.h b/oscar/SleepLib/loader_plugins/prs1_loader.h
index 04f24860..c549c2ff 100644
--- a/oscar/SleepLib/loader_plugins/prs1_loader.h
+++ b/oscar/SleepLib/loader_plugins/prs1_loader.h
@@ -233,10 +233,10 @@ public:
     QString wavefile;
     QString oxifile;
 
-    //! \brief As it says on the tin.. Parses .001 files for bricks.
-    bool ParseCompliance();
+    //! \brief Imports .000 files for bricks.
+    bool ImportCompliance();
 
-    //! \brief Imports the .002 summary file.
+    //! \brief Imports the .001 summary file.
     bool ImportSummary();
 
     //! \brief Figures out which Event Parser to call, based on machine family/version and calls it.
diff --git a/oscar/tests/prs1tests.cpp b/oscar/tests/prs1tests.cpp
index 15eb3872..79a8411f 100644
--- a/oscar/tests/prs1tests.cpp
+++ b/oscar/tests/prs1tests.cpp
@@ -256,6 +256,10 @@ void parseAndEmitChunkYaml(const QString & path)
             QFileInfo fi = flist.at(i);
             QString inpath = fi.canonicalFilePath();
             bool ok;
+            
+            if (fi.fileName() == ".DS_Store") {
+                continue;
+            }
 
             QString ext_s = fi.fileName().section(".", -1);
             ext_s.toInt(&ok);

From 264c41379b5a5f330ec64a0e4e20967e4e0359e4 Mon Sep 17 00:00:00 2001
From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com>
Date: Fri, 31 May 2019 21:00:35 -0400
Subject: [PATCH 02/42] Fix PRS1 compliance parsing based on 251P data, check
 for any unexpected values.

Also get rid of a premature parsing check in ScanFiles.
---
 oscar/SleepLib/loader_plugins/prs1_loader.cpp | 48 +++++++++----------
 1 file changed, 23 insertions(+), 25 deletions(-)

diff --git a/oscar/SleepLib/loader_plugins/prs1_loader.cpp b/oscar/SleepLib/loader_plugins/prs1_loader.cpp
index fe415e8a..c5d6b19d 100644
--- a/oscar/SleepLib/loader_plugins/prs1_loader.cpp
+++ b/oscar/SleepLib/loader_plugins/prs1_loader.cpp
@@ -1057,17 +1057,6 @@ void PRS1Loader::ScanFiles(const QStringList & paths, int sessionid_base, Machin
 
                 PRS1DataChunk * chunk = Chunks.at(i);
 
-                if (ext <= 1) {
-                    const unsigned char * data = (unsigned char *)chunk->m_data.constData();
-
-                    if (data[0x00] != 0) {
-                        // 5 length 5, 6 length 1, 7 length 3, 8 length 3 seen on 960P
-                        qWarning() << path << "data doesn't start with 0, skipping:" << data[0x00] << chunk->m_data.size();
-                        delete chunk;
-                        continue;
-                    }
-                }
-
                 SessionID chunk_sid = chunk->sessionid;
                 if (i > 0 || chunk_sid != sid) {  // log multiple chunks in non-waveform files and session ID mismatches
                     qDebug() << fi.canonicalFilePath() << chunk_sid;
@@ -3173,7 +3162,6 @@ bool PRS1Import::ImportCompliance()
             qint64 tt = start + qint64(s->m_start) * 1000L;
             qint64 duration = qint64(s->m_duration) * 1000L;
             session->m_slices.append(SessionSlice(tt, tt + duration, s->m_status));
-            qDebug() << compliance->sessionid << "Added Slice" << tt << (tt+duration) << s->m_status;
             continue;
         } else if (e->m_type != PRS1ParsedSettingEvent::TYPE) {
             qWarning() << "Compliance had non-setting event:" << (int) e->m_type;
@@ -3222,7 +3210,11 @@ bool PRS1Import::ImportCompliance()
 }
 
 
-#define CHECK_VALUE(SRC, VAL) if ((SRC) != (VAL)) qWarning() << this->sessionid << QString("%1: %2 = %3 != %4").arg(__func__).arg(#SRC).arg(SRC).arg(VAL);
+// TODO: have UNEXPECTED_VALUE set a flag in the importer/machine that this data set is unusual
+#define UNEXPECTED_VALUE(SRC, VALS) { qWarning() << this->sessionid << QString("%1: %2 = %3 != %4").arg(__func__).arg(#SRC).arg(SRC).arg(VALS); }
+#define CHECK_VALUE(SRC, VAL) if ((SRC) != (VAL)) UNEXPECTED_VALUE(SRC, VAL)
+#define CHECK_VALUES(SRC, VAL1, VAL2) if ((SRC) != (VAL1) && (SRC) != (VAL2)) UNEXPECTED_VALUE(SRC, #VAL1 " or " #VAL2)
+// for more than 2 values, just write the test manually and use UNEXPECTED_VALUE if it fails
 
 bool PRS1DataChunk::ParseCompliance(void)
 {
@@ -3248,23 +3240,21 @@ bool PRS1DataChunk::ParseCompliance(void)
 
     this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_PRESSURE, min_pressure));
 
-
     int ramp_time = data[0x06];
     int ramp_pressure = data[0x07];
-
     this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_RAMP_TIME, ramp_time));
     this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_RAMP_PRESSURE, ramp_pressure));
 
-    CHECK_VALUE(data[0x08], 0);
-
-    quint8 flex = data[0x09];
+    quint8 flex = data[0x08];  // TODO: why was this 0x09 originally? could the position vary?
     this->ParseFlexSetting(flex, MODE_CPAP);
 
-    // Something isn't right here, it keeps setting status 1 level 0 for both
-    // humidier on at level 1.0 and humidifer off/passive.
-    int humid = data[0x0A];
+    int humid = data[0x09];  // TODO: why was this 0x0A originally? could the position vary?
     this->ParseHumidifierSetting(humid, false);
 
+    // TODO: Where is Auto Off/On set? (both off)
+    // TODO: Where is "Altitude Compensation" set? (seems to be 1)
+    // TODO: Where are Mask Alert/Reminder Period set? (both off)
+    CHECK_VALUE(data[0x0a], 0x80);
     CHECK_VALUE(data[0x0b], 1);
     CHECK_VALUE(data[0x0c], 0);
     CHECK_VALUE(data[0x0d], 0);
@@ -3294,8 +3284,9 @@ bool PRS1DataChunk::ParseCompliance(void)
             status = EquipmentLeaking;
         } else if (c == 0x01) {
             status = EquipmentOff;
+            CHECK_VALUE(duration, 0);  // TODO: why would a slice duration be zero?
         } else {
-            qDebug() << this->sessionid << "Wasn't expecting" << c;
+            qDebug() << this->sessionid << "unknown slice status" << c;
             break;
         }
         this->AddEvent(new PRS1ParsedSliceEvent(tt, duration, status));
@@ -3306,8 +3297,8 @@ bool PRS1DataChunk::ParseCompliance(void)
     // also seems to be a trailing 01 00 81 after the slices?
     if (pos == len) {
         CHECK_VALUE(data[pos], 1);
-        CHECK_VALUE(data[pos+1], 0);  // sometimes 1
-        CHECK_VALUE(data[pos+2], 0x81);  // 0x80 when humidifier is off?
+        CHECK_VALUES(data[pos+1], 0, 1);  // sometimes 1
+        CHECK_VALUES(data[pos+2], 0x81, 0x80);  // 0x80 when humidifier is off, may be HumidifierSetting, but sometimes different from value above?
     } else {
         qWarning() << this->sessionid << (this->size() - pos) << "trailing bytes";
     }
@@ -3911,8 +3902,15 @@ bool PRS1DataChunk::ParseSummary()
 {
     const unsigned char * data = (unsigned char *)this->m_data.constData();
     
+    // TODO: 7 length 3, 8 length 3 have been seen on 960P, add those value checks once we look more closely at the data.
+    if (data[0] == 5) {
+        CHECK_VALUE(this->m_data.size(), 5);  // 4 more bytes before CRC, looks like a timestamp
+    } else if (data[0] == 6) {
+        CHECK_VALUE(this->m_data.size(), 1);  // 0 more bytes before CRC
+    } else {
+        CHECK_VALUE(data[0], 0);
+    }
     // All machines have a first byte zero for clean summary
-    CHECK_VALUE(data[0], 0);  // sometimes 5 with a short file?
     if (data[0] != 0) {
         return false;
     }

From 5fee567066adef39fe4b48008066bfad37fb8574 Mon Sep 17 00:00:00 2001
From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com>
Date: Fri, 31 May 2019 21:47:28 -0400
Subject: [PATCH 03/42] Fix PRS1 loader bug where chunks could be incorrectly
 skipped.

This doesn't fix the bigger bug where files are skipped based on
their filename rather than the actual chunk session IDs. That's
a trickier challenge for another day.
---
 oscar/SleepLib/loader_plugins/prs1_loader.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/oscar/SleepLib/loader_plugins/prs1_loader.cpp b/oscar/SleepLib/loader_plugins/prs1_loader.cpp
index c5d6b19d..a22df34f 100644
--- a/oscar/SleepLib/loader_plugins/prs1_loader.cpp
+++ b/oscar/SleepLib/loader_plugins/prs1_loader.cpp
@@ -1007,7 +1007,10 @@ void PRS1Loader::ScanFiles(const QStringList & paths, int sessionid_base, Machin
             }
             */
 
-
+            // TODO: BUG: This isn't right, since files can have multiple session
+            // chunks, which might not correspond to the filename. But before we can
+            // fix this we need to come up with a reasonably fast way to filter previously
+            // imported files without re-reading all of them.
             if (m->SessionExists(sid)) {
                 // Skip already imported session
                 qDebug() << path << "session already exists, skipping" << sid;
@@ -1061,7 +1064,7 @@ void PRS1Loader::ScanFiles(const QStringList & paths, int sessionid_base, Machin
                 if (i > 0 || chunk_sid != sid) {  // log multiple chunks in non-waveform files and session ID mismatches
                     qDebug() << fi.canonicalFilePath() << chunk_sid;
                 }
-                if (m->SessionExists(sid)) {  // BUG: this should presumably be chunk_sid, but any change needs to be tested.
+                if (m->SessionExists(chunk_sid)) {
                     qDebug() << path << "session already exists, skipping" << sid << chunk_sid;
                     delete chunk;
                     continue;

From 66585d939e0f19c8354f639e4f836bb9955dd0d7 Mon Sep 17 00:00:00 2001
From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com>
Date: Sun, 2 Jun 2019 21:50:45 -0400
Subject: [PATCH 04/42] Chase down all unusual values in 251P compliance sample
 data.

The big discovery is that slices aren't slices with durations,
they're events with a starting delta.
---
 oscar/SleepLib/loader_plugins/prs1_loader.cpp | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/oscar/SleepLib/loader_plugins/prs1_loader.cpp b/oscar/SleepLib/loader_plugins/prs1_loader.cpp
index a22df34f..dc1e1907 100644
--- a/oscar/SleepLib/loader_plugins/prs1_loader.cpp
+++ b/oscar/SleepLib/loader_plugins/prs1_loader.cpp
@@ -908,6 +908,7 @@ Machine* PRS1Loader::CreateMachineFromProperties(QString propertyfile)
     // This time supply the machine object so it can populate machine properties..
     PeekProperties(m->info, propertyfile, m);
     
+    // TODO: exclude bogus 100X100
     if (!m->untested() && !s_PRS1ModelInfo.IsTested(props)) {
         m->setUntested(true);
         qDebug() << info.modelnumber << "untested";
@@ -3231,7 +3232,7 @@ bool PRS1DataChunk::ParseCompliance(void)
     if (data[0x00] != 0) {
         return false;
     }
-    CHECK_VALUE(data[0x01], 1);
+    CHECK_VALUES(data[0x01], 1, 0);  // usually 1, occasionally 0, no visible difference in report
     CHECK_VALUE(data[0x02], 0);
 
     this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_CPAP_MODE, (int) MODE_CPAP));
@@ -3278,6 +3279,11 @@ bool PRS1DataChunk::ParseCompliance(void)
     int pos = 0x11;
     do {
         quint8 c = data[pos++];
+        // TODO: This isn't duration, it's a start time! Why else would an EquipmentOff
+        // slice have a nonzero value here? In one session, there's a big black span
+        // during which the machine is counting blower time but not usage, corresponding
+        // to the EquipmentOff delta. So these aren't slices with durations, they're events
+        // with a delta offset!
         int duration = data[pos] | data[pos+1] << 8;
         pos+=2;
         SliceStatus status;
@@ -3287,7 +3293,7 @@ bool PRS1DataChunk::ParseCompliance(void)
             status = EquipmentLeaking;
         } else if (c == 0x01) {
             status = EquipmentOff;
-            CHECK_VALUE(duration, 0);  // TODO: why would a slice duration be zero?
+            CHECK_VALUE(duration, 0);
         } else {
             qDebug() << this->sessionid << "unknown slice status" << c;
             break;
@@ -3299,9 +3305,10 @@ bool PRS1DataChunk::ParseCompliance(void)
 
     // also seems to be a trailing 01 00 81 after the slices?
     if (pos == len) {
-        CHECK_VALUE(data[pos], 1);
-        CHECK_VALUES(data[pos+1], 0, 1);  // sometimes 1
-        CHECK_VALUES(data[pos+2], 0x81, 0x80);  // 0x80 when humidifier is off, may be HumidifierSetting, but sometimes different from value above?
+        CHECK_VALUES(data[pos], 1, 0);  // usually 1, occasionally 0, no visible difference in report
+        //CHECK_VALUE(data[pos+1], 0);  // sometimes 1, 2, or 5, no visible difference in report
+        //CHECK_VALUES(data[pos+2], 0x81, 0x80);  // seems to be humidifier setting at end of session
+        //TODO: sanity check humidifier value here, but don't add event, since we don't know when a change happened
     } else {
         qWarning() << this->sessionid << (this->size() - pos) << "trailing bytes";
     }

From a6455b6b052e6a238b65ee64d0e85eccc69b1e86 Mon Sep 17 00:00:00 2001
From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com>
Date: Sun, 2 Jun 2019 22:05:10 -0400
Subject: [PATCH 05/42] Add sanity check for presumed humidifier setting in
 compliance.

Also suppress "untested" user alerts for a known bogus model number.
---
 oscar/SleepLib/loader_plugins/prs1_loader.cpp | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/oscar/SleepLib/loader_plugins/prs1_loader.cpp b/oscar/SleepLib/loader_plugins/prs1_loader.cpp
index dc1e1907..c4dc71f4 100644
--- a/oscar/SleepLib/loader_plugins/prs1_loader.cpp
+++ b/oscar/SleepLib/loader_plugins/prs1_loader.cpp
@@ -277,6 +277,12 @@ bool PRS1ModelInfo::IsTested(const QString & model, int family, int familyVersio
     if (m_testedModels.value(family).value(familyVersion).contains(model)) {
         return true;
     }
+    // Some 500X150 C0/C1 folders have contained this bogus model number in their PROP.TXT file,
+    // with the same serial number seen in the main PROP.TXT file that shows the real model number.
+    if (model == "100X100") {
+        qDebug() << "Ignoring 100X100 for untested alert";
+        return true;
+    }
     return false;
 };
 
@@ -908,7 +914,6 @@ Machine* PRS1Loader::CreateMachineFromProperties(QString propertyfile)
     // This time supply the machine object so it can populate machine properties..
     PeekProperties(m->info, propertyfile, m);
     
-    // TODO: exclude bogus 100X100
     if (!m->untested() && !s_PRS1ModelInfo.IsTested(props)) {
         m->setUntested(true);
         qDebug() << info.modelnumber << "untested";
@@ -3308,7 +3313,9 @@ bool PRS1DataChunk::ParseCompliance(void)
         CHECK_VALUES(data[pos], 1, 0);  // usually 1, occasionally 0, no visible difference in report
         //CHECK_VALUE(data[pos+1], 0);  // sometimes 1, 2, or 5, no visible difference in report
         //CHECK_VALUES(data[pos+2], 0x81, 0x80);  // seems to be humidifier setting at end of session
-        //TODO: sanity check humidifier value here, but don't add event, since we don't know when a change happened
+        if (data[pos+2] && (((data[pos+2] & 0x80) == 0) || (data[pos+2] & 0x07) > 5)) {
+            UNEXPECTED_VALUE(data[pos+2], "valid humidifier setting");
+        }
     } else {
         qWarning() << this->sessionid << (this->size() - pos) << "trailing bytes";
     }

From 1a0a4bbf5284d2bb1b8a5803f2fcef42631ad613 Mon Sep 17 00:00:00 2001
From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com>
Date: Mon, 3 Jun 2019 20:12:17 -0400
Subject: [PATCH 06/42] Convert compliance "slices" to events with a starting
 delta.

Also fix the related enums and add more value checks.
Also add YAML output of the cumulative mask-on slice time.
---
 oscar/Graphs/gSessionTimesChart.cpp           |  4 +-
 oscar/SleepLib/day.cpp                        |  4 +-
 oscar/SleepLib/loader_plugins/prs1_loader.cpp | 64 +++++++++++--------
 oscar/SleepLib/session.h                      |  6 +-
 oscar/tests/sessiontests.cpp                  | 16 +++++
 5 files changed, 59 insertions(+), 35 deletions(-)

diff --git a/oscar/Graphs/gSessionTimesChart.cpp b/oscar/Graphs/gSessionTimesChart.cpp
index 14004373..71c31171 100644
--- a/oscar/Graphs/gSessionTimesChart.cpp
+++ b/oscar/Graphs/gSessionTimesChart.cpp
@@ -896,10 +896,10 @@ void gSessionTimesChart::paint(QPainter &painter, gGraph &graph, const QRegion &
 
                         float s2 = double(slice.end - slice.start) / 3600000.0;
 
-                        QColor col = (slice.status == EquipmentOn) ? goodcolor : Qt::black;
+                        QColor col = (slice.status == MaskOn) ? goodcolor : Qt::black;
                         QString txt = QObject::tr("%1\nLength: %3\nStart: %2\n").arg(datestr).arg(st.time().toString("hh:mm:ss")).arg(s2,0,'f',2);
 
-                        txt += (slice.status == EquipmentOn) ? QObject::tr("Mask On") : QObject::tr("Mask Off");
+                        txt += (slice.status == MaskOn) ? QObject::tr("Mask On") : QObject::tr("Mask Off");
                         slices.append(SummaryChartSlice(&calcitems[0], s1, s2, txt, col));
                     }
                 } else {
diff --git a/oscar/SleepLib/day.cpp b/oscar/SleepLib/day.cpp
index fbbb13e3..a7981b6e 100644
--- a/oscar/SleepLib/day.cpp
+++ b/oscar/SleepLib/day.cpp
@@ -657,7 +657,7 @@ qint64 Day::total_time()
                 }
             } else {
                 for (auto & slice : sess->m_slices) {
-                    if (slice.status == EquipmentOn) {
+                    if (slice.status == MaskOn) {
                         range.insert(slice.start, 0);
                         range.insert(slice.end, 1);
                         d_totaltime += slice.end - slice.start;
@@ -727,7 +727,7 @@ qint64 Day::total_time(MachineType type)
                 }
             } else {
                 for (const auto & slice : sess->m_slices) {
-                    if (slice.status == EquipmentOn) {
+                    if (slice.status == MaskOn) {
                         range.insert(slice.start, 0);
                         range.insert(slice.end, 1);
                         d_totaltime += slice.end - slice.start;
diff --git a/oscar/SleepLib/loader_plugins/prs1_loader.cpp b/oscar/SleepLib/loader_plugins/prs1_loader.cpp
index c4dc71f4..d36d158c 100644
--- a/oscar/SleepLib/loader_plugins/prs1_loader.cpp
+++ b/oscar/SleepLib/loader_plugins/prs1_loader.cpp
@@ -1384,19 +1384,18 @@ public:
     }
 };
 
-class PRS1ParsedSliceEvent : public PRS1ParsedDurationEvent
+class PRS1ParsedSliceEvent : public PRS1ParsedValueEvent
 {
 public:
     virtual QMap<QString,QString> contents(void)
     {
         QMap<QString,QString> out;
         out["start"] = timeStr(m_start);
-        out["duration"] = timeStr(m_duration);
         QString s;
-        switch (m_status) {
-            case EquipmentOn: s = "EquipmentOn"; break;
+        switch ((SliceStatus) m_value) {
+            case MaskOn: s = "MaskOn"; break;
+            case MaskOff: s = "MaskOff"; break;
             case EquipmentOff: s = "EquipmentOff"; break;
-            case EquipmentLeaking: s = "EquipmentLeaking"; break;
             case UnknownStatus: s = "Unknown"; break;
         }
         out["status"] = s;
@@ -1404,9 +1403,8 @@ public:
     }
 
     static const PRS1ParsedEventType TYPE = EV_PRS1_SLICE;
-    SliceStatus m_status;
     
-    PRS1ParsedSliceEvent(int start, int duration, SliceStatus status) : PRS1ParsedDurationEvent(TYPE, start, duration), m_status(status) {}
+    PRS1ParsedSliceEvent(int start, SliceStatus status) : PRS1ParsedValueEvent(TYPE, start, (int) status) {}
 };
 
 
@@ -3169,8 +3167,11 @@ bool PRS1Import::ImportCompliance()
         if (e->m_type == PRS1ParsedSliceEvent::TYPE) {
             PRS1ParsedSliceEvent* s = (PRS1ParsedSliceEvent*) e;
             qint64 tt = start + qint64(s->m_start) * 1000L;
-            qint64 duration = qint64(s->m_duration) * 1000L;
-            session->m_slices.append(SessionSlice(tt, tt + duration, s->m_status));
+            if (!session->m_slices.isEmpty()) {
+                SessionSlice & prevSlice = session->m_slices.last();
+                prevSlice.end = tt;
+            }
+            session->m_slices.append(SessionSlice(tt, tt, (SliceStatus) s->m_value));
             continue;
         } else if (e->m_type != PRS1ParsedSettingEvent::TYPE) {
             qWarning() << "Compliance had non-setting event:" << (int) e->m_type;
@@ -3267,9 +3268,6 @@ bool PRS1DataChunk::ParseCompliance(void)
     CHECK_VALUE(data[0x0b], 1);
     CHECK_VALUE(data[0x0c], 0);
     CHECK_VALUE(data[0x0d], 0);
-    CHECK_VALUE(data[0x0e], 2);
-    CHECK_VALUE(data[0x0f], 0);
-    CHECK_VALUE(data[0x10], 0);
     
     // TODO: What are slices, and why would only bricks have them? That seems very weird.
     
@@ -3281,31 +3279,32 @@ bool PRS1DataChunk::ParseCompliance(void)
     int tt = start;
 
     int len = this->size()-3;
-    int pos = 0x11;
+    int pos = 0x0e;
     do {
         quint8 c = data[pos++];
-        // TODO: This isn't duration, it's a start time! Why else would an EquipmentOff
-        // slice have a nonzero value here? In one session, there's a big black span
-        // during which the machine is counting blower time but not usage, corresponding
-        // to the EquipmentOff delta. So these aren't slices with durations, they're events
-        // with a delta offset!
-        int duration = data[pos] | data[pos+1] << 8;
+        // These aren't really slices as originally thought, they're events with a delta offset.
+        // We'll convert them to slices in the importer.
+        int delta = data[pos] | data[pos+1] << 8;
         pos+=2;
         SliceStatus status;
-        if (c == 0x03) {
-            status = EquipmentOn;
-        } else if (c == 0x02) {
-            status = EquipmentLeaking;
+        if (c == 0x02) {
+            status = MaskOn;
+            if (tt == 0) {
+                CHECK_VALUE(delta, 0);  // we've never seen the initial MaskOn have any delta
+            } else {
+                if (delta % 60) UNEXPECTED_VALUE(delta, "even minutes");  // mask-off events seem to be whole minutes?
+            }
+        } else if (c == 0x03) {
+            status = MaskOff;
         } else if (c == 0x01) {
             status = EquipmentOff;
-            CHECK_VALUE(duration, 0);
+            // This has a delta if the mask was removed before the machine was shut off.
         } else {
             qDebug() << this->sessionid << "unknown slice status" << c;
             break;
         }
-        this->AddEvent(new PRS1ParsedSliceEvent(tt, duration, status));
-
-        tt += duration;
+        tt += delta;
+        this->AddEvent(new PRS1ParsedSliceEvent(tt, status));
     } while (pos < len);
 
     // also seems to be a trailing 01 00 81 after the slices?
@@ -3563,6 +3562,8 @@ void PRS1DataChunk::ParseFlexSetting(quint8 flex, CPAPMode cpapmode)
     // c0 Split CFlex then None
     // c8 Split CFlex+ then None
 
+    if (flex & (0x20 | 0x04)) UNEXPECTED_VALUE(flex, "known bits");
+
     flex &= 0xf8;
     bool split = false;
 
@@ -3591,11 +3592,18 @@ void PRS1DataChunk::ParseFlexSetting(quint8 flex, CPAPMode cpapmode)
 
 void PRS1DataChunk::ParseHumidifierSetting(int humid, bool supportsHeatedTubing)
 {
+    if (humid & (0x40 | 0x20 | 0x08)) UNEXPECTED_VALUE(humid, "known bits");
+    
     this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_HUMID_STATUS, (humid & 0x80) != 0));        // Humidifier Connected
     if (supportsHeatedTubing) {
         this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_HEATED_TUBING, (humid & 0x10) != 0));        // Heated Hose??
+    } else {
+        CHECK_VALUE(humid & 0x10, 0);
     }
-    this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_HUMID_LEVEL, (humid & 7)));          // Humidifier Value
+    int humidlevel = humid & 7;
+    this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_HUMID_LEVEL, humidlevel));          // Humidifier Value
+
+    if (humidlevel > 5) UNEXPECTED_VALUE(humidlevel, "<= 5");
 }
 
 
diff --git a/oscar/SleepLib/session.h b/oscar/SleepLib/session.h
index 663d053e..b9b46313 100644
--- a/oscar/SleepLib/session.h
+++ b/oscar/SleepLib/session.h
@@ -24,7 +24,7 @@
 class Machine;
 
 enum SliceStatus {
-    UnknownStatus=0, EquipmentOff, EquipmentLeaking, EquipmentOn
+    UnknownStatus=0, EquipmentOff, MaskOn, MaskOff  // is there an EquipmentOn?
 };
 
 class SessionSlice
@@ -137,7 +137,7 @@ class Session
 //            t = 0;
 //            for (int i=0; i<size; ++i) {
 //                const SessionSlice & slice = m_slices.at(i);
-//                if (slice.status == EquipmentOn) {
+//                if (slice.status == MaskOn) {
 //                    t += slice.end - slice.start;
 //                }
 //            }
@@ -187,7 +187,7 @@ class Session
             t = 0;
             for (int i=0; i<size; ++i) {
                 const SessionSlice & slice = m_slices.at(i);
-                if (slice.status == EquipmentOn) {
+                if (slice.status == MaskOn) {
                     t += slice.end - slice.start;
                 }
             }
diff --git a/oscar/tests/sessiontests.cpp b/oscar/tests/sessiontests.cpp
index 1701f25d..cf9539a8 100644
--- a/oscar/tests/sessiontests.cpp
+++ b/oscar/tests/sessiontests.cpp
@@ -19,6 +19,17 @@ static QString hex(int i)
     return QString("0x") + QString::number(i, 16).toUpper();
 }
 
+static QString dur(qint64 msecs)
+{
+    qint64 s = msecs / 1000L;
+    int h = s / 3600; s -= h * 3600;
+    int m = s / 60; s -= m * 60;
+    return QString("%1:%2:%3")
+        .arg(h, 2, 10, QChar('0'))
+        .arg(m, 2, 10, QChar('0'))
+        .arg(s, 2, 10, QChar('0'));
+}
+
 #define ENUMSTRING(ENUM) case ENUM: s = #ENUM; break
 static QString eventListTypeName(EventListType t)
 {
@@ -170,6 +181,11 @@ void SessionToYaml(QString filepath, Session* session)
     out << "  id: " << session->session() << endl;
     out << "  start: " << ts(session->first()) << endl;
     out << "  end: " << ts(session->last()) << endl;
+    
+    Day day;
+    day.addSession(session);
+    out << "  total_time: " << dur(day.total_time()) << endl;
+    day.removeSession(session);
 
     out << "  settings:" << endl;
 

From 26f6e15a7568b02cf1d8a385b4033df87ce8718b Mon Sep 17 00:00:00 2001
From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com>
Date: Mon, 3 Jun 2019 20:56:40 -0400
Subject: [PATCH 07/42] Add YAML output for session slices.

---
 oscar/tests/sessiontests.cpp | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/oscar/tests/sessiontests.cpp b/oscar/tests/sessiontests.cpp
index cf9539a8..79e46f4b 100644
--- a/oscar/tests/sessiontests.cpp
+++ b/oscar/tests/sessiontests.cpp
@@ -182,6 +182,21 @@ void SessionToYaml(QString filepath, Session* session)
     out << "  start: " << ts(session->first()) << endl;
     out << "  end: " << ts(session->last()) << endl;
     
+    if (!session->m_slices.isEmpty()) {
+        out << "  slices:" << endl;
+        for (auto & slice : session->m_slices) {
+            QString s;
+            switch (slice.status) {
+            case MaskOn: s = "mask on"; break;
+            case MaskOff: s = "mask off"; break;
+            case EquipmentOff: s = "equipment off"; break;
+            default: s = "unknown"; break;
+            }
+            out << "  - status: " << s << endl;
+            out << "    start: " << ts(slice.start) << endl;
+            out << "    end: " << ts(slice.end) << endl;
+        }
+    }
     Day day;
     day.addSession(session);
     out << "  total_time: " << dur(day.total_time()) << endl;

From 27c169e61e023c02df5374f8ed9dc2a6b0d6ad2b Mon Sep 17 00:00:00 2001
From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com>
Date: Mon, 3 Jun 2019 22:01:02 -0400
Subject: [PATCH 08/42] Report parsing failure when PRS1 sanity checks fail.

Remarkably, this resulted in nearly no changes to the test output.
Only one session with 0 duration had its start/end times reset to 0,
since it will no longer get imported.
---
 oscar/SleepLib/loader_plugins/prs1_loader.cpp | 29 +++++++++----------
 oscar/SleepLib/loader_plugins/prs1_loader.h   |  2 +-
 oscar/SleepLib/session.h                      |  5 ++--
 oscar/tests/prs1tests.cpp                     |  1 +
 oscar/tests/sessiontests.cpp                  |  1 +
 5 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/oscar/SleepLib/loader_plugins/prs1_loader.cpp b/oscar/SleepLib/loader_plugins/prs1_loader.cpp
index d36d158c..64ada317 100644
--- a/oscar/SleepLib/loader_plugins/prs1_loader.cpp
+++ b/oscar/SleepLib/loader_plugins/prs1_loader.cpp
@@ -1049,13 +1049,6 @@ void PRS1Loader::ScanFiles(const QStringList & paths, int sessionid_base, Machin
             }
 
             // Parse the data chunks and read the files..
-            if (fi.canonicalFilePath().isEmpty()) {
-#if QT_VERSION < QT_VERSION_CHECK(5,12,0)
-                qWarning() << fi.fileName() << "canonicalFilePath is empty";
-#else
-                qWarning() << fi << "cannonicalFilePath is empty";
-#endif
-            }
             QList<PRS1DataChunk *> Chunks = ParseFile(fi.canonicalFilePath());
 
             for (int i=0; i < Chunks.size(); ++i) {
@@ -1067,7 +1060,7 @@ void PRS1Loader::ScanFiles(const QStringList & paths, int sessionid_base, Machin
                 PRS1DataChunk * chunk = Chunks.at(i);
 
                 SessionID chunk_sid = chunk->sessionid;
-                if (i > 0 || chunk_sid != sid) {  // log multiple chunks in non-waveform files and session ID mismatches
+                if (i == 0 && chunk_sid != sid) {  // log session ID mismatches
                     qDebug() << fi.canonicalFilePath() << chunk_sid;
                 }
                 if (m->SessionExists(chunk_sid)) {
@@ -1717,7 +1710,7 @@ bool PRS1DataChunk::ParseEventsF5V3(void)
 {
     if (this->family != 5 || this->familyVersion != 3) {
         qWarning() << "ParseEventsF5V3 called with family" << this->family << "familyVersion" << this->familyVersion;
-        //break;  // don't break to avoid changing behavior (for now)
+        return false;
     }
     
     EventDataType data0, data1, data2, data3, data4, data5;
@@ -2437,7 +2430,7 @@ bool PRS1DataChunk::ParseEventsF3V6(void)
 
     if (this->family != 3 || this->familyVersion != 6) {
         qWarning() << "ParseEventsF3V6 called with family" << this->family << "familyVersion" << this->familyVersion;
-        //break;  // don't break to avoid changing behavior (for now)
+        return false;
     }
     
     int t = 0;
@@ -2623,7 +2616,7 @@ bool PRS1DataChunk::ParseEventsF3V3(void)
 {
     if (this->family != 3 || this->familyVersion != 3) {
         qWarning() << "ParseEventsF3V3 called with family" << this->family << "familyVersion" << this->familyVersion;
-        //break;  // don't break to avoid changing behavior (for now)
+        return false;
     }
     
     int t = 0, tt;
@@ -3209,7 +3202,7 @@ bool PRS1Import::ImportCompliance()
         }
     }
 
-    if (!ok) {
+    if (!ok || compliance->duration == 0) {
         return false;
     }
     session->setSummaryOnly(true);
@@ -3232,6 +3225,11 @@ bool PRS1DataChunk::ParseCompliance(void)
     if (this->family != 0 || this->familyVersion != 2) {
         return false;
     }
+    // TODO: hardcoding this is ugly, think of a better approach
+    if (this->m_data.size() < 0x13) {
+        qWarning() << "compliance data too short:" << this->m_data.size();
+        return false;
+    }
     const unsigned char * data = (unsigned char *)this->m_data.constData();
 
     CHECK_VALUE(data[0x00], 0);
@@ -4549,8 +4547,8 @@ PRS1DataChunk* PRS1DataChunk::ParseNext(QFile & f)
         // Make sure the calculated CRC over the entire chunk (header and data) matches the stored CRC.
         if (chunk->calcCrc != chunk->storedCrc) {
             // corrupt data block.. bleh..
-            qDebug() << chunk->m_path << "@" << chunk->m_filepos << "block CRC calc" << hex << chunk->calcCrc << "!= stored" << hex << chunk->storedCrc;
-            //break;  // don't break to avoid changing behavior (for now)
+            qWarning() << chunk->m_path << "@" << chunk->m_filepos << "block CRC calc" << hex << chunk->calcCrc << "!= stored" << hex << chunk->storedCrc;
+            break;
         }
 
         // Only return the chunk if it has passed all tests above.
@@ -4595,7 +4593,7 @@ bool PRS1DataChunk::ReadHeader(QFile & f)
         }
         if (this->htype != PRS1_HTYPE_NORMAL && this->htype != PRS1_HTYPE_INTERVAL) {
             qWarning() << this->m_path << "unexpected htype:" << this->htype;
-            //break;  // don't break to avoid changing behavior (for now)
+            break;
         }
 
         // Read format-specific variable-length header data.
@@ -4732,6 +4730,7 @@ bool PRS1DataChunk::ReadWaveformHeader(QFile & f)
         header = (unsigned char *)this->m_header.data();
 
         // Parse the variable-length waveform information.
+        // TODO: move these checks into the parser, after the header checksum has been verified
         int pos = 0x13;
         for (int i = 0; i < wvfm_signals; ++i) {
             quint8 kind = header[pos];
diff --git a/oscar/SleepLib/loader_plugins/prs1_loader.h b/oscar/SleepLib/loader_plugins/prs1_loader.h
index c549c2ff..b1edf308 100644
--- a/oscar/SleepLib/loader_plugins/prs1_loader.h
+++ b/oscar/SleepLib/loader_plugins/prs1_loader.h
@@ -25,7 +25,7 @@
 //********************************************************************************************
 // Please INCREMENT the following value when making changes to this loaders implementation
 // BEFORE making a release
-const int prs1_data_version = 15;
+const int prs1_data_version = 16;
 //
 //********************************************************************************************
 #if 0  // Apparently unused
diff --git a/oscar/SleepLib/session.h b/oscar/SleepLib/session.h
index b9b46313..79ef360d 100644
--- a/oscar/SleepLib/session.h
+++ b/oscar/SleepLib/session.h
@@ -1,7 +1,8 @@
-/* SleepLib Session Header
+/* SleepLib Session Header
  *
  * This stuff contains the session calculation smarts
  *
+ * Copyright (c) 2019 The OSCAR Team
  * Copyright (C) 2011-2018 Mark Watkins <mark@jedimark.net>
  *
  * This file is subject to the terms and conditions of the GNU General Public
@@ -169,7 +170,7 @@ class Session
     //! \brief Set last time to higher of 'd' and existing s_last.  Throw warning if 'd' less than s_first.
     void set_last(qint64 d) {
         if (d <= s_first) {
-            qWarning() << "Session::set_last() d<=s_first";
+            qWarning() << s_session << "Session::set_last() d<=s_first";
             return;
         }
 
diff --git a/oscar/tests/prs1tests.cpp b/oscar/tests/prs1tests.cpp
index 79a8411f..4fb0e854 100644
--- a/oscar/tests/prs1tests.cpp
+++ b/oscar/tests/prs1tests.cpp
@@ -122,6 +122,7 @@ void PRS1Tests::testSessionsToYaml()
 
 static QString ts(qint64 msecs)
 {
+    // TODO: make this UTC so that tests don't vary by where they're run
     return QDateTime::fromMSecsSinceEpoch(msecs).toString(Qt::ISODate);
 }
 
diff --git a/oscar/tests/sessiontests.cpp b/oscar/tests/sessiontests.cpp
index 79e46f4b..e260c116 100644
--- a/oscar/tests/sessiontests.cpp
+++ b/oscar/tests/sessiontests.cpp
@@ -11,6 +11,7 @@
 
 static QString ts(qint64 msecs)
 {
+    // TODO: make this UTC so that tests don't vary by where they're run
     return QDateTime::fromMSecsSinceEpoch(msecs).toString(Qt::ISODate);
 }
 

From 2021e9142692fb10f1c8f67d38da377d4223f10a Mon Sep 17 00:00:00 2001
From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com>
Date: Tue, 4 Jun 2019 12:18:20 -0400
Subject: [PATCH 09/42] Fix parsing PRS1 F0V2 settings and add value checks
 based on a few sample sessions.

---
 oscar/SleepLib/loader_plugins/prs1_loader.cpp | 77 ++++++++++++++-----
 1 file changed, 57 insertions(+), 20 deletions(-)

diff --git a/oscar/SleepLib/loader_plugins/prs1_loader.cpp b/oscar/SleepLib/loader_plugins/prs1_loader.cpp
index 64ada317..8efec2f8 100644
--- a/oscar/SleepLib/loader_plugins/prs1_loader.cpp
+++ b/oscar/SleepLib/loader_plugins/prs1_loader.cpp
@@ -3326,8 +3326,24 @@ bool PRS1DataChunk::ParseCompliance(void)
 
 bool PRS1DataChunk::ParseSummaryF0V23()
 {
+    if (this->family != 0 || (this->familyVersion != 2 && this->familyVersion != 3)) {
+        qWarning() << "ParseSummaryF0V23 called with family" << this->family << "familyVersion" << this->familyVersion;
+        return false;
+    }
+    // TODO: SET THIS VALUE, hardcoding this is ugly, think of a better approach
+    if (this->m_data.size() < 59) {
+        qWarning() << "summary data too short:" << this->m_data.size();
+        return false;
+    }
     const unsigned char * data = (unsigned char *)this->m_data.constData();
 
+    CHECK_VALUE(data[0x00], 0);
+    if (data[0x00] != 0) {
+        return false;
+    }
+    CHECK_VALUES(data[0x01] & 0xF0, 0x60, 0x70);  // TODO: what are these?
+    CHECK_VALUES(data[0x01] & 0x0F, 1, 3);  // TODO: what are these?
+
     CPAPMode cpapmode = MODE_UNKNOWN;
 
     switch (data[0x02]) {  // PRS1 mode   // 0 = CPAP, 2 = APAP
@@ -3343,10 +3359,14 @@ bool PRS1DataChunk::ParseSummaryF0V23()
     case 0x03:
         cpapmode = MODE_BILEVEL_AUTO_VARIABLE_PS;
     }
+    CHECK_VALUES(data[0x02], 0, 2);  // anything other than CPAP and APAP unverified
+
+    this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_CPAP_MODE, (int) cpapmode));
 
     int min_pressure = data[0x03];
     int max_pressure = data[0x04];
     int ps  = data[0x05]; // pressure support
+    CHECK_VALUE(ps, 0);  // unverified
 
     if (cpapmode == MODE_CPAP) {
         this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_PRESSURE, min_pressure));
@@ -3367,36 +3387,53 @@ bool PRS1DataChunk::ParseSummaryF0V23()
         this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_PS_MAX, ps));
     }
 
-    this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_CPAP_MODE, (int) cpapmode));
-
-
     int ramp_time = data[0x06];
     int ramp_pressure = data[0x07];
-
     this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_RAMP_TIME, ramp_time));
     this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_RAMP_PRESSURE, ramp_pressure));
 
-    // Tubing lock has no setting byte
-
-    // Menu Options
-    this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_SYSTEMONE_RESIST_LOCK, (data[0x0a] & 0x80) != 0)); // System One Resistance Lock Setting
-    this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_SYSTEMONE_RESIST_SETTING, data[0x0a] & 7));       // SYstem One Resistance setting value
-    this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_SYSTEMONE_RESIST_STATUS, (data[0x0a] & 0x40) != 0));  // System One Resistance Status bit
-    this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_HOSE_DIAMETER, (data[0x0a] & 0x08) ? 15 : 22));
-    this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_AUTO_ON, (data[0x0b] & 0x40) != 0));
-    this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_AUTO_OFF, (data[0x0c] & 0x10) != 0));
-    this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_MASK_ALERT, (data[0x0c] & 0x08) != 0));
-    this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_SHOW_AHI, (data[0x0c] & 0x04) != 0));
-    int humid = data[0x09];
-    this->ParseHumidifierSetting(humid, false);
-
-   // session->
-
     quint8 flex = data[0x08];
     this->ParseFlexSetting(flex, cpapmode);
 
+    int humid = data[0x09];
+    this->ParseHumidifierSetting(humid, false);
+    
+    // Tubing lock has no setting byte
+
+    // Menu Options
+    this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_SYSTEMONE_RESIST_LOCK, (data[0x0a] & 0x80) != 0)); // System One Resistance Lock Setting
+    this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_SYSTEMONE_RESIST_STATUS, (data[0x0a] & 0x40) != 0));  // System One Resistance Status bit
+    this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_HOSE_DIAMETER, (data[0x0a] & 0x08) ? 15 : 22));
+    this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_SYSTEMONE_RESIST_SETTING, data[0x0a] & 7));       // System One Resistance setting value
+    CHECK_VALUE(data[0x0a] & (0x20 | 0x10), 0);
+
+    CHECK_VALUE(data[0x0b], 1);
+    
+    this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_AUTO_ON, (data[0x0c] & 0x40) != 0));
+    this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_AUTO_OFF, (data[0x0c] & 0x10) != 0));
+    this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_MASK_ALERT, (data[0x0c] & 0x04) != 0));
+    this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_SHOW_AHI, (data[0x0c] & 0x02) != 0));
+    CHECK_VALUE(data[0x0c] & (0xA0 | 0x09), 0);
+
+    CHECK_VALUE(data[0x0d], 0);
+    if (cpapmode == MODE_CPAP) {
+        CHECK_VALUE(data[0x0e], ramp_pressure);
+    } else {
+        CHECK_VALUE(data[0x0e], min_pressure);
+    }
+    CHECK_VALUE(data[0x0f], 0);
+
+    // TODO: This looks like compliance's slices: 02 00 00 at the beginning, followed by 03 nn nn.
+    // But looking at a long .001 file, it seems like the 03 block is 0x22 bytes long instead of 3.
+    CHECK_VALUE(data[0x10], 2);
+    CHECK_VALUE(data[0x11], 0);
+    CHECK_VALUE(data[0x12], 0);
+    CHECK_VALUE(data[0x13], 3);
+
     this->duration = data[0x14] | data[0x15] << 8;
 
+    // seems to be trailing 01 [01 or 02] 83 after final 01 00 00?
+
     return true;
 }
 

From 5ac6745eefd147c05b0af0a88c0d4d2945228181 Mon Sep 17 00:00:00 2001
From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com>
Date: Tue, 4 Jun 2019 14:14:22 -0400
Subject: [PATCH 10/42] Fix PRS1 F0V23 PB parsing bug that triggered unordered
 data warnings.

A PB event obviously can't start so late that its duration ends in the future!
The fix hasn't been applied to F0V4 or F0V6 yet, since those haven't been
tested yet.

Also fix a sign bug in EventList::AddEvent when there *is* unordered data.
---
 oscar/SleepLib/event.cpp                      |  6 +++---
 oscar/SleepLib/loader_plugins/prs1_loader.cpp | 10 +++++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/oscar/SleepLib/event.cpp b/oscar/SleepLib/event.cpp
index a90bdbb1..6eda1143 100644
--- a/oscar/SleepLib/event.cpp
+++ b/oscar/SleepLib/event.cpp
@@ -1,4 +1,4 @@
-/* SleepLib Event Class Implementation
+/* SleepLib Event Class Implementation
  *
  * Copyright (c) 2011-2018 Mark Watkins <mark@jedimark.net>
  *
@@ -85,12 +85,12 @@ void EventList::AddEvent(qint64 time, EventStoreType data)
     if (m_first > time) {
         // Crud.. Update all the previous records
         // This really shouldn't happen.
-        qDebug() << "Unordered time detected in AddEvent().";
+        qDebug() << "Unordered time detected in AddEvent()" << m_count << m_first << time << data;
 
         qint32 delta = (m_first - time);
 
         for (quint32 i = 0; i < m_count; ++i) {
-            m_time[i] -= delta;
+            m_time[i] += delta;
         }
 
         m_first = time;
diff --git a/oscar/SleepLib/loader_plugins/prs1_loader.cpp b/oscar/SleepLib/loader_plugins/prs1_loader.cpp
index 8efec2f8..63a432ed 100644
--- a/oscar/SleepLib/loader_plugins/prs1_loader.cpp
+++ b/oscar/SleepLib/loader_plugins/prs1_loader.cpp
@@ -3072,7 +3072,7 @@ bool PRS1DataChunk::ParseEventsF0(CPAPMode mode)
 
             pos += 2;
             data1 = buffer[pos++];
-            this->AddEvent(new PRS1UnknownValueEvent(code, t - data1, data0));
+            this->AddEvent(new PRS1UnknownValueEvent(code, t - data1, data0));  // TODO: start time should probably match PB below
             break;
 
         case 0x0f: // Cheyne Stokes Respiration
@@ -3083,7 +3083,11 @@ bool PRS1DataChunk::ParseEventsF0(CPAPMode mode)
             }
             pos += 2;
             data1 = buffer[pos++];
-            this->AddEvent(new PRS1PeriodicBreathingEvent(t - data1, data0));
+            if (this->familyVersion == 2 || this->familyVersion == 3) {
+                this->AddEvent(new PRS1PeriodicBreathingEvent(t - data1 - data0, data0));  // PB event appears data1 seconds after conclusion
+            } else {
+                this->AddEvent(new PRS1PeriodicBreathingEvent(t - data1, data0));  // TODO: this should probably be the same as F0V23, but it hasn't been tested
+            }
             break;
 
         case 0x10: // Large Leak
@@ -3094,7 +3098,7 @@ bool PRS1DataChunk::ParseEventsF0(CPAPMode mode)
             }
             pos += 2;
             data1 = buffer[pos++];
-            this->AddEvent(new PRS1LargeLeakEvent(t - data1, data0));
+            this->AddEvent(new PRS1LargeLeakEvent(t - data1, data0));  // TODO: start time should probably match PB above
             break;
 
         case 0x11: // Leak Rate & Snore Graphs

From d80426af5ef9697664b6c0f9b9de127399312b24 Mon Sep 17 00:00:00 2001
From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com>
Date: Tue, 4 Jun 2019 20:26:43 -0400
Subject: [PATCH 11/42] Add slices to PRS1 F0V23 summaries.

This doesn't have much observable effect, other than reducing a
day's total usage time if there are periods with no breathing
detected. Most of the shortcomings were obscured by information
gleaned from the events and waveform files.
---
 oscar/SleepLib/loader_plugins/prs1_loader.cpp | 76 ++++++++++++++-----
 1 file changed, 59 insertions(+), 17 deletions(-)

diff --git a/oscar/SleepLib/loader_plugins/prs1_loader.cpp b/oscar/SleepLib/loader_plugins/prs1_loader.cpp
index 63a432ed..fa3bafe2 100644
--- a/oscar/SleepLib/loader_plugins/prs1_loader.cpp
+++ b/oscar/SleepLib/loader_plugins/prs1_loader.cpp
@@ -3271,12 +3271,7 @@ bool PRS1DataChunk::ParseCompliance(void)
     CHECK_VALUE(data[0x0c], 0);
     CHECK_VALUE(data[0x0d], 0);
     
-    // TODO: What are slices, and why would only bricks have them? That seems very weird.
-    
-    // need to parse a repeating structure here containing lengths of mask on/off..
-    // 0x03 = mask on
-    // 0x01 = mask off
-
+    // List of slices, really session-related events:
     int start = 0;
     int tt = start;
 
@@ -3323,7 +3318,6 @@ bool PRS1DataChunk::ParseCompliance(void)
 
     this->duration = tt;
 
-    // Bleh!! There is probably 10 different formats for these useless piece of junk machines
     return true;
 }
 
@@ -3427,16 +3421,54 @@ bool PRS1DataChunk::ParseSummaryF0V23()
     }
     CHECK_VALUE(data[0x0f], 0);
 
-    // TODO: This looks like compliance's slices: 02 00 00 at the beginning, followed by 03 nn nn.
-    // But looking at a long .001 file, it seems like the 03 block is 0x22 bytes long instead of 3.
-    CHECK_VALUE(data[0x10], 2);
-    CHECK_VALUE(data[0x11], 0);
-    CHECK_VALUE(data[0x12], 0);
-    CHECK_VALUE(data[0x13], 3);
+    // List of slices, really session-related events:
+    int start = 0;
+    int tt = start;
 
-    this->duration = data[0x14] | data[0x15] << 8;
+    int len = this->size()-3;
+    int pos = 0x10;
+    do {
+        quint8 c = data[pos++];
+        int delta = data[pos] | data[pos+1] << 8;
+        pos+=2;
+        SliceStatus status;
+        if (c == 0x02) {
+            status = MaskOn;
+            if (tt == 0) {
+                CHECK_VALUE(delta, 0);  // we've never seen the initial MaskOn have any delta
+            } else {
+                if (delta % 60) UNEXPECTED_VALUE(delta, "even minutes");  // mask-off events seem to be whole minutes?
+            }
+        } else if (c == 0x03) {
+            status = MaskOff;
+            // These are 0x22 bytes in a summary vs. 3 bytes in compliance data
+            // TODO: What are these values?
+            pos += 0x1F;
+        } else if (c == 0x01) {
+            status = EquipmentOff;
+            // This has a delta if the mask was removed before the machine was shut off.
+        } else {
+            qDebug() << this->sessionid << "unknown slice status" << c;
+            break;
+        }
+        tt += delta;
+        this->AddEvent(new PRS1ParsedSliceEvent(tt, status));
+    } while (pos < len);
 
-    // seems to be trailing 01 [01 or 02] 83 after final 01 00 00?
+    // seems to be trailing 01 [01 or 02] 83 after the slices?
+    if (pos == len) {
+        CHECK_VALUE(data[pos], 1);
+        CHECK_VALUES(data[pos+1], 0, 1);
+        //CHECK_VALUES(data[pos+2], 0x81, 0x80);  // seems to be humidifier setting at end of session
+        if (data[pos+2] && (((data[pos+2] & 0x80) == 0) || (data[pos+2] & 0x07) > 5)) {
+            UNEXPECTED_VALUE(data[pos+2], "valid humidifier setting");
+        }
+    } else {
+        qWarning() << this->sessionid << (this->size() - pos) << "trailing bytes";
+    }
+
+    this->duration = tt;
+    //this->duration = data[0x14] | data[0x15] << 8;
 
     return true;
 }
@@ -3839,7 +3871,8 @@ bool PRS1Import::ImportSummary()
 {
     if (!summary) return false;
 
-    session->set_first(qint64(summary->timestamp) * 1000L);
+    qint64 start = qint64(summary->timestamp) * 1000L;
+    session->set_first(start);
 
     session->setPhysMax(CPAP_LeakTotal, 120);
     session->setPhysMin(CPAP_LeakTotal, 0);
@@ -3857,7 +3890,16 @@ bool PRS1Import::ImportSummary()
     
     for (int i=0; i < summary->m_parsedData.count(); i++) {
         PRS1ParsedEvent* e = summary->m_parsedData.at(i);
-        if (e->m_type != PRS1ParsedSettingEvent::TYPE) {
+        if (e->m_type == PRS1ParsedSliceEvent::TYPE) {
+            PRS1ParsedSliceEvent* s = (PRS1ParsedSliceEvent*) e;
+            qint64 tt = start + qint64(s->m_start) * 1000L;
+            if (!session->m_slices.isEmpty()) {
+                SessionSlice & prevSlice = session->m_slices.last();
+                prevSlice.end = tt;
+            }
+            session->m_slices.append(SessionSlice(tt, tt, (SliceStatus) s->m_value));
+            continue;
+        } else if (e->m_type != PRS1ParsedSettingEvent::TYPE) {
             qWarning() << "Summary had non-setting event:" << (int) e->m_type;
             continue;
         }

From c2b8699ee94ee463fbcd7272284fe65de1a17190 Mon Sep 17 00:00:00 2001
From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com>
Date: Tue, 4 Jun 2019 23:19:35 -0400
Subject: [PATCH 12/42] Chase down all unusual values in F0V23 summary sample
 data.

Chunk parsing is now a lot quieter, and PS for non-auto bilevel has been fixed.
---
 oscar/SleepLib/loader_plugins/prs1_loader.cpp | 48 ++++++++++++-------
 1 file changed, 30 insertions(+), 18 deletions(-)

diff --git a/oscar/SleepLib/loader_plugins/prs1_loader.cpp b/oscar/SleepLib/loader_plugins/prs1_loader.cpp
index fa3bafe2..badaf7c3 100644
--- a/oscar/SleepLib/loader_plugins/prs1_loader.cpp
+++ b/oscar/SleepLib/loader_plugins/prs1_loader.cpp
@@ -280,7 +280,9 @@ bool PRS1ModelInfo::IsTested(const QString & model, int family, int familyVersio
     // Some 500X150 C0/C1 folders have contained this bogus model number in their PROP.TXT file,
     // with the same serial number seen in the main PROP.TXT file that shows the real model number.
     if (model == "100X100") {
+#ifndef UNITTEST_MODE
         qDebug() << "Ignoring 100X100 for untested alert";
+#endif
         return true;
     }
     return false;
@@ -3328,7 +3330,7 @@ bool PRS1DataChunk::ParseSummaryF0V23()
         qWarning() << "ParseSummaryF0V23 called with family" << this->family << "familyVersion" << this->familyVersion;
         return false;
     }
-    // TODO: SET THIS VALUE, hardcoding this is ugly, think of a better approach
+    // TODO: hardcoding this is ugly, think of a better approach
     if (this->m_data.size() < 59) {
         qWarning() << "summary data too short:" << this->m_data.size();
         return false;
@@ -3340,7 +3342,9 @@ bool PRS1DataChunk::ParseSummaryF0V23()
         return false;
     }
     CHECK_VALUES(data[0x01] & 0xF0, 0x60, 0x70);  // TODO: what are these?
-    CHECK_VALUES(data[0x01] & 0x0F, 1, 3);  // TODO: what are these?
+    if ((data[0x01] & 0x0F) != 1) {  // This is the most frequent value.
+        CHECK_VALUES(data[0x01] & 0x0F, 3, 0);  // TODO: what are these? 0 seems to be related to errors.
+    }
 
     CPAPMode cpapmode = MODE_UNKNOWN;
 
@@ -3356,29 +3360,35 @@ bool PRS1DataChunk::ParseSummaryF0V23()
         break;
     case 0x03:
         cpapmode = MODE_BILEVEL_AUTO_VARIABLE_PS;
+        break;
+    default:
+        qWarning() << this->sessionid << "unknown cpap mode" << data[0x02];
+        return false;
     }
-    CHECK_VALUES(data[0x02], 0, 2);  // anything other than CPAP and APAP unverified
 
     this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_CPAP_MODE, (int) cpapmode));
 
     int min_pressure = data[0x03];
     int max_pressure = data[0x04];
-    int ps  = data[0x05]; // pressure support
-    CHECK_VALUE(ps, 0);  // unverified
+    int ps  = data[0x05];  // max pressure support (for variable), seems to be zero otherwise
 
     if (cpapmode == MODE_CPAP) {
         this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_PRESSURE, min_pressure));
+        CHECK_VALUE(max_pressure, 0);
+        CHECK_VALUE(ps, 0);
     } else if (cpapmode == MODE_APAP) {
         this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_PRESSURE_MIN, min_pressure));
         this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_PRESSURE_MAX, max_pressure));
+        CHECK_VALUE(ps, 0);
     } else if (cpapmode == MODE_BILEVEL_FIXED) {
         this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_EPAP, min_pressure));
         this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_IPAP, max_pressure));
-        this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_PS, ps));
+        this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_PS, max_pressure - min_pressure));
+        CHECK_VALUE(ps, 0);  // this seems to be unused on fixed bilevel
     } else if (cpapmode == MODE_BILEVEL_AUTO_VARIABLE_PS) {
         int min_ps = 20;  // 2.0 cmH2O
         this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_EPAP_MIN, min_pressure));
-        this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_EPAP_MAX, max_pressure - min_ps));
+        this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_EPAP_MAX, max_pressure - min_ps));  // TODO: not yet confirmed
         this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_IPAP_MIN, min_pressure + min_ps));
         this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_IPAP_MAX, max_pressure));
         this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_PS_MIN, min_ps));
@@ -3401,7 +3411,7 @@ bool PRS1DataChunk::ParseSummaryF0V23()
     // Menu Options
     this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_SYSTEMONE_RESIST_LOCK, (data[0x0a] & 0x80) != 0)); // System One Resistance Lock Setting
     this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_SYSTEMONE_RESIST_STATUS, (data[0x0a] & 0x40) != 0));  // System One Resistance Status bit
-    this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_HOSE_DIAMETER, (data[0x0a] & 0x08) ? 15 : 22));
+    this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_HOSE_DIAMETER, (data[0x0a] & 0x08) ? 15 : 22));  // TODO: unconfirmed
     this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_SYSTEMONE_RESIST_SETTING, data[0x0a] & 7));       // System One Resistance setting value
     CHECK_VALUE(data[0x0a] & (0x20 | 0x10), 0);
 
@@ -3414,12 +3424,12 @@ bool PRS1DataChunk::ParseSummaryF0V23()
     CHECK_VALUE(data[0x0c] & (0xA0 | 0x09), 0);
 
     CHECK_VALUE(data[0x0d], 0);
-    if (cpapmode == MODE_CPAP) {
-        CHECK_VALUE(data[0x0e], ramp_pressure);
-    } else {
-        CHECK_VALUE(data[0x0e], min_pressure);
+    //CHECK_VALUES(data[0x0e], ramp_pressure, min_pressure);  // initial CPAP/EPAP, can be minimum pressure or ramp, or whatever auto decides to use
+    if (cpapmode == MODE_BILEVEL_FIXED) {  // initial IPAP for bilevel modes
+        CHECK_VALUE(data[0x0f], max_pressure);
+    } else if (cpapmode == MODE_BILEVEL_AUTO_VARIABLE_PS) {
+        CHECK_VALUE(data[0x0f], min_pressure + 20);
     }
-    CHECK_VALUE(data[0x0f], 0);
 
     // List of slices, really session-related events:
     int start = 0;
@@ -3457,8 +3467,10 @@ bool PRS1DataChunk::ParseSummaryF0V23()
 
     // seems to be trailing 01 [01 or 02] 83 after the slices?
     if (pos == len) {
-        CHECK_VALUE(data[pos], 1);
-        CHECK_VALUES(data[pos+1], 0, 1);
+        if (data[pos] != 1) {  // This is the usual value.
+            CHECK_VALUES(data[pos], 0, 3);  // 0 seems to be related to errors, 3 seen after 90 sec large leak before turning off?
+        }
+        //CHECK_VALUES(data[pos+1], 0, 1);  // TODO: may be related to ramp? 1-5 seems to have a ramp start or two
         //CHECK_VALUES(data[pos+2], 0x81, 0x80);  // seems to be humidifier setting at end of session
         if (data[pos+2] && (((data[pos+2] & 0x80) == 0) || (data[pos+2] & 0x07) > 5)) {
             UNEXPECTED_VALUE(data[pos+2], "valid humidifier setting");
@@ -3468,7 +3480,6 @@ bool PRS1DataChunk::ParseSummaryF0V23()
     }
 
     this->duration = tt;
-    //this->duration = data[0x14] | data[0x15] << 8;
 
     return true;
 }
@@ -3663,13 +3674,14 @@ void PRS1DataChunk::ParseFlexSetting(quint8 flex, CPAPMode cpapmode)
 
 void PRS1DataChunk::ParseHumidifierSetting(int humid, bool supportsHeatedTubing)
 {
-    if (humid & (0x40 | 0x20 | 0x08)) UNEXPECTED_VALUE(humid, "known bits");
+    if (humid & (0x40 | 0x08)) UNEXPECTED_VALUE(humid, "known bits");
     
     this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_HUMID_STATUS, (humid & 0x80) != 0));        // Humidifier Connected
     if (supportsHeatedTubing) {
         this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_HEATED_TUBING, (humid & 0x10) != 0));        // Heated Hose??
+        // TODO: 0x20 is seen on machines with System One humidification & heated tubing, not sure which setting it represents.
     } else {
-        CHECK_VALUE(humid & 0x10, 0);
+        CHECK_VALUE(humid & 0x30, 0);
     }
     int humidlevel = humid & 7;
     this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_HUMID_LEVEL, humidlevel));          // Humidifier Value

From 44d134dee5a2d1ed78e6949433dad9f2c2c668a6 Mon Sep 17 00:00:00 2001
From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com>
Date: Wed, 5 Jun 2019 08:34:36 -0400
Subject: [PATCH 13/42] Fix a sign error and don't consider 1-second gaps to be
 BND events in PRS1.

Presumably due to clock drift, there are occasionally 1-second discontinuities
in waveform data, in either direction. These will need to be addressed.
---
 oscar/SleepLib/loader_plugins/prs1_loader.cpp | 46 +++++++++++++++++--
 1 file changed, 42 insertions(+), 4 deletions(-)

diff --git a/oscar/SleepLib/loader_plugins/prs1_loader.cpp b/oscar/SleepLib/loader_plugins/prs1_loader.cpp
index badaf7c3..48bb632d 100644
--- a/oscar/SleepLib/loader_plugins/prs1_loader.cpp
+++ b/oscar/SleepLib/loader_plugins/prs1_loader.cpp
@@ -4364,12 +4364,21 @@ bool PRS1Import::ParseOximetery()
     return true;
 }
 
+
+static QString ts(qint64 msecs)
+{
+    // TODO: make this UTC so that tests don't vary by where they're run
+    return QDateTime::fromMSecsSinceEpoch(msecs).toString(Qt::ISODate);
+}
+
+
 bool PRS1Import::ParseWaveforms()
 {
     int size = waveforms.size();
     quint64 s1, s2;
 
 
+    int discontinuities = 0;
     qint64 lastti=0;
     EventList * bnd = nullptr; // Breathing Not Detected
 
@@ -4385,14 +4394,39 @@ bool PRS1Import::ParseWaveforms()
         quint64 ti = quint64(waveform->timestamp) * 1000L;
         quint64 dur = qint64(waveform->duration) * 1000L;
 
-        quint64 diff = ti - lastti;
-        if ((lastti != 0) && diff > 0) {
-            qDebug() << waveform->sessionid << waveform->timestamp << "BND?" << (diff / 1000L) << "=" << waveform->timestamp << "-" << (lastti / 1000L);
+        qint64 diff = ti - lastti;
+        if ((lastti != 0) && (diff == 1000 || diff == -1000)) {
+            // TODO: Evidently the machines' internal clock drifts slightly, and in some sessions that
+            // means two adjacent (5-minute) waveform chunks have have a +/- 1 second difference in
+            // their notion of the correct time, since the machines only record time at 1-second
+            // resolution. Presumably the real drift is fractional, but there's no way to tell from
+            // the data.
+            //
+            // Encore apparently drops the second chunk entirely if it overlaps with the first
+            // (even by 1 second), and inserts a 1-second gap in the data if it's 1 second later than
+            // the first ended.
+            //
+            // At worst in the former case it seems preferable to drop the overlap and then one
+            // additional second to mark the discontinuity. But depending how often these drifts
+            // occur, it may be possible to adjust all the data so that it's continuous. Alternatively,
+            // if it turns out overlapping waveform data always has overlapping identical values,
+            // it might be possible to drop the duplicated sample. Though that would mean that
+            // gaps are real, though potentially only by a single sample.
+            //
+            qDebug() << waveform->sessionid << "waveform discontinuity:" << (diff / 1000L) << "s @" << ts(waveform->timestamp * 1000L);
+            discontinuities++;
         }
-        if ((diff > 500) && (lastti != 0)) {
+        if ((diff > 1000) && (lastti != 0)) {
             if (!bnd) {
                 bnd = session->AddEventList(PRS1_BND, EVL_Event);
             }
+            // TODO: The machines' notion of BND appears to derive from the summary (maskoff/maskon)
+            // slices, but the waveform data (when present) does seem to agree. This should be confirmed
+            // once all summary parsers support slices.
+            if ((diff / 1000L) % 60) {
+                // Thus far all maskoff/maskon gaps have been multiples of 1 minute.
+                qDebug() << waveform->sessionid << "BND?" << (diff / 1000L) << "=" << ts(waveform->timestamp * 1000L) << "-" << ts(lastti);
+            }
             bnd->AddEvent(ti, double(diff)/1000.0);
         }
 
@@ -4430,6 +4464,10 @@ bool PRS1Import::ParseWaveforms()
         }
         lastti = dur+ti;
     }
+    
+    if (discontinuities > 1) {
+        qWarning() << session->s_session << "multiple discontinuities!" << discontinuities;
+    }
 
     return true;
 }

From 8fa5df5f89ba12a2e0a6d277829a87964151553f Mon Sep 17 00:00:00 2001
From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com>
Date: Wed, 5 Jun 2019 10:00:11 -0400
Subject: [PATCH 14/42] Fix PRS1 typo, resolve use of multiple event lists and
 refine warning.

---
 oscar/SleepLib/loader_plugins/prs1_loader.cpp |  4 ++--
 oscar/SleepLib/loader_plugins/prs1_loader.h   |  2 +-
 oscar/tests/sessiontests.cpp                  | 18 ++++++++++++++----
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/oscar/SleepLib/loader_plugins/prs1_loader.cpp b/oscar/SleepLib/loader_plugins/prs1_loader.cpp
index 48bb632d..9d3131d8 100644
--- a/oscar/SleepLib/loader_plugins/prs1_loader.cpp
+++ b/oscar/SleepLib/loader_plugins/prs1_loader.cpp
@@ -4319,7 +4319,7 @@ QList<PRS1DataChunk *> PRS1Import::CoalesceWaveformChunks(QList<PRS1DataChunk *>
 }
 
 
-bool PRS1Import::ParseOximetery()
+bool PRS1Import::ParseOximetry()
 {
     int size = oximetry.size();
 
@@ -4506,7 +4506,7 @@ bool PRS1Import::ParseSession(void)
         // Parse .006 Waveform file
         oximetry = loader->ParseFile(oxifile);
         oximetry = CoalesceWaveformChunks(oximetry);
-        ParseOximetery();
+        ParseOximetry();
 
         if (session->first() > 0) {
             if (session->last() < session->first()) {
diff --git a/oscar/SleepLib/loader_plugins/prs1_loader.h b/oscar/SleepLib/loader_plugins/prs1_loader.h
index b1edf308..43b9c517 100644
--- a/oscar/SleepLib/loader_plugins/prs1_loader.h
+++ b/oscar/SleepLib/loader_plugins/prs1_loader.h
@@ -249,7 +249,7 @@ public:
     bool ParseWaveforms();
 
     //! \brief Takes the parsed list of oximeter waveform chunks and adds them to the database.
-    bool ParseOximetery();
+    bool ParseOximetry();
 
 
     //! \brief Parse a single data chunk from a .002 file containing event data for a standard system one machine
diff --git a/oscar/tests/sessiontests.cpp b/oscar/tests/sessiontests.cpp
index e260c116..5b12d537 100644
--- a/oscar/tests/sessiontests.cpp
+++ b/oscar/tests/sessiontests.cpp
@@ -230,13 +230,23 @@ void SessionToYaml(QString filepath, Session* session)
         // Note that this is a vector of lists
         QVector<EventList *> &ev = session->eventlist[*key];
         int ev_size = ev.size();
+        if (ev_size == 0) {
+            continue;
+        }
+        EventList &e = *ev[0];
         
-        // TODO: See what this actually signifies. Some waveform data seems to have to multiple event lists,
-        // which might reflect blocks within the original files, or something else.
-        if (ev_size > 2) qDebug() << session->session() << eventChannel(*key) << "ev_size =" << ev_size;
+        // Multiple eventlists in a channel are used to account for discontiguous data.
+        // See CoalesceWaveformChunks for the coalescing of multiple contiguous waveform
+        // chunks and ParseWaveforms/ParseOximetry for the creation of eventlists per
+        // coalesced chunk.
+        //
+        // TODO: Is this only for waveform data?
+        if (ev_size > 1 && e.type() != EVL_Waveform) {
+            qWarning() << session->session() << eventChannel(*key) << "ev_size =" << ev_size;
+        }
 
         for (int j = 0; j < ev_size; j++) {
-            EventList &e = *ev[j];
+            e = *ev[j];
             out << "    - count: "  << (qint32)e.count() << endl;
             if (e.count() == 0)
                 continue;

From 092d46be3329cdad0105015f48bff931413cfe2d Mon Sep 17 00:00:00 2001
From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com>
Date: Wed, 5 Jun 2019 10:24:32 -0400
Subject: [PATCH 15/42] Add debug messages for exceptional events in
 PRS1Import::ParseSession.

Lots of new warnings that were being silently eaten!
---
 oscar/SleepLib/loader_plugins/prs1_loader.cpp | 76 ++++++++++++++-----
 1 file changed, 59 insertions(+), 17 deletions(-)

diff --git a/oscar/SleepLib/loader_plugins/prs1_loader.cpp b/oscar/SleepLib/loader_plugins/prs1_loader.cpp
index 9d3131d8..cda2fd86 100644
--- a/oscar/SleepLib/loader_plugins/prs1_loader.cpp
+++ b/oscar/SleepLib/loader_plugins/prs1_loader.cpp
@@ -4485,39 +4485,81 @@ void PRS1Import::run()
 
 bool PRS1Import::ParseSession(void)
 {
+    bool ok = false;
     bool save = false;
     session = new Session(mach, sessionid);
 
-    if ((compliance && ImportCompliance()) || (summary && ImportSummary())) {
-        if (event && !ParseEvents()) {
-        }
-
-        // Parse .005 Waveform file
-        waveforms = loader->ParseFile(wavefile);
-        waveforms = CoalesceWaveformChunks(waveforms);
-        if (session->eventlist.contains(CPAP_FlowRate)) {
-            if (waveforms.size() > 0) {
-                // Delete anything called "Flow rate" picked up in the events file if real data is present
-                session->destroyEvent(CPAP_FlowRate);
+    do {
+        if (compliance != nullptr) {
+            ok = ImportCompliance();
+            if (!ok) {
+                qWarning() << sessionid << "Error parsing compliance, skipping session";
+                break;
+            }
+        }
+        if (summary != nullptr) {
+            if (compliance != nullptr) {
+                qWarning() << sessionid << "Has both compliance and summary?!";
+                // Never seen this, but try the summary anyway.
+            }
+            ok = ImportSummary();
+            if (!ok) {
+                qWarning() << sessionid << "Error parsing summary, skipping session";
+                break;
+            }
+        }
+        if (compliance == nullptr && summary == nullptr) {
+            qWarning() << sessionid << "No compliance or summary, skipping session";
+            break;
+        }
+        
+        if (event != nullptr) {
+            ok = ParseEvents();
+            if (!ok) {
+                qWarning() << sessionid << "Error parsing events, proceeding anyway?";
             }
         }
-        ParseWaveforms();
 
-        // Parse .006 Waveform file
-        oximetry = loader->ParseFile(oxifile);
-        oximetry = CoalesceWaveformChunks(oximetry);
-        ParseOximetry();
+        if (!wavefile.isEmpty()) {
+            // Parse .005 Waveform file
+            waveforms = loader->ParseFile(wavefile);
+            waveforms = CoalesceWaveformChunks(waveforms);
+            if (session->eventlist.contains(CPAP_FlowRate)) {
+                if (waveforms.size() > 0) {
+                    // Delete anything called "Flow rate" picked up in the events file if real data is present
+                    session->destroyEvent(CPAP_FlowRate);
+                }
+            }
+            ok = ParseWaveforms();
+            if (!ok) {
+                qWarning() << sessionid << "Error parsing waveforms, proceeding anyway?";
+            }
+        }
+
+        if (!oxifile.isEmpty()) {
+            // Parse .006 Waveform file
+            oximetry = loader->ParseFile(oxifile);
+            oximetry = CoalesceWaveformChunks(oximetry);
+            ok = ParseOximetry();
+            if (!ok) {
+                qWarning() << sessionid << "Error parsing oximetry, proceeding anyway?";
+            }
+        }
 
         if (session->first() > 0) {
             if (session->last() < session->first()) {
                 // if last isn't set, duration couldn't be gained from summary, parsing events or waveforms..
                 // This session is dodgy, so kill it
+                qWarning() << sessionid << "Session last() earlier than first(), downgrading to summary only";
                 session->setSummaryOnly(true);
                 session->really_set_last(session->first()+(qint64(summary_duration) * 1000L));
             }
             save = true;
+        } else {
+            qWarning() << sessionid << "missing start time";
         }
-    }
+    } while (false);
+    
     return save;
 }
 

From fd6f3c3f0aff660dc82bd9bec1e69db6a14d077e Mon Sep 17 00:00:00 2001
From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com>
Date: Wed, 5 Jun 2019 11:12:08 -0400
Subject: [PATCH 16/42] Resolve new PRS1 warning messages, add the missing
 session end time in ParseSummary.

---
 oscar/SleepLib/loader_plugins/prs1_loader.cpp | 40 ++++++++++++++++---
 1 file changed, 34 insertions(+), 6 deletions(-)

diff --git a/oscar/SleepLib/loader_plugins/prs1_loader.cpp b/oscar/SleepLib/loader_plugins/prs1_loader.cpp
index cda2fd86..d9fb0977 100644
--- a/oscar/SleepLib/loader_plugins/prs1_loader.cpp
+++ b/oscar/SleepLib/loader_plugins/prs1_loader.cpp
@@ -3208,7 +3208,12 @@ bool PRS1Import::ImportCompliance()
         }
     }
 
-    if (!ok || compliance->duration == 0) {
+    if (!ok) {
+        return false;
+    }
+    if (compliance->duration == 0) {
+        // This does occasionally happen and merely indicates a brief session with no useful data.
+        //qDebug() << compliance->sessionid << "duration == 0";
         return false;
     }
     session->setSummaryOnly(true);
@@ -3233,13 +3238,16 @@ bool PRS1DataChunk::ParseCompliance(void)
     }
     // TODO: hardcoding this is ugly, think of a better approach
     if (this->m_data.size() < 0x13) {
-        qWarning() << "compliance data too short:" << this->m_data.size();
+        qWarning() << this->sessionid << "compliance data too short:" << this->m_data.size();
         return false;
     }
     const unsigned char * data = (unsigned char *)this->m_data.constData();
 
     CHECK_VALUE(data[0x00], 0);
     if (data[0x00] != 0) {
+        if (data[0x00] != 5) {
+            qDebug() << this->sessionid << "compliance first byte" << data[0x00] <<" != 0, skipping";
+        }
         return false;
     }
     CHECK_VALUES(data[0x01], 1, 0);  // usually 1, occasionally 0, no visible difference in report
@@ -3332,13 +3340,16 @@ bool PRS1DataChunk::ParseSummaryF0V23()
     }
     // TODO: hardcoding this is ugly, think of a better approach
     if (this->m_data.size() < 59) {
-        qWarning() << "summary data too short:" << this->m_data.size();
+        qWarning() << this->sessionid << "summary data too short:" << this->m_data.size();
         return false;
     }
     const unsigned char * data = (unsigned char *)this->m_data.constData();
 
     CHECK_VALUE(data[0x00], 0);
     if (data[0x00] != 0) {
+        if (data[0x00] != 5) {
+            qDebug() << this->sessionid << "summary first byte" << data[0x00] <<" != 0, skipping";
+        }
         return false;
     }
     CHECK_VALUES(data[0x01] & 0xF0, 0x60, 0x70);  // TODO: what are these?
@@ -3881,7 +3892,10 @@ bool PRS1DataChunk::ParseSummaryF0V6()
 
 bool PRS1Import::ImportSummary()
 {
-    if (!summary) return false;
+    if (!summary) {
+        qWarning() << "ImportSummary() called with no summary?";
+        return false;
+    }
 
     qint64 start = qint64(summary->timestamp) * 1000L;
     session->set_first(start);
@@ -4010,7 +4024,14 @@ bool PRS1Import::ImportSummary()
     if (!ok) {
         return false;
     }
+    if (summary->duration == 0) {
+        // This does occasionally happen and merely indicates a brief session with no useful data.
+        //qDebug() << summary->sessionid << "duration == 0";
+        return false;
+    }
+    
     summary_duration = summary->duration;
+    session->set_last(qint64(summary->timestamp + summary->duration) * 1000L);
 
     return true;
 }
@@ -4029,7 +4050,9 @@ bool PRS1DataChunk::ParseSummary()
         CHECK_VALUE(data[0], 0);
     }
     // All machines have a first byte zero for clean summary
+    // TODO: this check should move down into the individual family parsers once the V3 parsing below has been relocated.
     if (data[0] != 0) {
+        //qDebug() << this->sessionid << "summary first byte" << data[0] << "!= 0, skipping";
         return false;
     }
 
@@ -4490,10 +4513,12 @@ bool PRS1Import::ParseSession(void)
     session = new Session(mach, sessionid);
 
     do {
+        // TODO: There should be a way to distinguish between no-data-to-import vs. parsing errors
+        // (once we figure out what's benign and what isn't).
         if (compliance != nullptr) {
             ok = ImportCompliance();
             if (!ok) {
-                qWarning() << sessionid << "Error parsing compliance, skipping session";
+                //qWarning() << sessionid << "Error parsing compliance, skipping session";
                 break;
             }
         }
@@ -4504,7 +4529,7 @@ bool PRS1Import::ParseSession(void)
             }
             ok = ImportSummary();
             if (!ok) {
-                qWarning() << sessionid << "Error parsing summary, skipping session";
+                //qWarning() << sessionid << "Error parsing summary, skipping session";
                 break;
             }
         }
@@ -4548,6 +4573,9 @@ bool PRS1Import::ParseSession(void)
 
         if (session->first() > 0) {
             if (session->last() < session->first()) {
+                // Compliance and session parsing both use set_last() to set the session's last timestamp.
+                // Events and waveforms use updateLast().
+                //
                 // if last isn't set, duration couldn't be gained from summary, parsing events or waveforms..
                 // This session is dodgy, so kill it
                 qWarning() << sessionid << "Session last() earlier than first(), downgrading to summary only";

From ce38fbcddef6d4a462cb7d99efee173223edd469 Mon Sep 17 00:00:00 2001
From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com>
Date: Wed, 5 Jun 2019 17:08:45 -0400
Subject: [PATCH 17/42] Restore session end time to previous behavior, with
 better logging and documentation.

It turns out the session end time was intentionally not being set in ParseSummary,
probably due to its unreliability. This may be revisited once things are more
stable, but for now the old behavior is retained.
---
 oscar/SleepLib/loader_plugins/prs1_loader.cpp | 36 +++++++++++++------
 oscar/tests/prs1tests.cpp                     | 12 +++++++
 2 files changed, 37 insertions(+), 11 deletions(-)

diff --git a/oscar/SleepLib/loader_plugins/prs1_loader.cpp b/oscar/SleepLib/loader_plugins/prs1_loader.cpp
index d9fb0977..9817e481 100644
--- a/oscar/SleepLib/loader_plugins/prs1_loader.cpp
+++ b/oscar/SleepLib/loader_plugins/prs1_loader.cpp
@@ -3597,7 +3597,7 @@ bool PRS1DataChunk::ParseSummaryF3(void)
     if ((it=this->hbdata.find(5)) != this->hbdata.end()) {
         this->duration = (it.value()[1] << 8 ) + it.value()[0];
     } else {
-        qWarning() << "missing summary duration";
+        qWarning() << this->sessionid << "missing summary duration";
     }
 
     return true;
@@ -4024,15 +4024,20 @@ bool PRS1Import::ImportSummary()
     if (!ok) {
         return false;
     }
+    
+    summary_duration = summary->duration;
+
     if (summary->duration == 0) {
         // This does occasionally happen and merely indicates a brief session with no useful data.
         //qDebug() << summary->sessionid << "duration == 0";
-        return false;
+        return true;  // Don't bail for now, since some summary parsers are still very broken, so we want to proceed to events/waveforms.
     }
     
-    summary_duration = summary->duration;
-    session->set_last(qint64(summary->timestamp + summary->duration) * 1000L);
-
+    // Intentionally don't set the session's duration based on the summary duration.
+    // That only happens in PRS1Import::ParseSession() as a last resort.
+    // TODO: Revisit this once summary parsing is reliable.
+    //session->set_last(...);
+    
     return true;
 }
 
@@ -4573,13 +4578,22 @@ bool PRS1Import::ParseSession(void)
 
         if (session->first() > 0) {
             if (session->last() < session->first()) {
-                // Compliance and session parsing both use set_last() to set the session's last timestamp.
-                // Events and waveforms use updateLast().
-                //
-                // if last isn't set, duration couldn't be gained from summary, parsing events or waveforms..
-                // This session is dodgy, so kill it
-                qWarning() << sessionid << "Session last() earlier than first(), downgrading to summary only";
+                // Compliance uses set_last() to set the session's last timestamp, so it
+                // won't reach this point.
+                if (compliance != nullptr) {
+                    qWarning() << sessionid << "compliance didn't set session end?";
+                }
+
+                // Events and waveforms use updateLast() to set the session's last timestamp,
+                // so they should only reach this point if there was a problem parsing them.
+                if (event != nullptr || !wavefile.isEmpty() || !oxifile.isEmpty()) {
+                    qWarning() << sessionid << "Downgrading session to summary only";
+                }
                 session->setSummaryOnly(true);
+
+                // Only use the summary's duration if the session's duration couldn't be
+                // derived from events or waveforms.
+                // TODO: Revisit this once summary parsing is reliable.
                 session->really_set_last(session->first()+(qint64(summary_duration) * 1000L));
             }
             save = true;
diff --git a/oscar/tests/prs1tests.cpp b/oscar/tests/prs1tests.cpp
index 4fb0e854..d0115588 100644
--- a/oscar/tests/prs1tests.cpp
+++ b/oscar/tests/prs1tests.cpp
@@ -126,6 +126,17 @@ static QString ts(qint64 msecs)
     return QDateTime::fromMSecsSinceEpoch(msecs).toString(Qt::ISODate);
 }
 
+static QString dur(qint64 msecs)
+{
+    qint64 s = msecs / 1000L;
+    int h = s / 3600; s -= h * 3600;
+    int m = s / 60; s -= m * 60;
+    return QString("%1:%2:%3")
+        .arg(h, 2, 10, QChar('0'))
+        .arg(m, 2, 10, QChar('0'))
+        .arg(s, 2, 10, QChar('0'));
+}
+
 static QString byteList(QByteArray data, int limit=-1)
 {
     int count = data.size();
@@ -154,6 +165,7 @@ void ChunkToYaml(QFile & file, PRS1DataChunk* chunk)
     out << "  ext: " << chunk->ext << endl;
     out << "  session: " << chunk->sessionid << endl;
     out << "  start: " << ts(chunk->timestamp * 1000L) << endl;
+    out << "  duration: " << dur(chunk->duration * 1000L) << endl;
 
     // hblock for V3 non-waveform chunks
     if (chunk->fileVersion == 3 && chunk->htype == 0) {

From 330bdb6fb35d13436dc62c22d8cc9d3868622244 Mon Sep 17 00:00:00 2001
From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com>
Date: Thu, 6 Jun 2019 16:08:40 -0400
Subject: [PATCH 18/42] Split ParseCompliance into F0V23 and F0V6.

Also add some debug messages to FV3 parsing. It's clear the current
approach is wrong. This looks a lot like the slices seen earlier,
since hbdata values appear more than once in a given file.

Also turn off summary YAML since the next bit of work will focus on
parsing.
---
 oscar/SleepLib/loader_plugins/prs1_loader.cpp | 48 ++++++++++++++++++-
 oscar/SleepLib/loader_plugins/prs1_loader.h   |  8 +++-
 oscar/tests/prs1tests.cpp                     |  2 +-
 3 files changed, 54 insertions(+), 4 deletions(-)

diff --git a/oscar/SleepLib/loader_plugins/prs1_loader.cpp b/oscar/SleepLib/loader_plugins/prs1_loader.cpp
index 9817e481..8293f469 100644
--- a/oscar/SleepLib/loader_plugins/prs1_loader.cpp
+++ b/oscar/SleepLib/loader_plugins/prs1_loader.cpp
@@ -3232,10 +3232,32 @@ bool PRS1Import::ImportCompliance()
 
 bool PRS1DataChunk::ParseCompliance(void)
 {
-    // This parser doesn't seem right for 200X series, so bail for now.
-    if (this->family != 0 || this->familyVersion != 2) {
+    switch (this->family) {
+    case 0:
+        if (this->familyVersion == 6) {
+            return this->ParseComplianceF0V6();
+        } else if (this->familyVersion == 2 || this->familyVersion == 3) {
+            return this->ParseComplianceF0V23();
+        }
+    default:
+        ;
+    }
+
+    qWarning() << "unexpected family" << this->family << "familyVersion" << this->familyVersion;
+    return false;
+}
+
+
+bool PRS1DataChunk::ParseComplianceF0V23(void)
+{
+    if (this->family != 0 || (this->familyVersion != 2 && this->familyVersion != 3)) {
+        qWarning() << "ParseComplianceF0V23 called with family" << this->family << "familyVersion" << this->familyVersion;
         return false;
     }
+    // F0V3 is untested, but since summary and events seem to be the same for F0V2 and F0V3,
+    // we'll assume this one is for now, but flag it as unexpected.
+    CHECK_VALUE(this->familyVersion, 2);
+    
     // TODO: hardcoding this is ugly, think of a better approach
     if (this->m_data.size() < 0x13) {
         qWarning() << this->sessionid << "compliance data too short:" << this->m_data.size();
@@ -3733,6 +3755,19 @@ bool PRS1DataChunk::ParseSummaryF5V3(void)
 }
 
 
+bool PRS1DataChunk::ParseComplianceF0V6(void)
+{
+    if (this->family != 0 || this->familyVersion != 6) {
+        qWarning() << "ParseComplianceF0V2 called with family" << this->family << "familyVersion" << this->familyVersion;
+        return false;
+    }
+    
+    // Not implemented yet!
+    
+    return false;
+}
+
+
 bool PRS1DataChunk::ParseSummaryF0V6()
 {
     // DreamStation machines...
@@ -4088,14 +4123,23 @@ bool PRS1DataChunk::ParseSummary()
             bsize = it.value();
 
             if (val != 1) {
+                if (this->hbdata.contains(val)) {
+                    qWarning() << this->sessionid << "duplicate hbdata val" << val;
+                }
                 // store the data block for later reference
                 this->hbdata[val] = QByteArray((const char *)(&data[pos]), bsize);
             } else {
+                if (!this->mainblock.isEmpty()) {
+                    qWarning() << this->sessionid << "duplicate mainblock";
+                }
                 // Parse the nested data structure which contains settings
                 int p2 = 0;
                 do {
                     val = data[pos + p2++];
                     len = data[pos + p2++];
+                    if (this->mainblock.contains(val)) {
+                        qWarning() << this->sessionid << "duplicate mainblock val" << val;
+                    }
                     this->mainblock[val] = QByteArray((const char *)(&data[pos+p2]), len);
                     p2 += len;
                 } while ((p2 < bsize) && ((pos+p2) < size));
diff --git a/oscar/SleepLib/loader_plugins/prs1_loader.h b/oscar/SleepLib/loader_plugins/prs1_loader.h
index 43b9c517..60dba494 100644
--- a/oscar/SleepLib/loader_plugins/prs1_loader.h
+++ b/oscar/SleepLib/loader_plugins/prs1_loader.h
@@ -128,9 +128,15 @@ public:
     //! \brief Read the chunk's data from a PRS1 file and calculate its CRC, must be called after ReadHeader
     bool ReadData(class QFile & f);
     
-    //! \brief Parse a single data chunk from a .000 file containing compliance data for a brick
+    //! \brief Figures out which Compliance Parser to call, based on machine family/version and calls it.
     bool ParseCompliance(void);
     
+    //! \brief Parse a single data chunk from a .000 file containing compliance data for a P25x brick
+    bool ParseComplianceF0V23(void);
+    
+    //! \brief Parse a single data chunk from a .000 file containing compliance data for a DreamStation 200X brick
+    bool ParseComplianceF0V6(void);
+    
     //! \brief Figures out which Summary Parser to call, based on machine family/version and calls it.
     bool ParseSummary();
 
diff --git a/oscar/tests/prs1tests.cpp b/oscar/tests/prs1tests.cpp
index d0115588..57825781 100644
--- a/oscar/tests/prs1tests.cpp
+++ b/oscar/tests/prs1tests.cpp
@@ -114,7 +114,7 @@ void parseAndEmitSessionYaml(const QString & path)
 
 void PRS1Tests::testSessionsToYaml()
 {
-    iterateTestCards(TESTDATA_PATH "prs1/input/", parseAndEmitSessionYaml);
+    //iterateTestCards(TESTDATA_PATH "prs1/input/", parseAndEmitSessionYaml);
 }
 
 

From 7a00009a56c7f45dc469c95a3f8ea106129480a6 Mon Sep 17 00:00:00 2001
From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com>
Date: Thu, 6 Jun 2019 16:50:40 -0400
Subject: [PATCH 19/42] Add result of parsing/importing to PRS1 chunk and
 session YAML.

---
 oscar/tests/prs1tests.cpp    | 16 +++++++++-------
 oscar/tests/sessiontests.cpp |  3 ++-
 oscar/tests/sessiontests.h   |  2 +-
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/oscar/tests/prs1tests.cpp b/oscar/tests/prs1tests.cpp
index 57825781..15079983 100644
--- a/oscar/tests/prs1tests.cpp
+++ b/oscar/tests/prs1tests.cpp
@@ -100,12 +100,12 @@ void parseAndEmitSessionYaml(const QString & path)
 
         // Run the parser
         PRS1Import* import = dynamic_cast<PRS1Import*>(task);
-        import->ParseSession();
+        bool ok = import->ParseSession();
         
         // Emit the parsed session data to compare against our regression benchmarks
         Session* session = import->session;
         QString outpath = prs1OutputPath(path, m->serial(), session->session(), "-session.yml");
-        SessionToYaml(outpath, session);
+        SessionToYaml(outpath, session, ok);
         
         delete session;
         delete task;
@@ -150,13 +150,14 @@ static QString byteList(QByteArray data, int limit=-1)
     return s;
 }
 
-void ChunkToYaml(QFile & file, PRS1DataChunk* chunk)
+void ChunkToYaml(QFile & file, PRS1DataChunk* chunk, bool ok)
 {
     QTextStream out(&file);
 
     // chunk header
     out << "chunk:" << endl;
     out << "  at: " << hex << chunk->m_filepos << endl;
+    out << "  parsed: " << ok << endl;
     out << "  version: " << dec << chunk->fileVersion << endl;
     out << "  size: " << chunk->blockSize << endl;
     out << "  htype: " << chunk->htype << endl;
@@ -302,17 +303,18 @@ void parseAndEmitChunkYaml(const QString & path)
             QList<PRS1DataChunk *> chunks = s_loader->ParseFile(inpath);
             for (int i=0; i < chunks.size(); i++) {
                 PRS1DataChunk * chunk = chunks.at(i);
+                bool ok = true;
                 
                 // Parse the inner data.
                 switch (chunk->ext) {
-                    case 0: chunk->ParseCompliance(); break;
-                    case 1: chunk->ParseSummary(); break;
-                    case 2: chunk->ParseEvents(MODE_UNKNOWN); break;
+                    case 0: ok = chunk->ParseCompliance(); break;
+                    case 1: ok = chunk->ParseSummary(); break;
+                    case 2: ok = chunk->ParseEvents(MODE_UNKNOWN); break;
                     default: break;
                 }
                 
                 // Emit the YAML.
-                ChunkToYaml(file, chunk);
+                ChunkToYaml(file, chunk, ok);
                 delete chunk;
             }
             
diff --git a/oscar/tests/sessiontests.cpp b/oscar/tests/sessiontests.cpp
index 5b12d537..c677bf21 100644
--- a/oscar/tests/sessiontests.cpp
+++ b/oscar/tests/sessiontests.cpp
@@ -169,7 +169,7 @@ static QString intList(quint32* data, int count, int limit=-1)
     return s;
 }
 
-void SessionToYaml(QString filepath, Session* session)
+void SessionToYaml(QString filepath, Session* session, bool ok)
 {
     QFile file(filepath);
     if (!file.open(QFile::WriteOnly | QFile::Truncate)) {
@@ -182,6 +182,7 @@ void SessionToYaml(QString filepath, Session* session)
     out << "  id: " << session->session() << endl;
     out << "  start: " << ts(session->first()) << endl;
     out << "  end: " << ts(session->last()) << endl;
+    out << "  valid: " << ok << endl;
     
     if (!session->m_slices.isEmpty()) {
         out << "  slices:" << endl;
diff --git a/oscar/tests/sessiontests.h b/oscar/tests/sessiontests.h
index 01e8e438..03dceeb4 100644
--- a/oscar/tests/sessiontests.h
+++ b/oscar/tests/sessiontests.h
@@ -11,6 +11,6 @@
 
 #include "../SleepLib/session.h"
 
-void SessionToYaml(QString filepath, Session* session);
+void SessionToYaml(QString filepath, Session* session, bool ok);
 
 #endif // SESSIONTESTS_H

From ca23791414df37765b263faa179d1d41fe574f14 Mon Sep 17 00:00:00 2001
From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com>
Date: Thu, 6 Jun 2019 20:19:46 -0400
Subject: [PATCH 20/42] First pass at 200X compliance data.

Lots of debug messages and unknown values, but the structure seems right.

This is largely based on a combination of the mainblock parsing for fileVersion 3
as found in ParseSummary() and the switch statements of ParseSummaryF0V6,
based on our understanding of slices from F0V23. The slice types here
come from sample 200X files.
---
 oscar/SleepLib/loader_plugins/prs1_loader.cpp | 272 +++++++++++++++++-
 oscar/SleepLib/loader_plugins/prs1_loader.h   |   3 +
 2 files changed, 271 insertions(+), 4 deletions(-)

diff --git a/oscar/SleepLib/loader_plugins/prs1_loader.cpp b/oscar/SleepLib/loader_plugins/prs1_loader.cpp
index 8293f469..fc1f80a7 100644
--- a/oscar/SleepLib/loader_plugins/prs1_loader.cpp
+++ b/oscar/SleepLib/loader_plugins/prs1_loader.cpp
@@ -3755,16 +3755,280 @@ bool PRS1DataChunk::ParseSummaryF5V3(void)
 }
 
 
+// The below is based on fixing the fileVersion == 3 parsing in ParseSummary() based
+// on our understanding of slices from F0V23. The switch values come from sample files.
 bool PRS1DataChunk::ParseComplianceF0V6(void)
 {
     if (this->family != 0 || this->familyVersion != 6) {
         qWarning() << "ParseComplianceF0V2 called with family" << this->family << "familyVersion" << this->familyVersion;
         return false;
     }
-    
-    // Not implemented yet!
-    
-    return false;
+    // TODO: hardcoding this is ugly, think of a better approach
+    if (this->m_data.size() < 82) {
+        qWarning() << this->sessionid << "compliance data too short:" << this->m_data.size();
+        return false;
+    }
+    const unsigned char * data = (unsigned char *)this->m_data.constData();
+    int chunk_size = this->m_data.size();
+    static const int expected_sizes[] = { 1, 0x34, 9, 4, 2, 2, 4, 8 };
+    static const int ncodes = sizeof(expected_sizes) / sizeof(int);
+    for (int i = 0; i < ncodes; i++) {
+        if (this->hblock.contains(i)) {
+            CHECK_VALUE(this->hblock[i], expected_sizes[i]);
+        } else {
+            UNEXPECTED_VALUE(this->hblock.contains(i), true);
+        }
+    }
+
+    bool ok = true;
+    int pos = 0;
+    int code, size;
+    do {
+        code = data[pos++];
+        if (!this->hblock.contains(code)) {
+            qWarning() << this->sessionid << "missing hblock entry for" << code;
+            ok = false;
+            break;
+        }
+        size = this->hblock[code];
+        if (size < expected_sizes[code]) {
+            qWarning() << this->sessionid << "slice" << code << "too small" << size << "<" << expected_sizes[code];
+            ok = false;
+            break;
+        }
+        if (pos + size > chunk_size) {
+            qWarning() << this->sessionid << "slice" << code << "@" << pos << "longer than remaining chunk";
+            ok = false;
+            break;
+        }
+
+        switch (code) {
+            case 0:
+                // always first? Maybe equipmenton? Maybe 0 was always equipmenton, even in F0V23?
+                CHECK_VALUES(data[pos], 1, 7);
+                break;
+            case 1:
+                // This is where ParseSummaryF0V6 started (after "3 bytes that don't follow the pattern")
+                // Both compliance and summary files seem to have the same length for this slice, so maybe the
+                // settings are the same?
+                ok = this->ParseSettingsF0V6(data + pos, size);
+                break;
+            case 3:
+                // Might be mask on + timestamp: first occurrence right after settings, has 00 00
+                // 3C 00 (60 seconds?) appears a lot later, always after a 4-then-7 sequence.
+                // First 2 bytes might be a timestamp, 0x3C (60 seconds?) appears a lot if nonzero
+                // Yes:
+                //CHECK_VALUES(data[pos], 0, 0xa4);  // nonzero second occurrence, 0x3C
+                //CHECK_VALUE(data[pos+1], 0, 0x01);  // nonzero second occurrence, 0x00
+                qDebug() << this->sessionid << code << ((data[pos+1] << 8) | data[pos]);
+                CHECK_VALUE(data[pos+2], 0x50);
+                CHECK_VALUES(data[pos+3], 0x80, 0xb0);  // same value all occurrences in a file?
+                break;
+            case 4:
+                // Might be mask off + timestamp: always follows 3, two bytes vary each time it occurs in the file
+                // Looks like a timestamp, varies each time it occurs in a file.
+                // Yes: when there's just a single 3-4 sequence, this has the total duration (and 3 is 0)
+                //CHECK_VALUES(data[pos], 0x14, 0x4e);  // 3C, 0x78, 0xD0, 0x2C
+                //CHECK_VALUES(data[pos+1], 0x16, 0x05);  // 00, 02, 01
+                qDebug() << this->sessionid << code << ((data[pos+1] << 8) | data[pos]);
+                break;
+            case 7:
+                // Always follows 4?
+                CHECK_VALUES(data[pos], 0x01, 0x00);
+                CHECK_VALUE(data[pos+1], 0x00);
+                CHECK_VALUES(data[pos+2], 0x00, 0x01);
+                CHECK_VALUE(data[pos+3], 0x00);
+                //CHECK_VALUE(data[pos+4], 0x05, 0x0A);  // 00
+                CHECK_VALUE(data[pos+5], 0x00);
+                //CHECK_VALUE(data[pos+6], 0x64, 0x69);  // 6E, 6D, 6E, 6E, 80
+                //CHECK_VALUE(data[pos+7], 0x3d, 0x5c);  // 6A, 6A, 6B, 6C, 80
+                break;
+            case 2:
+                // always last? follows a 4-then-7 sequence, reminiscent of equipmentoff
+                // first two bytes are usually 0 but not always
+                //CHECK_VALUE(data[pos], 0x00);
+                //CHECK_VALUE(data[pos+1], 0x00);
+                qDebug() << this->sessionid << code << ((data[pos+1] << 8) | data[pos]);
+                //CHECK_VALUE(data[pos+2], 0x08);  // 0x01
+                //CHECK_VALUE(data[pos+3], 0x14);  // 0x12
+                //CHECK_VALUE(data[pos+4], 0x01);  // 0x00
+                //CHECK_VALUE(data[pos+5], 0x22);  // 0x28
+                CHECK_VALUE(data[pos+6], 0x02);  // 0x02
+                CHECK_VALUE(data[pos+7], 0x00);  // 0x00
+                CHECK_VALUE(data[pos+8], 0x00);  // 0x00
+                break;
+            default:
+                UNEXPECTED_VALUE(code, "[0,1,3,4,7,2]");
+                break;
+        }
+        pos += size;
+    } while (ok && pos < chunk_size);
+
+    return ok;
+}
+
+
+// The below is based on a combination of the mainblock parsing for fileVersion == 3
+// in ParseSummary() and the switch statements of ParseSummaryF0V6.
+//
+// Both compliance and summary files (at least for 200X and 400X machines) seem to have
+// the same length for this slice, so maybe the settings are the same? At least 0x0a
+// looks like a pressure in compliance files.
+bool PRS1DataChunk::ParseSettingsF0V6(const unsigned char* data, int size)
+{
+    static const QMap<int,int> expected_lengths = { {0x35,2} };
+    bool ok = true;
+
+    CPAPMode cpapmode = MODE_UNKNOWN;
+
+    int imin_epap = 0;
+    /*
+    //int imax_epap = 0;
+    int imin_ps   = 0;
+    int imax_ps   = 0;
+    //int imax_pressure = 0;
+    int min_pressure = 0;
+    int max_pressure = 0;
+    */
+    int duration  = 0;
+
+    // Parse the nested data structure which contains settings
+    int pos = 0;
+    do {
+        int code = data[pos++];
+        int len = data[pos++];
+
+        int expected_len = 1;
+        if (expected_lengths.contains(code)) {
+            expected_len = expected_lengths[code];
+        }
+        CHECK_VALUE(len, expected_len);
+        if (len < expected_len) {
+            qWarning() << this->sessionid << "setting" << code << "too small" << len << "<" << expected_len;
+            ok = false;
+            break;
+        }
+        if (pos + len > size) {
+            qWarning() << this->sessionid << "setting" << code << "@" << pos << "longer than remaining slice";
+            ok = false;
+            break;
+        }
+
+        switch (code) {
+            case 0: // mode?
+                CHECK_VALUE(data[pos], 0);
+                break;
+            case 1: // ???
+                CHECK_VALUE(data[pos], 0);
+                break;
+            case 0x0a:
+                cpapmode = MODE_CPAP;
+                imin_epap = data[pos+0];  // TODO: confirm this is right for compliance
+                break;
+            /*
+            case 13: // 0x0d
+                cpapmode = MODE_APAP;
+                if (dataPtr[1] != 2) qDebug() << "PRS1DataChunk::ParseSummaryF0V6=" << "Bad APAP value";
+                min_pressure = dataPtr[2];
+                max_pressure = dataPtr[3];
+                break;
+            case 14: // 0x0e  // <--- this is a total guess.. might be 3 and have a pressure support value
+                cpapmode = MODE_BILEVEL_FIXED;
+                if (dataPtr[1] != 2) qDebug() << "PRS1DataChunk::ParseSummaryF0V6=" << "Bad APAP value";
+                min_pressure = dataPtr[2];
+                max_pressure = dataPtr[3];
+                imin_ps = max_pressure - min_pressure;
+                break;
+            case 15: // 0x0f
+                cpapmode = MODE_BILEVEL_AUTO_VARIABLE_PS; //might be C_CHECK?
+                if (dataPtr[1] != 4) qDebug() << "PRS1DataChunk::ParseSummaryF0V6=" << "Bad APAP value";
+                min_pressure = dataPtr[2];
+                max_pressure = dataPtr[3];
+                imin_ps = dataPtr[4];
+                imax_ps = dataPtr[5];
+                break;
+            case 0x10: // Auto Trial mode
+                cpapmode = MODE_APAP;
+                if (dataPtr[1] != 3) qDebug() << "PRS1DataChunk::ParseSummaryF0V6=" << "Bad APAP value";
+                min_pressure = dataPtr[3];
+                max_pressure = dataPtr[4];
+                break;
+            */
+            case 0x2b:
+                CHECK_VALUE(data[pos], 0);
+                break;
+            case 0x2c:
+                CHECK_VALUE(data[pos], 0x14);
+                break;
+            case 0x2d:
+                CHECK_VALUE(data[pos], 0x46);
+                break;
+            case 0x2e:
+                CHECK_VALUE(data[pos], 0x80);
+                break;
+            case 0x2f:
+                CHECK_VALUE(data[pos], 0);
+                break;
+            case 0x30:
+                CHECK_VALUE(data[pos], 3);
+                break;
+            case 0x36:
+                CHECK_VALUE(data[pos], 0);
+                break;
+            case 0x38:
+                CHECK_VALUE(data[pos], 0);
+                break;
+            case 0x39:
+                CHECK_VALUE(data[pos], 0);
+                break;
+            case 0x3b:
+                CHECK_VALUE(data[pos], 2);
+                break;
+            case 0x3c:
+                CHECK_VALUE(data[pos], 0);
+                break;
+            case 0x3e:
+                CHECK_VALUE(data[pos], 0x80);
+                break;
+            case 0x3f:
+                CHECK_VALUE(data[pos], 0);
+                break;
+            case 0x35:
+                // ??? This seems totally wrong. Value seems to line up with second pair of bytes in slice code 3?
+                duration += ( data[pos+1] << 8 ) + data[pos+0];
+                break;
+            default:
+                qDebug() << "Unknown code:" << hex << code << "in" << this->sessionid << "at" << pos;
+                this->AddEvent(new PRS1UnknownDataEvent(QByteArray((const char*) data), pos, len));
+                break;
+        }
+
+        pos += len;
+    } while (ok && pos + 2 <= size);
+
+    // This is all straight from ParseSummaryF0V6; it may not apply to compliance.
+    this->duration = duration;
+    this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_CPAP_MODE, (int) cpapmode));
+    if (cpapmode == MODE_CPAP) {
+        this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_PRESSURE, imin_epap));
+/*
+    } else if (cpapmode == MODE_APAP) {
+        this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_PRESSURE_MIN, min_pressure));
+        this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_PRESSURE_MAX, max_pressure));
+    } else if (cpapmode == MODE_BILEVEL_FIXED) {
+        // Guessing here.. haven't seen BIPAP data.
+        this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_EPAP, min_pressure));
+        this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_IPAP, max_pressure));
+        this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_PS, imin_ps));
+    } else if (cpapmode == MODE_BILEVEL_AUTO_VARIABLE_PS) {
+        this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_EPAP_MIN, min_pressure));
+        this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_IPAP_MAX, max_pressure));
+        this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_PS_MIN, imin_ps));
+        this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_PS_MAX, imax_ps));
+*/
+    }
+
+    return ok;
 }
 
 
diff --git a/oscar/SleepLib/loader_plugins/prs1_loader.h b/oscar/SleepLib/loader_plugins/prs1_loader.h
index 60dba494..81574ebe 100644
--- a/oscar/SleepLib/loader_plugins/prs1_loader.h
+++ b/oscar/SleepLib/loader_plugins/prs1_loader.h
@@ -197,6 +197,9 @@ protected:
 
     //! \brief Extract the stored CRC from the end of the data of a PRS1 chunk
     bool ExtractStoredCrc(int size);
+
+    //! \brief Parse a settings slice from a .000 (and maybe .001) file
+    bool ParseSettingsF0V6(const unsigned char* data, int size);
 };
 
 

From ff4ec4fdabc68d80c9ba817e68818cc6003284e9 Mon Sep 17 00:00:00 2001
From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com>
Date: Fri, 7 Jun 2019 14:32:53 -0400
Subject: [PATCH 21/42] Create slices for 200X compliance data, along with
 first confirmed settings.

There's a new slice type to be examined and additional settings remain
that vary within the sample data.
---
 oscar/SleepLib/loader_plugins/prs1_loader.cpp | 68 ++++++++-----------
 1 file changed, 30 insertions(+), 38 deletions(-)

diff --git a/oscar/SleepLib/loader_plugins/prs1_loader.cpp b/oscar/SleepLib/loader_plugins/prs1_loader.cpp
index fc1f80a7..eeb43917 100644
--- a/oscar/SleepLib/loader_plugins/prs1_loader.cpp
+++ b/oscar/SleepLib/loader_plugins/prs1_loader.cpp
@@ -3783,6 +3783,7 @@ bool PRS1DataChunk::ParseComplianceF0V6(void)
     bool ok = true;
     int pos = 0;
     int code, size;
+    int tt = 0;
     do {
         code = data[pos++];
         if (!this->hblock.contains(code)) {
@@ -3805,35 +3806,27 @@ bool PRS1DataChunk::ParseComplianceF0V6(void)
         switch (code) {
             case 0:
                 // always first? Maybe equipmenton? Maybe 0 was always equipmenton, even in F0V23?
+                CHECK_VALUE(pos, 1);
                 CHECK_VALUES(data[pos], 1, 7);
                 break;
-            case 1:
+            case 1:  // Settings
                 // This is where ParseSummaryF0V6 started (after "3 bytes that don't follow the pattern")
                 // Both compliance and summary files seem to have the same length for this slice, so maybe the
                 // settings are the same?
                 ok = this->ParseSettingsF0V6(data + pos, size);
                 break;
-            case 3:
-                // Might be mask on + timestamp: first occurrence right after settings, has 00 00
-                // 3C 00 (60 seconds?) appears a lot later, always after a 4-then-7 sequence.
-                // First 2 bytes might be a timestamp, 0x3C (60 seconds?) appears a lot if nonzero
-                // Yes:
-                //CHECK_VALUES(data[pos], 0, 0xa4);  // nonzero second occurrence, 0x3C
-                //CHECK_VALUE(data[pos+1], 0, 0x01);  // nonzero second occurrence, 0x00
-                qDebug() << this->sessionid << code << ((data[pos+1] << 8) | data[pos]);
+            case 3:  // Mask On
+                tt += data[pos] | (data[pos+1] << 8);
+                this->AddEvent(new PRS1ParsedSliceEvent(tt, MaskOn));
                 CHECK_VALUE(data[pos+2], 0x50);
                 CHECK_VALUES(data[pos+3], 0x80, 0xb0);  // same value all occurrences in a file?
                 break;
-            case 4:
-                // Might be mask off + timestamp: always follows 3, two bytes vary each time it occurs in the file
-                // Looks like a timestamp, varies each time it occurs in a file.
-                // Yes: when there's just a single 3-4 sequence, this has the total duration (and 3 is 0)
-                //CHECK_VALUES(data[pos], 0x14, 0x4e);  // 3C, 0x78, 0xD0, 0x2C
-                //CHECK_VALUES(data[pos+1], 0x16, 0x05);  // 00, 02, 01
-                qDebug() << this->sessionid << code << ((data[pos+1] << 8) | data[pos]);
+            case 4:  // Mask Off
+                tt += data[pos] | (data[pos+1] << 8);
+                this->AddEvent(new PRS1ParsedSliceEvent(tt, MaskOff));
                 break;
             case 7:
-                // Always follows 4?
+                // Always follows mask off?
                 CHECK_VALUES(data[pos], 0x01, 0x00);
                 CHECK_VALUE(data[pos+1], 0x00);
                 CHECK_VALUES(data[pos+2], 0x00, 0x01);
@@ -3843,12 +3836,9 @@ bool PRS1DataChunk::ParseComplianceF0V6(void)
                 //CHECK_VALUE(data[pos+6], 0x64, 0x69);  // 6E, 6D, 6E, 6E, 80
                 //CHECK_VALUE(data[pos+7], 0x3d, 0x5c);  // 6A, 6A, 6B, 6C, 80
                 break;
-            case 2:
-                // always last? follows a 4-then-7 sequence, reminiscent of equipmentoff
-                // first two bytes are usually 0 but not always
-                //CHECK_VALUE(data[pos], 0x00);
-                //CHECK_VALUE(data[pos+1], 0x00);
-                qDebug() << this->sessionid << code << ((data[pos+1] << 8) | data[pos]);
+            case 2:  // Equipment Off
+                tt += data[pos] | (data[pos+1] << 8);
+                this->AddEvent(new PRS1ParsedSliceEvent(tt, EquipmentOff));
                 //CHECK_VALUE(data[pos+2], 0x08);  // 0x01
                 //CHECK_VALUE(data[pos+3], 0x14);  // 0x12
                 //CHECK_VALUE(data[pos+4], 0x01);  // 0x00
@@ -3857,13 +3847,18 @@ bool PRS1DataChunk::ParseComplianceF0V6(void)
                 CHECK_VALUE(data[pos+7], 0x00);  // 0x00
                 CHECK_VALUE(data[pos+8], 0x00);  // 0x00
                 break;
+            case 6:
+                this->AddEvent(new PRS1UnknownDataEvent(m_data, pos, size));
+                break;
             default:
-                UNEXPECTED_VALUE(code, "[0,1,3,4,7,2]");
+                UNEXPECTED_VALUE(code, "known slice code");
                 break;
         }
         pos += size;
     } while (ok && pos < chunk_size);
 
+    this->duration = tt;
+
     return ok;
 }
 
@@ -3890,7 +3885,6 @@ bool PRS1DataChunk::ParseSettingsF0V6(const unsigned char* data, int size)
     int min_pressure = 0;
     int max_pressure = 0;
     */
-    int duration  = 0;
 
     // Parse the nested data structure which contains settings
     int pos = 0;
@@ -3921,9 +3915,9 @@ bool PRS1DataChunk::ParseSettingsF0V6(const unsigned char* data, int size)
             case 1: // ???
                 CHECK_VALUE(data[pos], 0);
                 break;
-            case 0x0a:
+            case 0x0a:  // CPAP pressure setting
                 cpapmode = MODE_CPAP;
-                imin_epap = data[pos+0];  // TODO: confirm this is right for compliance
+                imin_epap = data[pos];
                 break;
             /*
             case 13: // 0x0d
@@ -3955,13 +3949,13 @@ bool PRS1DataChunk::ParseSettingsF0V6(const unsigned char* data, int size)
                 break;
             */
             case 0x2b:
-                CHECK_VALUE(data[pos], 0);
+                CHECK_VALUE(data[pos], 0);  // maybe ramp related? 0 on brick (linear ramp)
                 break;
-            case 0x2c:
-                CHECK_VALUE(data[pos], 0x14);
+            case 0x2c:  // Ramp Time
+                this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_RAMP_TIME, data[pos]));
                 break;
-            case 0x2d:
-                CHECK_VALUE(data[pos], 0x46);
+            case 0x2d:  // Ramp Pressure
+                this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_RAMP_PRESSURE, data[pos]));
                 break;
             case 0x2e:
                 CHECK_VALUE(data[pos], 0x80);
@@ -3972,6 +3966,10 @@ bool PRS1DataChunk::ParseSettingsF0V6(const unsigned char* data, int size)
             case 0x30:
                 CHECK_VALUE(data[pos], 3);
                 break;
+            case 0x35:
+                // This is not duration. Value seems to line up with second pair of bytes in Mask On slice?
+                //duration += ( data[pos+1] << 8 ) + data[pos+0];
+                break;
             case 0x36:
                 CHECK_VALUE(data[pos], 0);
                 break;
@@ -3993,10 +3991,6 @@ bool PRS1DataChunk::ParseSettingsF0V6(const unsigned char* data, int size)
             case 0x3f:
                 CHECK_VALUE(data[pos], 0);
                 break;
-            case 0x35:
-                // ??? This seems totally wrong. Value seems to line up with second pair of bytes in slice code 3?
-                duration += ( data[pos+1] << 8 ) + data[pos+0];
-                break;
             default:
                 qDebug() << "Unknown code:" << hex << code << "in" << this->sessionid << "at" << pos;
                 this->AddEvent(new PRS1UnknownDataEvent(QByteArray((const char*) data), pos, len));
@@ -4006,8 +4000,6 @@ bool PRS1DataChunk::ParseSettingsF0V6(const unsigned char* data, int size)
         pos += len;
     } while (ok && pos + 2 <= size);
 
-    // This is all straight from ParseSummaryF0V6; it may not apply to compliance.
-    this->duration = duration;
     this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_CPAP_MODE, (int) cpapmode));
     if (cpapmode == MODE_CPAP) {
         this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_PRESSURE, imin_epap));

From 250566f3f2f24ae39c065c18e5833415de377904 Mon Sep 17 00:00:00 2001
From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com>
Date: Fri, 7 Jun 2019 16:03:20 -0400
Subject: [PATCH 22/42] Refinement of 200X compliance data.

The new slice type appears when humidifier settings have changed during
the session, and includes a timestamp. The session time now matches
reports.

Otherwise just comments to indicate other values seen in the sample data,
including a lead on humidifier encoding.
---
 oscar/SleepLib/loader_plugins/prs1_loader.cpp | 26 ++++++++++---------
 oscar/tests/prs1tests.cpp                     |  2 +-
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/oscar/SleepLib/loader_plugins/prs1_loader.cpp b/oscar/SleepLib/loader_plugins/prs1_loader.cpp
index eeb43917..d712a806 100644
--- a/oscar/SleepLib/loader_plugins/prs1_loader.cpp
+++ b/oscar/SleepLib/loader_plugins/prs1_loader.cpp
@@ -3807,7 +3807,7 @@ bool PRS1DataChunk::ParseComplianceF0V6(void)
             case 0:
                 // always first? Maybe equipmenton? Maybe 0 was always equipmenton, even in F0V23?
                 CHECK_VALUE(pos, 1);
-                CHECK_VALUES(data[pos], 1, 7);
+                //CHECK_VALUES(data[pos], 1, 3);  // sometimes 7?
                 break;
             case 1:  // Settings
                 // This is where ParseSummaryF0V6 started (after "3 bytes that don't follow the pattern")
@@ -3818,8 +3818,8 @@ bool PRS1DataChunk::ParseComplianceF0V6(void)
             case 3:  // Mask On
                 tt += data[pos] | (data[pos+1] << 8);
                 this->AddEvent(new PRS1ParsedSliceEvent(tt, MaskOn));
-                CHECK_VALUE(data[pos+2], 0x50);
-                CHECK_VALUES(data[pos+3], 0x80, 0xb0);  // same value all occurrences in a file?
+                //CHECK_VALUES(data[pos+2], 0x50, 0x54);  // 0x90 (no humidifier data), 0x50 (15ht, tube 4/5, humid 4), 0x54 (15ht, tube 5, humid 5) 0x4c (15ht, tube temp 3, humidifier 3)
+                //CHECK_VALUES(data[pos+3], 0x80, 0xb0);  // 0xB4 (15ht, tube 5, humid 5), 0xB0 (15ht, tube 5, humid 4), 0x90 (tube 4, humid 4), 0x6C (15ht, tube temp 3, humidifier 3)
                 break;
             case 4:  // Mask Off
                 tt += data[pos] | (data[pos+1] << 8);
@@ -3827,9 +3827,9 @@ bool PRS1DataChunk::ParseComplianceF0V6(void)
                 break;
             case 7:
                 // Always follows mask off?
-                CHECK_VALUES(data[pos], 0x01, 0x00);
+                //CHECK_VALUES(data[pos], 0x01, 0x00);  // sometimes 32, 4
                 CHECK_VALUE(data[pos+1], 0x00);
-                CHECK_VALUES(data[pos+2], 0x00, 0x01);
+                //CHECK_VALUES(data[pos+2], 0x00, 0x01);  // sometimes 11, 3, 15
                 CHECK_VALUE(data[pos+3], 0x00);
                 //CHECK_VALUE(data[pos+4], 0x05, 0x0A);  // 00
                 CHECK_VALUE(data[pos+5], 0x00);
@@ -3843,12 +3843,14 @@ bool PRS1DataChunk::ParseComplianceF0V6(void)
                 //CHECK_VALUE(data[pos+3], 0x14);  // 0x12
                 //CHECK_VALUE(data[pos+4], 0x01);  // 0x00
                 //CHECK_VALUE(data[pos+5], 0x22);  // 0x28
-                CHECK_VALUE(data[pos+6], 0x02);  // 0x02
+                //CHECK_VALUE(data[pos+6], 0x02);  // sometimes 1, 0
                 CHECK_VALUE(data[pos+7], 0x00);  // 0x00
                 CHECK_VALUE(data[pos+8], 0x00);  // 0x00
                 break;
-            case 6:
-                this->AddEvent(new PRS1UnknownDataEvent(m_data, pos, size));
+            case 6:  // Humidier setting change
+                tt += data[pos] | (data[pos+1] << 8);  // This adds to the total duration (otherwise it won't match report)
+                //CHECK_VALUES(data[pos+2], 0x54);  // when changing from tube 4, humid 4 to tube 5, humid 5
+                //CHECK_VALUES(data[pos+3], 0xb4);  // when changing from tube 4, humid 4 to tube 5, humid 5
                 break;
             default:
                 UNEXPECTED_VALUE(code, "known slice code");
@@ -3958,13 +3960,13 @@ bool PRS1DataChunk::ParseSettingsF0V6(const unsigned char* data, int size)
                 this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_RAMP_PRESSURE, data[pos]));
                 break;
             case 0x2e:
-                CHECK_VALUE(data[pos], 0x80);
+                CHECK_VALUE(data[pos], 0x80);  // if below is flex level, maybe flex related? 0x80 when c-flex?
                 break;
             case 0x2f:
-                CHECK_VALUE(data[pos], 0);
+                CHECK_VALUE(data[pos], 0);  // if below is flex level, maybe flex related? 0x00 when c-flex?
                 break;
             case 0x30:
-                CHECK_VALUE(data[pos], 3);
+                CHECK_VALUE(data[pos], 3);  // flex level?
                 break;
             case 0x35:
                 // This is not duration. Value seems to line up with second pair of bytes in Mask On slice?
@@ -3980,7 +3982,7 @@ bool PRS1DataChunk::ParseSettingsF0V6(const unsigned char* data, int size)
                 CHECK_VALUE(data[pos], 0);
                 break;
             case 0x3b:
-                CHECK_VALUE(data[pos], 2);
+                CHECK_VALUES(data[pos], 2, 1);  // tubing type? 15HT = 2, 15 = 1?
                 break;
             case 0x3c:
                 CHECK_VALUE(data[pos], 0);
diff --git a/oscar/tests/prs1tests.cpp b/oscar/tests/prs1tests.cpp
index 15079983..84bb4b51 100644
--- a/oscar/tests/prs1tests.cpp
+++ b/oscar/tests/prs1tests.cpp
@@ -114,7 +114,7 @@ void parseAndEmitSessionYaml(const QString & path)
 
 void PRS1Tests::testSessionsToYaml()
 {
-    //iterateTestCards(TESTDATA_PATH "prs1/input/", parseAndEmitSessionYaml);
+    iterateTestCards(TESTDATA_PATH "prs1/input/", parseAndEmitSessionYaml);
 }
 
 

From 2ace7d3a6d18452bfec8b78d24318be1dc9c442e Mon Sep 17 00:00:00 2001
From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com>
Date: Fri, 7 Jun 2019 16:40:26 -0400
Subject: [PATCH 23/42] First pass at PRS1 200X humidifier settings.

Some of the values still aren't known, and OSCAR doesn't yet define
a channel for heated tube temperature.
---
 oscar/SleepLib/loader_plugins/prs1_loader.cpp | 61 +++++++++++++++----
 oscar/SleepLib/loader_plugins/prs1_loader.h   |  9 ++-
 2 files changed, 55 insertions(+), 15 deletions(-)

diff --git a/oscar/SleepLib/loader_plugins/prs1_loader.cpp b/oscar/SleepLib/loader_plugins/prs1_loader.cpp
index d712a806..78f96de3 100644
--- a/oscar/SleepLib/loader_plugins/prs1_loader.cpp
+++ b/oscar/SleepLib/loader_plugins/prs1_loader.cpp
@@ -3293,7 +3293,7 @@ bool PRS1DataChunk::ParseComplianceF0V23(void)
     this->ParseFlexSetting(flex, MODE_CPAP);
 
     int humid = data[0x09];  // TODO: why was this 0x0A originally? could the position vary?
-    this->ParseHumidifierSetting(humid, false);
+    this->ParseHumidifierSettingV2(humid, false);
 
     // TODO: Where is Auto Off/On set? (both off)
     // TODO: Where is "Altitude Compensation" set? (seems to be 1)
@@ -3437,7 +3437,7 @@ bool PRS1DataChunk::ParseSummaryF0V23()
     this->ParseFlexSetting(flex, cpapmode);
 
     int humid = data[0x09];
-    this->ParseHumidifierSetting(humid, false);
+    this->ParseHumidifierSettingV2(humid, false);
     
     // Tubing lock has no setting byte
 
@@ -3572,7 +3572,7 @@ bool PRS1DataChunk::ParseSummaryF0V4(void)
     this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_RAMP_PRESSURE, ramp_pressure));
 
     int humid = data[0x0b];
-    this->ParseHumidifierSetting(humid);
+    this->ParseHumidifierSettingV2(humid);
 
     this->duration = data[0x14] | data[0x15] << 8;
 
@@ -3658,7 +3658,7 @@ bool PRS1DataChunk::ParseSummaryF5V012(void)
     this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_RAMP_PRESSURE, ramp_pressure));
 
     int humid = data[0x0d];
-    this->ParseHumidifierSetting(humid);
+    this->ParseHumidifierSettingV2(humid);
 
     this->duration = data[0x18] | data[0x19] << 8;
 
@@ -3705,7 +3705,7 @@ void PRS1DataChunk::ParseFlexSetting(quint8 flex, CPAPMode cpapmode)
 }
 
 
-void PRS1DataChunk::ParseHumidifierSetting(int humid, bool supportsHeatedTubing)
+void PRS1DataChunk::ParseHumidifierSettingV2(int humid, bool supportsHeatedTubing)
 {
     if (humid & (0x40 | 0x08)) UNEXPECTED_VALUE(humid, "known bits");
     
@@ -3818,8 +3818,7 @@ bool PRS1DataChunk::ParseComplianceF0V6(void)
             case 3:  // Mask On
                 tt += data[pos] | (data[pos+1] << 8);
                 this->AddEvent(new PRS1ParsedSliceEvent(tt, MaskOn));
-                //CHECK_VALUES(data[pos+2], 0x50, 0x54);  // 0x90 (no humidifier data), 0x50 (15ht, tube 4/5, humid 4), 0x54 (15ht, tube 5, humid 5) 0x4c (15ht, tube temp 3, humidifier 3)
-                //CHECK_VALUES(data[pos+3], 0x80, 0xb0);  // 0xB4 (15ht, tube 5, humid 5), 0xB0 (15ht, tube 5, humid 4), 0x90 (tube 4, humid 4), 0x6C (15ht, tube temp 3, humidifier 3)
+                this->ParseHumidifierSettingF0V6(data[pos+2], data[pos+3]);
                 break;
             case 4:  // Mask Off
                 tt += data[pos] | (data[pos+1] << 8);
@@ -3849,8 +3848,7 @@ bool PRS1DataChunk::ParseComplianceF0V6(void)
                 break;
             case 6:  // Humidier setting change
                 tt += data[pos] | (data[pos+1] << 8);  // This adds to the total duration (otherwise it won't match report)
-                //CHECK_VALUES(data[pos+2], 0x54);  // when changing from tube 4, humid 4 to tube 5, humid 5
-                //CHECK_VALUES(data[pos+3], 0xb4);  // when changing from tube 4, humid 4 to tube 5, humid 5
+                this->ParseHumidifierSettingF0V6(data[pos+2], data[pos+3]);
                 break;
             default:
                 UNEXPECTED_VALUE(code, "known slice code");
@@ -3865,6 +3863,46 @@ bool PRS1DataChunk::ParseComplianceF0V6(void)
 }
 
 
+void PRS1DataChunk::ParseHumidifierSettingF0V6(unsigned char byte1, unsigned char byte2, bool add_setting)
+{
+    // Byte 1: 0x90 (no humidifier data), 0x50 (15ht, tube 4/5, humid 4), 0x54 (15ht, tube 5, humid 5) 0x4c (15ht, tube temp 3, humidifier 3)
+    // 0b10010000 no humidifier data
+    // 0b01010000 tube 4 and 5, humidifier 4
+    // 0b01010100 15ht, tube 5, humidifier 5
+    // 0b01001100 15ht, tube 3, humidifier 3
+    //      xxx   = humidifier setting
+    //   ???   ??
+    CHECK_VALUE(byte1 & 3, 0);
+    int unknown = byte1 >> 5;
+    if (unknown != 1 && unknown != 2 && unknown != 4) UNEXPECTED_VALUE(byte1 >> 5, "1, 2, or 4");  // 4 seems to mean no humidifer, 2 uses heated tube, 1 uses adaptive
+    int humidlevel = (byte1 >> 2) & 7;
+    if (humidlevel > 5 || humidlevel < 1) UNEXPECTED_VALUE(humidlevel, "1-5");
+
+    // Byte 2: 0xB4 (15ht, tube 5, humid 5), 0xB0 (15ht, tube 5, humid 4), 0x90 (tube 4, humid 4), 0x6C (15ht, tube temp 3, humidifier 3)
+    // 0x80?
+    // 0b10110100 15ht, tube 5, humidifier 5
+    // 0b10110000 15ht, tube 5, humidifier 4
+    // 0b10010000 tube 4, humidifier 4
+    // 0b01101100 15ht, tube 3, humidifier 3
+    //      xxx   = humidifier setting
+    //   xxx      = tube setting
+    //         ??
+    CHECK_VALUE(byte2 & 3, 0);
+    CHECK_VALUE(humidlevel, ((byte2 >> 2) & 7));
+    int tubelevel = (byte1 >> 5) & 7;
+    if (tubelevel > 5 || tubelevel < 1) UNEXPECTED_VALUE(tubelevel, "1-5");
+
+    if (add_setting) {
+        //this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_HUMID_STATUS, (humid & 0x80) != 0));  // this is F0V23 version, doesn't match F0V6
+        //this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_HEATED_TUBING, (humid & 0x10) != 0));  // this is F0V23 version, doesn't match F0V6
+        this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_HUMID_LEVEL, humidlevel));
+        
+        // TODO: add a channel for PRS1 heated tubing
+        //this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_TUBE_LEVEL, tubelevel));
+    }
+}
+
+
 // The below is based on a combination of the mainblock parsing for fileVersion == 3
 // in ParseSummary() and the switch statements of ParseSummaryF0V6.
 //
@@ -3968,9 +4006,8 @@ bool PRS1DataChunk::ParseSettingsF0V6(const unsigned char* data, int size)
             case 0x30:
                 CHECK_VALUE(data[pos], 3);  // flex level?
                 break;
-            case 0x35:
-                // This is not duration. Value seems to line up with second pair of bytes in Mask On slice?
-                //duration += ( data[pos+1] << 8 ) + data[pos+0];
+            case 0x35:  // Humidifier setting
+                this->ParseHumidifierSettingF0V6(data[pos], data[pos+1], true);
                 break;
             case 0x36:
                 CHECK_VALUE(data[pos], 0);
diff --git a/oscar/SleepLib/loader_plugins/prs1_loader.h b/oscar/SleepLib/loader_plugins/prs1_loader.h
index 81574ebe..0cfd1a4c 100644
--- a/oscar/SleepLib/loader_plugins/prs1_loader.h
+++ b/oscar/SleepLib/loader_plugins/prs1_loader.h
@@ -161,9 +161,12 @@ public:
     //! \brief Parse a flex setting byte from a .000 or .001 containing compliance/summary data
     void ParseFlexSetting(quint8 flex, CPAPMode cpapmode);
     
-    //! \brief Parse an humidifier setting byte from a .000 or .001 containing compliance/summary data
-    void ParseHumidifierSetting(int humid, bool supportsHeatedTubing=true);
-    
+    //! \brief Parse an humidifier setting byte from a .000 or .001 containing compliance/summary data for fileversion 2 machines: F0V234, F5V012, and maybe others
+    void ParseHumidifierSettingV2(int humid, bool supportsHeatedTubing=true);
+
+    //! \brief Parse an humidifier setting byte from a .000 or .001 containing compliance/summary data for family 0 CPAP/APAP family version 6 machines
+    void ParseHumidifierSettingF0V6(unsigned char byte1, unsigned char byte2, bool add_setting=false);
+
     //! \brief Figures out which Event Parser to call, based on machine family/version and calls it.
     bool ParseEvents(CPAPMode mode);
 

From c93932664c727699641d00ea80baa35cb4c7c44f Mon Sep 17 00:00:00 2001
From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com>
Date: Fri, 7 Jun 2019 21:12:55 -0400
Subject: [PATCH 24/42] Use decimal session IDs for chunk YAML file names, add
 original file path to YAML.

---
 oscar/tests/prs1tests.cpp | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/oscar/tests/prs1tests.cpp b/oscar/tests/prs1tests.cpp
index 84bb4b51..4d26a677 100644
--- a/oscar/tests/prs1tests.cpp
+++ b/oscar/tests/prs1tests.cpp
@@ -150,10 +150,8 @@ static QString byteList(QByteArray data, int limit=-1)
     return s;
 }
 
-void ChunkToYaml(QFile & file, PRS1DataChunk* chunk, bool ok)
+void ChunkToYaml(QTextStream & out, PRS1DataChunk* chunk, bool ok)
 {
-    QTextStream out(&file);
-
     // chunk header
     out << "chunk:" << endl;
     out << "  at: " << hex << chunk->m_filepos << endl;
@@ -224,7 +222,7 @@ void ChunkToYaml(QFile & file, PRS1DataChunk* chunk, bool ok)
             }
         }
     }
-    if (dump_data) {
+    if (dump_data || !ok) {
         out << "  data: " << byteList(chunk->m_data, 100) << endl;
     }
     
@@ -276,7 +274,7 @@ void parseAndEmitChunkYaml(const QString & path)
             }
 
             QString ext_s = fi.fileName().section(".", -1);
-            ext_s.toInt(&ok);
+            int ext = ext_s.toInt(&ok);
             if (!ok) {
                 // not a numerical extension
                 qWarning() << inpath << "unexpected filename";
@@ -284,7 +282,7 @@ void parseAndEmitChunkYaml(const QString & path)
             }
 
             QString session_s = fi.fileName().section(".", 0, -2);
-            session_s.toInt(&ok, sessionid_base);
+            int sessionid = session_s.toInt(&ok, sessionid_base);
             if (!ok) {
                 // not a numerical session ID
                 qWarning() << inpath << "unexpected filename";
@@ -292,12 +290,19 @@ void parseAndEmitChunkYaml(const QString & path)
             }
             
             // Create the YAML file.
-            QString outpath = prs1OutputPath(path, m->serial(), fi.fileName(), "-chunks.yml");
+            QString suffix = QString(".%1-chunks.yml").arg(ext, 3, 10, QChar('0'));
+            QString outpath = prs1OutputPath(path, m->serial(), sessionid, suffix);
             QFile file(outpath);
             if (!file.open(QFile::WriteOnly | QFile::Truncate)) {
                 qDebug() << outpath;
                 Q_ASSERT(false);
             }
+            QTextStream out(&file);
+
+            // keep only P1234568/Pn/00000000.001
+            QStringList pathlist = QDir::toNativeSeparators(inpath).split(QDir::separator(), QString::SkipEmptyParts);
+            QString relative = pathlist.mid(pathlist.size()-3).join(QDir::separator());
+            out << "file: " << relative << endl;
 
             // Parse the chunks in the file.
             QList<PRS1DataChunk *> chunks = s_loader->ParseFile(inpath);
@@ -314,7 +319,7 @@ void parseAndEmitChunkYaml(const QString & path)
                 }
                 
                 // Emit the YAML.
-                ChunkToYaml(file, chunk, ok);
+                ChunkToYaml(out, chunk, ok);
                 delete chunk;
             }
             

From e41515891bdb691a94d4ae9150716a6948fe840e Mon Sep 17 00:00:00 2001
From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com>
Date: Fri, 7 Jun 2019 22:05:52 -0400
Subject: [PATCH 25/42] First pass at fixing 400X summary data.

This is mostly a cut-and-paste of the ParseComplianceF0V6,
but the some of the slice codes and sizes are different.

Also start adding machine names for tested models.
---
 oscar/SleepLib/loader_plugins/prs1_loader.cpp | 161 ++++++++++++++++--
 1 file changed, 146 insertions(+), 15 deletions(-)

diff --git a/oscar/SleepLib/loader_plugins/prs1_loader.cpp b/oscar/SleepLib/loader_plugins/prs1_loader.cpp
index 78f96de3..058c9e54 100644
--- a/oscar/SleepLib/loader_plugins/prs1_loader.cpp
+++ b/oscar/SleepLib/loader_plugins/prs1_loader.cpp
@@ -214,13 +214,13 @@ struct PRS1TestedModel
 };
 
 static const PRS1TestedModel s_PRS1TestedModels[] = {
-    { "251P", 0, 2 },
-    { "450P", 0, 3 },
-    { "451P", 0, 3 },
-    { "550P", 0, 2 },
-    { "550P", 0, 3 },
-    { "551P", 0, 2 },
-    { "750P", 0, 2 },
+    { "251P", 0, 2 },  // "REMstar Plus (Philips Respironics)" (brick)
+    { "450P", 0, 3 },  // "REMstar Pro (Philips Respironics)"
+    { "451P", 0, 3 },  // "REMstar Pro (Philips Respironics)"
+    { "550P", 0, 2 },  // "REMstar Auto (Philips Respironics)"
+    { "550P", 0, 3 },  // "REMstar Auto (Philips Respironics)"
+    { "551P", 0, 2 },  // "REMstar Auto (Philips Respironics)"
+    { "750P", 0, 2 },  // "BiPAP Auto (Philips Respironics)"
 
     { "460P",   0, 4 },
     { "461P",   0, 4 },
@@ -230,9 +230,9 @@ static const PRS1TestedModel s_PRS1TestedModels[] = {
     { "660P",   0, 4 },
     { "760P",   0, 4 },
     
-    { "200X110", 0, 6 },
+    { "200X110", 0, 6 },  // "DreamStation CPAP" (brick)
     { "400G110", 0, 6 },
-    { "400X110", 0, 6 },
+    { "400X110", 0, 6 },  // "DreamStation CPAP Pro"
     { "400X150", 0, 6 },
     { "500X110", 0, 6 },
     { "500X150", 0, 6 },
@@ -3760,7 +3760,7 @@ bool PRS1DataChunk::ParseSummaryF5V3(void)
 bool PRS1DataChunk::ParseComplianceF0V6(void)
 {
     if (this->family != 0 || this->familyVersion != 6) {
-        qWarning() << "ParseComplianceF0V2 called with family" << this->family << "familyVersion" << this->familyVersion;
+        qWarning() << "ParseComplianceF0V6 called with family" << this->family << "familyVersion" << this->familyVersion;
         return false;
     }
     // TODO: hardcoding this is ugly, think of a better approach
@@ -3998,10 +3998,10 @@ bool PRS1DataChunk::ParseSettingsF0V6(const unsigned char* data, int size)
                 this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_RAMP_PRESSURE, data[pos]));
                 break;
             case 0x2e:
-                CHECK_VALUE(data[pos], 0x80);  // if below is flex level, maybe flex related? 0x80 when c-flex?
+                CHECK_VALUES(data[pos], 0x80, 0x90);  // if below is flex level, maybe flex related? 0x80 when c-flex? 0x90 when c-flex+?
                 break;
             case 0x2f:
-                CHECK_VALUE(data[pos], 0);  // if below is flex level, maybe flex related? 0x00 when c-flex?
+                CHECK_VALUE(data[pos], 0);  // if below is flex level, maybe flex related? 0x00 when c-flex and c-flex+?
                 break;
             case 0x30:
                 CHECK_VALUE(data[pos], 3);  // flex level?
@@ -4013,7 +4013,7 @@ bool PRS1DataChunk::ParseSettingsF0V6(const unsigned char* data, int size)
                 CHECK_VALUE(data[pos], 0);
                 break;
             case 0x38:
-                CHECK_VALUE(data[pos], 0);
+                CHECK_VALUES(data[pos], 0, 1);  // maybe mask resistance?
                 break;
             case 0x39:
                 CHECK_VALUE(data[pos], 0);
@@ -4022,10 +4022,10 @@ bool PRS1DataChunk::ParseSettingsF0V6(const unsigned char* data, int size)
                 CHECK_VALUES(data[pos], 2, 1);  // tubing type? 15HT = 2, 15 = 1?
                 break;
             case 0x3c:
-                CHECK_VALUE(data[pos], 0);
+                CHECK_VALUES(data[pos], 0, 0x80);  // 0x80 maybe show AHI?
                 break;
             case 0x3e:
-                CHECK_VALUE(data[pos], 0x80);
+                CHECK_VALUES(data[pos], 0, 0x80);  // 0x80 maybe auto-on?
                 break;
             case 0x3f:
                 CHECK_VALUE(data[pos], 0);
@@ -4063,6 +4063,136 @@ bool PRS1DataChunk::ParseSettingsF0V6(const unsigned char* data, int size)
 }
 
 
+bool PRS1DataChunk::ParseSummaryF0V6(void)
+{
+    if (this->family != 0 || this->familyVersion != 6) {
+        qWarning() << "ParseSummaryF0V6 called with family" << this->family << "familyVersion" << this->familyVersion;
+        return false;
+    }
+    // TODO: hardcoding this is ugly, think of a better approach
+    if (this->m_data.size() < 105) {
+        qWarning() << this->sessionid << "summary data too short:" << this->m_data.size();
+        return false;
+    }
+    const unsigned char * data = (unsigned char *)this->m_data.constData();
+    int chunk_size = this->m_data.size();
+    static const int expected_sizes[] = { 1, 0x34, 9, 4, 2, 4, 1, 4, 0x1f, 2, 4, 0x0b };
+    static const int ncodes = sizeof(expected_sizes) / sizeof(int);
+    for (int i = 0; i < ncodes; i++) {
+        if (this->hblock.contains(i)) {
+            CHECK_VALUE(this->hblock[i], expected_sizes[i]);
+        } else {
+            UNEXPECTED_VALUE(this->hblock.contains(i), true);
+        }
+    }
+
+    bool ok = true;
+    int pos = 0;
+    int code, size;
+    int tt = 0;
+    do {
+        code = data[pos++];
+        if (!this->hblock.contains(code)) {
+            qWarning() << this->sessionid << "missing hblock entry for" << code;
+            ok = false;
+            break;
+        }
+        size = this->hblock[code];
+        if (size < expected_sizes[code]) {
+            qWarning() << this->sessionid << "slice" << code << "too small" << size << "<" << expected_sizes[code];
+            ok = false;
+            break;
+        }
+        if (pos + size > chunk_size) {
+            qWarning() << this->sessionid << "slice" << code << "@" << pos << "longer than remaining chunk";
+            ok = false;
+            break;
+        }
+
+        switch (code) {
+            case 0:
+                CHECK_VALUE(pos, 1);  // Always first?
+                CHECK_VALUE(data[pos], 1);
+                break;
+            case 1:  // Settings
+                ok = this->ParseSettingsF0V6(data + pos, size);
+                break;
+            case 3:  // Mask On
+                tt += data[pos] | (data[pos+1] << 8);
+                this->AddEvent(new PRS1ParsedSliceEvent(tt, MaskOn));
+                this->ParseHumidifierSettingF0V6(data[pos+2], data[pos+3]);
+                break;
+            case 4:  // Mask Off
+                tt += data[pos] | (data[pos+1] << 8);
+                this->AddEvent(new PRS1ParsedSliceEvent(tt, MaskOff));
+                break;
+            case 8:  // vs. 7 in compliance, always follows mask off, also longer
+                CHECK_VALUE(data[pos], 0x02);
+                CHECK_VALUE(data[pos+1], 0x00);
+                CHECK_VALUE(data[pos+2], 0x0d);
+                CHECK_VALUE(data[pos+3], 0x00);
+                CHECK_VALUE(data[pos+4], 0x09);
+                CHECK_VALUE(data[pos+5], 0x00);
+                CHECK_VALUE(data[pos+6], 0x1e);
+                CHECK_VALUE(data[pos+7], 0x00);
+                CHECK_VALUE(data[pos+8], 0x8c);
+                CHECK_VALUE(data[pos+9], 0x00);
+                CHECK_VALUE(data[pos+0xa], 0xbb);
+                CHECK_VALUE(data[pos+0xb], 0x00);
+                CHECK_VALUE(data[pos+0xc], 0x15);
+                CHECK_VALUE(data[pos+0xd], 0x00);
+                CHECK_VALUE(data[pos+0xe], 0x01);
+                CHECK_VALUE(data[pos+0xf], 0x00);
+                CHECK_VALUE(data[pos+0x10], 0x21);
+                CHECK_VALUE(data[pos+0x11], 0x00);
+                CHECK_VALUE(data[pos+0x12], 0x13);
+                CHECK_VALUE(data[pos+0x13], 0x00);
+                CHECK_VALUE(data[pos+0x14], 0x05);
+                CHECK_VALUE(data[pos+0x15], 0x00);
+                CHECK_VALUE(data[pos+0x16], 0x00);
+                CHECK_VALUE(data[pos+0x17], 0x00);
+                CHECK_VALUE(data[pos+0x18], 0x69);
+                CHECK_VALUE(data[pos+0x19], 0x44);
+                CHECK_VALUE(data[pos+0x1a], 0x80);
+                CHECK_VALUE(data[pos+0x1b], 0x00);
+                CHECK_VALUE(data[pos+0x1c], 0x00);
+                CHECK_VALUE(data[pos+0x1d], 0x0c);
+                CHECK_VALUE(data[pos+0x1e], 0x31);
+                break;
+            case 2:  // Equipment Off
+                tt += data[pos] | (data[pos+1] << 8);
+                this->AddEvent(new PRS1ParsedSliceEvent(tt, EquipmentOff));
+                //CHECK_VALUE(data[pos+2], 0x08);  // 0x01
+                //CHECK_VALUE(data[pos+3], 0x14);  // 0x12
+                //CHECK_VALUE(data[pos+4], 0x01);  // 0x00
+                //CHECK_VALUE(data[pos+5], 0x22);  // 0x28
+                //CHECK_VALUE(data[pos+6], 0x02);  // sometimes 1, 0
+                CHECK_VALUE(data[pos+7], 0x00);  // 0x00
+                CHECK_VALUE(data[pos+8], 0x00);  // 0x00
+                break;
+            case 0x0a:  // new vs. compliance, maybe its version of 6: it looks like a timestamp + humidifier setting
+                this->AddEvent(new PRS1UnknownDataEvent(m_data, pos, size));
+                break;
+            /*
+            case 6:  // Humidier setting change
+                tt += data[pos] | (data[pos+1] << 8);  // This adds to the total duration (otherwise it won't match report)
+                this->ParseHumidifierSettingF0V6(data[pos+2], data[pos+3]);
+                break;
+            */
+            default:
+                UNEXPECTED_VALUE(code, "known slice code");
+                break;
+        }
+        pos += size;
+    } while (ok && pos < chunk_size);
+
+    this->duration = tt;
+
+    return ok;
+}
+
+
+#if 0
 bool PRS1DataChunk::ParseSummaryF0V6()
 {
     // DreamStation machines...
@@ -4218,6 +4348,7 @@ bool PRS1DataChunk::ParseSummaryF0V6()
 
     return true;
 }
+#endif
 
 
 bool PRS1Import::ImportSummary()

From 2a82ee09d66cbc0df5cfd4c2a9e47162b4730244 Mon Sep 17 00:00:00 2001
From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com>
Date: Sat, 8 Jun 2019 14:21:54 -0400
Subject: [PATCH 26/42] Refinement of 400X summary data.

Fixed a bug in the ramp pressure setting, identified the mask resistance
setting, and found the summary equivalent of the humidifier setting change
slice.
---
 oscar/SleepLib/loader_plugins/prs1_loader.cpp | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/oscar/SleepLib/loader_plugins/prs1_loader.cpp b/oscar/SleepLib/loader_plugins/prs1_loader.cpp
index 058c9e54..8900594f 100644
--- a/oscar/SleepLib/loader_plugins/prs1_loader.cpp
+++ b/oscar/SleepLib/loader_plugins/prs1_loader.cpp
@@ -3995,7 +3995,7 @@ bool PRS1DataChunk::ParseSettingsF0V6(const unsigned char* data, int size)
                 this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_RAMP_TIME, data[pos]));
                 break;
             case 0x2d:  // Ramp Pressure
-                this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_RAMP_PRESSURE, data[pos]));
+                this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_RAMP_PRESSURE, data[pos]));
                 break;
             case 0x2e:
                 CHECK_VALUES(data[pos], 0x80, 0x90);  // if below is flex level, maybe flex related? 0x80 when c-flex? 0x90 when c-flex+?
@@ -4012,8 +4012,8 @@ bool PRS1DataChunk::ParseSettingsF0V6(const unsigned char* data, int size)
             case 0x36:
                 CHECK_VALUE(data[pos], 0);
                 break;
-            case 0x38:
-                CHECK_VALUES(data[pos], 0, 1);  // maybe mask resistance?
+            case 0x38:  // Mask Resistance
+                this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_SYSTEMONE_RESIST_SETTING, data[pos]));
                 break;
             case 0x39:
                 CHECK_VALUE(data[pos], 0);
@@ -4170,15 +4170,10 @@ bool PRS1DataChunk::ParseSummaryF0V6(void)
                 CHECK_VALUE(data[pos+7], 0x00);  // 0x00
                 CHECK_VALUE(data[pos+8], 0x00);  // 0x00
                 break;
-            case 0x0a:  // new vs. compliance, maybe its version of 6: it looks like a timestamp + humidifier setting
-                this->AddEvent(new PRS1UnknownDataEvent(m_data, pos, size));
-                break;
-            /*
-            case 6:  // Humidier setting change
+            case 0x0a:  // Humidier setting change
                 tt += data[pos] | (data[pos+1] << 8);  // This adds to the total duration (otherwise it won't match report)
                 this->ParseHumidifierSettingF0V6(data[pos+2], data[pos+3]);
                 break;
-            */
             default:
                 UNEXPECTED_VALUE(code, "known slice code");
                 break;

From 08ad973a6a73f74eb78fd05fd7bd4094d21ddd7e Mon Sep 17 00:00:00 2001
From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com>
Date: Sat, 8 Jun 2019 14:45:57 -0400
Subject: [PATCH 27/42] Wrap up of 400X summary for now.

Mostly this is commenting out warnings about values that are different
for every session. They can be sorted out later.

Humidifier status and tube temperature are cleaned up as well.
---
 oscar/SleepLib/loader_plugins/prs1_loader.cpp | 54 +++++++++++--------
 1 file changed, 32 insertions(+), 22 deletions(-)

diff --git a/oscar/SleepLib/loader_plugins/prs1_loader.cpp b/oscar/SleepLib/loader_plugins/prs1_loader.cpp
index 8900594f..a5739001 100644
--- a/oscar/SleepLib/loader_plugins/prs1_loader.cpp
+++ b/oscar/SleepLib/loader_plugins/prs1_loader.cpp
@@ -3866,15 +3866,25 @@ bool PRS1DataChunk::ParseComplianceF0V6(void)
 void PRS1DataChunk::ParseHumidifierSettingF0V6(unsigned char byte1, unsigned char byte2, bool add_setting)
 {
     // Byte 1: 0x90 (no humidifier data), 0x50 (15ht, tube 4/5, humid 4), 0x54 (15ht, tube 5, humid 5) 0x4c (15ht, tube temp 3, humidifier 3)
+    // 0x0c (15, tube 3, humid 3, fixed)
     // 0b10010000 no humidifier data
     // 0b01010000 tube 4 and 5, humidifier 4
     // 0b01010100 15ht, tube 5, humidifier 5
     // 0b01001100 15ht, tube 3, humidifier 3
     //      xxx   = humidifier setting
-    //   ???   ??
+    //   xxx      = humidifier status
+    //         ??
     CHECK_VALUE(byte1 & 3, 0);
-    int unknown = byte1 >> 5;
-    if (unknown != 1 && unknown != 2 && unknown != 4) UNEXPECTED_VALUE(byte1 >> 5, "1, 2, or 4");  // 4 seems to mean no humidifer, 2 uses heated tube, 1 uses adaptive
+    int humid = byte1 >> 5;
+    switch (humid) {
+    case 0: break;  // fixed
+    case 1: break;  // adaptive
+    case 2: break;  // heated tube
+    case 4: break;  // no humidifier, possibly a bit flag rather than integer value
+    default:
+        UNEXPECTED_VALUE(humid, "known value");
+        break;
+    }
     int humidlevel = (byte1 >> 2) & 7;
     if (humidlevel > 5 || humidlevel < 1) UNEXPECTED_VALUE(humidlevel, "1-5");
 
@@ -3889,7 +3899,7 @@ void PRS1DataChunk::ParseHumidifierSettingF0V6(unsigned char byte1, unsigned cha
     //         ??
     CHECK_VALUE(byte2 & 3, 0);
     CHECK_VALUE(humidlevel, ((byte2 >> 2) & 7));
-    int tubelevel = (byte1 >> 5) & 7;
+    int tubelevel = (byte2 >> 5) & 7;
     if (tubelevel > 5 || tubelevel < 1) UNEXPECTED_VALUE(tubelevel, "1-5");
 
     if (add_setting) {
@@ -4112,7 +4122,7 @@ bool PRS1DataChunk::ParseSummaryF0V6(void)
         switch (code) {
             case 0:
                 CHECK_VALUE(pos, 1);  // Always first?
-                CHECK_VALUE(data[pos], 1);
+                CHECK_VALUES(data[pos], 1, 7);
                 break;
             case 1:  // Settings
                 ok = this->ParseSettingsF0V6(data + pos, size);
@@ -4127,37 +4137,37 @@ bool PRS1DataChunk::ParseSummaryF0V6(void)
                 this->AddEvent(new PRS1ParsedSliceEvent(tt, MaskOff));
                 break;
             case 8:  // vs. 7 in compliance, always follows mask off, also longer
-                CHECK_VALUE(data[pos], 0x02);
+                //CHECK_VALUES(data[pos], 0x02, 0x01);  // probably 16-bit value
                 CHECK_VALUE(data[pos+1], 0x00);
-                CHECK_VALUE(data[pos+2], 0x0d);
+                //CHECK_VALUES(data[pos+2], 0x0d, 0x0a);  // probably 16-bit value
                 CHECK_VALUE(data[pos+3], 0x00);
-                CHECK_VALUE(data[pos+4], 0x09);
+                //CHECK_VALUES(data[pos+4], 0x09, 0x0b);  // probably 16-bit value
                 CHECK_VALUE(data[pos+5], 0x00);
-                CHECK_VALUE(data[pos+6], 0x1e);
+                //CHECK_VALUES(data[pos+6], 0x1e, 0x35);  // probably 16-bit value
                 CHECK_VALUE(data[pos+7], 0x00);
-                CHECK_VALUE(data[pos+8], 0x8c);
+                //CHECK_VALUES(data[pos+8], 0x8c, 0x4c);  // probably 16-bit value
                 CHECK_VALUE(data[pos+9], 0x00);
-                CHECK_VALUE(data[pos+0xa], 0xbb);
+                //CHECK_VALUES(data[pos+0xa], 0xbb, 0x00);  // probably 16-bit value
                 CHECK_VALUE(data[pos+0xb], 0x00);
-                CHECK_VALUE(data[pos+0xc], 0x15);
+                //CHECK_VALUES(data[pos+0xc], 0x15, 0x02);  // probably 16-bit value
                 CHECK_VALUE(data[pos+0xd], 0x00);
-                CHECK_VALUE(data[pos+0xe], 0x01);
+                //CHECK_VALUES(data[pos+0xe], 0x01, 0x00);  // probably 16-bit value
                 CHECK_VALUE(data[pos+0xf], 0x00);
-                CHECK_VALUE(data[pos+0x10], 0x21);
+                //CHECK_VALUES(data[pos+0x10], 0x21, 5);  // probably 16-bit value
                 CHECK_VALUE(data[pos+0x11], 0x00);
-                CHECK_VALUE(data[pos+0x12], 0x13);
+                //CHECK_VALUES(data[pos+0x12], 0x13, 0);  // probably 16-bit value
                 CHECK_VALUE(data[pos+0x13], 0x00);
-                CHECK_VALUE(data[pos+0x14], 0x05);
+                //CHECK_VALUES(data[pos+0x14], 0x05, 0);  // probably 16-bit value
                 CHECK_VALUE(data[pos+0x15], 0x00);
                 CHECK_VALUE(data[pos+0x16], 0x00);
                 CHECK_VALUE(data[pos+0x17], 0x00);
-                CHECK_VALUE(data[pos+0x18], 0x69);
-                CHECK_VALUE(data[pos+0x19], 0x44);
-                CHECK_VALUE(data[pos+0x1a], 0x80);
-                CHECK_VALUE(data[pos+0x1b], 0x00);
+                //CHECK_VALUES(data[pos+0x18], 0x69, 0x23);
+                //CHECK_VALUES(data[pos+0x19], 0x44, 0x18);
+                //CHECK_VALUES(data[pos+0x1a], 0x80, 0x49);
+                //CHECK_VALUES(data[pos+0x1b], 0x00, 6);
                 CHECK_VALUE(data[pos+0x1c], 0x00);
-                CHECK_VALUE(data[pos+0x1d], 0x0c);
-                CHECK_VALUE(data[pos+0x1e], 0x31);
+                //CHECK_VALUES(data[pos+0x1d], 0x0c, 0x0d);
+                //CHECK_VALUES(data[pos+0x1e], 0x31, 0x3b);
                 break;
             case 2:  // Equipment Off
                 tt += data[pos] | (data[pos+1] << 8);

From 2120289792ac5088a80f3bdb93130e752911b003 Mon Sep 17 00:00:00 2001
From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com>
Date: Sat, 8 Jun 2019 21:36:51 -0400
Subject: [PATCH 28/42] Add support for 400G summary data.

Interestingly, it looks like settings and other slices can be of
varying length, even on the same machine. Stranger still, sometimes
the list of possible slices can change on the same machine.
---
 oscar/SleepLib/loader_plugins/prs1_loader.cpp | 99 ++++++++++++++-----
 1 file changed, 73 insertions(+), 26 deletions(-)

diff --git a/oscar/SleepLib/loader_plugins/prs1_loader.cpp b/oscar/SleepLib/loader_plugins/prs1_loader.cpp
index a5739001..b94b0be0 100644
--- a/oscar/SleepLib/loader_plugins/prs1_loader.cpp
+++ b/oscar/SleepLib/loader_plugins/prs1_loader.cpp
@@ -231,7 +231,7 @@ static const PRS1TestedModel s_PRS1TestedModels[] = {
     { "760P",   0, 4 },
     
     { "200X110", 0, 6 },  // "DreamStation CPAP" (brick)
-    { "400G110", 0, 6 },
+    { "400G110", 0, 6 },  // "DreamStation Go"
     { "400X110", 0, 6 },  // "DreamStation CPAP Pro"
     { "400X150", 0, 6 },
     { "500X110", 0, 6 },
@@ -1313,7 +1313,7 @@ public:
     {
         m_pos = pos;
         m_data = data.mid(pos, len);
-        Q_ASSERT(m_data.size() >= 3);
+        Q_ASSERT(m_data.size() >= 1);
         m_code = m_data.at(0);
     }
 };
@@ -3885,8 +3885,8 @@ void PRS1DataChunk::ParseHumidifierSettingF0V6(unsigned char byte1, unsigned cha
         UNEXPECTED_VALUE(humid, "known value");
         break;
     }
+    bool humidifier_present = ((byte1 & 0x80) == 0);
     int humidlevel = (byte1 >> 2) & 7;
-    if (humidlevel > 5 || humidlevel < 1) UNEXPECTED_VALUE(humidlevel, "1-5");
 
     // Byte 2: 0xB4 (15ht, tube 5, humid 5), 0xB0 (15ht, tube 5, humid 4), 0x90 (tube 4, humid 4), 0x6C (15ht, tube temp 3, humidifier 3)
     // 0x80?
@@ -3900,7 +3900,12 @@ void PRS1DataChunk::ParseHumidifierSettingF0V6(unsigned char byte1, unsigned cha
     CHECK_VALUE(byte2 & 3, 0);
     CHECK_VALUE(humidlevel, ((byte2 >> 2) & 7));
     int tubelevel = (byte2 >> 5) & 7;
-    if (tubelevel > 5 || tubelevel < 1) UNEXPECTED_VALUE(tubelevel, "1-5");
+    if (humidifier_present) {
+        if (humidlevel > 5 || humidlevel < 1) UNEXPECTED_VALUE(humidlevel, "1-5");
+        if (humid == 2) {  // heated tube
+            if (tubelevel > 5 || tubelevel < 1) UNEXPECTED_VALUE(tubelevel, "1-5");  // TODO: maybe this is only if heated tube?
+        }
+    }
 
     if (add_setting) {
         //this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_HUMID_STATUS, (humid & 0x80) != 0));  // this is F0V23 version, doesn't match F0V6
@@ -3946,7 +3951,7 @@ bool PRS1DataChunk::ParseSettingsF0V6(const unsigned char* data, int size)
         if (expected_lengths.contains(code)) {
             expected_len = expected_lengths[code];
         }
-        CHECK_VALUE(len, expected_len);
+        //CHECK_VALUE(len, expected_len);
         if (len < expected_len) {
             qWarning() << this->sessionid << "setting" << code << "too small" << len << "<" << expected_len;
             ok = false;
@@ -3964,6 +3969,9 @@ bool PRS1DataChunk::ParseSettingsF0V6(const unsigned char* data, int size)
                 break;
             case 1: // ???
                 CHECK_VALUE(data[pos], 0);
+                if (len == 2) {  // 400G has extra byte
+                    CHECK_VALUE(data[pos+1], 0);
+                }
                 break;
             case 0x0a:  // CPAP pressure setting
                 cpapmode = MODE_CPAP;
@@ -3998,11 +4006,13 @@ bool PRS1DataChunk::ParseSettingsF0V6(const unsigned char* data, int size)
                 max_pressure = dataPtr[4];
                 break;
             */
-            case 0x2b:
-                CHECK_VALUE(data[pos], 0);  // maybe ramp related? 0 on brick (linear ramp)
+            case 0x2b:  // Ramp Type
+                CHECK_VALUES(data[pos], 0, 0x80);  // 0 == "Linear", 0x80 = "SmartRamp"
                 break;
             case 0x2c:  // Ramp Time
-                this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_RAMP_TIME, data[pos]));
+                if (data[pos] != 0) {  // 0 == ramp off, and ramp pressure setting doesn't appear
+                    this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_RAMP_TIME, data[pos]));
+                }
                 break;
             case 0x2d:  // Ramp Pressure
                 this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_RAMP_PRESSURE, data[pos]));
@@ -4013,8 +4023,8 @@ bool PRS1DataChunk::ParseSettingsF0V6(const unsigned char* data, int size)
             case 0x2f:
                 CHECK_VALUE(data[pos], 0);  // if below is flex level, maybe flex related? 0x00 when c-flex and c-flex+?
                 break;
-            case 0x30:
-                CHECK_VALUE(data[pos], 3);  // flex level?
+            case 0x30:  // Flex level
+                this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_FLEX_LEVEL, data[pos]));
                 break;
             case 0x35:  // Humidifier setting
                 this->ParseHumidifierSettingF0V6(data[pos], data[pos+1], true);
@@ -4023,7 +4033,9 @@ bool PRS1DataChunk::ParseSettingsF0V6(const unsigned char* data, int size)
                 CHECK_VALUE(data[pos], 0);
                 break;
             case 0x38:  // Mask Resistance
-                this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_SYSTEMONE_RESIST_SETTING, data[pos]));
+                if (data[pos] != 0) {  // 0 == mask resistance off
+                    this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_SYSTEMONE_RESIST_SETTING, data[pos]));
+                }
                 break;
             case 0x39:
                 CHECK_VALUE(data[pos], 0);
@@ -4031,6 +4043,9 @@ bool PRS1DataChunk::ParseSettingsF0V6(const unsigned char* data, int size)
             case 0x3b:
                 CHECK_VALUES(data[pos], 2, 1);  // tubing type? 15HT = 2, 15 = 1?
                 break;
+            case 0x40:  // new to 400G, alternate tubing type? appears after 0x39 and before 0x3c, 12mm = 3?
+                CHECK_VALUE(data[pos], 3);
+                break;
             case 0x3c:
                 CHECK_VALUES(data[pos], 0, 0x80);  // 0x80 maybe show AHI?
                 break;
@@ -4040,9 +4055,12 @@ bool PRS1DataChunk::ParseSettingsF0V6(const unsigned char* data, int size)
             case 0x3f:
                 CHECK_VALUE(data[pos], 0);
                 break;
+            case 0x45:  // new to 400G, only in last session?
+                CHECK_VALUE(data[pos], 1);
+                break;
             default:
-                qDebug() << "Unknown code:" << hex << code << "in" << this->sessionid << "at" << pos;
-                this->AddEvent(new PRS1UnknownDataEvent(QByteArray((const char*) data), pos, len));
+                qDebug() << "Unknown setting:" << hex << code << "in" << this->sessionid << "at" << pos;
+                this->AddEvent(new PRS1UnknownDataEvent(QByteArray((const char*) data, size), pos, len));
                 break;
         }
 
@@ -4080,21 +4098,25 @@ bool PRS1DataChunk::ParseSummaryF0V6(void)
         return false;
     }
     // TODO: hardcoding this is ugly, think of a better approach
-    if (this->m_data.size() < 105) {
+    if (this->m_data.size() < 68) {
         qWarning() << this->sessionid << "summary data too short:" << this->m_data.size();
         return false;
     }
     const unsigned char * data = (unsigned char *)this->m_data.constData();
     int chunk_size = this->m_data.size();
-    static const int expected_sizes[] = { 1, 0x34, 9, 4, 2, 4, 1, 4, 0x1f, 2, 4, 0x0b };
-    static const int ncodes = sizeof(expected_sizes) / sizeof(int);
+    static const int minimum_sizes[] = { 1, 0x2e, 9, 4, 2, 4, 1, 4, 0x1f, 2, 4, 0x0b, 1, 2, 6 };
+    static const int ncodes = sizeof(minimum_sizes) / sizeof(int);
+    /*
     for (int i = 0; i < ncodes; i++) {
         if (this->hblock.contains(i)) {
-            CHECK_VALUE(this->hblock[i], expected_sizes[i]);
+            // These values can vary, interestingly.
+            //CHECK_VALUE(this->hblock[i], minimum_sizes[i]);
         } else {
-            UNEXPECTED_VALUE(this->hblock.contains(i), true);
+            // Even the length of hblock can vary.
+            //UNEXPECTED_VALUE(this->hblock.contains(i), true);
         }
     }
+    */
 
     bool ok = true;
     int pos = 0;
@@ -4108,11 +4130,14 @@ bool PRS1DataChunk::ParseSummaryF0V6(void)
             break;
         }
         size = this->hblock[code];
-        if (size < expected_sizes[code]) {
-            qWarning() << this->sessionid << "slice" << code << "too small" << size << "<" << expected_sizes[code];
-            ok = false;
-            break;
-        }
+        if (code < ncodes) {
+            // make sure the handlers below don't go past the end of the buffer
+            if (size < minimum_sizes[code]) {
+                qWarning() << this->sessionid << "slice" << code << "too small" << size << "<" << minimum_sizes[code];
+                ok = false;
+                break;
+            }
+        } // else if it's past ncodes, we'll log its information below (rather than handle it)
         if (pos + size > chunk_size) {
             qWarning() << this->sessionid << "slice" << code << "@" << pos << "longer than remaining chunk";
             ok = false;
@@ -4120,9 +4145,14 @@ bool PRS1DataChunk::ParseSummaryF0V6(void)
         }
 
         switch (code) {
-            case 0:
+            case 0:  // Equipment On
                 CHECK_VALUE(pos, 1);  // Always first?
-                CHECK_VALUES(data[pos], 1, 7);
+                //CHECK_VALUES(data[pos], 1, 7);  // or 3?
+                if (size == 4) {  // 400G has 3 more bytes?
+                    //CHECK_VALUE(data[pos+1], 0);  // or 2, 14, 4, etc.
+                    //CHECK_VALUES(data[pos+2], 8, 65);  // or 1
+                    //CHECK_VALUES(data[pos+3], 0, 20);  // or 21, 22, etc.
+                }
                 break;
             case 1:  // Settings
                 ok = this->ParseSettingsF0V6(data + pos, size);
@@ -4168,6 +4198,8 @@ bool PRS1DataChunk::ParseSummaryF0V6(void)
                 CHECK_VALUE(data[pos+0x1c], 0x00);
                 //CHECK_VALUES(data[pos+0x1d], 0x0c, 0x0d);
                 //CHECK_VALUES(data[pos+0x1e], 0x31, 0x3b);
+                // TODO: 400G has 8 more bytes?
+                // TODO: 400G sometimes has another 4 on top of that?
                 break;
             case 2:  // Equipment Off
                 tt += data[pos] | (data[pos+1] << 8);
@@ -4179,11 +4211,25 @@ bool PRS1DataChunk::ParseSummaryF0V6(void)
                 //CHECK_VALUE(data[pos+6], 0x02);  // sometimes 1, 0
                 CHECK_VALUE(data[pos+7], 0x00);  // 0x00
                 CHECK_VALUE(data[pos+8], 0x00);  // 0x00
+                if (size == 0x0c) {  // 400G has 3 more bytes, seem to match Equipment On bytes
+                    //CHECK_VALUE(data[pos+1], 0);
+                    //CHECK_VALUES(data[pos+2], 8, 65);
+                    //CHECK_VALUE(data[pos+3], 0);
+                }
                 break;
             case 0x0a:  // Humidier setting change
                 tt += data[pos] | (data[pos+1] << 8);  // This adds to the total duration (otherwise it won't match report)
                 this->ParseHumidifierSettingF0V6(data[pos+2], data[pos+3]);
                 break;
+            case 0x0e:
+                // only seen once on 400G?
+                CHECK_VALUE(data[pos], 0);
+                CHECK_VALUE(data[pos+1], 0);
+                CHECK_VALUE(data[pos+2], 7);
+                CHECK_VALUE(data[pos+3], 7);
+                CHECK_VALUE(data[pos+4], 7);
+                CHECK_VALUE(data[pos+5], 0);
+                break;
             default:
                 UNEXPECTED_VALUE(code, "known slice code");
                 break;
@@ -4555,7 +4601,8 @@ bool PRS1DataChunk::ParseSummary()
 
             if (val != 1) {
                 if (this->hbdata.contains(val)) {
-                    qWarning() << this->sessionid << "duplicate hbdata val" << val;
+                    // We know this is entirely wrong. It will be removed after F3V6 is updated.
+                    //qWarning() << this->sessionid << "duplicate hbdata val" << val;
                 }
                 // store the data block for later reference
                 this->hbdata[val] = QByteArray((const char *)(&data[pos]), bsize);

From a66dd145b8d176b73c2afb23b6e4aa7a55c717cc Mon Sep 17 00:00:00 2001
From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com>
Date: Mon, 10 Jun 2019 14:30:50 -0400
Subject: [PATCH 29/42] Add support for 500X summary data.

This one's slice 8 is shorter than anything else we've seen before!

Also add support for a new slice type and noted possible values
for other data, including a possible lead on the CPAP mode.
---
 oscar/SleepLib/loader_plugins/prs1_loader.cpp | 63 ++++++++++++-------
 oscar/tests/sessiontests.cpp                  |  8 +--
 2 files changed, 43 insertions(+), 28 deletions(-)

diff --git a/oscar/SleepLib/loader_plugins/prs1_loader.cpp b/oscar/SleepLib/loader_plugins/prs1_loader.cpp
index b94b0be0..3d1f8b7b 100644
--- a/oscar/SleepLib/loader_plugins/prs1_loader.cpp
+++ b/oscar/SleepLib/loader_plugins/prs1_loader.cpp
@@ -234,7 +234,7 @@ static const PRS1TestedModel s_PRS1TestedModels[] = {
     { "400G110", 0, 6 },  // "DreamStation Go"
     { "400X110", 0, 6 },  // "DreamStation CPAP Pro"
     { "400X150", 0, 6 },
-    { "500X110", 0, 6 },
+    { "500X110", 0, 6 },  // "DreamStation Auto CPAP"
     { "500X150", 0, 6 },
     { "502G150", 0, 6 },
     { "600X110", 0, 6 },
@@ -3937,9 +3937,9 @@ bool PRS1DataChunk::ParseSettingsF0V6(const unsigned char* data, int size)
     int imin_ps   = 0;
     int imax_ps   = 0;
     //int imax_pressure = 0;
+    */
     int min_pressure = 0;
     int max_pressure = 0;
-    */
 
     // Parse the nested data structure which contains settings
     int pos = 0;
@@ -3965,7 +3965,8 @@ bool PRS1DataChunk::ParseSettingsF0V6(const unsigned char* data, int size)
 
         switch (code) {
             case 0: // mode?
-                CHECK_VALUE(data[pos], 0);
+                CHECK_VALUE(pos, 2);  // always first?
+                CHECK_VALUES(data[pos], 0, 2);  // 0 when CPAP, 2 when AutoCPAP
                 break;
             case 1: // ???
                 CHECK_VALUE(data[pos], 0);
@@ -3977,13 +3978,12 @@ bool PRS1DataChunk::ParseSettingsF0V6(const unsigned char* data, int size)
                 cpapmode = MODE_CPAP;
                 imin_epap = data[pos];
                 break;
-            /*
-            case 13: // 0x0d
+            case 0x0d:  // AutoCPAP pressure setting
                 cpapmode = MODE_APAP;
-                if (dataPtr[1] != 2) qDebug() << "PRS1DataChunk::ParseSummaryF0V6=" << "Bad APAP value";
-                min_pressure = dataPtr[2];
-                max_pressure = dataPtr[3];
+                min_pressure = data[pos];
+                max_pressure = data[pos+1];
                 break;
+            /*
             case 14: // 0x0e  // <--- this is a total guess.. might be 3 and have a pressure support value
                 cpapmode = MODE_BILEVEL_FIXED;
                 if (dataPtr[1] != 2) qDebug() << "PRS1DataChunk::ParseSummaryF0V6=" << "Bad APAP value";
@@ -4018,10 +4018,12 @@ bool PRS1DataChunk::ParseSettingsF0V6(const unsigned char* data, int size)
                 this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_RAMP_PRESSURE, data[pos]));
                 break;
             case 0x2e:
-                CHECK_VALUES(data[pos], 0x80, 0x90);  // if below is flex level, maybe flex related? 0x80 when c-flex? 0x90 when c-flex+?
+                if (data[pos] != 0) {
+                    CHECK_VALUES(data[pos], 0x80, 0x90);  // maybe flex related? 0x80 when c-flex? 0x90 when c-flex+?, 0x00 when no flex
+                }
                 break;
             case 0x2f:
-                CHECK_VALUE(data[pos], 0);  // if below is flex level, maybe flex related? 0x00 when c-flex and c-flex+?
+                CHECK_VALUE(data[pos], 0);  // maybe flex related? 0x00 when c-flex and c-flex+?
                 break;
             case 0x30:  // Flex level
                 this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_FLEX_LEVEL, data[pos]));
@@ -4041,7 +4043,9 @@ bool PRS1DataChunk::ParseSettingsF0V6(const unsigned char* data, int size)
                 CHECK_VALUE(data[pos], 0);
                 break;
             case 0x3b:
-                CHECK_VALUES(data[pos], 2, 1);  // tubing type? 15HT = 2, 15 = 1?
+                if (data[pos] != 0) {
+                    CHECK_VALUES(data[pos], 2, 1);  // tubing type? 15HT = 2, 15 = 1, 22 = 0?
+                }
                 break;
             case 0x40:  // new to 400G, alternate tubing type? appears after 0x39 and before 0x3c, 12mm = 3?
                 CHECK_VALUE(data[pos], 3);
@@ -4070,10 +4074,10 @@ bool PRS1DataChunk::ParseSettingsF0V6(const unsigned char* data, int size)
     this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_CPAP_MODE, (int) cpapmode));
     if (cpapmode == MODE_CPAP) {
         this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_PRESSURE, imin_epap));
-/*
     } else if (cpapmode == MODE_APAP) {
         this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_PRESSURE_MIN, min_pressure));
         this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_PRESSURE_MAX, max_pressure));
+/*
     } else if (cpapmode == MODE_BILEVEL_FIXED) {
         // Guessing here.. haven't seen BIPAP data.
         this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_EPAP, min_pressure));
@@ -4104,7 +4108,7 @@ bool PRS1DataChunk::ParseSummaryF0V6(void)
     }
     const unsigned char * data = (unsigned char *)this->m_data.constData();
     int chunk_size = this->m_data.size();
-    static const int minimum_sizes[] = { 1, 0x2e, 9, 4, 2, 4, 1, 4, 0x1f, 2, 4, 0x0b, 1, 2, 6 };
+    static const int minimum_sizes[] = { 1, 0x2e, 9, 4, 2, 4, 1, 4, 0x1b, 2, 4, 0x0b, 1, 2, 6 };
     static const int ncodes = sizeof(minimum_sizes) / sizeof(int);
     /*
     for (int i = 0; i < ncodes; i++) {
@@ -4166,10 +4170,11 @@ bool PRS1DataChunk::ParseSummaryF0V6(void)
                 tt += data[pos] | (data[pos+1] << 8);
                 this->AddEvent(new PRS1ParsedSliceEvent(tt, MaskOff));
                 break;
-            case 8:  // vs. 7 in compliance, always follows mask off, also longer
+            case 8:  // vs. 7 in compliance, always follows mask off (except when there's a 5, see below), also longer
+                // Maybe statistics of some kind, given the pressure stats that seem to appear before it on AutoCPAP machines?
                 //CHECK_VALUES(data[pos], 0x02, 0x01);  // probably 16-bit value
                 CHECK_VALUE(data[pos+1], 0x00);
-                //CHECK_VALUES(data[pos+2], 0x0d, 0x0a);  // probably 16-bit value
+                //CHECK_VALUES(data[pos+2], 0x0d, 0x0a);  // probably 16-bit value, maybe OA count?
                 CHECK_VALUE(data[pos+3], 0x00);
                 //CHECK_VALUES(data[pos+4], 0x09, 0x0b);  // probably 16-bit value
                 CHECK_VALUE(data[pos+5], 0x00);
@@ -4183,23 +4188,25 @@ bool PRS1DataChunk::ParseSummaryF0V6(void)
                 CHECK_VALUE(data[pos+0xd], 0x00);
                 //CHECK_VALUES(data[pos+0xe], 0x01, 0x00);  // probably 16-bit value
                 CHECK_VALUE(data[pos+0xf], 0x00);
-                //CHECK_VALUES(data[pos+0x10], 0x21, 5);  // probably 16-bit value
+                //CHECK_VALUES(data[pos+0x10], 0x21, 5);  // probably 16-bit value, maybe H count?
                 CHECK_VALUE(data[pos+0x11], 0x00);
                 //CHECK_VALUES(data[pos+0x12], 0x13, 0);  // probably 16-bit value
                 CHECK_VALUE(data[pos+0x13], 0x00);
-                //CHECK_VALUES(data[pos+0x14], 0x05, 0);  // probably 16-bit value
+                //CHECK_VALUES(data[pos+0x14], 0x05, 0);  // probably 16-bit value, maybe RE count?
                 CHECK_VALUE(data[pos+0x15], 0x00);
-                CHECK_VALUE(data[pos+0x16], 0x00);
+                //CHECK_VALUE(data[pos+0x16], 0x00, 4);  // probably a 16-bit value, PB or FL count?
                 CHECK_VALUE(data[pos+0x17], 0x00);
                 //CHECK_VALUES(data[pos+0x18], 0x69, 0x23);
                 //CHECK_VALUES(data[pos+0x19], 0x44, 0x18);
                 //CHECK_VALUES(data[pos+0x1a], 0x80, 0x49);
-                //CHECK_VALUES(data[pos+0x1b], 0x00, 6);
-                CHECK_VALUE(data[pos+0x1c], 0x00);
-                //CHECK_VALUES(data[pos+0x1d], 0x0c, 0x0d);
-                //CHECK_VALUES(data[pos+0x1e], 0x31, 0x3b);
-                // TODO: 400G has 8 more bytes?
-                // TODO: 400G sometimes has another 4 on top of that?
+                if (size >= 0x1f) {  // 500X is only 0x1b long!
+                    //CHECK_VALUES(data[pos+0x1b], 0x00, 6);
+                    CHECK_VALUE(data[pos+0x1c], 0x00);
+                    //CHECK_VALUES(data[pos+0x1d], 0x0c, 0x0d);
+                    //CHECK_VALUES(data[pos+0x1e], 0x31, 0x3b);
+                    // TODO: 400G has 8 more bytes?
+                    // TODO: 400G sometimes has another 4 on top of that?
+                }
                 break;
             case 2:  // Equipment Off
                 tt += data[pos] | (data[pos+1] << 8);
@@ -4230,6 +4237,13 @@ bool PRS1DataChunk::ParseSummaryF0V6(void)
                 CHECK_VALUE(data[pos+4], 7);
                 CHECK_VALUE(data[pos+5], 0);
                 break;
+            case 0x05:
+                // AutoCPAP-related? First appeared on 500X, follows 4, before 8, look like pressure values
+                //CHECK_VALUE(data[pos], 0x4b);    // maybe min pressure? (matches ramp pressure, see ramp on pressure graph)
+                //CHECK_VALUE(data[pos+1], 0x5a);  // maybe max pressure? (close to max on pressure graph, time at pressure graph)
+                //CHECK_VALUE(data[pos+2], 0x5a);  // seems to match Average 90% Pressure
+                //CHECK_VALUE(data[pos+3], 0x58);  // seems to match Average CPAP
+                break;
             default:
                 UNEXPECTED_VALUE(code, "known slice code");
                 break;
@@ -4776,6 +4790,7 @@ bool PRS1Import::ParseEvents()
 
         } else {
             if (!session->settings.contains(CPAP_Pressure) && !session->settings.contains(CPAP_PressureMin)) {
+                qWarning() << session->s_session << "broken summary, missing pressure";
                 session->settings[CPAP_BrokenSummary] = true;
 
                 //session->set_last(session->first());
diff --git a/oscar/tests/sessiontests.cpp b/oscar/tests/sessiontests.cpp
index c677bf21..e63b27df 100644
--- a/oscar/tests/sessiontests.cpp
+++ b/oscar/tests/sessiontests.cpp
@@ -40,7 +40,7 @@ static QString eventListTypeName(EventListType t)
         ENUMSTRING(EVL_Event);
         default:
             s = hex(t);
-            qDebug() << qPrintable(s);
+            qDebug() << "EVL" << qPrintable(s);
     }
     return s;
 }
@@ -88,8 +88,9 @@ static QString settingChannel(ChannelID i)
         CHANNELNAME(PRS1_AutoOff);
         CHANNELNAME(PRS1_MaskAlert);
         CHANNELNAME(PRS1_ShowAHI);
+        CHANNELNAME(CPAP_BrokenSummary);
         s = hex(i);
-        qDebug() << qPrintable(s);
+        qDebug() << "setting channel" << qPrintable(s);
     } while(false);
     return s;
 }
@@ -138,9 +139,8 @@ static QString eventChannel(ChannelID i)
         CHANNELNAME(PRS1_0C);
         CHANNELNAME(PRS1_0E);
         CHANNELNAME(PRS1_15);
-        CHANNELNAME(CPAP_BrokenSummary);
         s = hex(i);
-        qDebug() << qPrintable(s);
+        qDebug() << "event channel" << qPrintable(s);
     } while(false);
     return s;
 }

From 92f029a5f4ef0dd35e0e18bfe52f3492ab00dc83 Mon Sep 17 00:00:00 2001
From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com>
Date: Mon, 10 Jun 2019 15:02:54 -0400
Subject: [PATCH 30/42] Add support for 502G summary data.

Not many changes, just some new unknown settings, and warning
when there's a 0-length slice.
---
 oscar/SleepLib/day.cpp                        | 12 ++++++++++++
 oscar/SleepLib/loader_plugins/prs1_loader.cpp | 14 ++++++++++----
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/oscar/SleepLib/day.cpp b/oscar/SleepLib/day.cpp
index a7981b6e..d01e8af2 100644
--- a/oscar/SleepLib/day.cpp
+++ b/oscar/SleepLib/day.cpp
@@ -654,6 +654,9 @@ qint64 Day::total_time()
                     range.insert(first, 0);
                     range.insert(last, 1);
                     d_totaltime += sess->length();
+                    if (sess->length() == 0) {
+                        qWarning() << sess->s_session << "0 length session";
+                    }
                 }
             } else {
                 for (auto & slice : sess->m_slices) {
@@ -661,6 +664,9 @@ qint64 Day::total_time()
                         range.insert(slice.start, 0);
                         range.insert(slice.end, 1);
                         d_totaltime += slice.end - slice.start;
+                        if (slice.end - slice.start == 0) {
+                            qWarning() << sess->s_session << "0 length slice";
+                        }
                     }
                 }
             }
@@ -724,6 +730,9 @@ qint64 Day::total_time(MachineType type)
                     range.insert(first, 0);
                     range.insert(last, 1);
                     d_totaltime += sess->length();
+                    if (sess->length() == 0) {
+                        qWarning() << sess->s_session << "0 length session";
+                    }
                 }
             } else {
                 for (const auto & slice : sess->m_slices) {
@@ -731,6 +740,9 @@ qint64 Day::total_time(MachineType type)
                         range.insert(slice.start, 0);
                         range.insert(slice.end, 1);
                         d_totaltime += slice.end - slice.start;
+                        if (slice.end - slice.start == 0) {
+                            qWarning() << sess->s_session << "0 length slice";
+                        }
                     }
                 }
             }
diff --git a/oscar/SleepLib/loader_plugins/prs1_loader.cpp b/oscar/SleepLib/loader_plugins/prs1_loader.cpp
index 3d1f8b7b..b66a6df0 100644
--- a/oscar/SleepLib/loader_plugins/prs1_loader.cpp
+++ b/oscar/SleepLib/loader_plugins/prs1_loader.cpp
@@ -236,7 +236,7 @@ static const PRS1TestedModel s_PRS1TestedModels[] = {
     { "400X150", 0, 6 },
     { "500X110", 0, 6 },  // "DreamStation Auto CPAP"
     { "500X150", 0, 6 },
-    { "502G150", 0, 6 },
+    { "502G150", 0, 6 },  // "DreamStation Go Auto"
     { "600X110", 0, 6 },
     { "700X110", 0, 6 },
     
@@ -3926,7 +3926,7 @@ void PRS1DataChunk::ParseHumidifierSettingF0V6(unsigned char byte1, unsigned cha
 // looks like a pressure in compliance files.
 bool PRS1DataChunk::ParseSettingsF0V6(const unsigned char* data, int size)
 {
-    static const QMap<int,int> expected_lengths = { {0x35,2} };
+    static const QMap<int,int> expected_lengths = { {0x0d,2}, {0x35,2} };
     bool ok = true;
 
     CPAPMode cpapmode = MODE_UNKNOWN;
@@ -4057,7 +4057,13 @@ bool PRS1DataChunk::ParseSettingsF0V6(const unsigned char* data, int size)
                 CHECK_VALUES(data[pos], 0, 0x80);  // 0x80 maybe auto-on?
                 break;
             case 0x3f:
-                CHECK_VALUE(data[pos], 0);
+                CHECK_VALUE(data[pos], 0);  // 0x80 in one 0-length session on 502G?
+                break;
+            case 0x43:  // new to 502G, sessions 3-8, Auto-Trial is off, Opti-Start is missing
+                CHECK_VALUE(data[pos], 0x3C);
+                break;
+            case 0x44:  // new to 502G, sessions 3-8, Auto-Trial is off, Opti-Start is missing
+                CHECK_VALUE(data[pos], 0xFF);
                 break;
             case 0x45:  // new to 400G, only in last session?
                 CHECK_VALUE(data[pos], 1);
@@ -4108,7 +4114,7 @@ bool PRS1DataChunk::ParseSummaryF0V6(void)
     }
     const unsigned char * data = (unsigned char *)this->m_data.constData();
     int chunk_size = this->m_data.size();
-    static const int minimum_sizes[] = { 1, 0x2e, 9, 4, 2, 4, 1, 4, 0x1b, 2, 4, 0x0b, 1, 2, 6 };
+    static const int minimum_sizes[] = { 1, 0x2b, 9, 4, 2, 4, 1, 4, 0x1b, 2, 4, 0x0b, 1, 2, 6 };
     static const int ncodes = sizeof(minimum_sizes) / sizeof(int);
     /*
     for (int i = 0; i < ncodes; i++) {

From 4e8a6514ef80191c616cab1e751c9ca4814c5a99 Mon Sep 17 00:00:00 2001
From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com>
Date: Mon, 10 Jun 2019 15:30:22 -0400
Subject: [PATCH 31/42] Add support for 600X summary data.

---
 oscar/SleepLib/loader_plugins/prs1_loader.cpp | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/oscar/SleepLib/loader_plugins/prs1_loader.cpp b/oscar/SleepLib/loader_plugins/prs1_loader.cpp
index b66a6df0..6fabf2ed 100644
--- a/oscar/SleepLib/loader_plugins/prs1_loader.cpp
+++ b/oscar/SleepLib/loader_plugins/prs1_loader.cpp
@@ -237,7 +237,7 @@ static const PRS1TestedModel s_PRS1TestedModels[] = {
     { "500X110", 0, 6 },  // "DreamStation Auto CPAP"
     { "500X150", 0, 6 },
     { "502G150", 0, 6 },  // "DreamStation Go Auto"
-    { "600X110", 0, 6 },
+    { "600X110", 0, 6 },  // "DreamStation BiPAP Pro"
     { "700X110", 0, 6 },
     
     { "950P", 5, 0 },
@@ -3926,7 +3926,7 @@ void PRS1DataChunk::ParseHumidifierSettingF0V6(unsigned char byte1, unsigned cha
 // looks like a pressure in compliance files.
 bool PRS1DataChunk::ParseSettingsF0V6(const unsigned char* data, int size)
 {
-    static const QMap<int,int> expected_lengths = { {0x0d,2}, {0x35,2} };
+    static const QMap<int,int> expected_lengths = { {0x0d,2}, {0x0e,2}, {0x35,2} };
     bool ok = true;
 
     CPAPMode cpapmode = MODE_UNKNOWN;
@@ -3934,7 +3934,9 @@ bool PRS1DataChunk::ParseSettingsF0V6(const unsigned char* data, int size)
     int imin_epap = 0;
     /*
     //int imax_epap = 0;
+    */
     int imin_ps   = 0;
+    /*
     int imax_ps   = 0;
     //int imax_pressure = 0;
     */
@@ -3966,7 +3968,9 @@ bool PRS1DataChunk::ParseSettingsF0V6(const unsigned char* data, int size)
         switch (code) {
             case 0: // mode?
                 CHECK_VALUE(pos, 2);  // always first?
-                CHECK_VALUES(data[pos], 0, 2);  // 0 when CPAP, 2 when AutoCPAP
+                if (data[pos] != 0) {
+                    CHECK_VALUES(data[pos], 1, 2);  // 0 when CPAP, 2 when AutoCPAP, 1 when Bi-Level
+                }
                 break;
             case 1: // ???
                 CHECK_VALUE(data[pos], 0);
@@ -3983,14 +3987,13 @@ bool PRS1DataChunk::ParseSettingsF0V6(const unsigned char* data, int size)
                 min_pressure = data[pos];
                 max_pressure = data[pos+1];
                 break;
-            /*
-            case 14: // 0x0e  // <--- this is a total guess.. might be 3 and have a pressure support value
+            case 0x0e:  // Bi-Level pressure setting
                 cpapmode = MODE_BILEVEL_FIXED;
-                if (dataPtr[1] != 2) qDebug() << "PRS1DataChunk::ParseSummaryF0V6=" << "Bad APAP value";
-                min_pressure = dataPtr[2];
-                max_pressure = dataPtr[3];
+                min_pressure = data[pos];
+                max_pressure = data[pos+1];
                 imin_ps = max_pressure - min_pressure;
                 break;
+            /*
             case 15: // 0x0f
                 cpapmode = MODE_BILEVEL_AUTO_VARIABLE_PS; //might be C_CHECK?
                 if (dataPtr[1] != 4) qDebug() << "PRS1DataChunk::ParseSummaryF0V6=" << "Bad APAP value";
@@ -4083,12 +4086,11 @@ bool PRS1DataChunk::ParseSettingsF0V6(const unsigned char* data, int size)
     } else if (cpapmode == MODE_APAP) {
         this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_PRESSURE_MIN, min_pressure));
         this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_PRESSURE_MAX, max_pressure));
-/*
     } else if (cpapmode == MODE_BILEVEL_FIXED) {
-        // Guessing here.. haven't seen BIPAP data.
         this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_EPAP, min_pressure));
         this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_IPAP, max_pressure));
         this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_PS, imin_ps));
+/*
     } else if (cpapmode == MODE_BILEVEL_AUTO_VARIABLE_PS) {
         this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_EPAP_MIN, min_pressure));
         this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_IPAP_MAX, max_pressure));

From 96815cb068f1352425bd65b9b369ad1b5abaf89d Mon Sep 17 00:00:00 2001
From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com>
Date: Mon, 10 Jun 2019 20:30:05 -0400
Subject: [PATCH 32/42] Add support for 700X summary data.

---
 oscar/SleepLib/loader_plugins/prs1_loader.cpp | 50 +++++++++++--------
 1 file changed, 30 insertions(+), 20 deletions(-)

diff --git a/oscar/SleepLib/loader_plugins/prs1_loader.cpp b/oscar/SleepLib/loader_plugins/prs1_loader.cpp
index 6fabf2ed..6da6bbca 100644
--- a/oscar/SleepLib/loader_plugins/prs1_loader.cpp
+++ b/oscar/SleepLib/loader_plugins/prs1_loader.cpp
@@ -238,7 +238,7 @@ static const PRS1TestedModel s_PRS1TestedModels[] = {
     { "500X150", 0, 6 },
     { "502G150", 0, 6 },  // "DreamStation Go Auto"
     { "600X110", 0, 6 },  // "DreamStation BiPAP Pro"
-    { "700X110", 0, 6 },
+    { "700X110", 0, 6 },  // "DreamStation Auto BiPAP"
     
     { "950P", 5, 0 },
     { "960P", 5, 1 },
@@ -3926,7 +3926,7 @@ void PRS1DataChunk::ParseHumidifierSettingF0V6(unsigned char byte1, unsigned cha
 // looks like a pressure in compliance files.
 bool PRS1DataChunk::ParseSettingsF0V6(const unsigned char* data, int size)
 {
-    static const QMap<int,int> expected_lengths = { {0x0d,2}, {0x0e,2}, {0x35,2} };
+    static const QMap<int,int> expected_lengths = { {0x0d,2}, {0x0e,2}, {0x0f,4}, {0x35,2} };
     bool ok = true;
 
     CPAPMode cpapmode = MODE_UNKNOWN;
@@ -3936,8 +3936,8 @@ bool PRS1DataChunk::ParseSettingsF0V6(const unsigned char* data, int size)
     //int imax_epap = 0;
     */
     int imin_ps   = 0;
-    /*
     int imax_ps   = 0;
+    /*
     //int imax_pressure = 0;
     */
     int min_pressure = 0;
@@ -3966,10 +3966,16 @@ bool PRS1DataChunk::ParseSettingsF0V6(const unsigned char* data, int size)
         }
 
         switch (code) {
-            case 0: // mode?
+            case 0: // Device Mode
                 CHECK_VALUE(pos, 2);  // always first?
-                if (data[pos] != 0) {
-                    CHECK_VALUES(data[pos], 1, 2);  // 0 when CPAP, 2 when AutoCPAP, 1 when Bi-Level
+                switch (data[pos]) {
+                case 0: cpapmode = MODE_CPAP; break;
+                case 2: cpapmode = MODE_APAP; break;
+                case 1: cpapmode = MODE_BILEVEL_FIXED; break;
+                case 3: cpapmode = MODE_BILEVEL_AUTO_VARIABLE_PS; break;
+                default:
+                    UNEXPECTED_VALUE(data[pos], "known device mode");
+                    break;
                 }
                 break;
             case 1: // ???
@@ -3979,29 +3985,28 @@ bool PRS1DataChunk::ParseSettingsF0V6(const unsigned char* data, int size)
                 }
                 break;
             case 0x0a:  // CPAP pressure setting
-                cpapmode = MODE_CPAP;
+                CHECK_VALUE(cpapmode, MODE_CPAP);
                 imin_epap = data[pos];
                 break;
             case 0x0d:  // AutoCPAP pressure setting
-                cpapmode = MODE_APAP;
+                CHECK_VALUE(cpapmode, MODE_APAP);
                 min_pressure = data[pos];
                 max_pressure = data[pos+1];
                 break;
             case 0x0e:  // Bi-Level pressure setting
-                cpapmode = MODE_BILEVEL_FIXED;
+                CHECK_VALUE(cpapmode, MODE_BILEVEL_FIXED);
                 min_pressure = data[pos];
                 max_pressure = data[pos+1];
                 imin_ps = max_pressure - min_pressure;
                 break;
-            /*
-            case 15: // 0x0f
-                cpapmode = MODE_BILEVEL_AUTO_VARIABLE_PS; //might be C_CHECK?
-                if (dataPtr[1] != 4) qDebug() << "PRS1DataChunk::ParseSummaryF0V6=" << "Bad APAP value";
-                min_pressure = dataPtr[2];
-                max_pressure = dataPtr[3];
-                imin_ps = dataPtr[4];
-                imax_ps = dataPtr[5];
+            case 0x0f:  // Auto Bi-Level pressure setting
+                CHECK_VALUE(cpapmode, MODE_BILEVEL_AUTO_VARIABLE_PS);
+                min_pressure = data[pos];
+                max_pressure = data[pos+1];
+                imin_ps = data[pos+2];
+                imax_ps = data[pos+3];
                 break;
+            /*
             case 0x10: // Auto Trial mode
                 cpapmode = MODE_APAP;
                 if (dataPtr[1] != 3) qDebug() << "PRS1DataChunk::ParseSummaryF0V6=" << "Bad APAP value";
@@ -4060,7 +4065,7 @@ bool PRS1DataChunk::ParseSettingsF0V6(const unsigned char* data, int size)
                 CHECK_VALUES(data[pos], 0, 0x80);  // 0x80 maybe auto-on?
                 break;
             case 0x3f:
-                CHECK_VALUE(data[pos], 0);  // 0x80 in one 0-length session on 502G?
+                CHECK_VALUES(data[pos], 0, 0x80);  // 0x80 maybe auto-off?
                 break;
             case 0x43:  // new to 502G, sessions 3-8, Auto-Trial is off, Opti-Start is missing
                 CHECK_VALUE(data[pos], 0x3C);
@@ -4090,13 +4095,11 @@ bool PRS1DataChunk::ParseSettingsF0V6(const unsigned char* data, int size)
         this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_EPAP, min_pressure));
         this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_IPAP, max_pressure));
         this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_PS, imin_ps));
-/*
     } else if (cpapmode == MODE_BILEVEL_AUTO_VARIABLE_PS) {
         this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_EPAP_MIN, min_pressure));
         this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_IPAP_MAX, max_pressure));
         this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_PS_MIN, imin_ps));
         this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_PS_MAX, imax_ps));
-*/
     }
 
     return ok;
@@ -4252,6 +4255,13 @@ bool PRS1DataChunk::ParseSummaryF0V6(void)
                 //CHECK_VALUE(data[pos+2], 0x5a);  // seems to match Average 90% Pressure
                 //CHECK_VALUE(data[pos+3], 0x58);  // seems to match Average CPAP
                 break;
+            case 0x07:
+                // AutoBiLevel-related? First appeared on 700X, follows 4, before 8, looks like pressure values
+                //CHECK_VALUE(data[pos], 0x50);    // maybe min IPAP or max titrated EPAP? (matches time at pressure graph, auto bi-level summary)
+                //CHECK_VALUE(data[pos+1], 0x64);  // maybe max IPAP or max titrated IPAP? (matches time at pressure graph, auto bi-level summary)
+                //CHECK_VALUE(data[pos+2], 0x4b);  // seems to match 90% EPAP
+                //CHECK_VALUE(data[pos+3], 0x64);  // seems to match 90% IPAP
+                break;
             default:
                 UNEXPECTED_VALUE(code, "known slice code");
                 break;

From 2383c11be2ba022490306b1fb919cf68b6ae259c Mon Sep 17 00:00:00 2001
From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com>
Date: Mon, 10 Jun 2019 20:57:05 -0400
Subject: [PATCH 33/42] Minor clean up of F0V6 summary parsing, fix GUI build
 bug.

---
 oscar/SleepLib/loader_plugins/prs1_loader.cpp | 191 ++----------------
 1 file changed, 13 insertions(+), 178 deletions(-)

diff --git a/oscar/SleepLib/loader_plugins/prs1_loader.cpp b/oscar/SleepLib/loader_plugins/prs1_loader.cpp
index 6da6bbca..f6e825b6 100644
--- a/oscar/SleepLib/loader_plugins/prs1_loader.cpp
+++ b/oscar/SleepLib/loader_plugins/prs1_loader.cpp
@@ -3977,6 +3977,7 @@ bool PRS1DataChunk::ParseSettingsF0V6(const unsigned char* data, int size)
                     UNEXPECTED_VALUE(data[pos], "known device mode");
                     break;
                 }
+                this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_CPAP_MODE, (int) cpapmode));
                 break;
             case 1: // ???
                 CHECK_VALUE(data[pos], 0);
@@ -3987,17 +3988,23 @@ bool PRS1DataChunk::ParseSettingsF0V6(const unsigned char* data, int size)
             case 0x0a:  // CPAP pressure setting
                 CHECK_VALUE(cpapmode, MODE_CPAP);
                 imin_epap = data[pos];
+                this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_PRESSURE, imin_epap));
                 break;
             case 0x0d:  // AutoCPAP pressure setting
                 CHECK_VALUE(cpapmode, MODE_APAP);
                 min_pressure = data[pos];
                 max_pressure = data[pos+1];
+                this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_PRESSURE_MIN, min_pressure));
+                this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_PRESSURE_MAX, max_pressure));
                 break;
             case 0x0e:  // Bi-Level pressure setting
                 CHECK_VALUE(cpapmode, MODE_BILEVEL_FIXED);
                 min_pressure = data[pos];
                 max_pressure = data[pos+1];
                 imin_ps = max_pressure - min_pressure;
+                this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_EPAP, min_pressure));
+                this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_IPAP, max_pressure));
+                this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_PS, imin_ps));
                 break;
             case 0x0f:  // Auto Bi-Level pressure setting
                 CHECK_VALUE(cpapmode, MODE_BILEVEL_AUTO_VARIABLE_PS);
@@ -4005,6 +4012,10 @@ bool PRS1DataChunk::ParseSettingsF0V6(const unsigned char* data, int size)
                 max_pressure = data[pos+1];
                 imin_ps = data[pos+2];
                 imax_ps = data[pos+3];
+                this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_EPAP_MIN, min_pressure));
+                this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_IPAP_MAX, max_pressure));
+                this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_PS_MIN, imin_ps));
+                this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_PS_MAX, imax_ps));
                 break;
             /*
             case 0x10: // Auto Trial mode
@@ -4085,23 +4096,6 @@ bool PRS1DataChunk::ParseSettingsF0V6(const unsigned char* data, int size)
         pos += len;
     } while (ok && pos + 2 <= size);
 
-    this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_CPAP_MODE, (int) cpapmode));
-    if (cpapmode == MODE_CPAP) {
-        this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_PRESSURE, imin_epap));
-    } else if (cpapmode == MODE_APAP) {
-        this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_PRESSURE_MIN, min_pressure));
-        this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_PRESSURE_MAX, max_pressure));
-    } else if (cpapmode == MODE_BILEVEL_FIXED) {
-        this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_EPAP, min_pressure));
-        this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_IPAP, max_pressure));
-        this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_PS, imin_ps));
-    } else if (cpapmode == MODE_BILEVEL_AUTO_VARIABLE_PS) {
-        this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_EPAP_MIN, min_pressure));
-        this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_IPAP_MAX, max_pressure));
-        this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_PS_MIN, imin_ps));
-        this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_PS_MAX, imax_ps));
-    }
-
     return ok;
 }
 
@@ -4275,165 +4269,6 @@ bool PRS1DataChunk::ParseSummaryF0V6(void)
 }
 
 
-#if 0
-bool PRS1DataChunk::ParseSummaryF0V6()
-{
-    // DreamStation machines...
-
-    // APAP models..
-
-    const unsigned char * data = (unsigned char *)this->m_data.constData();
-
-    CPAPMode cpapmode = MODE_UNKNOWN;
-
-    int imin_epap = 0;
-    //int imax_epap = 0;
-    int imin_ps   = 0;
-    int imax_ps   = 0;
-    //int imax_pressure = 0;
-    int min_pressure = 0;
-    int max_pressure = 0;
-    int duration  = 0;
-
-    // in 'data', we start with 3 bytes that don't follow the pattern
-    // pattern is varNumber, dataSize, dataValue(dataSize)
-    // examples, 0x0d 0x02 0x28 0xC8  , or 0x0a 0x01 0x64,
-    // first, verify that this dataSize is where we expect
-    //     each var pair in headerblock should be (indexByte, valueByte)
-
-    if ((int)this->m_headerblock[(1 * 2)] != 0x01) {
-        return false;  //nope, not here
-        qDebug() << "PRS1DataChunk::ParseSummaryF0V6=" << "Bad datablock length";
-    }
-    int dataBlockSize = this->m_headerblock[(1 * 2) + 1];
-    //int zero = 0;
-    const unsigned char *dataPtr;
-
-    //      start at 3rd byte ; did we go past the end? ; increment for dataSize + varNumberByte + dataSizeByte
-    for ( dataPtr = data + 3; dataPtr < (data + 3 + dataBlockSize); dataPtr+= dataPtr[1] + 2) {
-        switch( *dataPtr) {
-        case 00: // mode?
-            break;
-        case 01: // ???
-            break;
-        case 10: // 0x0a
-            cpapmode = MODE_CPAP;
-            if (dataPtr[1] != 1) qDebug() << "PRS1DataChunk::ParseSummaryF0V6=" << "Bad CPAP value";
-            imin_epap = dataPtr[2];
-            break;
-        case 13: // 0x0d
-            cpapmode = MODE_APAP;
-            if (dataPtr[1] != 2) qDebug() << "PRS1DataChunk::ParseSummaryF0V6=" << "Bad APAP value";
-            min_pressure = dataPtr[2];
-            max_pressure = dataPtr[3];
-            break;
-        case 14: // 0x0e  // <--- this is a total guess.. might be 3 and have a pressure support value
-            cpapmode = MODE_BILEVEL_FIXED;
-            if (dataPtr[1] != 2) qDebug() << "PRS1DataChunk::ParseSummaryF0V6=" << "Bad APAP value";
-            min_pressure = dataPtr[2];
-            max_pressure = dataPtr[3];
-            imin_ps = max_pressure - min_pressure;
-            break;
-        case 15: // 0x0f
-            cpapmode = MODE_BILEVEL_AUTO_VARIABLE_PS; //might be C_CHECK?
-            if (dataPtr[1] != 4) qDebug() << "PRS1DataChunk::ParseSummaryF0V6=" << "Bad APAP value";
-            min_pressure = dataPtr[2];
-            max_pressure = dataPtr[3];
-            imin_ps = dataPtr[4];
-            imax_ps = dataPtr[5];
-            break;
-        case 0x10: // Auto Trial mode
-            cpapmode = MODE_APAP;
-            if (dataPtr[1] != 3) qDebug() << "PRS1DataChunk::ParseSummaryF0V6=" << "Bad APAP value";
-            min_pressure = dataPtr[3];
-            max_pressure = dataPtr[4];
-            break;
-
-        case 0x35:
-            duration += ( dataPtr[3] << 8 ) + dataPtr[2];
-            break;
-//        case 3:
-//            break;
-        default:
-            // have not found this before
-            ;
-         //   qDebug() << "PRS1Loader::ParseSummaryF0V6=" << "Unknown datablock value:" << (zero + *dataPtr) ;
-        }
-    }
-    // now we encounter yet a different format of data
-  /*  const unsigned char *data2Ptr = data + 3 + dataBlockSize;
-    // pattern is byte/data, where length of data depends on value of 'byte'
-    bool data2Done = false;
-    while (!data2Done) {
-        switch(*data2Ptr){
-        case 0:
-            //this appears to be the last one.  '0' plus 5 bytes **eats crc** without checking
-            data2Ptr += 4;
-            data2Ptr += 2; //this is the **CRC**??
-            data2Done = true; //hope this is always there, since we don't have blocksize from header
-            break;
-        case 1:
-            //don't know yet.  data size is the '1' plus 16 bytes
-            data2Ptr += 5;
-            break;
-        case 2:
-            //don't know yet.  data size is the '2' plus 16 bytes
-            data2Ptr += 3;
-            break;
-        case 3:
-            //don't know yet.  data size is the '3' plus 4 bytes
-            // have seen multiple of these....may have to add them?
-            data2Ptr += 5;
-            break;
-        case 4:
-            // have seen multiple of these....may have to add them?
-            duration = ( data2Ptr[3] << 8 ) + data2Ptr[2];
-            data2Ptr += 3;
-            break;
-        case 5:
-            //don't know yet.  data size is the '5' plus 4 bytes
-            data2Ptr += 5;
-            break;
-        case 6:
-            //don't know yet.  data size is the '5' plus 1 byte
-            data2Ptr += 2;
-            break;
-        case 8:
-            //don't know yet.  data size is the '8' plus 27 bytes (might be a '0' in here...not enough different types found yet)
-            data2Ptr += 28;
-            break;
-        default:
-            qDebug() << "PRS1Loader::ParseSummaryF0V6=" << "Unknown datablock2 value:" << (zero + *data2Ptr) ;
-            break;
-        }
-    }*/
-// need to populate summary->
-
-    this->duration = duration;
-    this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_CPAP_MODE, (int) cpapmode));
-    if (cpapmode == MODE_CPAP) {
-        this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_PRESSURE, imin_epap));
-
-    } else if (cpapmode == MODE_APAP) {
-        this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_PRESSURE_MIN, min_pressure));
-        this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_PRESSURE_MAX, max_pressure));
-    } else if (cpapmode == MODE_BILEVEL_FIXED) {
-        // Guessing here.. haven't seen BIPAP data.
-        this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_EPAP, min_pressure));
-        this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_IPAP, max_pressure));
-        this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_PS, imin_ps));
-    } else if (cpapmode == MODE_BILEVEL_AUTO_VARIABLE_PS) {
-        this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_EPAP_MIN, min_pressure));
-        this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_IPAP_MAX, max_pressure));
-        this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_PS_MIN, imin_ps));
-        this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_PS_MAX, imax_ps));
-    }
-
-    return true;
-}
-#endif
-
-
 bool PRS1Import::ImportSummary()
 {
     if (!summary) {
@@ -4808,7 +4643,7 @@ bool PRS1Import::ParseEvents()
 
         } else {
             if (!session->settings.contains(CPAP_Pressure) && !session->settings.contains(CPAP_PressureMin)) {
-                qWarning() << session->s_session << "broken summary, missing pressure";
+                qWarning() << session->session() << "broken summary, missing pressure";
                 session->settings[CPAP_BrokenSummary] = true;
 
                 //session->set_last(session->first());
@@ -5049,7 +4884,7 @@ bool PRS1Import::ParseWaveforms()
     }
     
     if (discontinuities > 1) {
-        qWarning() << session->s_session << "multiple discontinuities!" << discontinuities;
+        qWarning() << session->session() << "multiple discontinuities!" << discontinuities;
     }
 
     return true;

From 610c9351915399a3ae997618de36510c833aff28 Mon Sep 17 00:00:00 2001
From: Seeker4 <guy.oscar@moxis.com>
Date: Tue, 11 Jun 2019 06:28:34 -0700
Subject: [PATCH 34/42] Correct error in calculating number of periods in
 monthly report.

---
 oscar/statistics.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/oscar/statistics.cpp b/oscar/statistics.cpp
index e3cea829..dd7fc6a3 100644
--- a/oscar/statistics.cpp
+++ b/oscar/statistics.cpp
@@ -1011,13 +1011,14 @@ QString Statistics::GenerateHTML()
     // Compute number of monthly periods for a monthly rather than standard time distribution
     int number_periods = 0;
     if (p_profile->general->statReportMode() == STAT_MODE_MONTHLY) {
-        QDate beginDate = qMax(firstcpap, lastcpap.addYears(-1));
-        int beginMonth = beginDate.month();
+        int firstMonth = firstcpap.month();
         int lastMonth = lastcpap.month();
-        if (lastMonth < beginMonth) lastMonth += 12; // handle time extending to next year
-        number_periods = lastMonth - beginMonth + 1;
+        if (lastMonth <= firstMonth && firstcpap.year() != lastcpap.year())
+            lastMonth += 12; // handle time extending to next year
+        number_periods = lastMonth - firstMonth + 1;
+
         if (number_periods < 1) {
-            qDebug() << "*** Begin" << beginDate << "beginMonth" << beginMonth << "lastMonth" << lastMonth << "periods" << number_periods;
+            qDebug() << "*** Begin" << firstcpap << "beginMonth" << firstMonth << "lastMonth" << lastMonth << "periods" << number_periods;
             number_periods = 1;
         }
         // But not more than one year

From 24258ea4e3abc2df8c7b16243005914ba5406e4e Mon Sep 17 00:00:00 2001
From: Seeker4 <guy.oscar@moxis.com>
Date: Tue, 11 Jun 2019 10:20:03 -0700
Subject: [PATCH 35/42] Correctly identify Climate setting as Auto or Manual in
 Machine Settings on Daily page.

---
 oscar/SleepLib/loader_plugins/resmed_loader.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/oscar/SleepLib/loader_plugins/resmed_loader.cpp b/oscar/SleepLib/loader_plugins/resmed_loader.cpp
index 7e37534c..cbf0fe37 100644
--- a/oscar/SleepLib/loader_plugins/resmed_loader.cpp
+++ b/oscar/SleepLib/loader_plugins/resmed_loader.cpp
@@ -3117,8 +3117,8 @@ void ResmedLoader::initChannels()
         QObject::tr("Climate Control"),
         "", LOOKUP, Qt::black));
 
-    chan->addOption(0, QObject::tr("Manual"));
-    chan->addOption(1, QObject::tr("Auto"));
+    chan->addOption(0, QObject::tr("Auto"));
+    chan->addOption(1, QObject::tr("Manual"));
 
     channel.add(GRP_CPAP, chan = new Channel(RMS9_Mask= 0xe20C, SETTING, MT_CPAP, SESSION,
         "RMS9_Mask", QObject::tr("Mask"),

From a4abb7d5d6334f02cdbe47f6459286f107168088 Mon Sep 17 00:00:00 2001
From: Seeker4 <guy.oscar@moxis.com>
Date: Tue, 11 Jun 2019 11:34:00 -0700
Subject: [PATCH 36/42] Break monolithic statistics page html into separable
 components.

---
 oscar/statistics.cpp | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/oscar/statistics.cpp b/oscar/statistics.cpp
index dd7fc6a3..7e187e42 100644
--- a/oscar/statistics.cpp
+++ b/oscar/statistics.cpp
@@ -17,6 +17,13 @@
 
 extern MainWindow *mainwin;
 
+// HTML components that make up Statistics page and printed report
+QString htmlPageHeader = "";        // Page header
+QString htmlUsage = "";             // CPAP and Oximetry
+QString htmlMachineSettings = "";   // Machine (formerly Rx) changes
+QString htmlMachines = "";          // Machines used in this profile
+QString htmlReportFooter = "";      // Page footer
+
 QString resizeHTMLPixmap(QPixmap &pixmap, int width, int height) {
     QByteArray byteArray;
     QBuffer buffer(&byteArray); // use buffer to store pixmap into byteArray
@@ -976,13 +983,14 @@ QString Statistics::GenerateHTML()
     }
 
     // Create HTML header and <body> statement
-    QString html = htmlHeader(havedata);
+    htmlPageHeader = htmlHeader(havedata);
+    QString html = "";
 
     // If we don't have any data, return HTML that says that and we are done
     if (!havedata) {
         html += htmlNoData();
         html += htmlFooter(havedata);
-        return html;
+        return htmlPageHeader + html;
     }
 
     // Find first and last days with valid CPAP data
@@ -1175,18 +1183,19 @@ QString Statistics::GenerateHTML()
     html += "</table>";
     html += "</div>";
 
+    htmlUsage = html;
 
-    html += GenerateRXChanges();
-    html += GenerateMachineList();
+    htmlMachineSettings = GenerateRXChanges();
+    htmlMachines = GenerateMachineList();
 
     UpdateRecordsBox();
 
 
 
-    html += "<script type='text/javascript' language='javascript' src='qrc:/docs/script.js'></script>";
+    QString htmlScript = "<script type='text/javascript' language='javascript' src='qrc:/docs/script.js'></script>";
     //updateFavourites();
-    html += htmlFooter();
-    return html;
+//    html += htmlFooter();
+    return htmlPageHeader + htmlUsage + htmlMachineSettings + htmlMachines + htmlScript + htmlReportFooter;
 }
 
 void Statistics::UpdateRecordsBox()

From a628e2a9ff1caee1eecb58b2e285e36443bfe27d Mon Sep 17 00:00:00 2001
From: Seeker4 <guy.oscar@moxis.com>
Date: Tue, 11 Jun 2019 16:43:13 -0700
Subject: [PATCH 37/42] Move statistics printing code from mainwindow.cpp to
 statistics.cpp.  Abandon printing of Help subsystem pages.

---
 oscar/mainwindow.cpp | 66 +++-----------------------------------------
 oscar/statistics.cpp | 64 ++++++++++++++++++++++++++++++++++++++++++
 oscar/statistics.h   |  3 ++
 3 files changed, 71 insertions(+), 62 deletions(-)

diff --git a/oscar/mainwindow.cpp b/oscar/mainwindow.cpp
index f4f9b634..143e6809 100644
--- a/oscar/mainwindow.cpp
+++ b/oscar/mainwindow.cpp
@@ -1404,70 +1404,12 @@ void MainWindow::on_actionPrint_Report_triggered()
         Report::PrintReport(overview->graphView(), STR_TR_Overview);
     } else if (ui->tabWidget->currentWidget() == daily) {
         Report::PrintReport(daily->graphView(), STR_TR_Daily, daily->getDate());
-    } else {
-        QPrinter printer(QPrinter::HighResolution);
-#ifdef Q_WS_X11
-        printer.setPrinterName("Print to File (PDF)");
-        printer.setOutputFormat(QPrinter::PdfFormat);
-        QString name;
-        QString datestr;
-
-        if (ui->tabWidget->currentWidget() == ui->statisticsTab) {
-            name = "Statistics";
-            datestr = QDate::currentDate().toString(Qt::ISODate);
-        } else if (ui->tabWidget->currentWidget() == ui->helpTab) {
-            name = "Help";
-            datestr = QDateTime::currentDateTime().toString(Qt::ISODate);
-        } else { name = "Unknown"; }
-
-        QString filename = p_pref->Get("{home}/" + name + "_" + p_profile->user->userName() + "_" + datestr + ".pdf");
-
-        printer.setOutputFileName(filename);
-#endif
-        printer.setPrintRange(QPrinter::AllPages);
-//        if (ui->tabWidget->currentWidget() == ui->statisticsTab) {
-//            printer.setOrientation(QPrinter::Landscape);
-//        } else {
-            printer.setOrientation(QPrinter::Portrait);
-        //}
-        printer.setFullPage(false); // This has nothing to do with scaling
-        printer.setNumCopies(1);
-        printer.setResolution(1200);
-        //printer.setPaperSize(QPrinter::A4);
-        //printer.setOutputFormat(QPrinter::PdfFormat);
-        printer.setPageMargins(5, 5, 5, 5, QPrinter::Millimeter);
-        QPrintDialog pdlg(&printer, this);
-
-        if (pdlg.exec() == QPrintDialog::Accepted) {
-
-            if (ui->tabWidget->currentWidget() == ui->statisticsTab) {
-
-                QTextBrowser b;
-                QPainter painter;
-                painter.begin(&printer);
-
-                QRect rect = printer.pageRect();
-                b.setHtml(ui->statisticsView->toHtml());
-                b.resize(rect.width()/4, rect.height()/4);
-                b.setFrameShape(QFrame::NoFrame);
-
-                double xscale = printer.pageRect().width()/double(b.width());
-                double yscale = printer.pageRect().height()/double(b.height());
-                double scale = qMin(xscale, yscale);
-                painter.translate(printer.paperRect().x() + printer.pageRect().width()/2, printer.paperRect().y() + printer.pageRect().height()/2);
-                painter.scale(scale, scale);
-                painter.translate(-b.width()/2, -b.height()/2);
-
-                b.render(&painter, QPoint(0,0));
-                painter.end();
-
+    } else if (ui->tabWidget->currentWidget() == ui->statisticsTab) {
+        Statistics::printReport(this);
 #ifndef helpless
-            } else if (ui->tabWidget->currentWidget() == help) {
-                help->print(&printer);
+    } else if (ui->tabWidget->currentWidget() == help) {
+        help->print(&printer);  // **** THIS DID NOT SURVIVE REFACTORING STATISTICS PRINT
 #endif
-            }
-
-        }
     }
 }
 
diff --git a/oscar/statistics.cpp b/oscar/statistics.cpp
index 7e187e42..b8e6cd59 100644
--- a/oscar/statistics.cpp
+++ b/oscar/statistics.cpp
@@ -12,6 +12,11 @@
 #include <QBuffer>
 #include <cmath>
 
+#include <QPrinter>
+#include <QPrintDialog>
+#include <QPainter>
+#include <QMainWindow>
+
 #include "mainwindow.h"
 #include "statistics.h"
 
@@ -1198,6 +1203,65 @@ QString Statistics::GenerateHTML()
     return htmlPageHeader + htmlUsage + htmlMachineSettings + htmlMachines + htmlScript + htmlReportFooter;
 }
 
+void Statistics::printReport(QWidget * parent) {
+
+    QPrinter printer(QPrinter::HighResolution);
+#ifdef Q_WS_X11
+    printer.setPrinterName("Print to File (PDF)");
+    printer.setOutputFormat(QPrinter::PdfFormat);
+    QString name;
+    QString datestr;
+
+    if (ui->tabWidget->currentWidget() == ui->statisticsTab) {
+        name = "Statistics";
+        datestr = QDate::currentDate().toString(Qt::ISODate);
+    } else if (ui->tabWidget->currentWidget() == ui->helpTab) {
+        name = "Help";
+        datestr = QDateTime::currentDateTime().toString(Qt::ISODate);
+    } else { name = "Unknown"; }
+
+    QString filename = p_pref->Get("{home}/" + name + "_" + p_profile->user->userName() + "_" + datestr + ".pdf");
+
+    printer.setOutputFileName(filename);
+#endif
+    printer.setPrintRange(QPrinter::AllPages);
+//        if (ui->tabWidget->currentWidget() == ui->statisticsTab) {
+//            printer.setOrientation(QPrinter::Landscape);
+//        } else {
+        printer.setOrientation(QPrinter::Portrait);
+    //}
+    printer.setFullPage(false); // This has nothing to do with scaling
+    printer.setNumCopies(1);
+    printer.setResolution(1200);
+    //printer.setPaperSize(QPrinter::A4);
+    //printer.setOutputFormat(QPrinter::PdfFormat);
+    printer.setPageMargins(5, 5, 5, 5, QPrinter::Millimeter);
+    QPrintDialog pdlg(&printer, parent);
+
+    if (pdlg.exec() == QPrintDialog::Accepted) {
+
+            QTextBrowser b;
+            QPainter painter;
+            painter.begin(&printer);
+
+            QRect rect = printer.pageRect();
+            b.setHtml(htmlPageHeader + htmlUsage + htmlMachineSettings + htmlMachines + htmlReportFooter);
+            b.resize(rect.width()/4, rect.height()/4);
+            b.setFrameShape(QFrame::NoFrame);
+
+            double xscale = printer.pageRect().width()/double(b.width());
+            double yscale = printer.pageRect().height()/double(b.height());
+            double scale = qMin(xscale, yscale);
+            painter.translate(printer.paperRect().x() + printer.pageRect().width()/2, printer.paperRect().y() + printer.pageRect().height()/2);
+            painter.scale(scale, scale);
+            painter.translate(-b.width()/2, -b.height()/2);
+
+            b.render(&painter, QPoint(0,0));
+            painter.end();
+
+    }
+}
+
 void Statistics::UpdateRecordsBox()
 {
     QString html = "<html><head><style type='text/css'>"
diff --git a/oscar/statistics.h b/oscar/statistics.h
index be33e6d1..14b7e9b8 100644
--- a/oscar/statistics.h
+++ b/oscar/statistics.h
@@ -10,6 +10,7 @@
 #define SUMMARY_H
 
 #include <QObject>
+#include <QMainWindow>
 #include <QHash>
 #include <QList>
 #include "SleepLib/schema.h"
@@ -171,6 +172,8 @@ class Statistics : public QObject
 
     void UpdateRecordsBox();
 
+    static void printReport(QWidget *parent = nullptr);
+
 
   protected:
     QString htmlNoData();

From d0903ce3bd5d62da74c64af43ac70f3598921b5a Mon Sep 17 00:00:00 2001
From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com>
Date: Tue, 11 Jun 2019 21:26:40 -0400
Subject: [PATCH 38/42] Add initial support for DreamStation Auto-Trial and
 CPAP-Check modes.

This resolves many of the unexpected value warnings in the sample
data, but there are still a bunch to tackle.
---
 oscar/SleepLib/loader_plugins/prs1_loader.cpp | 93 +++++++++++--------
 1 file changed, 56 insertions(+), 37 deletions(-)

diff --git a/oscar/SleepLib/loader_plugins/prs1_loader.cpp b/oscar/SleepLib/loader_plugins/prs1_loader.cpp
index f6e825b6..64b9f514 100644
--- a/oscar/SleepLib/loader_plugins/prs1_loader.cpp
+++ b/oscar/SleepLib/loader_plugins/prs1_loader.cpp
@@ -3901,7 +3901,7 @@ void PRS1DataChunk::ParseHumidifierSettingF0V6(unsigned char byte1, unsigned cha
     CHECK_VALUE(humidlevel, ((byte2 >> 2) & 7));
     int tubelevel = (byte2 >> 5) & 7;
     if (humidifier_present) {
-        if (humidlevel > 5 || humidlevel < 1) UNEXPECTED_VALUE(humidlevel, "1-5");
+        if (humidlevel > 5 || humidlevel < 0) UNEXPECTED_VALUE(humidlevel, "0-5");  // 0=off is valid when a humidifier is attached
         if (humid == 2) {  // heated tube
             if (tubelevel > 5 || tubelevel < 1) UNEXPECTED_VALUE(tubelevel, "1-5");  // TODO: maybe this is only if heated tube?
         }
@@ -3926,20 +3926,14 @@ void PRS1DataChunk::ParseHumidifierSettingF0V6(unsigned char byte1, unsigned cha
 // looks like a pressure in compliance files.
 bool PRS1DataChunk::ParseSettingsF0V6(const unsigned char* data, int size)
 {
-    static const QMap<int,int> expected_lengths = { {0x0d,2}, {0x0e,2}, {0x0f,4}, {0x35,2} };
+    static const QMap<int,int> expected_lengths = { {0x0c,3}, {0x0d,2}, {0x0e,2}, {0x0f,4}, {0x10,3}, {0x35,2} };
     bool ok = true;
 
     CPAPMode cpapmode = MODE_UNKNOWN;
 
-    int imin_epap = 0;
-    /*
-    //int imax_epap = 0;
-    */
+    int pressure = 0;
     int imin_ps   = 0;
     int imax_ps   = 0;
-    /*
-    //int imax_pressure = 0;
-    */
     int min_pressure = 0;
     int max_pressure = 0;
 
@@ -3973,6 +3967,7 @@ bool PRS1DataChunk::ParseSettingsF0V6(const unsigned char* data, int size)
                 case 2: cpapmode = MODE_APAP; break;
                 case 1: cpapmode = MODE_BILEVEL_FIXED; break;
                 case 3: cpapmode = MODE_BILEVEL_AUTO_VARIABLE_PS; break;
+                case 4: cpapmode = MODE_CPAP; break;  // "CPAP-Check" in report, but seems like CPAP
                 default:
                     UNEXPECTED_VALUE(data[pos], "known device mode");
                     break;
@@ -3980,15 +3975,25 @@ bool PRS1DataChunk::ParseSettingsF0V6(const unsigned char* data, int size)
                 this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_CPAP_MODE, (int) cpapmode));
                 break;
             case 1: // ???
-                CHECK_VALUE(data[pos], 0);
+                if (data[pos] != 0) {
+                    CHECK_VALUES(data[pos], 1, 2);  // 1 when EZ-Start is enabled? 2 when Auto-Trial?
+                }
                 if (len == 2) {  // 400G has extra byte
                     CHECK_VALUE(data[pos+1], 0);
                 }
                 break;
             case 0x0a:  // CPAP pressure setting
                 CHECK_VALUE(cpapmode, MODE_CPAP);
-                imin_epap = data[pos];
-                this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_PRESSURE, imin_epap));
+                pressure = data[pos];
+                this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_PRESSURE, pressure));
+                break;
+            case 0x0c:  // CPAP-Check pressure setting
+                CHECK_VALUE(cpapmode, MODE_CPAP);
+                min_pressure = data[pos];  // Min Setting on pressure graph
+                max_pressure = data[pos+1];  // Max Setting on pressure graph
+                pressure = data[pos+2];  // CPAP on pressure graph and CPAP-Check Pressure on settings detail
+                CHECK_VALUE(pressure, 0x5a);
+                this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_PRESSURE, pressure));
                 break;
             case 0x0d:  // AutoCPAP pressure setting
                 CHECK_VALUE(cpapmode, MODE_APAP);
@@ -4017,14 +4022,18 @@ bool PRS1DataChunk::ParseSettingsF0V6(const unsigned char* data, int size)
                 this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_PS_MIN, imin_ps));
                 this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_PS_MAX, imax_ps));
                 break;
-            /*
-            case 0x10: // Auto Trial mode
-                cpapmode = MODE_APAP;
-                if (dataPtr[1] != 3) qDebug() << "PRS1DataChunk::ParseSummaryF0V6=" << "Bad APAP value";
-                min_pressure = dataPtr[3];
-                max_pressure = dataPtr[4];
+            case 0x10: // Auto-Trial mode
+                CHECK_VALUE(cpapmode, MODE_CPAP);  // the mode setting is CPAP, even though it's operating in APAP mode
+                cpapmode = MODE_APAP;  // but categorize it now as APAP, since that's what it's really doing
+                CHECK_VALUE(data[pos], 30);  // Auto-Trial Duration
+                min_pressure = data[pos+1];
+                max_pressure = data[pos+2];
+                this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_PRESSURE_MIN, min_pressure));
+                this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_PRESSURE_MAX, max_pressure));
+                break;
+            case 0x2a:  // EZ-Start
+                CHECK_VALUE(data[pos], 0x80);  // EZ-Start enabled
                 break;
-            */
             case 0x2b:  // Ramp Type
                 CHECK_VALUES(data[pos], 0, 0x80);  // 0 == "Linear", 0x80 = "SmartRamp"
                 break;
@@ -4059,7 +4068,7 @@ bool PRS1DataChunk::ParseSettingsF0V6(const unsigned char* data, int size)
                 }
                 break;
             case 0x39:
-                CHECK_VALUE(data[pos], 0);
+                CHECK_VALUES(data[pos], 0, 0x80);  // 0x80 maybe auto-trial?
                 break;
             case 0x3b:
                 if (data[pos] != 0) {
@@ -4106,26 +4115,18 @@ bool PRS1DataChunk::ParseSummaryF0V6(void)
         qWarning() << "ParseSummaryF0V6 called with family" << this->family << "familyVersion" << this->familyVersion;
         return false;
     }
-    // TODO: hardcoding this is ugly, think of a better approach
-    if (this->m_data.size() < 68) {
-        qWarning() << this->sessionid << "summary data too short:" << this->m_data.size();
-        return false;
-    }
     const unsigned char * data = (unsigned char *)this->m_data.constData();
     int chunk_size = this->m_data.size();
     static const int minimum_sizes[] = { 1, 0x2b, 9, 4, 2, 4, 1, 4, 0x1b, 2, 4, 0x0b, 1, 2, 6 };
     static const int ncodes = sizeof(minimum_sizes) / sizeof(int);
-    /*
-    for (int i = 0; i < ncodes; i++) {
-        if (this->hblock.contains(i)) {
-            // These values can vary, interestingly.
-            //CHECK_VALUE(this->hblock[i], minimum_sizes[i]);
-        } else {
-            // Even the length of hblock can vary.
-            //UNEXPECTED_VALUE(this->hblock.contains(i), true);
-        }
+    // NOTE: The sizes contained in hblock can vary, even within a single machine, as can the length of hblock itself!
+
+    // TODO: hardcoding this is ugly, think of a better approach
+    if (chunk_size < minimum_sizes[0] + minimum_sizes[1] + minimum_sizes[2]) {
+        qWarning() << this->sessionid << "summary data too short:" << chunk_size;
+        return false;
     }
-    */
+    if (chunk_size < 60) UNEXPECTED_VALUE(chunk_size, ">= 60");
 
     bool ok = true;
     int pos = 0;
@@ -4191,8 +4192,8 @@ bool PRS1DataChunk::ParseSummaryF0V6(void)
                 CHECK_VALUE(data[pos+0xb], 0x00);
                 //CHECK_VALUES(data[pos+0xc], 0x15, 0x02);  // probably 16-bit value
                 CHECK_VALUE(data[pos+0xd], 0x00);
-                //CHECK_VALUES(data[pos+0xe], 0x01, 0x00);  // probably 16-bit value
-                CHECK_VALUE(data[pos+0xf], 0x00);
+                //CHECK_VALUES(data[pos+0xe], 0x01, 0x00);  // 16-bit VS count
+                //CHECK_VALUE(data[pos+0xf], 0x00);
                 //CHECK_VALUES(data[pos+0x10], 0x21, 5);  // probably 16-bit value, maybe H count?
                 CHECK_VALUE(data[pos+0x11], 0x00);
                 //CHECK_VALUES(data[pos+0x12], 0x13, 0);  // probably 16-bit value
@@ -4256,6 +4257,24 @@ bool PRS1DataChunk::ParseSummaryF0V6(void)
                 //CHECK_VALUE(data[pos+2], 0x4b);  // seems to match 90% EPAP
                 //CHECK_VALUE(data[pos+3], 0x64);  // seems to match 90% IPAP
                 break;
+            case 0x0b:
+                // CPAP-Check related? follows 3, so first two bytes may be time delta
+                CHECK_VALUE(data[pos], 3);
+                CHECK_VALUE(data[pos+1], 0);
+                CHECK_VALUE(data[pos+2], 0);
+                CHECK_VALUE(data[pos+3], 0);
+                CHECK_VALUE(data[pos+4], 0);
+                CHECK_VALUE(data[pos+5], 0);
+                CHECK_VALUE(data[pos+6], 0);
+                CHECK_VALUE(data[pos+7], 0);
+                CHECK_VALUE(data[pos+8], 0);
+                CHECK_VALUE(data[pos+9], 0);
+                CHECK_VALUE(data[pos+0xa], 0);
+                break;
+            case 0x06:
+                // CPAP-Check related? follows 4, before 8, looks like a pressure value
+                CHECK_VALUES(data[pos], 90, 60);  // maybe CPAP-Check pressure, also matches EZ-Start Pressure
+                break;
             default:
                 UNEXPECTED_VALUE(code, "known slice code");
                 break;

From 575b9a5372895ec6898b3e7f0f2e56469da65392 Mon Sep 17 00:00:00 2001
From: Seeker4 <guy.oscar@moxis.com>
Date: Wed, 12 Jun 2019 13:32:22 -0700
Subject: [PATCH 39/42] More refactoring and re-organizing.

---
 oscar/mainwindow.cpp | 16 +++++++++----
 oscar/mainwindow.h   |  3 +++
 oscar/statistics.cpp | 54 ++++++++++++++++++++------------------------
 oscar/statistics.h   |  3 ++-
 4 files changed, 40 insertions(+), 36 deletions(-)

diff --git a/oscar/mainwindow.cpp b/oscar/mainwindow.cpp
index 143e6809..a1d5e7ee 100644
--- a/oscar/mainwindow.cpp
+++ b/oscar/mainwindow.cpp
@@ -1076,6 +1076,13 @@ void MainWindow::setRecBoxHTML(QString html)
 {
     ui->recordsBox->setHtml(html);
 }
+
+void MainWindow::setStatsHTML(QString html)
+{
+    ui->statisticsView->setHtml(html);
+}
+
+
 /***
 QString MainWindow::getWelcomeHTML()
 {
@@ -2308,14 +2315,13 @@ void MainWindow::GenerateStatistics()
     ui->statEndDate->setMaximumDate(last);
 
     Statistics stats;
-    QString html = stats.GenerateHTML();
+    QString htmlStats = stats.GenerateHTML();
+    QString htmlRecords = stats.UpdateRecordsBox();
 
     updateFavourites();
 
-    //QWebFrame *frame=ui->statisticsView->page()->currentFrame();
-    //frame->addToJavaScriptWindowObject("mainwin",this);
-    //ui->statisticsView->setHtml(html);
-    ui->statisticsView->setHtml(html);
+    setStatsHTML(htmlStats);
+    setRecBoxHTML(htmlRecords);
 
 }
 
diff --git a/oscar/mainwindow.h b/oscar/mainwindow.h
index 87c91448..25fe95bf 100644
--- a/oscar/mainwindow.h
+++ b/oscar/mainwindow.h
@@ -160,6 +160,9 @@ class MainWindow : public QMainWindow
 
     //! \brief Internal function to set Records Box html from statistics module
     void setRecBoxHTML(QString html);
+    //! \brief Internal function to set Statistics page html from statistics module
+    void setStatsHTML(QString html);
+
     int importCPAP(ImportPath import, const QString &message);
 
     void startImportDialog() { on_action_Import_Data_triggered(); }
diff --git a/oscar/statistics.cpp b/oscar/statistics.cpp
index b8e6cd59..545ea61f 100644
--- a/oscar/statistics.cpp
+++ b/oscar/statistics.cpp
@@ -23,7 +23,7 @@
 extern MainWindow *mainwin;
 
 // HTML components that make up Statistics page and printed report
-QString htmlPageHeader = "";        // Page header
+QString htmlReportHeader = "";      // Page header
 QString htmlUsage = "";             // CPAP and Oximetry
 QString htmlMachineSettings = "";   // Machine (formerly Rx) changes
 QString htmlMachines = "";          // Machines used in this profile
@@ -967,8 +967,8 @@ QString Statistics::getRDIorAHIText() {
     return STR_TR_AHI;
 }
 
-// Create the HTML that will be the Statistics page.
-QString Statistics::GenerateHTML()
+// Create the HTML for CPAP and Oximetry usage
+QString Statistics::GenerateCPAPUsage()
 {
     QList<Machine *> cpap_machines = p_profile->GetMachines(MT_CPAP);
     QList<Machine *> oximeters = p_profile->GetMachines(MT_OXIMETER);
@@ -987,15 +987,11 @@ QString Statistics::GenerateHTML()
         }
     }
 
-    // Create HTML header and <body> statement
-    htmlPageHeader = htmlHeader(havedata);
     QString html = "";
 
     // If we don't have any data, return HTML that says that and we are done
     if (!havedata) {
-        html += htmlNoData();
-        html += htmlFooter(havedata);
-        return htmlPageHeader + html;
+        return "";
     }
 
     // Find first and last days with valid CPAP data
@@ -1082,19 +1078,6 @@ QString Statistics::GenerateHTML()
                     l = s.addDays(-1);
                 } while ((l > first) && (j < number_periods));
 
-//                for (; j < number_periods; ++j) {
-//                    s=QDate(l.year(), l.month(), 1);
-//                    if (s < first) {
-//                        done = true;
-//                        s = first;
-//                    }
-//                    if (p_profile->countDays(row.type, s, l) > 0) {
-//                        periods.push_back(Period(s, l, s.toString("MMMM")));
-//                    } else {
-//                    }
-//                    l = s.addDays(-1);
-//                    if (done || (l < first)) break;
-//                }
                 for (; j < number_periods; ++j) {
                     periods.push_back(Period(last,last, ""));
                 }
@@ -1188,19 +1171,29 @@ QString Statistics::GenerateHTML()
     html += "</table>";
     html += "</div>";
 
-    htmlUsage = html;
+    return html;
+}
+
+// Create the HTML that will be the Statistics page.
+QString Statistics::GenerateHTML()
+{
+    htmlReportHeader = htmlHeader(true);
+    htmlReportFooter = htmlFooter(true);
+
+    htmlUsage = GenerateCPAPUsage();
+
+    if (htmlUsage == "") {
+        return htmlReportHeader + htmlNoData() + htmlReportFooter;
+    }
 
     htmlMachineSettings = GenerateRXChanges();
     htmlMachines = GenerateMachineList();
 
     UpdateRecordsBox();
 
-
-
     QString htmlScript = "<script type='text/javascript' language='javascript' src='qrc:/docs/script.js'></script>";
-    //updateFavourites();
-//    html += htmlFooter();
-    return htmlPageHeader + htmlUsage + htmlMachineSettings + htmlMachines + htmlScript + htmlReportFooter;
+
+    return htmlReportHeader + htmlUsage + htmlMachineSettings + htmlMachines + htmlScript + htmlReportFooter;
 }
 
 void Statistics::printReport(QWidget * parent) {
@@ -1245,7 +1238,7 @@ void Statistics::printReport(QWidget * parent) {
             painter.begin(&printer);
 
             QRect rect = printer.pageRect();
-            b.setHtml(htmlPageHeader + htmlUsage + htmlMachineSettings + htmlMachines + htmlReportFooter);
+            b.setHtml(htmlReportHeader + htmlUsage + htmlMachineSettings + htmlMachines + htmlReportFooter);
             b.resize(rect.width()/4, rect.height()/4);
             b.setFrameShape(QFrame::NoFrame);
 
@@ -1262,7 +1255,7 @@ void Statistics::printReport(QWidget * parent) {
     }
 }
 
-void Statistics::UpdateRecordsBox()
+QString Statistics::UpdateRecordsBox()
 {
     QString html = "<html><head><style type='text/css'>"
                      "p,a,td,body { font-family: '" + QApplication::font().family() + "'; }"
@@ -1547,7 +1540,8 @@ void Statistics::UpdateRecordsBox()
 
 
     html += "</body></html>";
-    mainwin->setRecBoxHTML(html);
+
+    return html;
 }
 
 
diff --git a/oscar/statistics.h b/oscar/statistics.h
index 14b7e9b8..4c9b0e4d 100644
--- a/oscar/statistics.h
+++ b/oscar/statistics.h
@@ -169,8 +169,9 @@ class Statistics : public QObject
     QString GenerateHTML();
     QString GenerateMachineList();
     QString GenerateRXChanges();
+    QString GenerateCPAPUsage();
 
-    void UpdateRecordsBox();
+    QString UpdateRecordsBox();
 
     static void printReport(QWidget *parent = nullptr);
 

From 4527a7091db53ae599b6975efb6aaede25b484c8 Mon Sep 17 00:00:00 2001
From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com>
Date: Wed, 12 Jun 2019 20:37:04 -0400
Subject: [PATCH 40/42] Clean up remaining DreamStation parsing warnings.

---
 oscar/SleepLib/loader_plugins/prs1_loader.cpp | 55 +++++++++++--------
 1 file changed, 31 insertions(+), 24 deletions(-)

diff --git a/oscar/SleepLib/loader_plugins/prs1_loader.cpp b/oscar/SleepLib/loader_plugins/prs1_loader.cpp
index 64b9f514..8fc836d3 100644
--- a/oscar/SleepLib/loader_plugins/prs1_loader.cpp
+++ b/oscar/SleepLib/loader_plugins/prs1_loader.cpp
@@ -3903,7 +3903,7 @@ void PRS1DataChunk::ParseHumidifierSettingF0V6(unsigned char byte1, unsigned cha
     if (humidifier_present) {
         if (humidlevel > 5 || humidlevel < 0) UNEXPECTED_VALUE(humidlevel, "0-5");  // 0=off is valid when a humidifier is attached
         if (humid == 2) {  // heated tube
-            if (tubelevel > 5 || tubelevel < 1) UNEXPECTED_VALUE(tubelevel, "1-5");  // TODO: maybe this is only if heated tube?
+            if (tubelevel > 5 || tubelevel < 0) UNEXPECTED_VALUE(tubelevel, "0-5");  // TODO: maybe this is only if heated tube? 0=off is valid even in heated tube mode
         }
     }
 
@@ -3975,8 +3975,8 @@ bool PRS1DataChunk::ParseSettingsF0V6(const unsigned char* data, int size)
                 this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_CPAP_MODE, (int) cpapmode));
                 break;
             case 1: // ???
-                if (data[pos] != 0) {
-                    CHECK_VALUES(data[pos], 1, 2);  // 1 when EZ-Start is enabled? 2 when Auto-Trial?
+                if (data[pos] != 0 && data[pos] != 3) {
+                    CHECK_VALUES(data[pos], 1, 2);  // 1 when EZ-Start is enabled? 2 when Auto-Trial? 3 when Auto-Trial is off or Opti-Start isn't off?
                 }
                 if (len == 2) {  // 400G has extra byte
                     CHECK_VALUE(data[pos+1], 0);
@@ -3992,7 +3992,10 @@ bool PRS1DataChunk::ParseSettingsF0V6(const unsigned char* data, int size)
                 min_pressure = data[pos];  // Min Setting on pressure graph
                 max_pressure = data[pos+1];  // Max Setting on pressure graph
                 pressure = data[pos+2];  // CPAP on pressure graph and CPAP-Check Pressure on settings detail
-                CHECK_VALUE(pressure, 0x5a);
+                // This seems to be the initial pressure. If the pressure changes mid-session, the pressure
+                // graph will show either the changed pressure or the majority pressure, not sure which.
+                // The time of change is most likely in the events file. See slice 6 for ending pressure.
+                //CHECK_VALUE(pressure, 0x5a);
                 this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_PRESSURE, pressure));
                 break;
             case 0x0d:  // AutoCPAP pressure setting
@@ -4025,9 +4028,10 @@ bool PRS1DataChunk::ParseSettingsF0V6(const unsigned char* data, int size)
             case 0x10: // Auto-Trial mode
                 CHECK_VALUE(cpapmode, MODE_CPAP);  // the mode setting is CPAP, even though it's operating in APAP mode
                 cpapmode = MODE_APAP;  // but categorize it now as APAP, since that's what it's really doing
-                CHECK_VALUE(data[pos], 30);  // Auto-Trial Duration
+                CHECK_VALUES(data[pos], 30, 5);  // Auto-Trial Duration
                 min_pressure = data[pos+1];
                 max_pressure = data[pos+2];
+                this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_CPAP_MODE, (int) cpapmode));
                 this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_PRESSURE_MIN, min_pressure));
                 this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_PRESSURE_MAX, max_pressure));
                 break;
@@ -4047,11 +4051,11 @@ bool PRS1DataChunk::ParseSettingsF0V6(const unsigned char* data, int size)
                 break;
             case 0x2e:
                 if (data[pos] != 0) {
-                    CHECK_VALUES(data[pos], 0x80, 0x90);  // maybe flex related? 0x80 when c-flex? 0x90 when c-flex+?, 0x00 when no flex
+                    CHECK_VALUES(data[pos], 0x80, 0x90);  // maybe flex related? 0x80 when c-flex? 0x90 when c-flex+ or A-flex?, 0x00 when no flex
                 }
                 break;
-            case 0x2f:
-                CHECK_VALUE(data[pos], 0);  // maybe flex related? 0x00 when c-flex and c-flex+?
+            case 0x2f:  // Flex lock
+                CHECK_VALUES(data[pos], 0, 0x80);
                 break;
             case 0x30:  // Flex level
                 this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_FLEX_LEVEL, data[pos]));
@@ -4075,8 +4079,10 @@ bool PRS1DataChunk::ParseSettingsF0V6(const unsigned char* data, int size)
                     CHECK_VALUES(data[pos], 2, 1);  // tubing type? 15HT = 2, 15 = 1, 22 = 0?
                 }
                 break;
-            case 0x40:  // new to 400G, alternate tubing type? appears after 0x39 and before 0x3c, 12mm = 3?
-                CHECK_VALUE(data[pos], 3);
+            case 0x40:  // new to 400G, also seen on 500X110, alternate tubing type? appears after 0x39 and before 0x3c
+                if (data[pos] != 3) {
+                    CHECK_VALUES(data[pos], 1, 2);  // 1 = 15mm, 2 = 15HT, 3 = 12mm
+                }
                 break;
             case 0x3c:
                 CHECK_VALUES(data[pos], 0, 0x80);  // 0x80 maybe show AHI?
@@ -4186,10 +4192,10 @@ bool PRS1DataChunk::ParseSummaryF0V6(void)
                 CHECK_VALUE(data[pos+5], 0x00);
                 //CHECK_VALUES(data[pos+6], 0x1e, 0x35);  // probably 16-bit value
                 CHECK_VALUE(data[pos+7], 0x00);
-                //CHECK_VALUES(data[pos+8], 0x8c, 0x4c);  // probably 16-bit value
-                CHECK_VALUE(data[pos+9], 0x00);
-                //CHECK_VALUES(data[pos+0xa], 0xbb, 0x00);  // probably 16-bit value
-                CHECK_VALUE(data[pos+0xb], 0x00);
+                //CHECK_VALUES(data[pos+8], 0x8c, 0x4c);  // 16-bit value, not sure what
+                //CHECK_VALUE(data[pos+9], 0x00);
+                //CHECK_VALUES(data[pos+0xa], 0xbb, 0x00);  // 16-bit minutes in large leak
+                //CHECK_VALUE(data[pos+0xb], 0x00);
                 //CHECK_VALUES(data[pos+0xc], 0x15, 0x02);  // probably 16-bit value
                 CHECK_VALUE(data[pos+0xd], 0x00);
                 //CHECK_VALUES(data[pos+0xe], 0x01, 0x00);  // 16-bit VS count
@@ -4258,22 +4264,23 @@ bool PRS1DataChunk::ParseSummaryF0V6(void)
                 //CHECK_VALUE(data[pos+3], 0x64);  // seems to match 90% IPAP
                 break;
             case 0x0b:
-                // CPAP-Check related? follows 3, so first two bytes may be time delta
-                CHECK_VALUE(data[pos], 3);
-                CHECK_VALUE(data[pos+1], 0);
-                CHECK_VALUE(data[pos+2], 0);
+                // CPAP-Check related? follows 3 in CPAP-Check mode
+                tt += data[pos] | (data[pos+1] << 8);  // This adds to the total duration (otherwise it won't match report)
+                //CHECK_VALUE(data[pos+2], 0);  // probably 16-bit value
                 CHECK_VALUE(data[pos+3], 0);
-                CHECK_VALUE(data[pos+4], 0);
+                //CHECK_VALUE(data[pos+4], 0);  // probably 16-bit value
                 CHECK_VALUE(data[pos+5], 0);
-                CHECK_VALUE(data[pos+6], 0);
+                //CHECK_VALUE(data[pos+6], 0);  // probably 16-bit value
                 CHECK_VALUE(data[pos+7], 0);
-                CHECK_VALUE(data[pos+8], 0);
+                //CHECK_VALUE(data[pos+8], 0);  // probably 16-bit value
                 CHECK_VALUE(data[pos+9], 0);
-                CHECK_VALUE(data[pos+0xa], 0);
+                //CHECK_VALUES(data[pos+0xa], 20, 60);  // or 0? 44 when changed pressure mid-session?
                 break;
             case 0x06:
-                // CPAP-Check related? follows 4, before 8, looks like a pressure value
-                CHECK_VALUES(data[pos], 90, 60);  // maybe CPAP-Check pressure, also matches EZ-Start Pressure
+                // Maybe starting pressure? follows 4, before 8, looks like a pressure value, seen with CPAP-Check and EZ-Start
+                // Maybe ending pressure: matches ending CPAP-Check pressure if it changes mid-session.
+                // TODO: The daily details will show when it changed, so maybe there's an event that indicates a pressure change.
+                //CHECK_VALUES(data[pos], 90, 60);  // maybe CPAP-Check pressure, also matches EZ-Start Pressure
                 break;
             default:
                 UNEXPECTED_VALUE(code, "known slice code");

From 6dfb8fda6e26cb1a647316b5ec999bc4ffc4f372 Mon Sep 17 00:00:00 2001
From: Seeker4 <guy.oscar@moxis.com>
Date: Wed, 12 Jun 2019 18:37:06 -0700
Subject: [PATCH 41/42] Change #ifdef Q_WS_X11 to Q_OS_LINUX.

---
 oscar/statistics.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/oscar/statistics.cpp b/oscar/statistics.cpp
index 545ea61f..a0601bdb 100644
--- a/oscar/statistics.cpp
+++ b/oscar/statistics.cpp
@@ -1199,7 +1199,7 @@ QString Statistics::GenerateHTML()
 void Statistics::printReport(QWidget * parent) {
 
     QPrinter printer(QPrinter::HighResolution);
-#ifdef Q_WS_X11
+#ifdef Q_OS_LINUX
     printer.setPrinterName("Print to File (PDF)");
     printer.setOutputFormat(QPrinter::PdfFormat);
     QString name;

From 917890e0777d9b06c66330d556f4953e7e2e5631 Mon Sep 17 00:00:00 2001
From: Phil Olynyk <phil@pholynyk.ca>
Date: Wed, 12 Jun 2019 23:27:46 -0400
Subject: [PATCH 42/42] Fix errors in linux conditional code

---
 oscar/statistics.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/oscar/statistics.cpp b/oscar/statistics.cpp
index a0601bdb..afa30ed4 100644
--- a/oscar/statistics.cpp
+++ b/oscar/statistics.cpp
@@ -1202,18 +1202,18 @@ void Statistics::printReport(QWidget * parent) {
 #ifdef Q_OS_LINUX
     printer.setPrinterName("Print to File (PDF)");
     printer.setOutputFormat(QPrinter::PdfFormat);
-    QString name;
-    QString datestr;
+    QString name = "Statistics";
+    QString datestr = QDate::currentDate().toString(Qt::ISODate);
 
-    if (ui->tabWidget->currentWidget() == ui->statisticsTab) {
-        name = "Statistics";
-        datestr = QDate::currentDate().toString(Qt::ISODate);
-    } else if (ui->tabWidget->currentWidget() == ui->helpTab) {
-        name = "Help";
-        datestr = QDateTime::currentDateTime().toString(Qt::ISODate);
-    } else { name = "Unknown"; }
+//    if (ui->tabWidget->currentWidget() == ui->statisticsTab) {
+//        name = "Statistics";
+//        datestr = QDate::currentDate().toString(Qt::ISODate);
+//    } else if (ui->tabWidget->currentWidget() == ui->helpTab) {
+//        name = "Help";
+//        datestr = QDateTime::currentDateTime().toString(Qt::ISODate);
+//    } else { name = "Unknown"; }
 
-    QString filename = p_pref->Get("{home}/" + name + "_" + p_profile->user->userName() + "_" + datestr + ".pdf");
+    QString filename = p_pref->Get("{home}/") + name + "_" + p_profile->user->userName() + "_" + datestr + ".pdf";
 
     printer.setOutputFileName(filename);
 #endif