chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-06 19:20:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add preliminary support for rare time-adjustment event observed on PRS1 550P.

Browse Source 
Also add 900X150 to the list of tested machines, and update other warnings
based on new test data.
This commit is contained in:
sawinglogz 2020-06-26 12:53:52 -04:00
parent af1aa46427
commit 11dfa09c7b
2 changed files with 36 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Htmldocs/release_notes.html
View File

@ -7,6 +7,17 @@
<meta content="The OSCAR Team" name="author" > <meta content="The OSCAR Team" name="author" >
</head> </head>
<body> <body>
<p>
<b>Changes and fixes in OSCAR v1.X.Y</b>
<br>Portions of OSCAR are © 2019-2020 by
<i>The OSCAR Team</i></p>
<ul>
<li>[new] Additional Philips Respironics devices tested and fully supported:
<ul>
<li>DreamStation BiPAP autoSV (900X150)</li>
</ul>
<li>[fix] Improve support for rare events in 50-series Philips Respironics devices.</li>
</ul>
<p> <p>
<b>Changes and fixes in OSCAR v1.1.1</b> <b>Changes and fixes in OSCAR v1.1.1</b>
<br>Portions of OSCAR are © 2019-2020 by <br>Portions of OSCAR are © 2019-2020 by

40
oscar/SleepLib/loader_plugins/prs1_loader.cpp
View File

@ -295,6 +295,7 @@ static const PRS1TestedModel s_PRS1TestedModels[] = {
{ "960T", 5, 2, "BiPAP autoSV Advanced 30 (System One 60 Series)" }, // omits "(System One 60 Series)" on official reports { "960T", 5, 2, "BiPAP autoSV Advanced 30 (System One 60 Series)" }, // omits "(System One 60 Series)" on official reports
{ "900X110", 5, 3, "DreamStation BiPAP autoSV" }, { "900X110", 5, 3, "DreamStation BiPAP autoSV" },
{ "900X120", 5, 3, "DreamStation BiPAP autoSV" }, { "900X120", 5, 3, "DreamStation BiPAP autoSV" },
{ "900X150", 5, 3, "DreamStation BiPAP autoSV" },
{ "1061401", 3, 0, "BiPAP S/T (C Series)" }, { "1061401", 3, 0, "BiPAP S/T (C Series)" },
{ "1061T", 3, 3, "BiPAP S/T 30 (System One 60 Series)" }, { "1061T", 3, 3, "BiPAP S/T 30 (System One 60 Series)" },
@ -3602,23 +3603,33 @@ bool PRS1DataChunk::ParseEventsF0V23()
break; break;
} }
startpos = pos; startpos = pos;
if (code != 0x12) { // This one event has no timestamp in F0V6 if (code != 0x12 && code != 0x01) { // This one event has no timestamp in F0V6
t += data[pos] | (data[pos+1] << 8); elapsed = data[pos] | (data[pos+1] << 8);
if (elapsed > 0x7FFF) UNEXPECTED_VALUE(elapsed, "<32768s"); // check whether this is generally unsigned, since 0x01 isn't
t += elapsed;
pos += 2; pos += 2;
} }
switch (code) { switch (code) {
case 0x00: // ??? So far only seen on 451P and 551P occasionally, usually no more than once per session case 0x00: // Humidifier setting change (logged in summary in 60 series)
// A nonzero delta corresponds to an N-second gap in data (value was 0x85, only seen once). Look for more. ParseHumidifierSetting50Series(data[pos]);
if (sessionid != 122) CHECK_VALUE(data[startpos], 0); // skip the onc occurrence already seen
CHECK_VALUE(data[startpos+1], 0);
if (data[pos] < 0x80 || data[pos] > 0x85) {
UNEXPECTED_VALUE(data[pos], "0x80-0x85");
DUMP_EVENT();
}
if (this->familyVersion == 3) DUMP_EVENT(); if (this->familyVersion == 3) DUMP_EVENT();
break; break;
//case 0x01: // never seen case 0x01: // Time elapsed?
// Only seen once, on a 550P.
// It looks almost like a time-elapsed event 4 found in F0V4 summaries, but
// 0xFFCC looks like it represents a time adjustment of -52 seconds,
// since the subsequent 0x11 statistics event has a time offset of 172 seconds,
// and counting this as -52 seconds results in a total session time that
// matches the summary and waveform data. Very weird.
CHECK_VALUE(data[pos], 0xCC);
CHECK_VALUE(data[pos+1], 0xFF);
elapsed = data[pos] | (data[pos+1] << 8);
if (elapsed & 0x8000) {
elapsed = (~0xFFFF | elapsed); // sign extend 16-bit number to native int
}
t += elapsed;
break;
case 0x02: // Pressure adjustment case 0x02: // Pressure adjustment
// See notes in ParseEventsF0V6. // See notes in ParseEventsF0V6.
this->AddEvent(new PRS1PressureSetEvent(t, data[pos])); this->AddEvent(new PRS1PressureSetEvent(t, data[pos]));
@ -5083,7 +5094,7 @@ bool PRS1DataChunk::ParseSummaryF0V4(void)
CHECK_VALUE(chunk_size, 1); // and the only record in the session. CHECK_VALUE(chunk_size, 1); // and the only record in the session.
if (this->sessionid == 1) UNEXPECTED_VALUE(this->sessionid, ">1"); if (this->sessionid == 1) UNEXPECTED_VALUE(this->sessionid, ">1");
break; break;
case 7: // Humidifier setting change 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) 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]); this->ParseHumidifierSetting60Series(data[pos+2], data[pos+3]);
break; break;
@ -6783,8 +6794,7 @@ void PRS1DataChunk::ParseHumidifierSettingV3(unsigned char byte1, unsigned char
// All variations seen. // All variations seen.
} else if (family == 5) { } else if (family == 5) {
if (tubepresent) { if (tubepresent) {
if (tubetemp != 0 && tubetemp > 4) UNEXPECTED_VALUE(tubetemp, "<= 4"); // All tube temperature and humidity levels seen.
// All humidity levels seen.
} else if (humidadaptive) { } else if (humidadaptive) {
// All humidity levels seen. // All humidity levels seen.
} else if (humidfixed) { } else if (humidfixed) {
@ -8689,7 +8699,7 @@ bool PRS1DataChunk::ReadHeader(QFile & f)
// Do a few early sanity checks before any variable-length header data. // Do a few early sanity checks before any variable-length header data.
if (this->blockSize == 0) { if (this->blockSize == 0) {
qWarning() << this->m_path << "blocksize 0?"; qWarning() << this->m_path << "@" << hex << this->m_filepos << "blocksize 0, skipping remainder of file";
break; break;
} }
if (this->fileVersion < 2 || this->fileVersion > 3) { if (this->fileVersion < 2 || this->fileVersion > 3) {