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

Merge branch 'master' into update-macOS-icons

Browse Source
This commit is contained in:
Jeff Norman 2021-11-29 10:35:04 -05:00
commit 11da0d2a07
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Htmldocs/release_notes.html
View File

@ -17,6 +17,7 @@
<ul>
<li>[new] Additional Philips Respironics devices tested and fully supported:
<ul>
<li>REMstar Plus (System One 60 Series) (261P) <i>provides only limited information</i></li>
<li>REMstar Pro (System One 60 Series) (460PBT)</li>
</ul>
</li>

2
oscar/SleepLib/loader_plugins/intellipap_loader.cpp
View File

@ -2496,8 +2496,8 @@ bool load6EventData () {
RE->AddEvent(ti, duration);
#ifdef DEBUGDV6
qDebug() << "E.BIN - RERA" << QDateTime::fromSecsSinceEpoch(rec_ts1).toString("MM/dd/yyyy hh:mm:ss") << "ti" << QDateTime::fromSecsSinceEpoch(ti/1000).toString("hh:mm:ss") << "duration" << duration << "r" << rf.recnum();
break;
#endif
break;
case 8: // snore
SN->AddEvent(ti, duration);
#ifdef DEBUGDV6

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

@ -91,6 +91,7 @@ static const PRS1TestedModel s_PRS1TestedModels[] = {
{ "750P", 0, 2, "BiPAP Auto (System One)" },
{ "261CA", 0, 4, "REMstar Plus (System One 60 Series)" }, // (brick)
{ "261P", 0, 4, "REMstar Plus (System One 60 Series)" }, // (brick)
{ "460P", 0, 4, "REMstar Pro (System One 60 Series)" },
{ "460PBT", 0, 4, "REMstar Pro (System One 60 Series)" }, // evidently built-in bluetooth
{ "461P", 0, 4, "REMstar Pro (System One 60 Series)" },
@ -161,7 +162,7 @@ PRS1ModelInfo::PRS1ModelInfo()
m_modelNames[model.model] = model.name;
}
m_bricks = { "251P", "261CA", "200X110", "501V" };
m_bricks = { "251P", "261CA", "261P", "200X110", "501V" };
}
bool PRS1ModelInfo::IsSupported(int family, int familyVersion) const

5
oscar/SleepLib/loader_plugins/prs1_parser_xpap.cpp
View File

@ -707,11 +707,10 @@ bool PRS1DataChunk::ParseComplianceF0V4(void)
case 1: // Equipment Off
tt += data[pos] | (data[pos+1] << 8);
this->AddEvent(new PRS1ParsedSliceEvent(tt, EquipmentOff));
// TODO: check values
CHECK_VALUES(data[pos+2], 1, 3);
//CHECK_VALUES(data[pos+2], 1, 3); // or 0
//CHECK_VALUE(data[pos+2] & ~(0x40|8|4|2|1), 0); // ???, seen various bit combinations
//CHECK_VALUE(data[pos+3], 0x19); // 0x17, 0x16
CHECK_VALUES(data[pos+4], 0, 1);
//CHECK_VALUES(data[pos+4], 0, 1); // or 2
//CHECK_VALUES(data[pos+4], 0, 1); // or 2
//CHECK_VALUE(data[pos+5], 0x35); // 0x36, 0x36
if (data[pos+6] != 1) {