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

Split parsing from importing for F0V2 and F0V3 summaries.

Browse Source
This commit is contained in:
sawinglogz 2019-05-25 21:57:29 -04:00
parent 7a153a6516
commit eb75860221
2 changed files with 159 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1017,6 +1017,14 @@ enum PRS1ParsedSettingType
PRS1_SETTING_HUMID_STATUS, PRS1_SETTING_HUMID_STATUS,
PRS1_SETTING_HUMID_LEVEL, PRS1_SETTING_HUMID_LEVEL,
PRS1_SETTING_HEATED_TUBING, PRS1_SETTING_HEATED_TUBING,
PRS1_SETTING_SYSTEMONE_RESIST_LOCK,
PRS1_SETTING_SYSTEMONE_RESIST_SETTING,
PRS1_SETTING_SYSTEMONE_RESIST_STATUS,
PRS1_SETTING_HOSE_DIAMETER,
PRS1_SETTING_AUTO_ON,
PRS1_SETTING_AUTO_OFF,
PRS1_SETTING_MASK_ALERT,
PRS1_SETTING_SHOW_AHI,
}; };
class PRS1ParsedEvent class PRS1ParsedEvent
@ -2937,9 +2945,119 @@ bool PRS1Import::ParseCompliance()
return true; return true;
} }
bool PRS1Import::ParseSummaryF0()
bool PRS1Import::ParseSummaryF0V23()
{ {
const unsigned char * data = (unsigned char *)summary->m_data.constData(); bool ok;
ok = summary->ParseSummaryF0V23();
for (int i=0; i < summary->m_parsedData.count(); i++) {
PRS1ParsedEvent* e = summary->m_parsedData.at(i);
if (e->m_type != EV_PRS1_SETTING) {
qWarning() << "Summary had non-setting event:" << (int) e->m_type;
continue;
}
PRS1ParsedSettingEvent* s = (PRS1ParsedSettingEvent*) e;
switch (s->m_setting) {
case PRS1_SETTING_CPAP_MODE:
session->settings[CPAP_Mode] = e->m_value;
break;
case PRS1_SETTING_PRESSURE:
session->settings[CPAP_Pressure] = e->value();
break;
case PRS1_SETTING_PRESSURE_MIN:
session->settings[CPAP_PressureMin] = e->value();
break;
case PRS1_SETTING_PRESSURE_MAX:
session->settings[CPAP_PressureMax] = e->value();
break;
case PRS1_SETTING_EPAP:
session->settings[CPAP_EPAP] = e->value();
break;
case PRS1_SETTING_IPAP:
session->settings[CPAP_IPAP] = e->value();
break;
case PRS1_SETTING_PS:
session->settings[CPAP_PS] = e->value();
break;
case PRS1_SETTING_EPAP_MIN:
session->settings[CPAP_EPAPLo] = e->value();
break;
case PRS1_SETTING_EPAP_MAX:
session->settings[CPAP_EPAPHi] = e->value();
break;
case PRS1_SETTING_IPAP_MIN:
session->settings[CPAP_IPAPLo] = e->value();
break;
case PRS1_SETTING_IPAP_MAX:
session->settings[CPAP_IPAPHi] = e->value();
break;
case PRS1_SETTING_PS_MIN:
session->settings[CPAP_PSMin] = e->value();
break;
case PRS1_SETTING_PS_MAX:
session->settings[CPAP_PSMax] = e->value();
break;
case PRS1_SETTING_FLEX_MODE:
session->settings[PRS1_FlexMode] = e->m_value;
break;
case PRS1_SETTING_FLEX_LEVEL:
session->settings[PRS1_FlexLevel] = e->m_value;
break;
case PRS1_SETTING_RAMP_TIME:
session->settings[CPAP_RampTime] = e->m_value;
break;
case PRS1_SETTING_RAMP_PRESSURE:
session->settings[CPAP_RampPressure] = e->value();
break;
case PRS1_SETTING_HUMID_STATUS:
session->settings[PRS1_HumidStatus] = (bool) e->m_value;
break;
case PRS1_SETTING_HUMID_LEVEL:
session->settings[PRS1_HumidLevel] = e->m_value;
break;
case PRS1_SETTING_SYSTEMONE_RESIST_LOCK:
session->settings[PRS1_SysLock] = (bool) e->m_value;
break;
case PRS1_SETTING_SYSTEMONE_RESIST_SETTING:
session->settings[PRS1_SysOneResistSet] = e->m_value;
break;
case PRS1_SETTING_SYSTEMONE_RESIST_STATUS:
session->settings[PRS1_SysOneResistStat] = (bool) e->m_value;
break;
case PRS1_SETTING_HOSE_DIAMETER:
session->settings[PRS1_HoseDiam] = e->m_value == 15 ? QObject::tr("15mm") : QObject::tr("22mm");
break;
case PRS1_SETTING_AUTO_ON:
session->settings[PRS1_AutoOn] = (bool) e->m_value;
break;
case PRS1_SETTING_AUTO_OFF:
session->settings[PRS1_AutoOff] = (bool) e->m_value;
break;
case PRS1_SETTING_MASK_ALERT:
session->settings[PRS1_MaskAlert] = (bool) e->m_value;
break;
case PRS1_SETTING_SHOW_AHI:
session->settings[PRS1_ShowAHI] = (bool) e->m_value;
break;
default:
qWarning() << "Unknown PRS1 setting type" << (int) s->m_setting;
break;
}
}
if (!ok) {
return false;
}
summary_duration = summary->duration;
return true;
}
bool PRS1DataChunk::ParseSummaryF0V23()
{
const unsigned char * data = (unsigned char *)this->m_data.constData();
CPAPMode cpapmode = MODE_UNKNOWN; CPAPMode cpapmode = MODE_UNKNOWN;
@ -2957,50 +3075,52 @@ bool PRS1Import::ParseSummaryF0()
cpapmode = MODE_BILEVEL_AUTO_VARIABLE_PS; cpapmode = MODE_BILEVEL_AUTO_VARIABLE_PS;
} }
EventDataType min_pressure = EventDataType(data[0x03]) / 10.0; int min_pressure = data[0x03];
EventDataType max_pressure = EventDataType(data[0x04]) / 10.0; int max_pressure = data[0x04];
EventDataType ps = EventDataType(data[0x05]) / 10.0; // pressure support int ps = data[0x05]; // pressure support
if (cpapmode == MODE_CPAP) { if (cpapmode == MODE_CPAP) {
session->settings[CPAP_Pressure] = min_pressure; this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_PRESSURE, min_pressure));
} else if (cpapmode == MODE_APAP) { } else if (cpapmode == MODE_APAP) {
session->settings[CPAP_PressureMin] = min_pressure; this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_PRESSURE_MIN, min_pressure));
session->settings[CPAP_PressureMax] = max_pressure; this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_PRESSURE_MAX, max_pressure));
} else if (cpapmode == MODE_BILEVEL_FIXED) { } else if (cpapmode == MODE_BILEVEL_FIXED) {
session->settings[CPAP_EPAP] = min_pressure; this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_EPAP, min_pressure));
session->settings[CPAP_IPAP] = max_pressure; this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_IPAP, max_pressure));
session->settings[CPAP_PS] = ps; this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_PS, ps));
} else if (cpapmode == MODE_BILEVEL_AUTO_VARIABLE_PS) { } else if (cpapmode == MODE_BILEVEL_AUTO_VARIABLE_PS) {
session->settings[CPAP_EPAPLo] = min_pressure; int min_ps = 2;
session->settings[CPAP_EPAPHi] = max_pressure - 2.0; this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_EPAP_MIN, min_pressure));
session->settings[CPAP_IPAPLo] = min_pressure + 2.0; this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_EPAP_MAX, max_pressure - min_ps));
session->settings[CPAP_IPAPHi] = max_pressure; this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_IPAP_MIN, min_pressure + min_ps));
session->settings[CPAP_PSMin] = 2.0f; this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_IPAP_MAX, max_pressure));
session->settings[CPAP_PSMax] = ps; this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_PS_MIN, min_ps));
this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_PS_MAX, ps));
} }
session->settings[CPAP_Mode] = (int)cpapmode; this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_CPAP_MODE, (int) cpapmode));
int ramp_time = data[0x06]; int ramp_time = data[0x06];
EventDataType ramp_pressure = EventDataType(data[0x07]) / 10.0; int ramp_pressure = data[0x07];
session->settings[CPAP_RampTime] = (int)ramp_time; this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_RAMP_TIME, ramp_time));
session->settings[CPAP_RampPressure] = ramp_pressure; this->AddEvent(new PRS1PressureSettingEvent(PRS1_SETTING_RAMP_PRESSURE, ramp_pressure));
// Tubing lock has no setting byte // Tubing lock has no setting byte
// Menu Options // Menu Options
session->settings[PRS1_SysLock] = (bool) (data[0x0a] & 0x80); // System One Resistance Lock Setting this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_SYSTEMONE_RESIST_LOCK, (data[0x0a] & 0x80) != 0)); // System One Resistance Lock Setting
session->settings[PRS1_SysOneResistSet] = (int)data[0x0a] & 7; // SYstem One Resistance setting value this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_SYSTEMONE_RESIST_SETTING, data[0x0a] & 7)); // SYstem One Resistance setting value
session->settings[PRS1_SysOneResistStat] = (bool) (data[0x0a] & 0x40); // System One Resistance Status bit this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_SYSTEMONE_RESIST_STATUS, (data[0x0a] & 0x40) != 0)); // System One Resistance Status bit
session->settings[PRS1_HoseDiam] = (data[0x0a] & 0x08) ? QObject::tr("15mm") : QObject::tr("22mm"); this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_HOSE_DIAMETER, (data[0x0a] & 0x08) ? 15 : 22));
session->settings[PRS1_AutoOn] = (bool) (data[0x0b] & 0x40); this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_AUTO_ON, (data[0x0b] & 0x40) != 0));
session->settings[PRS1_AutoOff] = (bool) (data[0x0c] & 0x10); this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_AUTO_OFF, (data[0x0c] & 0x10) != 0));
session->settings[PRS1_MaskAlert] = (bool) (data[0x0c] & 0x08); this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_MASK_ALERT, (data[0x0c] & 0x08) != 0));
session->settings[PRS1_ShowAHI] = (bool) (data[0x0c] & 0x04); this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_SHOW_AHI, (data[0x0c] & 0x04) != 0));
session->settings[PRS1_HumidStatus] = (bool)(data[0x09] & 0x80); // Humidifier Connected int humid = data[0x09];
session->settings[PRS1_HumidLevel] = (int)(data[0x09] & 7); // Humidifier Value this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_HUMID_STATUS, (humid & 0x80) != 0)); // Humidifier Connected
this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_HUMID_LEVEL, (humid & 7))); // Humidifier Value
// session-> // session->
@ -3036,10 +3156,10 @@ bool PRS1Import::ParseSummaryF0()
} }
} else flexmode = FLEX_None; } else flexmode = FLEX_None;
session->settings[PRS1_FlexMode] = (int)flexmode; this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_FLEX_MODE, (int) flexmode));
session->settings[PRS1_FlexLevel] = (int)flexlevel; this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_FLEX_LEVEL, flexlevel));
summary_duration = data[0x14] | data[0x15] << 8; this->duration = data[0x14] | data[0x15] << 8;
return true; return true;
} }
@ -3856,7 +3976,7 @@ bool PRS1Import::ParseSummary()
} else if (summary->familyVersion == 4) { } else if (summary->familyVersion == 4) {
return ParseSummaryF0V4(); return ParseSummaryF0V4();
} else { } else {
return ParseSummaryF0(); return ParseSummaryF0V23();
} }
case 3: case 3:
return ParseSummaryF3(); return ParseSummaryF3();

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

@ -127,6 +127,9 @@ public:
//! \brief Read the chunk's data from a PRS1 file and calculate its CRC, must be called after ReadHeader //! \brief Read the chunk's data from a PRS1 file and calculate its CRC, must be called after ReadHeader
bool ReadData(class QFile & f); bool ReadData(class QFile & f);
//! \brief Parse a single data chunk from a .001 file containing summary data for a family 0 CPAP/APAP family version 2 or 3 machine
bool ParseSummaryF0V23(void);
//! \brief Parse a single data chunk from a .001 file containing summary data for a family 0 CPAP/APAP family version 4 machine //! \brief Parse a single data chunk from a .001 file containing summary data for a family 0 CPAP/APAP family version 4 machine
bool ParseSummaryF0V4(void); bool ParseSummaryF0V4(void);
@ -227,7 +230,7 @@ public:
//! \brief Summary parser for 50 series Family 0 CPAP/APAP models //! \brief Summary parser for 50 series Family 0 CPAP/APAP models
bool ParseSummaryF0(); bool ParseSummaryF0V23();
//! \brief Summary parser for 60 series Family 0 CPAP/APAP models //! \brief Summary parser for 60 series Family 0 CPAP/APAP models
bool ParseSummaryF0V4(); bool ParseSummaryF0V4();
//! \brief Summary parser for 1060 series AVAPS models //! \brief Summary parser for 1060 series AVAPS models