From 3ea13f736fdce955f2452e9d686cbbc7cb26d026 Mon Sep 17 00:00:00 2001 From: Guy Scharf Date: Sat, 12 Sep 2020 09:50:09 -0700 Subject: [PATCH 01/12] Increase minimum width of Preferences dialog don't import before date field. - Intent is to prevent clipping of year number for months with long names (September). - This helps with default font size on my system but may not help on others. --- oscar/preferencesdialog.ui | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/oscar/preferencesdialog.ui b/oscar/preferencesdialog.ui index 4a5507fc..53c9403b 100644 --- a/oscar/preferencesdialog.ui +++ b/oscar/preferencesdialog.ui @@ -19,6 +19,12 @@ 0 + + + 145 + 0 + + Preferences From abf0747b509538cc4bce30bb7580094c286a7ac7 Mon Sep 17 00:00:00 2001 From: Guy Scharf Date: Sat, 12 Sep 2020 09:51:49 -0700 Subject: [PATCH 02/12] Add data directory path to error message when unable to write test file. - This is intended to make the error message and log entries more descriptive. --- oscar/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oscar/main.cpp b/oscar/main.cpp index 8419a68d..44077282 100644 --- a/oscar/main.cpp +++ b/oscar/main.cpp @@ -564,7 +564,7 @@ int main(int argc, char *argv[]) { if (testFile.exists()) testFile.remove(); if (!testFile.open(QFile::ReadWrite)) { - QString errMsg = QObject::tr("Unable to write to OSCAR data directory") + "\n" + + QString errMsg = QObject::tr("Unable to write to OSCAR data directory") + " " + GetAppData() + "\n" + GetAppData() + "\n" + QObject::tr("Error code") + ": " + QString::number(testFile.error()) + " - " + testFile.errorString() + "\n\n" + QObject::tr("OSCAR cannot continue and is exiting.") + "\n"; From ade32fa91407452c4d4fc16b66522fdf348e7180 Mon Sep 17 00:00:00 2001 From: Guy Scharf Date: Sat, 12 Sep 2020 09:53:36 -0700 Subject: [PATCH 03/12] Change Profiles page and Daily Records box in right sidebar to show data for most recently used machine. - Changed Profile::GetMachine() to find machine with latest lastImportDate when there were multiple machines in a profile. - Previously, OSCAR would shown the "first" machine in its list, without clarity about how a machine was designated "first". --- oscar/SleepLib/profiles.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/oscar/SleepLib/profiles.cpp b/oscar/SleepLib/profiles.cpp index 11d80312..16ce3fb2 100644 --- a/oscar/SleepLib/profiles.cpp +++ b/oscar/SleepLib/profiles.cpp @@ -941,7 +941,14 @@ Machine *Profile::GetMachine(MachineType t) return nullptr; } - return vec[0]; + // Find most recently imported machine + int idx = 0; + + for (int i=1; i < vec.size(); i++) { + if (vec[i]->lastImported() > vec[idx]->lastImported()) + idx = i; + } + return vec[idx]; } //bool Profile::trashMachine(Machine * mach) From 036117d41d1f7566886d2bd6de353616378e573d Mon Sep 17 00:00:00 2001 From: Guy Scharf Date: Sat, 12 Sep 2020 14:47:08 -0700 Subject: [PATCH 04/12] Correct reversion in beta-1 that lost date last imported. --- oscar/SleepLib/machine.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/oscar/SleepLib/machine.cpp b/oscar/SleepLib/machine.cpp index 15ce7756..e8358382 100644 --- a/oscar/SleepLib/machine.cpp +++ b/oscar/SleepLib/machine.cpp @@ -613,7 +613,6 @@ void Machine::setInfo(MachineInfo inf) { MachineInfo merged = inf; if (info.purgeDate.isValid()) merged.purgeDate = info.purgeDate; - if (info.lastimported.isValid()) merged.lastimported = info.lastimported; info = merged; m_loader = GetLoader(inf.loadername); } From d54e8b2e11b041248780bb151bbc49c957aed884 Mon Sep 17 00:00:00 2001 From: harre Date: Sun, 13 Sep 2020 01:10:03 +0200 Subject: [PATCH 05/12] Added default copy operators as implicit default is deprecated --- oscar/Graphs/gGraphView.h | 2 ++ oscar/Graphs/gLineChart.h | 2 ++ oscar/SleepLib/session.h | 1 + oscar/statistics.h | 1 + 4 files changed, 6 insertions(+) diff --git a/oscar/Graphs/gGraphView.h b/oscar/Graphs/gGraphView.h index 57b0e896..99fcc19e 100644 --- a/oscar/Graphs/gGraphView.h +++ b/oscar/Graphs/gGraphView.h @@ -277,6 +277,8 @@ struct SelectionHistoryItem { } quint64 minx; quint64 maxx; + + SelectionHistoryItem& operator=(const SelectionHistoryItem& other) = default; }; class MyDockWindow:public QMainWindow diff --git a/oscar/Graphs/gLineChart.h b/oscar/Graphs/gLineChart.h index 1da1d8ac..859e6aa0 100644 --- a/oscar/Graphs/gLineChart.h +++ b/oscar/Graphs/gLineChart.h @@ -53,6 +53,8 @@ public: return value; } + DottedLine& operator=(const DottedLine& other) = default; + ChannelID code; ChannelCalcType type; EventDataType value; diff --git a/oscar/SleepLib/session.h b/oscar/SleepLib/session.h index 4350dbdc..f8e35e9b 100644 --- a/oscar/SleepLib/session.h +++ b/oscar/SleepLib/session.h @@ -42,6 +42,7 @@ public: end = copy.end; status = copy.status; } + SessionSlice& operator=(const SessionSlice& other) = default; SessionSlice(qint64 start, qint64 end, SliceStatus status):start(start), end(end), status(status) {} qint64 start; diff --git a/oscar/statistics.h b/oscar/statistics.h index 95dab267..0c3946da 100644 --- a/oscar/statistics.h +++ b/oscar/statistics.h @@ -128,6 +128,7 @@ public: dates = copy.dates; highlight = copy.highlight; } + RXItem& operator=(const RXItem& other) = default; inline quint64 count(ChannelID id) const { QHash::const_iterator it = s_count.find(id); if (it == s_count.end()) return 0; From e98f6bd3791dc20369519e00fd7685245f8448fe Mon Sep 17 00:00:00 2001 From: Guy Scharf Date: Sun, 13 Sep 2020 11:12:51 -0700 Subject: [PATCH 06/12] Another adjustment to width of date edit field in Preferences dialog --- preferencesdialog.ui | 3234 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 3234 insertions(+) create mode 100644 preferencesdialog.ui diff --git a/preferencesdialog.ui b/preferencesdialog.ui new file mode 100644 index 00000000..1dc08914 --- /dev/null +++ b/preferencesdialog.ui @@ -0,0 +1,3234 @@ + + + PreferencesDialog + + + Qt::ApplicationModal + + + + 0 + 0 + 942 + 651 + + + + + 0 + 0 + + + + + 145 + 0 + + + + Preferences + + + + :/icons/preferences.png:/icons/preferences.png + + + true + + + true + + + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + 0 + 0 + + + + 0 + + + + &Import + + + + 4 + + + 4 + + + 4 + + + 4 + + + 4 + + + + + + 0 + 0 + + + + Session Splitting Settings + + + + 4 + + + 4 + + + 4 + + + 4 + + + 4 + + + + + + 0 + 0 + + + + [ResMed warning message] + + + true + + + true + + + + + + + + 0 + 0 + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + + Combine Close Sessions + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + Minutes + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + + + + + 0 + 0 + + + + Multiple sessions closer together than this value will be kept on the same day. + + + + 0 + + + 240 + + + 10 + + + 30 + + + 0 + + + Qt::Horizontal + + + false + + + false + + + QSlider::TicksAbove + + + 10 + + + + + + + QFrame::Box + + + 5 + + + QLCDNumber::Flat + + + + + + + + + + + Ignore Short Sessions + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + Minutes + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + + 4 + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Sessions shorter in duration than this will not be displayed<span style=" font-style:italic;">.</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-style:italic;"></p></body></html> + + + 90 + + + 5 + + + Qt::Horizontal + + + QSlider::TicksAbove + + + 5 + + + + + + + QFrame::Box + + + QLCDNumber::Flat + + + + + + + + + 4 + + + + + Day Split Time + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + Sessions starting before this time will go to the previous calendar day. + + + QAbstractSpinBox::UpDownArrows + + + + 12 + 0 + 0 + 2000 + 1 + 1 + + + + + + + + Qt::Horizontal + + + QSizePolicy::Minimum + + + + 10 + 20 + + + + + + + + <html><head/><body><p><span style=" font-weight:600;">This setting should be used with caution...</span> Switching it off comes with consequences involving accuracy of summary only days, as certain calculations only work properly provided summary only sessions that came from individual day records are kept together. </p><p><span style=" font-weight:600;">ResMed users:</span> Just because it seems natural to you and I that the 12 noon session restart should be in the previous day, does not mean ResMed's data agrees with us. The STF.edf summary index format has serious weaknesses that make doing this not a good idea.</p><p>This option exists to pacify those who don't care and want to see this &quot;fixed&quot; no matter the costs, but know it comes with a cost. If you keep your SD card in every night, and import at least once a week, you won't see problems with this very often.</p></body></html> + + + Don't Split Summary Days (Warning: read the tooltip!) + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + + + + + + 0 + 0 + + + + Session Storage Options + + + + 4 + + + 9 + + + 4 + + + 0 + + + 0 + + + 4 + + + + + + true + + + + Changing SD Backup compression options doesn't automatically recompress backup data. + + + true + + + + + + + Compress ResMed (EDF) backups to save disk space. +Backed up EDF files are stored in the .gz format, +which is common on Mac & Linux platforms.. + +OSCAR can import from this compressed backup directory natively.. +To use it with ResScan will require the .gz files to be uncompressed first.. + + + Compress SD Card Backups (slower first import, but makes backups smaller) + + + + + + + + true + + + + The following options affect the amount of disk space OSCAR uses, and have an effect on how long import takes. + + + true + + + + + + + This makes OSCAR's data take around half as much space. +But it makes import and day changing take longer.. +If you've got a new computer with a small solid state disk, this is a good option. + + + Compress Session Data (makes OSCAR data smaller, but day changing slower.) + + + + + + + This maintains a backup of SD-card data for ResMed machines, + +ResMed S9 series machines delete high resolution data older than 7 days, +and graph data older than 30 days.. + +OSCAR can keep a copy of this data if you ever need to reinstall. +(Highly recomended, unless your short on disk space or don't care about the graph data) + + + Create SD Card Backups during Import (Turn this off at your own peril!) + + + + + + + 0 + + + 0 + + + 0 + + + + + Do not import sessions older than: + + + + + + + + 165 + 0 + + + + Sessions older than this date will not be imported + + + true + + + true + + + + 2099 + 12 + 31 + + + + + 1970 + 1 + 2 + + + + QDateTimeEdit::DaySection + + + dd MMMM yyyy + + + true + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + + + 0 + 0 + + + + Memory and Startup Options + + + + + + Bypass the login screen and load the most recent User Profile + + + Auto-Launch CPAP Importer after opening profile + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + <html><head/><body><p>This setting keeps waveform and event data in memory after use to speed up revisiting days.</p><p>This is not really a necessary option, as your operating system caches previously used files too.</p><p>Recommendation is to leave it switched off, unless your computer has a ton of memory.</p></body></html> + + + Keep Waveform/Event data in memory + + + + + + + <html><head/><body><p>Makes starting OSCAR a bit slower, by pre-loading all the summary data in advance, which speeds up overview browsing and a few other calculations later on. </p><p>If you have a large amount of data, it might be worth keeping this switched off, but if you typically like to view <span style=" font-style:italic;">everything</span> in overview, all the summary data still has to be loaded anyway. </p><p>Note this setting doesn't affect waveform and event data, which is always demand loaded as needed.</p></body></html> + + + Pre-Load all summary data at startup + + + + + + + Automatically load last used profile on start-up + + + + + + + <html><head/><body><p>Cuts down on any unimportant confirmation dialogs during import.</p></body></html> + + + Import without asking for confirmation + + + + + + + <html><head/><body><p>Provide an alert when importing data from any machine model that has not yet been tested by OSCAR developers.</p></body></html> + + + Warn when importing data from an untested machine + + + + + + + <html><head/><body><p>Provide an alert when importing data that is somehow different from anything previously seen by OSCAR developers.</p></body></html> + + + Warn when previously unseen data is encountered + + + + + + + + + + + &CPAP + + + + 4 + + + 4 + + + 4 + + + 4 + + + 4 + + + + + 20 + + + QLayout::SetMinimumSize + + + 5 + + + 5 + + + 5 + + + 5 + + + + + + 0 + 0 + + + + CPAP Clock Drift + + + + 4 + + + 4 + + + 4 + + + 4 + + + 4 + + + + + + 0 + 0 + + + + <html><head/><body><p>Note: This is not intended for timezone corrections! Make sure your operating system clock and timezone is set correctly.</p></body></html> + + + true + + + + + + + -9999 + + + 9999 + + + + + + + Minutes + + + + + + + -59 + + + 59 + + + 0 + + + + + + + -99 + + + + + + + Hours + + + + + + + Seconds + + + + + + + + + + + 0 + 0 + + + + This calculation requires Total Leaks data to be provided by the CPAP machine. (Eg, PRS1, but not ResMed, which has these already) + +The Unintentional Leak calculations used here are linear, they don't model the mask vent curve. + +If you use a few different masks, pick average values instead. It should still be close enough. + + + Calculate Unintentional Leaks When Not Present + + + true + + + + + + Your masks vent rate at 20 cmH2O pressure + + + 300 + + + 550 + + + 10 + + + 470 + + + Qt::Horizontal + + + QSlider::TicksAbove + + + 20 + + + + + + + + 0 + 0 + + + + + 80 + 0 + + + + QFrame::Box + + + 48 l/m + + + true + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + Your masks vent rate at 4 cmH2O pressure + + + 120 + + + 240 + + + 1 + + + 10 + + + 201 + + + Qt::Horizontal + + + false + + + QSlider::TicksAbove + + + + + + + 4 cmH2O + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + 20 cmH2O + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 80 + 0 + + + + QFrame::Box + + + 20 l/m + + + true + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + Note: A linear calculation method is used. Changing these values requires a recalculation. + + + true + + + + + + + + + + + 0 + 0 + + + + Enable/disable experimental event flagging enhancements. +It allows detecting borderline events, and some the machine missed. +This option must be enabled before import, otherwise a purge is required. + + + Custom CPAP User Event Flagging + + + false + + + true + + + + 4 + + + 9 + + + 4 + + + 4 + + + 4 + + + + + s + + + 10.000000000000000 + + + + + + + % + + + 10.000000000000000 + + + + + + + This experimental option attempts to use OSCAR's event flagging system to improve machine detected event positioning. + + + Resync Machine Detected Events (Experimental) + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + #2 + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 0 + 0 + + + + Flow Restriction + + + + + + + + 0 + 0 + + + + + true + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans'; font-size:10pt; font-weight:400; font-style:italic;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Custom flagging is an experimental method of detecting events missed by the machine. They are <span style=" text-decoration: underline;">not</span> included in AHI.</p></body></html> + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + + + + + + 0 + 0 + + + + Percentage of restriction in airflow from the median value. +A value of 20% works well for detecting apneas. + + + % + + + 10.000000000000000 + + + + + + + Show in Event Breakdown Piechart + + + + + + + Duration of airflow restriction + + + s + + + 1.000000000000000 + + + 10.000000000000000 + + + + + + + #1 + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + Allow duplicates near machine events. + + + + + + + + 0 + 0 + + + + Event Duration + + + + + + + + + + + + QLayout::SetMinimumSize + + + 5 + + + 5 + + + + + + 0 + 0 + + + + General CPAP and Related Settings + + + + + + Show flags for machine detected events that haven't been identified yet. + + + Enable Unknown Events Channels + + + + + + + AHI/Hour Graph Time Window + + + + + + + Compliance defined as + + + + + + + + 0 + 0 + + + + Adjusts the amount of data considered for each point in the AHI/Hour graph. +Defaults to 60 minutes.. Highly recommend it's left at this value. + + + minutes + + + 5 + + + 999 + + + 60 + + + + + + + + 50 + false + + + + Whether to show the leak redline in the leak graph + + + Flag leaks over threshold + + + + + + + Preferred major event index + + + + + + + Reset the counter to zero at beginning of each (time) window. + + + Zero Reset + + + + + + + + 0 + 0 + + + + User definable threshold considered large leak + + + L/min + + + 1 + + + + + + + + 0 + 0 + + + + Regard days with under this usage as "incompliant". 4 hours is usually considered compliant. + + + hours + + + 1 + + + 8.000000000000000 + + + 4.000000000000000 + + + + + + + + 0 + 0 + + + + + AHI + + + + + RDI + + + + + + + + + + + + 0 + 0 + + + + Changes to the following settings needs a restart, but not a recalc. + + + Preferred Calculation Methods + + + + + + For consistancy, ResMed users should use 95% here, +as this is the only value available on summary-only days. + + + % + + + 1 + + + 99 + + + + + + + + 0 + 0 + + + + Middle Calculations + + + + + + + Maximum Calcs + + + + + + + Upper Percentile + + + + + + + Culminative Indices + + + + + + + Median is recommended for ResMed users. + + + + Median + + + + + Weighted Average + + + + + Normal Average + + + + + + + + + 0 + 0 + + + + + 140 + 0 + + + + <html><head/><body><p>True maximum is the maximum of the data set.</p><p>99th percentile filters out the rarest outliers.</p></body></html> + + + + True Maximum + + + + + 99% Percentile + + + + + + + + + Combined Count divided by Total Hours + + + + + Time Weighted average of Indice + + + + + Standard average of indice + + + + + Median + + + + + + + + + 0 + 0 + + + + <html><head/><body><p><span style=" font-weight:600;">Note: </span>Due to summary design limitations, ResMed machines do not support changing these settings.</p></body></html> + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + &Oximetry + + + + 4 + + + 2 + + + 2 + + + 2 + + + 2 + + + + + Oximetry Settings + + + false + + + + 4 + + + 8 + + + 4 + + + 4 + + + 5 + + + + + + 0 + 0 + + + + Other oximetry options + + + + + + % + + + + + + + bpm + + + + + + + Small chunks of oximetry data under this amount will be discarded. + + + s + + + 300 + + + + + + + Discard segments under + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + bpm + + + + + + + Flag SPO2 Desaturations Below + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + Flag Pulse Rate Below + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + Flag Pulse Rate Above + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + + + + 0 + 0 + + + + Flag rapid changes in oximetry stats + + + + + + + 0 + 0 + + + + SPO2 + + + + + + + Minimum duration of drop in oxygen saturation + + + s + + + 0 + + + + + + + Sudden change in Pulse Rate of at least this amount + + + bpm + + + 0 + + + 1.000000000000000 + + + + + + + Minimum duration of pulse change event. + + + s + + + 0 + + + + + + + + 0 + 0 + + + + Pulse + + + + + + + Percentage drop in oxygen saturation + + + % + + + 0 + + + 1.000000000000000 + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + + 0 + 0 + + + + + 300 + 0 + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:7.84158pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans'; font-size:10pt; font-weight:600;">Syncing Oximetry and CPAP Data</span></p> +<p align="justify" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans'; font-size:10pt;"><br /></p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans'; font-size:10pt;">CMS50 data imported from SpO2Review (from .spoR files) or the serial import method does </span><span style=" font-family:'Sans'; font-size:10pt; font-weight:600; text-decoration: underline;">not</span><span style=" font-family:'Sans'; font-size:10pt;"> have the correct timestamp needed to sync.</span></p> +<p align="justify" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans'; font-size:10pt;"><br /></p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans'; font-size:10pt;">Live view mode (using a serial cable) is one way to acheive an accurate sync on CMS50 oximeters, but does not counter for CPAP clock drift.</span></p> +<p align="justify" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans'; font-size:10pt;"><br /></p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans'; font-size:10pt;">If you start your Oximeters recording mode at </span><span style=" font-family:'Sans'; font-size:10pt; font-style:italic;">exactly </span><span style=" font-family:'Sans'; font-size:10pt;">the same time you start your CPAP machine, you can now also achieve sync. </span></p> +<p align="justify" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans'; font-size:10pt;"><br /></p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans'; font-size:10pt;">The serial import process takes the starting time from last nights first CPAP session. (Remember to import your CPAP data first!)</span></p></body></html> + + + + + + + + Events + + + + 4 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + + Search + + + + + + + + + + + + + 0 + 0 + + + + + + + + + + + 0 + 0 + + + + Reset &Defaults + + + + + + + + 0 + 0 + + + + <html><head/><body><p><span style=" font-weight:600;">Warning: </span>Just because you can, does not mean it's good practice.</p></body></html> + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + + + Waveforms + + + + 4 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + + Search + + + + + + + + + + + + + 0 + 0 + + + + + + + + + + + 0 + 0 + + + + Reset &Defaults + + + + + + + + 0 + 0 + + + + <html><head/><body><p><span style=" font-weight:600;">Warning: </span>Just because you can, does not mean it's good practice.</p></body></html> + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + + + &General + + + + + + + + + 0 + 0 + + + + General Settings + + + + 4 + + + 4 + + + 4 + + + 4 + + + 4 + + + + + Allow use of multiple CPU cores where available to improve performance. +Mainly affects the importer. + + + Enable Multithreading + + + + + + + Show Remove Card reminder notification on OSCAR shutdown + + + + + + + Always save screenshots in the OSCAR Data folder + + + + + + + + + + Qt::Vertical + + + + + + + + + Qt::Horizontal + + + + + + + Graphics Engine (Requires Restart) + + + + + + Try changing this from the default setting (Desktop OpenGL) if you experience rendering problems with OSCAR's graphs. + + + true + + + + + + + + + + + + + + 0 + 0 + + + + Check For Updates + + + false + + + + + + + 0 + 0 + + + + You are using a test version of OSCAR. Test versions check for updates automatically at least once every seven days. You may set the interval to less than seven days. + + + true + + + + + + + + 50 + false + false + false + + + + Automatically check for updates + + + + + + + + + + 0 + 0 + + + + Check for new version every + + + + + + + How often OSCAR should check for updates. + + + 90 + + + + + + + + 0 + 0 + + + + days. + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + + 0 + 0 + + + + Last Checked For Updates: + + + + + + + + 0 + 0 + + + + TextLabel + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + If you are interested in helping test new features and bugfixes early, click here. + + + I want to try experimental and test builds. (Advanced users only please.) + + + + + + + + 0 + 0 + + + + If you would like to help test early versions of OSCAR, please see the Wiki page about testing OSCAR. We welcome everyone who would like to test OSCAR, help develop OSCAR, and help with translations to existing or new languages. https://www.sleepfiles.com/OSCAR + + + true + + + true + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + &Appearance + + + + 4 + + + 2 + + + 2 + + + 2 + + + 2 + + + + + + + + 0 + 0 + + + + Graph Settings + + + + + + On Opening + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + <html><head/><body><p>Which tab to open on loading a profile. (Note: It will default to Profile if OSCAR is set to not open a profile on startup)</p></body></html> + + + Profile + + + + Profile + + + + + Welcome + + + + + Daily + + + + + Overview + + + + + Statistics + + + + + + + + Switch Tabs + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + No change + + + + + Welcome + + + + + Daily + + + + + Overview + + + + + Statistics + + + + + + + + After Import + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + Graph Height + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 0 + 0 + + + + Overlay Flags + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + Line Thickness + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 0 + 0 + + + + The visual method of displaying waveform overlay flags. + + + + + Standard Bars + + + + + Top Markers + + + + + + + + + + The pixel thickness of line plots + + + 2 + + + 8 + + + 1 + + + Qt::Horizontal + + + QSlider::TicksBelow + + + + + + + + + Tooltip Timeout + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + Scroll Dampening + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + + How long you want the tooltips to stay visible. + + + 1000 + + + 30000 + + + 100 + + + 500 + + + 5000 + + + Qt::Horizontal + + + QSlider::TicksBelow + + + 1000 + + + + + + + + 0 + 0 + + + + + 60 + 0 + + + + QFrame::Box + + + TextLabel + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + + Graph Tooltips + + + + + + + + Bar Tops + + + + + Line Chart + + + + + + + + + 0 + 0 + + + + Default display height of graphs in pixels + + + 50 + + + 600 + + + 10 + + + 180 + + + + + + + + + <html><head/><body><p>This makes scrolling when zoomed in easier on sensitive bidirectional TouchPads</p><p>50ms is recommended value.</p></body></html> + + + 25 + + + 1 + + + 5 + + + Qt::Horizontal + + + false + + + QSlider::TicksBelow + + + 1 + + + + + + + + 0 + 0 + + + + + 60 + 0 + + + + QFrame::Box + + + TextLabel + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + + Overview Linecharts + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + + + + 0 + 0 + + + + Other Visual Settings + + + + + + Anti-Aliasing applies smoothing to graph plots.. +Certain plots look more attractive with this on. +This also affects printed reports. + +Try it and see if you like it. + + + Use Anti-Aliasing + + + + + + + Makes certain plots look more "square waved". + + + Square Wave Plots + + + + + + + Pixmap caching is an graphics acceleration technique. May cause problems with font drawing in graph display area on your platform. + + + Use Pixmap Caching + + + + + + + <html><head/><body><p>These features have recently been pruned. They will come back later. </p></body></html> + + + Animations && Fancy Stuff + + + + + + + Daily view navigation buttons will skip over days without data records + + + Skip over Empty Days + + + + + + + Whether to allow changing yAxis scales by double clicking on yAxis labels + + + Allow YAxis Scaling + + + + + + + Whether to include machine serial number on machine settings changes report + + + Include Serial Number + + + + + + + Print reports in black and white, which can be more legible on non-color printers + + + Print reports in black and white (monochrome) + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + + + Qt::Horizontal + + + + + + + Fonts (Application wide settings) + + + false + + + + 0 + + + 4 + + + 0 + + + 4 + + + + + + + + 0 + 0 + + + + + 75 + true + + + + Font + + + + + + + + 0 + 0 + + + + + 75 + true + + + + Size + + + + + + + + 0 + 0 + + + + + 75 + true + + + + Bold + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + + 0 + 0 + + + + + 75 + true + + + + Italic + + + + + + + + 0 + 0 + + + + Application + + + + + + + + + + + 80 + 16777215 + + + + 6 + + + 30 + + + 10 + + + + + + + + 0 + 0 + + + + Qt::LeftToRight + + + + + + + + + + + 0 + 0 + + + + + + + + + + + + 0 + 0 + + + + Graph Text + + + + + + + + + + + 80 + 16777215 + + + + 6 + + + 40 + + + 11 + + + + + + + + 0 + 0 + + + + + + + + + + + + 0 + 0 + + + + + + + + + + + + 0 + 0 + + + + Graph Titles + + + + + + + + + + + 80 + 16777215 + + + + 6 + + + 40 + + + 14 + + + + + + + + 0 + 0 + + + + + + + + + + + + 0 + 0 + + + + + + + + + + + + 0 + 0 + + + + Big Text + + + + + + + + + + + 80 + 16777215 + + + + 6 + + + 72 + + + 18 + + + + + + + + 0 + 0 + + + + + + + + + + + + 0 + 0 + + + + + + + + + + + + 0 + 0 + + + + + 75 + true + + + + Details + + + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + + + + + &Cancel + + + + + + + &Ok + + + + + + + Qt::Horizontal + + + + 750 + 20 + + + + + + + + + + + + cancelButton + clicked() + PreferencesDialog + reject() + + + 757 + 605 + + + 286 + 274 + + + + + From 53de4f0f49486022040666e72d9cef4d37c230be Mon Sep 17 00:00:00 2001 From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com> Date: Sat, 12 Sep 2020 16:54:29 -0400 Subject: [PATCH 07/12] Add older 450P to the list of tested machines. Also update warnings based on test data. --- oscar/SleepLib/loader_plugins/prs1_loader.cpp | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/oscar/SleepLib/loader_plugins/prs1_loader.cpp b/oscar/SleepLib/loader_plugins/prs1_loader.cpp index 8f28a2ae..3e4aad6f 100644 --- a/oscar/SleepLib/loader_plugins/prs1_loader.cpp +++ b/oscar/SleepLib/loader_plugins/prs1_loader.cpp @@ -251,6 +251,7 @@ struct PRS1TestedModel static const PRS1TestedModel s_PRS1TestedModels[] = { // This first set says "(Philips Respironics)" intead of "(System One)" on official reports. { "251P", 0, 2, "REMstar Plus (System One)" }, // (brick) + { "450P", 0, 2, "REMstar Pro (System One)" }, { "450P", 0, 3, "REMstar Pro (System One)" }, { "451P", 0, 2, "REMstar Pro (System One)" }, { "451P", 0, 3, "REMstar Pro (System One)" }, @@ -4519,7 +4520,13 @@ bool PRS1DataChunk::ParseSummaryF0V23() CHECK_VALUES(delta, 1, 59); // we've seen the 550P start its first mask-on at these time deltas } } else { - if (delta % 60) UNEXPECTED_VALUE(delta, "even minutes"); // mask-off events seem to be whole minutes? + if (delta % 60) { + if (this->familyVersion == 2 && ((delta + 1) % 60) == 0) { + // For some reason F0V2 frequently is frequently 1 second less than whole minute intervals. + } else { + UNEXPECTED_VALUE(delta, "even minutes"); // mask-off events seem to be whole minutes? + } + } } tt += delta; this->AddEvent(new PRS1ParsedSliceEvent(tt, MaskOn)); @@ -4881,6 +4888,12 @@ void PRS1DataChunk::ParseHumidifierSetting60Series(unsigned char humid1, unsigne bool no_data = (humid2 & 0x10) != 0; // As described in chart, settings still show up int tubepresent = (humid2 & 0x08) != 0; bool humidsystemone = (humid2 & 0x04) != 0; // Set on "System One" humidification mode reports when tubepresent is false + if (humidsystemone && tubepresent) { + // On a 560P, we've observed a spurious tubepresent bit being set during two sessions. + // Those sessions (and the ones that followed) used a 22mm hose. + CHECK_VALUE(add_setting, false); // We've only seen this appear during a session, not in the initial settings. + tubepresent = false; + } // When no_data, reports always say "System One" with humidity level 3, regardless of humidlevel and humidsystemone From c8b10e31a713f885a3d51781fd2f381faac67be0 Mon Sep 17 00:00:00 2001 From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com> Date: Sat, 12 Sep 2020 20:12:31 -0400 Subject: [PATCH 08/12] Add initial support for PRS1 Dorma 501V. --- oscar/SleepLib/loader_plugins/prs1_loader.cpp | 130 +++++++++++++++++- oscar/SleepLib/loader_plugins/prs1_loader.h | 7 +- 2 files changed, 131 insertions(+), 6 deletions(-) diff --git a/oscar/SleepLib/loader_plugins/prs1_loader.cpp b/oscar/SleepLib/loader_plugins/prs1_loader.cpp index 3e4aad6f..4b61bfaf 100644 --- a/oscar/SleepLib/loader_plugins/prs1_loader.cpp +++ b/oscar/SleepLib/loader_plugins/prs1_loader.cpp @@ -274,6 +274,8 @@ static const PRS1TestedModel s_PRS1TestedModels[] = { { "660P", 0, 4, "BiPAP Pro (System One 60 Series)" }, { "760P", 0, 4, "BiPAP Auto (System One 60 Series)" }, + { "501V", 0, 5, "Dorma 500 Auto (System One 60 Series)" }, // (brick) + { "200X110", 0, 6, "DreamStation CPAP" }, // (brick) { "400G110", 0, 6, "DreamStation Go" }, { "400X110", 0, 6, "DreamStation CPAP Pro" }, @@ -324,7 +326,7 @@ PRS1ModelInfo::PRS1ModelInfo() m_modelNames[model.model] = model.name; } - m_bricks = { "251P", "261CA", "200X110" }; + m_bricks = { "251P", "261CA", "200X110", "501V" }; } bool PRS1ModelInfo::IsSupported(int family, int familyVersion) const @@ -4359,6 +4361,8 @@ bool PRS1DataChunk::ParseCompliance(void) return this->ParseComplianceF0V23(); case 4: return this->ParseComplianceF0V4(); + case 5: + return this->ParseComplianceF0V5(); case 6: return this->ParseComplianceF0V6(); } @@ -4681,8 +4685,12 @@ bool PRS1DataChunk::ParseSettingsF0V23(const unsigned char* data, int /*size*/) } -bool PRS1DataChunk::ParseSettingsF0V4(const unsigned char* data, int /*size*/) +bool PRS1DataChunk::ParseSettingsF0V45(const unsigned char* data, int size) { + if (size < 0xd) { + qWarning() << "invalid size passed to ParseSettingsF0V45"; + return false; + } PRS1Mode cpapmode = PRS1_MODE_UNKNOWN; switch (data[0x02]) { // PRS1 mode @@ -4764,10 +4772,19 @@ bool PRS1DataChunk::ParseSettingsF0V4(const unsigned char* data, int /*size*/) } quint8 flex = data[0x0a]; + if (this->familyVersion == 5) CHECK_VALUE(flex, 0xE1); this->ParseFlexSettingF0V234(flex, cpapmode); + if (this->familyVersion == 5) { + CHECK_VALUES(data[0x0b], 0x00, 0x02); + CHECK_VALUE(data[0x0c], 0x60); + } this->ParseHumidifierSetting60Series(data[0x0b], data[0x0c], true); + if (size <= 0xd) { + return true; + } + int resist_level = (data[0x0d] >> 3) & 7; // 0x18 resist=3, 0x11 resist=2, 0x28 resist=5 this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_MASK_RESIST_LOCK, (data[0x0d] & 0x40) != 0)); this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_MASK_RESIST_SETTING, resist_level)); @@ -4831,6 +4848,10 @@ bool PRS1DataChunk::ParseSettingsF0V4(const unsigned char* data, int /*size*/) // 93 11 = H=3, S1, no data // 04 30 = H=3, S1, no data +// F0V5 confirmed: +// 00 60 = H=Off, Classic +// 02 60 = H=2, Classic + // F5V1 confirmed: // A0 4A = HT=5, H=2, HT // B1 09 = HT=3, H=3, HT @@ -4964,6 +4985,103 @@ void PRS1DataChunk::ParseHumidifierSetting60Series(unsigned char humid1, unsigne } +// Based on ParseComplianceF0V4, but this has shorter settings and stats following equipment off. +bool PRS1DataChunk::ParseComplianceF0V5(void) +{ + if (this->family != 0 || (this->familyVersion != 5)) { + qWarning() << "ParseComplianceF0V5 called with family" << this->family << "familyVersion" << this->familyVersion; + return false; + } + const unsigned char * data = (unsigned char *)this->m_data.constData(); + int chunk_size = this->m_data.size(); + static const int minimum_sizes[] = { 0xf, 7, 4, 0xf }; + static const int ncodes = sizeof(minimum_sizes) / sizeof(int); + // NOTE: These are fixed sizes, but are called minimum to more closely match the F0V6 parser. + + bool ok = true; + int pos = 0; + int code, size; + int tt = 0; + while (ok && pos < chunk_size) { + code = data[pos++]; + // There is no hblock prior to F0V6. + size = 0; + if (code < ncodes) { + // make sure the handlers below don't go past the end of the buffer + size = minimum_sizes[code]; + } // 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; + break; + } + + switch (code) { + case 0: // Equipment On + CHECK_VALUE(pos, 1); // Always first + CHECK_VALUE(data[pos], 0x31); + // F0V5 doesn't have a separate settings record like F0V6 does, the settings just follow the EquipmentOn data. + ok = ParseSettingsF0V45(data, 0x0d); + CHECK_VALUE(data[pos+0xd], 0); + CHECK_VALUE(data[pos+0xe], 0); + CHECK_VALUE(data[pos+0xf], 0); + break; + case 2: // Mask On + tt += data[pos] | (data[pos+1] << 8); + this->AddEvent(new PRS1ParsedSliceEvent(tt, MaskOn)); + CHECK_VALUES(data[pos+2], 0, 2); + CHECK_VALUE(data[pos+3], 0x60); + this->ParseHumidifierSetting60Series(data[pos+2], data[pos+3]); + break; + case 3: // Mask Off + tt += data[pos] | (data[pos+1] << 8); + this->AddEvent(new PRS1ParsedSliceEvent(tt, MaskOff)); + // F0V5 compliance has MaskOff stats unlike all other compliance. + // This is presumably because the 501V is an Auto-CPAP, so it needs to record titration data. + // 51s, 13940s, 13348s + CHECK_VALUES(data[pos+2], 40, 50); // min pressure + CHECK_VALUES(data[pos+3], 40, 150); // maybe max pressure? + //CHECK_VALUES(data[pos+4], 40, 150); // Average Device Pressure <= 90% of Time (report is time-weighted per slice) + //CHECK_VALUES(data[pos+5], 40, 108); // Auto CPAP Mean Pressure (report is time-weighted per slice) + // (not sure how "Peak Average Pressure" on report differs, maybe that's over all sessions or days?) + //CHECK_VALUES(data[pos+6], 0, 5); // Apnea or Hypopnea count (probably 16-bit), contributes to AHI + CHECK_VALUE(data[pos+7], 0); + //CHECK_VALUES(data[pos+8], 0, 6); // Apnea or Hypopnea count (probably 16-bit), contributes to AHI + CHECK_VALUE(data[pos+9], 0); + CHECK_VALUES(data[pos+10], 0, 2); // Average Large Leak minutes? (Maybe average only if there's more than one day?) + CHECK_VALUE(data[pos+11], 0); + //CHECK_VALUES(data[pos+12], 179, 50); // Average 90% Leak (report is time-weighted per slice) + //CHECK_VALUES(data[pos+13], 178, 32); // Average Total Leak (report is time-weighted per slice) + //CHECK_VALUES(data[pos+14], 180, 36); // Max leak (report shows max for all slices) + break; + case 1: // Equipment Off + tt += data[pos] | (data[pos+1] << 8); + this->AddEvent(new PRS1ParsedSliceEvent(tt, EquipmentOff)); + CHECK_VALUE(data[pos+2], 1); + CHECK_VALUES(data[pos+3], 0x16, 0x13); // 22, 19 + CHECK_VALUE(data[pos+4], 0); + CHECK_VALUES(data[pos+5], 0x2F, 0x26); // 47, 38 + CHECK_VALUE(data[pos+6], 1); + break; + /* See ParseComplianceF0V4 if we encounter slices 4-8 */ + default: + UNEXPECTED_VALUE(code, "known slice code"); + ok = false; // unlike F0V6, we don't know the size of unknown slices, so we can't recover + break; + } + pos += size; + } + + if (ok && pos != chunk_size) { + qWarning() << this->sessionid << (this->size() - pos) << "trailing bytes"; + } + + this->duration = tt; + + return ok; +} + + bool PRS1DataChunk::ParseComplianceF0V4(void) { if (this->family != 0 || (this->familyVersion != 4)) { @@ -4999,7 +5117,7 @@ bool PRS1DataChunk::ParseComplianceF0V4(void) CHECK_VALUE(pos, 1); // Always first CHECK_VALUES(data[pos], 1, 3); // F0V4 doesn't have a separate settings record like F0V6 does, the settings just follow the EquipmentOn data. - ok = ParseSettingsF0V4(data, 0x0f); + ok = ParseSettingsF0V45(data, 0x11); CHECK_VALUE(data[pos+0x11], 0); CHECK_VALUE(data[pos+0x12], 0); CHECK_VALUE(data[pos+0x13], 0); @@ -5152,7 +5270,7 @@ bool PRS1DataChunk::ParseSummaryF0V4(void) //CHECK_VALUES(data[pos] & 0x0F, 3, 5); // TODO: what are these? 0 seems to be related to errors. } // F0V4 doesn't have a separate settings record like F0V6 does, the settings just follow the EquipmentOn data. - ok = ParseSettingsF0V4(data, 0x0f); + ok = ParseSettingsF0V45(data, 0x11); CHECK_VALUE(data[pos+0x11], 0); CHECK_VALUE(data[pos+0x12], 0); CHECK_VALUE(data[pos+0x13], 0); @@ -6490,7 +6608,11 @@ bool PRS1DataChunk::ParseSummaryF5V012(void) // 0x8B = C-Flex+ 3 (CPAP mode) // 0x8B = A-Flex 3 (AutoCPAP mode) +// Flex F0V5 confirmed +// 0xE1 = Flex (AutoCPAP mode) + // 8 = enabled +// 4 = lock // 1 = rise time // 8 = C-Flex+ / A-Flex (depending on mode) // 3 = level diff --git a/oscar/SleepLib/loader_plugins/prs1_loader.h b/oscar/SleepLib/loader_plugins/prs1_loader.h index e64ad36b..eaaccc75 100644 --- a/oscar/SleepLib/loader_plugins/prs1_loader.h +++ b/oscar/SleepLib/loader_plugins/prs1_loader.h @@ -141,6 +141,9 @@ public: //! \brief Parse a single data chunk from a .000 file containing compliance data for a P256x brick bool ParseComplianceF0V4(void); + //! \brief Parse a single data chunk from a .000 file containing compliance data for a x00V brick + bool ParseComplianceF0V5(void); + //! \brief Parse a single data chunk from a .000 file containing compliance data for a DreamStation 200X brick bool ParseComplianceF0V6(void); @@ -168,7 +171,7 @@ public: //! \brief Parse a single data chunk from a .001 file containing summary data for a family 5 ASV family version 3 machine bool ParseSummaryF5V3(void); - //! \brief Parse a flex setting byte from a .000 or .001 containing compliance/summary data for CPAP/APAP family versions 2, 3, or 4 + //! \brief Parse a flex setting byte from a .000 or .001 containing compliance/summary data for CPAP/APAP family versions 2, 3, 4, or 5 void ParseFlexSettingF0V234(quint8 flex, int prs1mode); //! \brief Parse a flex setting byte from a .000 or .001 containing compliance/summary data for ASV family versions 0, 1, or 2 @@ -241,7 +244,7 @@ protected: bool ParseSettingsF0V23(const unsigned char* data, int size); //! \brief Parse a settings slice from a .000 and .001 file - bool ParseSettingsF0V4(const unsigned char* data, int size); + bool ParseSettingsF0V45(const unsigned char* data, int size); //! \brief Parse a settings slice from a .000 and .001 file bool ParseSettingsF0V6(const unsigned char* data, int size); From d1985c9dc25225932324624fa675ed30cf9d2510 Mon Sep 17 00:00:00 2001 From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com> Date: Sun, 13 Sep 2020 14:00:59 -0400 Subject: [PATCH 09/12] Add support for all current Dorma 501V test data. --- oscar/SleepLib/loader_plugins/prs1_loader.cpp | 93 ++++++++++++------- oscar/SleepLib/loader_plugins/prs1_loader.h | 4 +- 2 files changed, 64 insertions(+), 33 deletions(-) diff --git a/oscar/SleepLib/loader_plugins/prs1_loader.cpp b/oscar/SleepLib/loader_plugins/prs1_loader.cpp index 4b61bfaf..080ea6c8 100644 --- a/oscar/SleepLib/loader_plugins/prs1_loader.cpp +++ b/oscar/SleepLib/loader_plugins/prs1_loader.cpp @@ -218,7 +218,7 @@ void PRS1Loader::LogUnexpectedMessage(const QString & message) } -enum FlexMode { FLEX_None, FLEX_CFlex, FLEX_CFlexPlus, FLEX_AFlex, FLEX_RiseTime, FLEX_BiFlex, FLEX_PFlex, FLEX_Unknown }; +enum FlexMode { FLEX_None, FLEX_CFlex, FLEX_CFlexPlus, FLEX_AFlex, FLEX_RiseTime, FLEX_BiFlex, FLEX_PFlex, FLEX_Flex, FLEX_Unknown = -1 }; enum BackupBreathMode { PRS1Backup_Off, PRS1Backup_Auto, PRS1Backup_Fixed }; @@ -4275,6 +4275,12 @@ bool PRS1Import::ImportCompliance() case PRS1_SETTING_PRESSURE: session->settings[CPAP_Pressure] = e->value(); break; + case PRS1_SETTING_PRESSURE_MIN: + session->settings[CPAP_PressureMin] = e->value(); + break; + case PRS1_SETTING_PRESSURE_MAX: + session->settings[CPAP_PressureMax] = e->value(); + break; case PRS1_SETTING_FLEX_MODE: session->settings[PRS1_FlexMode] = e->m_value; break; @@ -4655,7 +4661,7 @@ bool PRS1DataChunk::ParseSettingsF0V23(const unsigned char* data, int /*size*/) } quint8 flex = data[0x08]; - this->ParseFlexSettingF0V234(flex, cpapmode); + this->ParseFlexSettingF0V2345(flex, cpapmode); int humid = data[0x09]; this->ParseHumidifierSetting50Series(humid, true); @@ -4772,12 +4778,11 @@ bool PRS1DataChunk::ParseSettingsF0V45(const unsigned char* data, int size) } quint8 flex = data[0x0a]; - if (this->familyVersion == 5) CHECK_VALUE(flex, 0xE1); - this->ParseFlexSettingF0V234(flex, cpapmode); + if (this->familyVersion == 5) { if (flex != 0xE1) CHECK_VALUES(flex, 0xA1, 0xA2); } + this->ParseFlexSettingF0V2345(flex, cpapmode); if (this->familyVersion == 5) { - CHECK_VALUES(data[0x0b], 0x00, 0x02); - CHECK_VALUE(data[0x0c], 0x60); + CHECK_VALUES(data[0x0c], 0x60, 0x70); } this->ParseHumidifierSetting60Series(data[0x0b], data[0x0c], true); @@ -4851,6 +4856,8 @@ bool PRS1DataChunk::ParseSettingsF0V45(const unsigned char* data, int size) // F0V5 confirmed: // 00 60 = H=Off, Classic // 02 60 = H=2, Classic +// 05 60 = H=5, Classic +// 00 70 = H=Off, no data in chart // F5V1 confirmed: // A0 4A = HT=5, H=2, HT @@ -4994,7 +5001,7 @@ bool PRS1DataChunk::ParseComplianceF0V5(void) } const unsigned char * data = (unsigned char *)this->m_data.constData(); int chunk_size = this->m_data.size(); - static const int minimum_sizes[] = { 0xf, 7, 4, 0xf }; + static const int minimum_sizes[] = { 0xf, 7, 4, 0xf, 0, 4, 0, 4 }; static const int ncodes = sizeof(minimum_sizes) / sizeof(int); // NOTE: These are fixed sizes, but are called minimum to more closely match the F0V6 parser. @@ -5019,18 +5026,17 @@ bool PRS1DataChunk::ParseComplianceF0V5(void) switch (code) { case 0: // Equipment On CHECK_VALUE(pos, 1); // Always first - CHECK_VALUE(data[pos], 0x31); + //CHECK_VALUES(data[pos], 0x73, 0x31); // 0x71 // F0V5 doesn't have a separate settings record like F0V6 does, the settings just follow the EquipmentOn data. ok = ParseSettingsF0V45(data, 0x0d); CHECK_VALUE(data[pos+0xd], 0); CHECK_VALUE(data[pos+0xe], 0); - CHECK_VALUE(data[pos+0xf], 0); + CHECK_VALUES(data[pos+0xf], 0, 2); break; case 2: // Mask On tt += data[pos] | (data[pos+1] << 8); this->AddEvent(new PRS1ParsedSliceEvent(tt, MaskOn)); - CHECK_VALUES(data[pos+2], 0, 2); - CHECK_VALUE(data[pos+3], 0x60); + CHECK_VALUES(data[pos+3], 0x60, 0x70); this->ParseHumidifierSetting60Series(data[pos+2], data[pos+3]); break; case 3: // Mask Off @@ -5038,32 +5044,41 @@ bool PRS1DataChunk::ParseComplianceF0V5(void) this->AddEvent(new PRS1ParsedSliceEvent(tt, MaskOff)); // F0V5 compliance has MaskOff stats unlike all other compliance. // This is presumably because the 501V is an Auto-CPAP, so it needs to record titration data. - // 51s, 13940s, 13348s - CHECK_VALUES(data[pos+2], 40, 50); // min pressure - CHECK_VALUES(data[pos+3], 40, 150); // maybe max pressure? - //CHECK_VALUES(data[pos+4], 40, 150); // Average Device Pressure <= 90% of Time (report is time-weighted per slice) - //CHECK_VALUES(data[pos+5], 40, 108); // Auto CPAP Mean Pressure (report is time-weighted per slice) - // (not sure how "Peak Average Pressure" on report differs, maybe that's over all sessions or days?) - //CHECK_VALUES(data[pos+6], 0, 5); // Apnea or Hypopnea count (probably 16-bit), contributes to AHI + //CHECK_VALUES(data[pos+2], 40, 50); // min pressure + //CHECK_VALUES(data[pos+3], 40, 150); // max pressure + //CHECK_VALUES(data[pos+4], 40, 150); // Average Device Pressure <= 90% of Time (report is time-weighted per slice, for all sessions) + //CHECK_VALUES(data[pos+5], 40, 108); // Auto CPAP Mean Pressure (report is time-weighted per slice, for all sessions) + // Peak Average Pressure is the maximum "mean pressure" reported in any session. + //CHECK_VALUES(data[pos+6], 0, 5); // Apnea or Hypopnea count (probably 16-bit), contributes to AHI CHECK_VALUE(data[pos+7], 0); - //CHECK_VALUES(data[pos+8], 0, 6); // Apnea or Hypopnea count (probably 16-bit), contributes to AHI + //CHECK_VALUES(data[pos+8], 0, 6); // Apnea or Hypopnea count (probably 16-bit), contributes to AHI CHECK_VALUE(data[pos+9], 0); - CHECK_VALUES(data[pos+10], 0, 2); // Average Large Leak minutes? (Maybe average only if there's more than one day?) + //CHECK_VALUES(data[pos+10], 0, 2); // Average Large Leak minutes (probably 16-bit, report show sum of all slices) CHECK_VALUE(data[pos+11], 0); - //CHECK_VALUES(data[pos+12], 179, 50); // Average 90% Leak (report is time-weighted per slice) - //CHECK_VALUES(data[pos+13], 178, 32); // Average Total Leak (report is time-weighted per slice) - //CHECK_VALUES(data[pos+14], 180, 36); // Max leak (report shows max for all slices) + //CHECK_VALUES(data[pos+12], 179, 50); // Average 90% Leak (report is time-weighted per slice) + //CHECK_VALUES(data[pos+13], 178, 32); // Average Total Leak (report is time-weighted per slice) + //CHECK_VALUES(data[pos+14], 180, 36); // Max leak (report shows max for all slices) break; case 1: // Equipment Off tt += data[pos] | (data[pos+1] << 8); this->AddEvent(new PRS1ParsedSliceEvent(tt, EquipmentOff)); - CHECK_VALUE(data[pos+2], 1); - CHECK_VALUES(data[pos+3], 0x16, 0x13); // 22, 19 - CHECK_VALUE(data[pos+4], 0); - CHECK_VALUES(data[pos+5], 0x2F, 0x26); // 47, 38 - CHECK_VALUE(data[pos+6], 1); + CHECK_VALUE(data[pos+2] & ~(0x40|0x02|0x01), 0); + //CHECK_VALUES(data[pos+3], 0x16, 0x13); // 22, 19 + if (data[pos+4] < 0 || data[pos+4] > 3) UNEXPECTED_VALUE(data[pos+4], "0-3"); + //CHECK_VALUES(data[pos+5], 0x2F, 0x26); // 47, 38 + if (data[pos+6] < 0 || data[pos+6] > 7) UNEXPECTED_VALUE(data[pos+6], "0-7"); + break; + //case 4: // Time Elapsed? See ParseComplianceF0V4 if we encounter this. + case 5: // Clock adjustment? + CHECK_VALUE(pos, 1); // Always first + CHECK_VALUE(chunk_size, 5); // and the only record in the session. + // This looks like it's minor adjustments to the clock, see ParseComplianceF0V4 for details. + break; + //case 6: // Cleared? See ParseComplianceF0V4 if we encounter this. + case 7: // Humidifier setting change (logged in events in 50 series) + tt += data[pos] | (data[pos+1] << 8); // This adds to the total duration (otherwise it won't match report) + this->ParseHumidifierSetting60Series(data[pos+2], data[pos+3]); break; - /* See ParseComplianceF0V4 if we encounter slices 4-8 */ default: UNEXPECTED_VALUE(code, "known slice code"); ok = false; // unlike F0V6, we don't know the size of unknown slices, so we can't recover @@ -6610,22 +6625,26 @@ bool PRS1DataChunk::ParseSummaryF5V012(void) // Flex F0V5 confirmed // 0xE1 = Flex (AutoCPAP mode) +// 0xA1 = Flex (AutoCPAP mode) +// 0xA2 = Flex (AutoCPAP mode) // 8 = enabled // 4 = lock +// 2 = Flex (only seen on Dorma series) // 1 = rise time // 8 = C-Flex+ / A-Flex (depending on mode) // 3 = level -void PRS1DataChunk::ParseFlexSettingF0V234(quint8 flex, int cpapmode) +void PRS1DataChunk::ParseFlexSettingF0V2345(quint8 flex, int cpapmode) { FlexMode flexmode = FLEX_None; bool enabled = (flex & 0x80) != 0; bool lock = (flex & 0x40) != 0; + bool plain_flex = (flex & 0x20) != 0; // "Flex", seen on Dorma series bool risetime = (flex & 0x10) != 0; bool plusmode = (flex & 0x08) != 0; int flexlevel = flex & 0x03; - if (flex & (0x20 | 0x04)) UNEXPECTED_VALUE(flex, "known bits"); + if (flex & 0x04) UNEXPECTED_VALUE(flex, "known bits"); if (this->familyVersion == 2) { //CHECK_VALUE(lock, false); // We've seen this set on F0V2, but it doesn't appear on the reports. } @@ -6651,6 +6670,17 @@ void PRS1DataChunk::ParseFlexSettingF0V234(quint8 flex, int cpapmode) UNEXPECTED_VALUE(cpapmode, "expected C-Flex+/A-Flex mode"); break; } + } else if (plain_flex) { + CHECK_VALUE(this->familyVersion, 5); // so far only seen with F0V5 + switch (cpapmode) { + case PRS1_MODE_AUTOCPAP: + flexmode = FLEX_Flex; // unknown whether this is equivalent to C-Flex, C-Flex+, or A-Flex + break; + default: + UNEXPECTED_VALUE(cpapmode, "expected mode"); + flexmode = FLEX_Flex; // probably the same for CPAP mode as well, but we haven't tested that yet + break; + } } else { switch (cpapmode) { case PRS1_MODE_CPAP: @@ -9295,6 +9325,7 @@ void PRS1Loader::initChannels() chan->addOption(FLEX_RiseTime, QObject::tr("Rise Time")); chan->addOption(FLEX_BiFlex, QObject::tr("Bi-Flex")); //chan->addOption(FLEX_AVAPS, QObject::tr("AVAPS")); // Converted into AVAPS PRS1_Mode with FLEX_RiseTime + chan->addOption(FLEX_Flex, QObject::tr("Flex")); channel.add(GRP_CPAP, chan = new Channel(PRS1_FlexLevel = 0xe106, SETTING, MT_CPAP, SESSION, "PRS1FlexSet", diff --git a/oscar/SleepLib/loader_plugins/prs1_loader.h b/oscar/SleepLib/loader_plugins/prs1_loader.h index eaaccc75..8b8b6a65 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 = 19; +const int prs1_data_version = 20; // //******************************************************************************************** #if 0 // Apparently unused @@ -172,7 +172,7 @@ public: bool ParseSummaryF5V3(void); //! \brief Parse a flex setting byte from a .000 or .001 containing compliance/summary data for CPAP/APAP family versions 2, 3, 4, or 5 - void ParseFlexSettingF0V234(quint8 flex, int prs1mode); + void ParseFlexSettingF0V2345(quint8 flex, int prs1mode); //! \brief Parse a flex setting byte from a .000 or .001 containing compliance/summary data for ASV family versions 0, 1, or 2 void ParseFlexSettingF5V012(quint8 flex, int prs1mode); From d98a76aa221eb01472762dce7cbbce01eef3c186 Mon Sep 17 00:00:00 2001 From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com> Date: Sun, 13 Sep 2020 19:00:16 -0400 Subject: [PATCH 10/12] Recognize low MV alarm on 1030X and update warnings based on test data. --- Htmldocs/release_notes.html | 13 +++++++++++++ oscar/SleepLib/loader_plugins/prs1_loader.cpp | 17 ++++++++++++----- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/Htmldocs/release_notes.html b/Htmldocs/release_notes.html index 1fd701b5..fec4cf0e 100644 --- a/Htmldocs/release_notes.html +++ b/Htmldocs/release_notes.html @@ -11,6 +11,19 @@ For other languages, go to:
http://www.apneaboard.com/wiki/index.php/OSCAR_Release_Notes

+ Changes and fixes in OSCAR v1.2.0-beta-XXX +
Portions of OSCAR are © 2019-2020 by + The OSCAR Team

+
    +
  • [new] Additional Philips Respironics devices tested and fully supported: +
      +
    • REMstar Pro (System One) (450P V1)
      • +
    • Dorma 500 Auto (System One 60 Series) (501V)
      • +
    +
    • +
  • [fix] Improve support of rare Philips Respironics 1030X events and update warnings.
    • +

+

Changes and fixes in OSCAR v1.2.0-beta-2
Portions of OSCAR are © 2019-2020 by The OSCAR Team

diff --git a/oscar/SleepLib/loader_plugins/prs1_loader.cpp b/oscar/SleepLib/loader_plugins/prs1_loader.cpp index 080ea6c8..b9b59017 100644 --- a/oscar/SleepLib/loader_plugins/prs1_loader.cpp +++ b/oscar/SleepLib/loader_plugins/prs1_loader.cpp @@ -3331,7 +3331,10 @@ bool PRS1DataChunk::ParseEventsF3V6(void) // no additional data this->AddEvent(new PRS1ApneaAlarmEvent(t, 0)); break; - // case 0x0d? + case 0x0d: // Low MV Alarm + // no additional data + this->AddEvent(new PRS1LowMinuteVentilationAlarmEvent(t, 0)); + break; // case 0x0e? // case 0x0f? default: @@ -5963,7 +5966,7 @@ bool PRS1DataChunk::ParseSummaryF3V6(void) } CHECK_VALUE(data[pos+3], 1); CHECK_VALUE(data[pos+4], 1); - CHECK_VALUE(data[pos+5], 0); + CHECK_VALUES(data[pos+5], 0, 1); // 1 = Low Minute Ventilation Alarm set to 1 CHECK_VALUE(data[pos+6], 2); CHECK_VALUE(data[pos+7], 1); CHECK_VALUE(data[pos+8], 0); // 1 = patient disconnect alarm of 15 sec on F5V3, not sure where time is encoded @@ -7139,7 +7142,7 @@ void PRS1DataChunk::ParseHumidifierSettingV3(unsigned char byte1, unsigned char if (tubepresent) { // All tube temperature and humidity levels seen. } else if (humidadaptive) { - if (humidlevel == 1) UNEXPECTED_VALUE(humidlevel, "[0,2-5]"); + // All humidity levels seen. } else if (humidfixed) { if (humidlevel == 0) UNEXPECTED_VALUE(humidlevel, "1-5"); } @@ -8341,8 +8344,12 @@ bool PRS1Import::ImportEvents() // First make a list of the mask-on slices that will be imported (nonzero duration) QVector maskOn; for (auto & slice : m_slices) { - if (slice.status == MaskOn && slice.end > slice.start) { - maskOn.append(slice); + if (slice.status == MaskOn) { + if (slice.end > slice.start) { + maskOn.append(slice); + } else { + qWarning() << this->sessionid << "Dropping empty mask-on slice:" << ts(slice.start); + } } } // Then go through each required channel and make sure each eventlist is within From 3bda3ce2752c39b1aa720d55dd32fbce93498b58 Mon Sep 17 00:00:00 2001 From: Phil Olynyk Date: Sun, 13 Sep 2020 20:10:12 -0400 Subject: [PATCH 11/12] Add Unidee to the list ot Testers --- Htmldocs/credits.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Htmldocs/credits.html b/Htmldocs/credits.html index fe05ae13..f5d2a68c 100644 --- a/Htmldocs/credits.html +++ b/Htmldocs/credits.html @@ -34,7 +34,8 @@

Testers
- Fred Bonjour (Lead Tester), Beej, DeepBreathing, Fastlane, GuyScharf, JJJ, LookingForward, Pollcat, Ruth Catrin, SarcasticDave94

+ Fred Bonjour (Lead Tester), Beej, DeepBreathing, Fastlane, GuyScharf, JJJ, LookingForward, Pollcat, Ruth Catrin, SarcasticDave94, + Unidee

Advisors
aviB, SkepticDoc, Sleeprider, SleepyProgrammer, srlevine1, LunaFerret, harre, mdhamptom, mitchcampbell, rtannerf

From 2563e5c4f0a45b664c7e77aeab816f4c1fab35cb Mon Sep 17 00:00:00 2001 From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com> Date: Mon, 14 Sep 2020 14:58:11 -0400 Subject: [PATCH 12/12] Fix gcc compiler error introduced by d98a76a. --- oscar/SleepLib/loader_plugins/prs1_loader.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/oscar/SleepLib/loader_plugins/prs1_loader.cpp b/oscar/SleepLib/loader_plugins/prs1_loader.cpp index b9b59017..a2b549ad 100644 --- a/oscar/SleepLib/loader_plugins/prs1_loader.cpp +++ b/oscar/SleepLib/loader_plugins/prs1_loader.cpp @@ -5067,9 +5067,9 @@ bool PRS1DataChunk::ParseComplianceF0V5(void) this->AddEvent(new PRS1ParsedSliceEvent(tt, EquipmentOff)); CHECK_VALUE(data[pos+2] & ~(0x40|0x02|0x01), 0); //CHECK_VALUES(data[pos+3], 0x16, 0x13); // 22, 19 - if (data[pos+4] < 0 || data[pos+4] > 3) UNEXPECTED_VALUE(data[pos+4], "0-3"); + if (data[pos+4] > 3) UNEXPECTED_VALUE(data[pos+4], "0-3"); //CHECK_VALUES(data[pos+5], 0x2F, 0x26); // 47, 38 - if (data[pos+6] < 0 || data[pos+6] > 7) UNEXPECTED_VALUE(data[pos+6], "0-7"); + if (data[pos+6] > 7) UNEXPECTED_VALUE(data[pos+6], "0-7"); break; //case 4: // Time Elapsed? See ParseComplianceF0V4 if we encounter this. case 5: // Clock adjustment?