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

Fix pressure gain for F3V6 events and waveforms.

Browse Source 
Also change fileVersion == 3 tests to appropriate familyVersion for ASV and ventilators, respectively.
This commit is contained in:
sawinglogz 2019-07-24 22:42:00 -04:00
parent d33e7585bf
commit a2bcbf1b00
2 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2277,8 +2277,12 @@ bool PRS1DataChunk::ParseEventsF5V012(void)
} }
bool PRS1Import::ParseF3EventsV3()
bool PRS1Import::ParseEventsF3V6()
{ {
// F3V6 uses a gain of 0.125 rather than 0.1 to allow for a maximum value of 30 cmH2O
static const float GAIN = 0.125F; // TODO: parameterize this somewhere better
// Required channels // Required channels
EventList *OA = session->AddEventList(CPAP_Obstructive, EVL_Event); EventList *OA = session->AddEventList(CPAP_Obstructive, EVL_Event);
EventList *HY = session->AddEventList(CPAP_Hypopnea, EVL_Event); EventList *HY = session->AddEventList(CPAP_Hypopnea, EVL_Event);
@ -2292,8 +2296,8 @@ bool PRS1Import::ParseF3EventsV3()
EventList *PB = session->AddEventList(CPAP_PB, EVL_Event); EventList *PB = session->AddEventList(CPAP_PB, EVL_Event);
EventList *PTB = session->AddEventList(CPAP_PTB, EVL_Event); EventList *PTB = session->AddEventList(CPAP_PTB, EVL_Event);
EventList *TB = session->AddEventList(PRS1_TimedBreath, EVL_Event); EventList *TB = session->AddEventList(PRS1_TimedBreath, EVL_Event);
EventList *IPAP = session->AddEventList(CPAP_IPAP, EVL_Event, 0.1F); EventList *IPAP = session->AddEventList(CPAP_IPAP, EVL_Event, GAIN);
EventList *EPAP = session->AddEventList(CPAP_EPAP, EVL_Event, 0.1F); EventList *EPAP = session->AddEventList(CPAP_EPAP, EVL_Event, GAIN);
EventList *RE = session->AddEventList(CPAP_RERA, EVL_Event); EventList *RE = session->AddEventList(CPAP_RERA, EVL_Event);
EventList *ZZ = session->AddEventList(CPAP_NRI, EVL_Event); EventList *ZZ = session->AddEventList(CPAP_NRI, EVL_Event);
EventList *TMV = session->AddEventList(CPAP_Test1, EVL_Event); EventList *TMV = session->AddEventList(CPAP_Test1, EVL_Event);
@ -5081,14 +5085,16 @@ bool PRS1Import::ParseEvents()
res = ParseF0Events(); res = ParseF0Events();
break; break;
case 3: case 3:
if (event->fileVersion == 3) { // NOTE: The original comment in the header for ParseF3EventsV3 said there was a 1060P with fileVersion 3.
res = ParseF3EventsV3(); // We've never seen that, so we're reverting to checking familyVersion.
if (event->familyVersion == 6) {
res = ParseEventsF3V6();
} else { } else {
res = ParseF3Events(); res = ParseF3Events();
} }
break; break;
case 5: case 5:
if (event->fileVersion==3) { if (event->familyVersion == 3) {
res = ParseEventsF5V3(); res = ParseEventsF5V3();
} else { } else {
res = ParseF5Events(); res = ParseF5Events();
@ -5333,8 +5339,9 @@ bool PRS1Import::ParseWaveforms()
if (num > 1) { if (num > 1) {
float pressure_gain = 0.1F; // standard pressure gain float pressure_gain = 0.1F; // standard pressure gain
if (waveform->family == 5 && waveform->familyVersion == 3) { if ((waveform->family == 5 && waveform->familyVersion == 3) ||
// F5V3 uses a gain of 0.125 rather than 0.1 to allow for a maximum value of 30 cmH2O (waveform->family == 3 && waveform->familyVersion == 6)){
// F5V3 and F3V6 use a gain of 0.125 rather than 0.1 to allow for a maximum value of 30 cmH2O
pressure_gain = 0.125F; // TODO: this should be parameterized somewhere better, once we have a clear idea of which machines use this pressure_gain = 0.125F; // TODO: this should be parameterized somewhere better, once we have a clear idea of which machines use this
} }

6
oscar/SleepLib/loader_plugins/prs1_loader.h
View File

@ -277,11 +277,11 @@ public:
bool ParseF0Events(); bool ParseF0Events();
//! \brief Parse a single data chunk from a .002 file containing event data for a AVAPS 1060P machine //! \brief Parse a single data chunk from a .002 file containing event data for a AVAPS 1060P machine
bool ParseF3Events(); bool ParseF3Events();
//! \brief Parse a single data chunk from a .002 file containing event data for a AVAPS 1060P machine file version 3 //! \brief Parse a single data chunk from a .002 file containing event data for a family 3 ventilator machine (family version 6)
bool ParseF3EventsV3(); bool ParseEventsF3V6();
//! \brief Parse a single data chunk from a .002 file containing event data for a family 5 ASV machine (which has a different format) //! \brief Parse a single data chunk from a .002 file containing event data for a family 5 ASV machine (which has a different format)
bool ParseF5Events(); bool ParseF5Events();
//! \brief Parse a single data chunk from a .002 file containing event data for a family 5 ASV file version 3 machine (which has a different format again) //! \brief Parse a single data chunk from a .002 file containing event data for a family 5 ASV family version 3 machine (which has a different format again)
bool ParseEventsF5V3(); bool ParseEventsF5V3();