PRS1 Family 4 Leak/PB flag span fixes

This commit is contained in:
Mark Watkins 2016-02-29 20:21:57 +10:00
parent 57ac57b110
commit bb0ff10161

View File

@ -1374,12 +1374,17 @@ bool PRS1Import::ParseF0Events()
case 0x0e: // Unknown case 0x0e: // Unknown
data[0] = buffer[pos + 1] << 8 | buffer[pos]; data[0] = buffer[pos + 1] << 8 | buffer[pos];
if (event->familyVersion >= 4) {
// might not doublerize on older machines
data[0] *= 2;
}
pos += 2; pos += 2;
data[1] = buffer[pos++]; data[1] = buffer[pos++];
tt = t - qint64(data[1]) * 1000L; tt = t - qint64(data[1]) * 1000L;
//LL->AddEvent(tt, data[0]); //LL->AddEvent(tt, data[0]);
Code[17]->AddEvent(t, data[1]); Code[17]->AddEvent(t, data[0]);
@ -1399,7 +1404,7 @@ bool PRS1Import::ParseF0Events()
case 0x0f: // Cheyne Stokes Respiration case 0x0f: // Cheyne Stokes Respiration
data[0] = (buffer[pos + 1] << 8 | buffer[pos]); data[0] = (buffer[pos + 1] << 8 | buffer[pos]);
if (event->familyVersion > 4) { if (event->familyVersion >= 4) {
// might not doublerize on older machines // might not doublerize on older machines
data[0] *= 2; data[0] *= 2;
} }
@ -1410,7 +1415,7 @@ bool PRS1Import::ParseF0Events()
break; break;
case 0x10: // Large Leak case 0x10: // Large Leak
data[0] = buffer[pos + 1] << 8 | buffer[pos]; data[0] = buffer[pos + 1] << 8 | buffer[pos];
if (event->familyVersion > 4) { if (event->familyVersion >= 4) {
// might not doublerize on older machines // might not doublerize on older machines
data[0] *= 2; data[0] *= 2;
} }
@ -1435,10 +1440,8 @@ bool PRS1Import::ParseF0Events()
if (((event->family == 0) && (event->familyVersion >= 4)) || (event->fileVersion == 3)) { if (((event->family == 0) && (event->familyVersion >= 4)) || (event->fileVersion == 3)) {
// EPAP / Flex Pressure // EPAP / Flex Pressure
data[0] = buffer[pos++]; data[0] = buffer[pos++];
if (!(EPAP = session->AddEventList(CPAP_EPAP, EVL_Event, 0.1F))) { return false; } //if (!(EPAP = session->AddEventList(CPAP_EPAP, EVL_Event, 0.1F))) { return false; }
EPAP->AddEvent(t, data[0]); //EPAP->AddEvent(t, data[0]);
// pos++;
} }
break; break;