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

Don't calculate unintentional leak for PRS1 autoSV 60-series machines, which report it.

Browse Source 
This fixes 960P-960T, which was importing both values at each interval, presumably
trampling each other. 950P didn't report it, and DreamStation never calculated it.

Also fix timed breath gain for pre-DreamStation autoSV.
This commit is contained in:
sawinglogz 2019-10-10 17:20:24 -04:00
parent 6715e05f61
commit abb7ddd9cb
1 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1738,9 +1738,6 @@ bool PRS1Import::ParseEventsF5V3()
bool ok; bool ok;
ok = event->ParseEvents(); ok = event->ParseEvents();
if (!ok) { // TODO: reconcile with F5V2 and earlier
return false;
}
for (int i=0; i < event->m_parsedData.count(); i++) { for (int i=0; i < event->m_parsedData.count(); i++) {
PRS1ParsedEvent* e = event->m_parsedData.at(i); PRS1ParsedEvent* e = event->m_parsedData.at(i);
@ -1832,7 +1829,7 @@ bool PRS1Import::ParseEventsF5V3()
case PRS1TidalVolumeEvent::TYPE: case PRS1TidalVolumeEvent::TYPE:
TV->AddEvent(t, e->m_value); TV->AddEvent(t, e->m_value);
break; break;
case PRS1PressurePulseEvent::TYPE: case PRS1PressurePulseEvent::TYPE: // Only seen in F5V3, not F5V2 or earlier
if (!PP) { if (!PP) {
if (!(PP = session->AddEventList(CPAP_PressurePulse, EVL_Event))) { return false; } if (!(PP = session->AddEventList(CPAP_PressurePulse, EVL_Event))) { return false; }
} }
@ -1848,6 +1845,10 @@ bool PRS1Import::ParseEventsF5V3()
} }
} }
if (!ok) {
return false;
}
// TODO: why is the below commented out? // TODO: why is the below commented out?
//t = qint64(event->timestamp + event->duration) * 1000L; //t = qint64(event->timestamp + event->duration) * 1000L;
session->updateLast(t); session->updateLast(t);
@ -2050,7 +2051,7 @@ bool PRS1Import::ParseF5Events()
EventList *PTB = session->AddEventList(CPAP_PTB, EVL_Event); EventList *PTB = session->AddEventList(CPAP_PTB, EVL_Event);
// TB could be on-demand // TB could be on-demand
EventList *TB = session->AddEventList(PRS1_TimedBreath, EVL_Event); // TODO: a gain of 0.1 should affect display, but it doesn't EventList *TB = session->AddEventList(PRS1_TimedBreath, EVL_Event, 0.1F); // TODO: a gain of 0.1 should affect display, but it doesn't
EventList *IPAP = session->AddEventList(CPAP_IPAP, EVL_Event, GAIN); EventList *IPAP = session->AddEventList(CPAP_IPAP, EVL_Event, GAIN);
EventList *EPAP = session->AddEventList(CPAP_EPAP, EVL_Event, GAIN); EventList *EPAP = session->AddEventList(CPAP_EPAP, EVL_Event, GAIN);
@ -2059,12 +2060,13 @@ bool PRS1Import::ParseF5Events()
EventList *IPAPHi = session->AddEventList(CPAP_IPAPHi, EVL_Event, GAIN); EventList *IPAPHi = session->AddEventList(CPAP_IPAPHi, EVL_Event, GAIN);
// On-demand channels // On-demand channels
//EventList * PP=nullptr; EventList *PP = nullptr;
EventDataType currentPressure=0; EventDataType currentPressure=0;
// Unintentional leak calculation, see zMaskProfile:calcLeak in calcs.cpp for explanation // Unintentional leak calculation, see zMaskProfile:calcLeak in calcs.cpp for explanation
bool calcLeaks = p_profile->cpap->calculateUnintentionalLeaks(); // Only needed for F5V0: F5V1 and later report it directly
bool calcLeaks = (event->familyVersion == 0) && p_profile->cpap->calculateUnintentionalLeaks();
EventDataType lpm4 = p_profile->cpap->custom4cmH2OLeaks(); EventDataType lpm4 = p_profile->cpap->custom4cmH2OLeaks();
EventDataType lpm20 = p_profile->cpap->custom20cmH2OLeaks(); EventDataType lpm20 = p_profile->cpap->custom20cmH2OLeaks();
EventDataType lpm = lpm20 - lpm4; EventDataType lpm = lpm20 - lpm4;
@ -2176,8 +2178,16 @@ bool PRS1Import::ParseF5Events()
case PRS1TidalVolumeEvent::TYPE: case PRS1TidalVolumeEvent::TYPE:
TV->AddEvent(t, e->m_value); TV->AddEvent(t, e->m_value);
break; break;
// No PP event in F5V2 or earlier? case PRS1PressurePulseEvent::TYPE: // Only seen in F5V3, not F5V2 or earlier
// Eat PRS1UnknownDataEvent like F5V3? if (!PP) {
if (!(PP = session->AddEventList(CPAP_PressurePulse, EVL_Event))) { return false; }
}
PP->AddEvent(t, e->m_value);
break;
case PRS1UnknownDataEvent::TYPE:
// These will show up in chunk YAML and any user alerts will be driven
// by the parser.
break;
default: default:
qWarning() << "Unknown PRS1 event type" << (int) e->m_type; qWarning() << "Unknown PRS1 event type" << (int) e->m_type;
break; break;
@ -2783,9 +2793,6 @@ bool PRS1Import::ParseEventsF3V6()
bool ok; bool ok;
ok = event->ParseEvents(); ok = event->ParseEvents();
if (!ok) {
return false;
}
for (int i=0; i < event->m_parsedData.count(); i++) { for (int i=0; i < event->m_parsedData.count(); i++) {
PRS1ParsedEvent* e = event->m_parsedData.at(i); PRS1ParsedEvent* e = event->m_parsedData.at(i);
@ -2901,6 +2908,11 @@ bool PRS1Import::ParseEventsF3V6()
} }
} }
if (!ok) {
return false;
}
// TODO: Why is the below commented out?
//t = qint64(event->timestamp + event->duration) * 1000L; //t = qint64(event->timestamp + event->duration) * 1000L;
session->updateLast(t); session->updateLast(t);
session->m_cnt.clear(); session->m_cnt.clear();