chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-05 10:40:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add support for newly discovered event in PRS1 F0V6, fixing total session time.

Browse Source 
Also added 500X120 to list of tested machines.
This commit is contained in:
sawinglogz 2020-04-04 17:26:50 -04:00
parent 4cac0d1019
commit 244f18f2af
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Htmldocs/release_notes.html
View File

@ -18,7 +18,12 @@
<li>AVAPS settings are now displayed correctly, including target tidal volume.</li>
<li>Backup breath settings are now imported and displayed.</li>
<li>The settings for CPAP-Check and Auto-Trial modes are now displayed correctly.</li>
</ul>
</ul></li>
<li>[fix] Fix the reported duration for extremely long sessions on DreamStation CPAP and BiPAP devices</li>
<li>[new] Additional Philips Respironics devices tested and fully supported:
<ul>
<li>DreamStation Auto CPAP (500X120)</li>
</ul></li>
<li>[fix] Fix regression in Welcome page pressure display
<li>[fix] Several crashes have been fixed.
</ul>

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

@ -272,6 +272,7 @@ static const PRS1TestedModel s_PRS1TestedModels[] = {
{ "400X110", 0, 6, "DreamStation CPAP Pro" },
{ "400X150", 0, 6, "DreamStation CPAP Pro" },
{ "500X110", 0, 6, "DreamStation Auto CPAP" },
{ "500X120", 0, 6, "DreamStation Auto CPAP" },
{ "500X130", 0, 6, "DreamStation Auto CPAP" },
{ "500X150", 0, 6, "DreamStation Auto CPAP" },
{ "501X120", 0, 6, "DreamStation Auto CPAP with P-Flex" },
@ -4973,7 +4974,7 @@ bool PRS1DataChunk::ParseSummaryF0V4(void)
// That's represented by a mask-off event 19129 seconds after the mask-on, then a time-elapsed
// event after 65535 seconds, then an equipment off event after another 616 seconds.
tt += data[pos] | (data[pos+1] << 8);
// TODO: see if this event exists in other versions
// TODO: see if this event exists in earlier versions
break;
case 5: // Clock adjustment?
CHECK_VALUE(pos, 1); // Always first
@ -6113,10 +6114,10 @@ bool PRS1DataChunk::ParseSummaryF5V012(void)
CHECK_VALUE(chunk_size, 1); // and the only record in the session.
if (this->sessionid == 1) UNEXPECTED_VALUE(this->sessionid, ">1");
break;
case 7: // ???
case 7: // Time Elapsed?
tt += data[pos] | (data[pos+1] << 8); // This adds to the total duration (otherwise it won't match report)
break;
case 8: // ???
case 8: // Time Elapsed? How is this different from 7?
tt += data[pos] | (data[pos+1] << 8); // This also adds to the total duration (otherwise it won't match report)
break;
case 9: // Humidifier setting change
@ -7075,6 +7076,9 @@ bool PRS1DataChunk::ParseSummaryF0V6(void)
//CHECK_VALUE(data[pos+3], 0);
}
break;
case 0x09: // Time Elapsed (event 4 in F0V4)
tt += data[pos] | (data[pos+1] << 8);
break;
case 0x0a: // Humidifier setting change
tt += data[pos] | (data[pos+1] << 8); // This adds to the total duration (otherwise it won't match report)
this->ParseHumidifierSettingV3(data[pos+2], data[pos+3]);