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

Refactor ParseSummaryF0V23 to match loop structure of F0V6. No change to imported data.

Browse Source
This commit is contained in:
sawinglogz 2019-09-24 21:07:10 -04:00
parent 55525cdc01
commit fd23108c3d
1 changed files with 82 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3775,6 +3775,11 @@ bool PRS1Import::ImportCompliance()
//TODO: channel.add if we ever want to import this //TODO: channel.add if we ever want to import this
//session->settings[PRS1_SysLock] = (bool) e->m_value; //session->settings[PRS1_SysLock] = (bool) e->m_value;
break; break;
case PRS1_SETTING_MASK_RESIST_SETTING:
case PRS1_SETTING_MASK_RESIST_STATUS:
// Don't bother importing these for bricks, because they're always locked off.
CHECK_VALUE(e->m_value, 0);
break;
case PRS1_SETTING_HOSE_DIAMETER: case PRS1_SETTING_HOSE_DIAMETER:
session->settings[PRS1_HoseDiam] = QObject::tr("%1mm").arg(e->m_value); session->settings[PRS1_HoseDiam] = QObject::tr("%1mm").arg(e->m_value);
break; break;
@ -3925,26 +3930,45 @@ bool PRS1DataChunk::ParseSummaryF0V23()
qWarning() << "ParseSummaryF0V23 called with family" << this->family << "familyVersion" << this->familyVersion; qWarning() << "ParseSummaryF0V23 called with family" << this->family << "familyVersion" << this->familyVersion;
return false; return false;
} }
const unsigned char * data = (unsigned char *)this->m_data.constData();
int chunk_size = this->m_data.size();
static const int minimum_sizes[] = { 0xf, 5, 2, 0x21 };
static const int ncodes = sizeof(minimum_sizes) / sizeof(int);
// NOTE: These are fixed sizes, but are called minimum to more closely match the F0V6 parser.
// TODO: hardcoding this is ugly, think of a better approach // TODO: hardcoding this is ugly, think of a better approach
if (this->m_data.size() < 59) { if (chunk_size < 59) {
qWarning() << this->sessionid << "summary data too short:" << this->m_data.size(); qWarning() << this->sessionid << "summary data too short:" << this->m_data.size();
return false; return false;
} }
const unsigned char * data = (unsigned char *)this->m_data.constData();
CHECK_VALUE(data[0x00], 0); bool ok = true;
if (data[0x00] != 0) { int pos = 0;
if (data[0x00] != 5) { int code, size;
qDebug() << this->sessionid << "summary first byte" << data[0x00] <<" != 0, skipping"; int tt = 0;
} do {
return false; code = data[pos++];
} // There is no hblock prior to F0V6.
CHECK_VALUES(data[0x01] & 0xF0, 0x60, 0x70); // TODO: what are these? size = 0;
if ((data[0x01] & 0x0F) != 1) { // This is the most frequent value. if (code < ncodes) {
CHECK_VALUES(data[0x01] & 0x0F, 3, 0); // TODO: what are these? 0 seems to be related to errors. // make sure the handlers below don't go past the end of the buffer
size = minimum_sizes[code];
} // else if it's past ncodes, we'll log its information below (rather than handle it)
if (pos + size > chunk_size) {
qWarning() << this->sessionid << "slice" << code << "@" << pos << "longer than remaining chunk";
ok = false;
break;
} }
ParseSettingsF0V23(data, 0x0e); switch (code) {
case 0: // Equipment On
CHECK_VALUE(pos, 1); // Always first
CHECK_VALUES(data[pos] & 0xF0, 0x60, 0x70); // TODO: what are these?
if ((data[pos] & 0x0F) != 1) { // This is the most frequent value.
CHECK_VALUES(data[pos] & 0x0F, 3, 0); // TODO: what are these? 0 seems to be related to errors.
}
// F0V23 doesn't have a separate settings record like F0V6 does, the settings just follow the EquipmentOn data.
ok = ParseSettingsF0V23(data, 0x0e);
// TODO: register these as pressure set events // TODO: register these as pressure set events
//CHECK_VALUES(data[0x0e], ramp_pressure, min_pressure); // initial CPAP/EPAP, can be minimum pressure or ramp, or whatever auto decides to use //CHECK_VALUES(data[0x0e], ramp_pressure, min_pressure); // initial CPAP/EPAP, can be minimum pressure or ramp, or whatever auto decides to use
//if (cpapmode == PRS1_MODE_BILEVEL) { // initial IPAP for bilevel modes //if (cpapmode == PRS1_MODE_BILEVEL) { // initial IPAP for bilevel modes
@ -3952,52 +3976,47 @@ bool PRS1DataChunk::ParseSummaryF0V23()
//} else if (cpapmode == PRS1_MODE_AUTOBILEVEL) { //} else if (cpapmode == PRS1_MODE_AUTOBILEVEL) {
// CHECK_VALUE(data[0x0f], min_pressure + 20); // CHECK_VALUE(data[0x0f], min_pressure + 20);
//} //}
break;
// List of slices, really session-related events: case 2: // Mask On
int start = 0; tt += data[pos] | (data[pos+1] << 8);
int tt = start; this->AddEvent(new PRS1ParsedSliceEvent(tt, MaskOn));
// no per-slice humidifer settings as in F0V6
int len = this->size()-3; break;
int pos = 0x10; case 3: // Mask Off
do { tt += data[pos] | (data[pos+1] << 8);
quint8 c = data[pos++]; this->AddEvent(new PRS1ParsedSliceEvent(tt, MaskOff));
int delta = data[pos] | data[pos+1] << 8; // F0V23 doesn't have a separate stats record like F0V6 does, the stats just follow the MaskOff data.
pos+=2;
SliceStatus status;
if (c == 0x02) {
status = MaskOn;
if (tt == 0) {
CHECK_VALUE(delta, 0); // we've never seen the initial MaskOn have any delta
} else {
if (delta % 60) UNEXPECTED_VALUE(delta, "even minutes"); // mask-off events seem to be whole minutes?
}
} else if (c == 0x03) {
status = MaskOff;
// These are 0x22 bytes in a summary vs. 3 bytes in compliance data // These are 0x22 bytes in a summary vs. 3 bytes in compliance data
// TODO: What are these values? // TODO: What are these values?
pos += 0x1F; break;
} else if (c == 0x01) { case 1: // Equipment Off
status = EquipmentOff; tt += data[pos] | (data[pos+1] << 8);
// This has a delta if the mask was removed before the machine was shut off. this->AddEvent(new PRS1ParsedSliceEvent(tt, EquipmentOff));
} else {
qDebug() << this->sessionid << "unknown slice status" << c; // seems to be trailing 01 [01 or 02] 83 after equipment off?
if (data[pos+2] != 1) { // This is the usual value.
CHECK_VALUES(data[pos+2], 0, 3); // 0 seems to be related to errors, 3 seen after 90 sec large leak before turning off?
}
//CHECK_VALUES(data[pos+3], 0, 1); // TODO: may be related to ramp? 1-5 seems to have a ramp start or two
//CHECK_VALUES(data[pos+4], 0x81, 0x80); // seems to be humidifier setting at end of session
if (data[pos+4] && (((data[pos+4] & 0x80) == 0) || (data[pos+4] & 0x07) > 5)) {
UNEXPECTED_VALUE(data[pos+4], "valid humidifier setting");
}
break;
case 5: // Unknown, but occasionally encountered
CHECK_VALUE(pos, 1); // Always first
CHECK_VALUE(chunk_size, 1); // and the only record in the session.
ok = false;
break;
default:
UNEXPECTED_VALUE(code, "known slice code");
ok = false; // unlike F0V6, we don't know the size of unknown slices, so we can't recover
break; break;
} }
tt += delta; pos += size;
this->AddEvent(new PRS1ParsedSliceEvent(tt, status)); } while (ok && pos < chunk_size);
} while (pos < len);
// seems to be trailing 01 [01 or 02] 83 after the slices? if (ok && pos != chunk_size) {
if (pos == len) {
if (data[pos] != 1) { // This is the usual value.
CHECK_VALUES(data[pos], 0, 3); // 0 seems to be related to errors, 3 seen after 90 sec large leak before turning off?
}
//CHECK_VALUES(data[pos+1], 0, 1); // TODO: may be related to ramp? 1-5 seems to have a ramp start or two
//CHECK_VALUES(data[pos+2], 0x81, 0x80); // seems to be humidifier setting at end of session
if (data[pos+2] && (((data[pos+2] & 0x80) == 0) || (data[pos+2] & 0x07) > 5)) {
UNEXPECTED_VALUE(data[pos+2], "valid humidifier setting");
}
} else {
qWarning() << this->sessionid << (this->size() - pos) << "trailing bytes"; qWarning() << this->sessionid << (this->size() - pos) << "trailing bytes";
} }