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

Clean up ParseEventsF5V0 switch statement based on sample data.

Browse Source 
This fixes a lot of issues with event parsing. Now VS, LL, and EPAP
adjustment events are now correctly parsed.

And as a result the timestamps for events and overall session durations
are now accurate.

The handlers were essentially copied from F5V3 and F0V12 for
consistency and cross-checking.
This commit is contained in:
sawinglogz 2019-10-05 20:52:34 -04:00
parent 4119a57278
commit 15f7dacbab
1 changed files with 87 additions and 231 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1630,7 +1630,7 @@ static QString DumpEvent(int t, int code, const unsigned char* data, int size)
} }
return dump; return dump;
} }
#define DUMP_EVENT() qWarning() << this->sessionid << DumpEvent(t, code, data + pos, size - (pos - startpos)) << "@" << pos #define DUMP_EVENT() qWarning() << this->sessionid << DumpEvent(t, code, data + pos, size - (pos - startpos)) + " @ " + hex(startpos-1)
void PRS1DataChunk::AddEvent(PRS1ParsedEvent* const event) void PRS1DataChunk::AddEvent(PRS1ParsedEvent* const event)
@ -2128,7 +2128,7 @@ bool PRS1DataChunk::ParseEventsF5V0(void)
} }
const unsigned char * data = (unsigned char *)this->m_data.constData(); const unsigned char * data = (unsigned char *)this->m_data.constData();
int chunk_size = this->m_data.size(); int chunk_size = this->m_data.size();
static const QMap<int,int> event_sizes = { {0,3}, {1,2}, {3,4}, {8,3}, {9,3}, {0xa,2}, {0xb,5}, {0xc,5}, {0xd,0xc}, {0xf,5}, {0x10,5}, {0x11,2}, {0x12,6} }; static const QMap<int,int> event_sizes = { {1,2}, {3,4}, {0xa,2}, {0xb,5}, {0xc,5}, {0xd,0xc} };
if (chunk_size < 1) { if (chunk_size < 1) {
// This does occasionally happen in F0V6. // This does occasionally happen in F0V6.
@ -2140,8 +2140,7 @@ bool PRS1DataChunk::ParseEventsF5V0(void)
int pos = 0, startpos; int pos = 0, startpos;
int code, size; int code, size;
int t = 0; int t = 0;
EventDataType data0, data1, data4, data5; int elapsed, duration;
//int elapsed, duration, value;
do { do {
code = data[pos++]; code = data[pos++];
@ -2155,236 +2154,92 @@ bool PRS1DataChunk::ParseEventsF5V0(void)
break; break;
} }
startpos = pos; startpos = pos;
if (code != 0 && code != 0x12) { // These two codes have no timestamp TODO: verify this applies to F5V012 if (code != 0) { // Does this code really not have a timestamp? See below where we check.
t += data[pos] /*| (data[pos+1] << 8)*/; // TODO: Is this really only 1 byte? t += data[pos] | (data[pos+1] << 8);
pos += 2; pos += 2;
} }
switch (code) { switch (code) {
case 0x00: // Unknown (ASV Pressure value) case 0x00: // Unknown, only seen twice
// offset? //DUMP_EVENT();
data0 = data[pos++]; // So far we've only seen 0 for the first 2 bytes. Look for nonzero to see if it's actually a timestamp. If so, fix above to read it.
CHECK_VALUE(data[pos], 0);
if (!data[pos - 1]) { // WTH??? CHECK_VALUE(data[pos+1], 0);
data1 = data[pos++]; CHECK_VALUES(data[pos+2], 0x81, 0x83); // Only two values seen so far
}
if (!data[pos - 1]) {
//data2 = data[pos++];
pos++;
}
break; break;
//case 0x01: // never seen on F5V0
case 0x01: // Unknown case 0x02: // Pressure adjustment
this->AddEvent(new PRS1UnknownValueEvent(code, t, 0, 0.1F)); this->AddEvent(new PRS1EPAPSetEvent(t, data[pos++]));
break; break;
//case 0x03: // never seen on F5V0
case 0x02: // Pressure ???
data0 = data[pos++];
// if (!Code[2]) {
// if (!(Code[2]=session->AddEventList(cpapcode,EVL_Event,0.1))) return false;
// }
// Code[2]->AddEvent(t,data0);
break;
case 0x03: // BIPAP Pressure
qDebug() << "0x03 Observed in ASV data!!????";
data0 = data[pos++];
data1 = data[pos++];
// data0/=10.0;
// data1/=10.0;
// session->AddEvent(new Event(t,CPAP_EAP, 0, data, 1));
// session->AddEvent(new Event(t,CPAP_IAP, 0, &data1, 1));
break;
case 0x04: // Timed Breath case 0x04: // Timed Breath
data0 = data[pos++]; // TB events have a duration in 0.1s, based on the review of pressure waveforms.
// TODO: Ideally the starting time here would be adjusted here, but PRS1ParsedEvents
this->AddEvent(new PRS1TimedBreathEvent(t, data0)); // currently assume integer seconds rather than ms, so that's done at import.
duration = data[pos];
this->AddEvent(new PRS1TimedBreathEvent(t, duration));
break; break;
case 0x05: // Obstructive Apnea
case 0x05: // OA events are instantaneous flags with no duration: reviewing waveforms
//code=CPAP_Obstructive; // shows that the time elapsed between the flag and reporting often includes
data0 = data[pos++]; // non-apnea breathing.
this->AddEvent(new PRS1ObstructiveApneaEvent(t - data0, data0)); elapsed = data[pos];
this->AddEvent(new PRS1ObstructiveApneaEvent(t - elapsed, 0));
break; break;
case 0x06: // Clear Airway Apnea
case 0x06: // CA events are instantaneous flags with no duration: reviewing waveforms
//code=CPAP_ClearAirway; // shows that the time elapsed between the flag and reporting often includes
data0 = data[pos++]; // non-apnea breathing.
this->AddEvent(new PRS1ClearAirwayEvent(t - data0, data0)); elapsed = data[pos];
this->AddEvent(new PRS1ClearAirwayEvent(t - elapsed, 0));
break; break;
case 0x07: // Hypopnea
case 0x07: // TODO: How is this hypopnea different from events 0xd and 0xe?
//code=CPAP_Hypopnea; // NOTE: No additional (unknown) first byte as in F5V3.
data0 = data[pos++]; elapsed = data[pos]; // based on sample waveform, the hypopnea is over after this
this->AddEvent(new PRS1HypopneaEvent(t - data0, data0)); this->AddEvent(new PRS1HypopneaEvent(t - elapsed, 0));
break; break;
//case 0x08: // never seen on F5V0
case 0x08: // ??? case 0x09: // Flow Limitation, note this is 0x8 in F5V3
// This was breaking parsing for F5V1 prior to using fixed lengths. // TODO: We should revisit whether this is elapsed or duration once (if)
// That means it's probably very wrong. // we start calculating flow limitations ourselves. Flow limitations aren't
data0 = data[pos++]; // as obvious as OA/CA when looking at a waveform.
//qDebug() << "Code 8 found at " << hex << pos - 1 << " " << tt; elapsed = data[pos];
this->AddEvent(new PRS1FlowLimitationEvent(t - elapsed, 0));
/*
if (this->familyVersion>=2) {
this->AddEvent(new PRS1HypopneaEvent(t - data0, data0));
} else {
*/
this->AddEvent(new PRS1UnknownValueEvent(code, t - data0, data0));
//????
//data1=data[pos++]; // ???
//pos++;
break; break;
case 0x0a: // Vibratory Snore, note this is 0x9 in F5V3
case 0x09: // ASV Codes // VS events are instantaneous flags with no duration, drawn on the official waveform.
//if (this->familyVersion<2) { // The current thinking is that these are the snores that cause a change in auto-titrating
//code=CPAP_FlowLimit; // pressure. The snoring statistic above seems to be a total count. It's unclear whether
data0 = data[pos++]; // the trigger for pressure change is severity or count or something else.
// no data bytes
this->AddEvent(new PRS1FlowLimitationEvent(t - data0, data0)); this->AddEvent(new PRS1VibratorySnoreEvent(t, 0));
/*
} else {
data0 = data[pos++];
data1 = data[pos++];
*/
break; break;
case 0x0b: // Periodic Breathing, note this is 0xa in F5V3
case 0x0a: // PB events are reported some time after they conclude, and they do have a reported duration.
data0 = data[pos++]; duration = 2 * (data[pos] | (data[pos+1] << 8)); // confirmed to double in F5V0
/* elapsed = data[pos+2];
if (this->familyVersion>=2) { this->AddEvent(new PRS1PeriodicBreathingEvent(t - elapsed - duration, duration));
this->AddEvent(new PRS1FlowLimitationEvent(t - data0, data0));
} else {
*/
this->AddEvent(new PRS1UnknownValueEvent(code, t - data0, data0));
break; break;
case 0x0c: // Large Leak, note this is 0xb in F5V3
// LL events are reported some time after they conclude, and they do have a reported duration.
case 0x0b: // Cheyne Stokes duration = 2 * (data[pos] | (data[pos+1] << 8)); // confirmed to double in F5V0
data0 = ((unsigned char *)data)[pos + 1] << 8 | ((unsigned char *)data)[pos]; elapsed = data[pos+2];
//data0*=2; this->AddEvent(new PRS1LargeLeakEvent(t - elapsed - duration, duration));
pos += 2;
data1 = ((unsigned char *)data)[pos]; //|data[pos+1] << 8
pos += 1;
//tt-=delta;
this->AddEvent(new PRS1PeriodicBreathingEvent(t - data1, data0));
break; break;
case 0x0d: // Statistics
case 0x0c: // These appear every 2 minutes, so presumably summarize the preceding period.
/* this->AddEvent(new PRS1IPAPAverageEvent(t, data[pos+0])); // 00=IPAP
if (this->familyVersion>=2) { this->AddEvent(new PRS1IPAPLowEvent(t, data[pos+1])); // 01=IAP Low
data0 = (data[pos + 1] << 8 | data[pos]); this->AddEvent(new PRS1IPAPHighEvent(t, data[pos+2])); // 02=IAP High
data0 *= 2; this->AddEvent(new PRS1TotalLeakEvent(t, data[pos+3])); // 03=Total leak (average?)
pos += 2; this->AddEvent(new PRS1RespiratoryRateEvent(t, data[pos+4])); // 04=Breaths Per Minute (average?)
data1 = data[pos++]; this->AddEvent(new PRS1PatientTriggeredBreathsEvent(t, data[pos+5])); // 05=Patient Triggered Breaths (average?)
this->AddEvent(new PRS1PeriodicBreathingEvent(t - data1, data0)); this->AddEvent(new PRS1MinuteVentilationEvent(t, data[pos+6])); // 06=Minute Ventilation (average?)
this->AddEvent(new PRS1TidalVolumeEvent(t, data[pos+7])); // 07=Tidal Volume (average?)
} else { this->AddEvent(new PRS1SnoreEvent(t, data[pos+8])); // 08=Snore count // TODO: not a VS on official waveform, but appears in flags and contributes to overall VS index
*/ this->AddEvent(new PRS1EPAPAverageEvent(t, data[pos+9])); // 09=EPAP average
data0 = data[pos++];
qDebug() << "Code 12 found at " << hex << pos - 1 << " " << t - data0;
this->AddEvent(new PRS1UnknownValueEvent(code, t - data0, data0));
pos += 2;
break; break;
case 0x0d: // All the other ASV graph stuff.
/*
if (this->familyVersion>=2) {
data0 = (data[pos + 1] << 8 | data[pos]);
data0 *= 2;
pos += 2;
data1 = data[pos++];
//tt = t - qint64(data1) * 1000L;
} else {
*/
this->AddEvent(new PRS1IPAPAverageEvent(t, data[pos++])); // 00=IAP
data4 = data[pos++];
this->AddEvent(new PRS1IPAPLowEvent(t, data4)); // 01=IAP Low
data5 = data[pos++];
this->AddEvent(new PRS1IPAPHighEvent(t, data5)); // 02=IAP High
this->AddEvent(new PRS1TotalLeakEvent(t, data[pos++])); // 03=LEAK
this->AddEvent(new PRS1RespiratoryRateEvent(t, data[pos++])); // 04=Breaths Per Minute
this->AddEvent(new PRS1PatientTriggeredBreathsEvent(t, data[pos++])); // 05=Patient Triggered Breaths
this->AddEvent(new PRS1MinuteVentilationEvent(t, data[pos++])); // 06=Minute Ventilation
//tmp=data[pos++] * 10.0;
this->AddEvent(new PRS1TidalVolumeEvent(t, data[pos++])); // 07=Tidal Volume
this->AddEvent(new PRS1SnoreEvent(t, data[pos++])); // 08=Snore
this->AddEvent(new PRS1EPAPAverageEvent(t, data1 = data[pos++])); // 09=EPAP
/*
if (this->familyVersion >= 1) {
data0 = data[pos++];
}
*/
break;
case 0x0e: // Unknown
/*
// Family 5.2 has this code
if (this->familyVersion>=2) {
this->AddEvent(new PRS1IPAPAverageEvent(t, data1=data[pos+0])); // 0
this->AddEvent(new PRS1IPAPLowEvent(t, data[pos+1])); // 1
this->AddEvent(new PRS1IPAPHighEvent(t, data[pos+2])); // 2
this->AddEvent(new PRS1LeakEvent(t, data[pos+3])); // 3 // F5V2, is this really unintentional leak rather than total leak?
this->AddEvent(new PRS1TidalVolumeEvent(t, data[pos+7])); // 7
this->AddEvent(new PRS1RespiratoryRateEvent(t, data[pos+4])); // 4
this->AddEvent(new PRS1PatientTriggeredBreathsEvent(t, data[pos+5])); // 5
this->AddEvent(new PRS1MinuteVentilationEvent(t, data[pos+6])); //6
this->AddEvent(new PRS1SnoreEvent(t, data[pos+8])); //??
this->AddEvent(new PRS1EPAPAverageEvent(t, data[pos+9])); // 9
pos+=11;
} else {
*/
qDebug() << "0x0E Observed in ASV data!!????";
data0 = data[pos++]; // << 8) | data[pos];
break;
case 0x0f:
qDebug() << "0x0f Observed in ASV data!!????";
data0 = data[pos + 1] << 8 | data[pos];
pos += 2;
data1 = data[pos]; //|data[pos+1] << 8
pos += 1;
//tt -= qint64(data1) * 1000L;
//session->AddEvent(new Event(tt,cpapcode, 0, data, 2));
break;
case 0x10: // Unknown
data0 = data[pos + 1] << 8 | data[pos];
pos += 2;
data1 = data[pos++];
this->AddEvent(new PRS1LargeLeakEvent(t - data1, data0));
// qDebug() << "0x10 Observed in ASV data!!????";
// data0 = data[pos++]; // << 8) | data[pos];
// data1 = data[pos++];
// data2 = data[pos++];
//session->AddEvent(new Event(t,cpapcode, 0, data, 3));
break;
case 0x11: // Not Leak Rate
qDebug() << "0x11 Observed in ASV data!!????";
//if (!Code[24]) {
// Code[24]=new EventList(cpapcode,EVL_Event);
//}
//Code[24]->AddEvent(t,data[pos++]);
break;
case 0x12: // Summary
qDebug() << "0x12 Observed in ASV data!!????";
data0 = data[pos++];
data1 = data[pos++];
//data2 = data[pos + 1] << 8 | data[pos];
pos += 2;
//session->AddEvent(new Event(t,cpapcode, 0, data,3));
break;
default: default:
DUMP_EVENT(); DUMP_EVENT();
UNEXPECTED_VALUE(code, "known event code"); UNEXPECTED_VALUE(code, "known event code");
@ -2415,6 +2270,7 @@ bool PRS1DataChunk::ParseEventsF5V1(void)
const unsigned char * data = (unsigned char *)this->m_data.constData(); const unsigned char * data = (unsigned char *)this->m_data.constData();
int chunk_size = this->m_data.size(); int chunk_size = this->m_data.size();
static const QMap<int,int> event_sizes = { {0,4}, {1,2}, {3,4}, {8,4}, {9,3}, {0xa,2}, {0xb,5}, {0xc,5}, {0xd,0xd}, {0xf,5}, {0x10,5}, {0x11,2}, {0x12,6} }; static const QMap<int,int> event_sizes = { {0,4}, {1,2}, {3,4}, {8,4}, {9,3}, {0xa,2}, {0xb,5}, {0xc,5}, {0xd,0xd}, {0xf,5}, {0x10,5}, {0x11,2}, {0x12,6} };
//static const QMap<int,int> F5V0_sizes= { {0,3}, {1,2}, {3,4}, {8,3}, {9,3}, {0xa,2}, {0xb,5}, {0xc,5}, {0xd,0xc} };
if (chunk_size < 1) { if (chunk_size < 1) {
// This does occasionally happen in F0V6. // This does occasionally happen in F0V6.