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

Update ParseEventsF0V23 with event handlers from F0V6 after verifying them against sample F0V2 data.

Browse Source 
The only difference so far is the lack of doubled duration for PB/LL, slightly rearranged
events 0-3, and the absence of events 0x14 and 0x15 in F0V2 (so far).

The only change in import functionality is that apneas/hypopneas now have a (correct)
duration of 0.

Next step is to test against more samples and particularly F0V3 samples.
This commit is contained in:
sawinglogz 2019-10-03 21:18:52 -04:00
parent b2b62256d5
commit 460959dd78
1 changed files with 124 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3099,6 +3099,22 @@ bool PRS1Import::ParseF0Events()
return true; return true;
} }
static QString DumpEvent(int t, int code, const unsigned char* data, int size)
{
int s = t;
int h = s / 3600; s -= h * 3600;
int m = s / 60; s -= m * 60;
QString dump = QString("%1:%2:%3")
.arg(h, 2, 10, QChar('0'))
.arg(m, 2, 10, QChar('0'))
.arg(s, 2, 10, QChar('0'));
dump = dump + " " + hex(code) + ":";
for (int i = 0; i < size; i++) {
dump = dump + QString(" %1").arg(data[i]);
}
return dump;
}
#define DUMP_EVENT() qWarning() << this->sessionid << DumpEvent(t, code, data + pos, size - (pos - startpos)) << "@" << pos
bool PRS1DataChunk::ParseEventsF0V23(CPAPMode /*mode*/) bool PRS1DataChunk::ParseEventsF0V23(CPAPMode /*mode*/)
{ {
@ -3116,13 +3132,12 @@ bool PRS1DataChunk::ParseEventsF0V23(CPAPMode /*mode*/)
return false; return false;
} }
CHECK_VALUE(this->familyVersion, 2);
bool ok = true; bool ok = true;
int pos = 0, startpos; int pos = 0, startpos;
int code, size; int code, size;
int t = 0; int t = 0;
EventDataType data0, data1, data2; int elapsed, duration, value;
Q_UNUSED(data2)
//int elapsed, duration, value;
do { do {
code = data[pos++]; code = data[pos++];
@ -3142,129 +3157,113 @@ bool PRS1DataChunk::ParseEventsF0V23(CPAPMode /*mode*/)
} }
switch (code) { switch (code) {
case 0x00: // Unknown 00 //case 0x00: // never seen
this->AddEvent(new PRS1UnknownValueEvent(code, t, data[pos++])); //case 0x01: // never seen
break; case 0x02: // Pressure adjustment
// See notes in ParseEventsF0V6.
case 0x01: // Unknown this->AddEvent(new PRS1PressureSetEvent(t, data[pos]));
this->AddEvent(new PRS1UnknownValueEvent(code, t, 0)); break;
break; case 0x03: // Pressure adjustment (bi-level)
// See notes in ParseEventsF0V6.
case 0x02: // Pressure this->AddEvent(new PRS1IPAPSetEvent(t, data[pos+1]));
this->AddEvent(new PRS1PressureSetEvent(t, data[pos++])); this->AddEvent(new PRS1EPAPSetEvent(t, data[pos])); // EPAP needs to be added second to calculate PS
break; break;
case 0x04: // Pressure Pulse
case 0x03: // BIPAP Pressure duration = data[pos]; // TODO: is this a duration?
{ this->AddEvent(new PRS1PressurePulseEvent(t, duration));
data0 = data[pos++]; break;
data1 = data[pos++]; case 0x05: // RERA
this->AddEvent(new PRS1IPAPSetEvent(t, data1)); elapsed = data[pos++];
this->AddEvent(new PRS1EPAPSetEvent(t, data0)); // EPAP needs to be added second to calculate PS this->AddEvent(new PRS1RERAEvent(t - elapsed, 0));
} break;
break; case 0x06: // Obstructive Apnea
// OA events are instantaneous flags with no duration: reviewing waveforms
case 0x04: // Pressure Pulse // shows that the time elapsed between the flag and reporting often includes
data0 = data[pos++]; // non-apnea breathing.
this->AddEvent(new PRS1PressurePulseEvent(t, data0)); elapsed = data[pos];
break; this->AddEvent(new PRS1ObstructiveApneaEvent(t - elapsed, 0));
break;
case 0x05: // RERA case 0x07: // Clear Airway Apnea
data0 = data[pos++]; // CA events are instantaneous flags with no duration: reviewing waveforms
this->AddEvent(new PRS1RERAEvent(t - data0, data0)); // shows that the time elapsed between the flag and reporting often includes
break; // non-apnea breathing.
elapsed = data[pos];
case 0x06: // Obstructive Apoanea this->AddEvent(new PRS1ClearAirwayEvent(t - elapsed, 0));
data0 = data[pos++]; break;
this->AddEvent(new PRS1ObstructiveApneaEvent(t - data0, data0)); //case 0x08: // never seen
break; //case 0x09: // never seen
case 0x0a: // Hypopnea
case 0x07: // Clear Airway // TODO: How is this hypopnea different from events 0xb, [0x14 and 0x15 on F0V6]?
data0 = data[pos++]; elapsed = data[pos++];
this->AddEvent(new PRS1ClearAirwayEvent(t - data0, data0)); this->AddEvent(new PRS1HypopneaEvent(t - elapsed, 0));
break; break;
case 0x0b: // Hypopnea
case 0x0a: // Hypopnea // TODO: How is this hypopnea different from events 0xa, [0x14 and 0x15 on F0V6]?
data0 = data[pos++]; // TODO: What is the first byte?
this->AddEvent(new PRS1HypopneaEvent(t - data0, data0)); //data[pos+0]; // unknown first byte?
break; elapsed = data[pos+1]; // based on sample waveform, the hypopnea is over after this
this->AddEvent(new PRS1HypopneaEvent(t - elapsed, 0));
case 0x0c: // Flow Limitation break;
data0 = data[pos++]; case 0x0c: // Flow Limitation
this->AddEvent(new PRS1FlowLimitationEvent(t - data0, data0)); // TODO: We should revisit whether this is elapsed or duration once (if)
break; // we start calculating flow limitations ourselves. Flow limitations aren't
// as obvious as OA/CA when looking at a waveform.
case 0x0b: // Breathing not Detected flag???? but it doesn't line up elapsed = data[pos];
data0 = data[pos]; this->AddEvent(new PRS1FlowLimitationEvent(t - elapsed, 0));
data1 = data[pos+1]; break;
pos += 2; case 0x0d: // Vibratory Snore
// VS events are instantaneous flags with no duration, drawn on the official waveform.
this->AddEvent(new PRS1UnknownValueEvent(code, t, data0)); // FIXME // The current thinking is that these are the snores that cause a change in auto-titrating
break; // pressure. The snoring statistics below seem to be a total count. It's unclear whether
// the trigger for pressure change is severity or count or something else.
case 0x0d: // Vibratory Snore // no data bytes
this->AddEvent(new PRS1VibratorySnoreEvent(t, 0)); this->AddEvent(new PRS1VibratorySnoreEvent(t, 0));
break; break;
case 0x0e: // ???
case 0x0e: // Unknown // 5 bytes like PB and LL, but what is it?
data0 = data[pos + 1] << 8 | data[pos]; // TODO: does duration double like F0V4?
/* duration = (data[pos] | (data[pos+1] << 8)); // this looks like a 16-bit value, so may be duration like PB?
if (this->familyVersion == 4) { elapsed = data[pos+2]; // this is always 60 seconds unless it's at the end, so it seems like elapsed
// might not doublerize on older machines? CHECK_VALUES(elapsed, 60, 0);
data0 *= 2; this->AddEvent(new PRS1UnknownDurationEvent(t - elapsed - duration, duration));
} break;
*/ case 0x0f: // Periodic Breathing
pos += 2; // PB events are reported some time after they conclude, and they do have a reported duration.
data1 = data[pos++]; // NOTE: F0V2 does NOT double this like F0V6 does
this->AddEvent(new PRS1UnknownValueEvent(code, t - data1, data0)); // TODO: start time should probably match PB below if (this->familyVersion == 3) // double-check whether there's doubling on F0V3
break; DUMP_EVENT();
duration = (data[pos] | (data[pos+1] << 8));
case 0x0f: // Cheyne Stokes Respiration elapsed = data[pos+2];
data0 = (data[pos + 1] << 8 | data[pos]); this->AddEvent(new PRS1PeriodicBreathingEvent(t - elapsed - duration, duration));
/* break;
if (this->familyVersion == 4) { case 0x10: // Large Leak
// might not doublerize on older machines // LL events are reported some time after they conclude, and they do have a reported duration.
data0 *= 2; // NOTE: F0V2 does NOT double this like F0V6 does
} if (this->familyVersion == 3) // double-check whether there's doubling on F0V3
*/ DUMP_EVENT();
pos += 2; duration = (data[pos] | (data[pos+1] << 8));
data1 = data[pos++]; elapsed = data[pos+2];
this->AddEvent(new PRS1LargeLeakEvent(t - elapsed - duration, duration));
// TODO: this fixed some timing errors on parsing/import, but may have broken drawing, since OSCAR break;
// apparently does treat a span's timestamp as an endpoint (at least when drawing, see gFlagsLine::paint)! case 0x11: // Leak Rate & Snore Graphs
this->AddEvent(new PRS1PeriodicBreathingEvent(t - data1 - data0, data0)); // PB event appears data1 seconds after conclusion this->AddEvent(new PRS1TotalLeakEvent(t, data[pos]));
break; this->AddEvent(new PRS1SnoreEvent(t, data[pos+1]));
break;
case 0x10: // Large Leak case 0x12: // Snore count per pressure
data0 = data[pos + 1] << 8 | data[pos]; // Some sessions (with lots of ramps) have multiple of these, each with a
/* // different pressure. The total snore count across all of them matches the
if (this->familyVersion == 4) { // total found in the stats event.
// might not doublerize on older machines if (data[pos] != 0) {
data0 *= 2; CHECK_VALUES(data[pos], 1, 2); // 0 = CPAP pressure, 1 = bi-level EPAP, 2 = bi-level IPAP
} }
*/ //CHECK_VALUE(data[pos+1], 0x78); // pressure
pos += 2; //CHECK_VALUE(data[pos+2], 1); // 16-bit snore count
data1 = data[pos++]; //CHECK_VALUE(data[pos+3], 0);
this->AddEvent(new PRS1LargeLeakEvent(t - data1, data0)); // TODO: start time should probably match PB above value = (data[pos+2] | (data[pos+3] << 8));
break; this->AddEvent(new PRS1SnoresAtPressureEvent(t, data[pos], data[pos+1], value));
break;
case 0x11: // Leak Rate & Snore Graphs
data0 = data[pos++];
data1 = data[pos++];
this->AddEvent(new PRS1TotalLeakEvent(t, data0));
this->AddEvent(new PRS1SnoreEvent(t, data1));
break;
case 0x12: // Summary
data0 = data[pos++];
data1 = data[pos++];
data2 = data[pos + 1] << 8 | data[pos];
pos += 2;
// Could end here, but I've seen data sets valid data after!!!
break;
default: default:
DUMP_EVENT();
UNEXPECTED_VALUE(code, "known event code"); UNEXPECTED_VALUE(code, "known event code");
this->AddEvent(new PRS1UnknownDataEvent(m_data, startpos)); this->AddEvent(new PRS1UnknownDataEvent(m_data, startpos));
ok = false; // unlike F0V6, we don't know the size of unknown slices, so we can't recover ok = false; // unlike F0V6, we don't know the size of unknown slices, so we can't recover