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

FIX Unkownen Issue for AC11 vAuto and ASV

Browse Source
This commit is contained in:
LoudSnorer 2024-09-19 20:08:43 -04:00
parent a9ad89cd19
commit af82004f56
2 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
oscar/SleepLib/loader_plugins/edfparser.cpp
View File

@ -7,6 +7,9 @@
* License. See the file COPYING in the main directory of the source code * License. See the file COPYING in the main directory of the source code
* for more details. */ * for more details. */
#define TEST_MACROS_ENABLEDoff
#include <test_macros.h>
#include <QDateTime> #include <QDateTime>
#include <QTimeZone> #include <QTimeZone>
#include <QDebug> #include <QDebug>
@ -305,6 +308,11 @@ bool EDFInfo::ParseSignalData() {
for (int j=0;j<sig.sampleCnt;j++) { // Big endian safe for (int j=0;j<sig.sampleCnt;j++) { // Big endian safe
qint16 t=Read16(); qint16 t=Read16();
sig.dataArray[recNo*sig.sampleCnt+j]=t; sig.dataArray[recNo*sig.sampleCnt+j]=t;
// c++ macros IF DEBUGFC Q QQ will expand when TEST_MACROS_ENABLED is enabled
// Displays the first entry in an edf signal when data is valid (not all ones).
IF ( (j==0) && (t !=-1) ) {
DEBUGFC Q(&sig) QQ(rec,recNo) QQ(Cnt,sig.sampleCnt) QQ(off,j) QQ(dat,t) QQ(lab,sig.label);
}
} }
} }
} }

28
oscar/SleepLib/loader_plugins/resmed_loader.cpp
View File

@ -64,7 +64,7 @@ void ResmedLoader::LogUnexpectedMessage(const QString & message)
m_importMutex.unlock(); m_importMutex.unlock();
} }
static const QVector<int> AS11TestedModels {39463, 39420, 39421, 39423, 39483, 39485, 39517, 39520, 0}; static const QVector<int> AS11TestedModels {39463, 39420, 39421, 39423, 39483, 39485, 39517, 39520, 39494, 39491, 0};
ResmedLoader::ResmedLoader() { ResmedLoader::ResmedLoader() {
#ifndef UNITTEST_MODE #ifndef UNITTEST_MODE
@ -1413,10 +1413,15 @@ bool ResmedLoader::ProcessSTRfiles(Machine *mach, QMap<QDate, STRFile> & STRmap,
R.maskevents = maskeventcount->dataArray[rec]; R.maskevents = maskeventcount->dataArray[rec];
CPAPMode mode = MODE_UNKNOWN; CPAPMode mode = MODE_UNKNOWN;
IF (AS_eleven)
DEBUGFC Q(AS_eleven) Q(mode) Q(CPAP_Mode) Q(MODE_CPAP) Q((void*)str.lookupSignal(CPAP_Mode)) O("___________________________________");
if ((sig = str.lookupSignal(CPAP_Mode))) { if ((sig = str.lookupSignal(CPAP_Mode))) {
int mod = EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset; int mod = EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset;
R.rms9_mode = mod; R.rms9_mode = mod;
// Convert AirCurve 11 and AirSense 11 to appropiate resmed 10 modes.
DEBUGFC Q(rec) Q(sig->label) Q(sig->transducer_type);
DEBUGFC Q(mod) O("=") Q(sig->dataArray[rec]) O("*") Q(sig->gain) Q("+") Q(sig->offset);
if ( AS_eleven ) { // translate AS11 mode values back to S9 / AS10 values if ( AS_eleven ) { // translate AS11 mode values back to S9 / AS10 values
switch ( mod ) { switch ( mod ) {
case 0: case 0:
@ -1431,6 +1436,12 @@ bool ResmedLoader::ProcessSTRfiles(Machine *mach, QMap<QDate, STRFile> & STRmap,
case 3: case 3:
R.rms9_mode = 0; // make it be CPAP R.rms9_mode = 0; // make it be CPAP
break; break;
case 7: // Added for ASV .
case 8: // Added for vAuto .
//case 9:
//case 10:
//case 11: // will 11 (A4Her) ever be generated by AS/AC 11?
break; // no change these are the same as in aircurve 10
default: default:
R.rms9_mode = 16; // unknown for now R.rms9_mode = 16; // unknown for now
break; break;
@ -1866,7 +1877,7 @@ bool ResmedLoader::ProcessSTRfiles(Machine *mach, QMap<QDate, STRFile> & STRmap,
R.s_SmartStop = EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset; R.s_SmartStop = EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset;
if ( AS_eleven ) if ( AS_eleven )
R.s_SmartStop--; R.s_SmartStop--;
qDebug() << "SmartStop is set to" << R.s_SmartStop; //qDebug() << "SmartStop is set to" << R.s_SmartStop;
} }
if ((sig = str.lookupLabel("S.HumEnable"))) { if ((sig = str.lookupLabel("S.HumEnable"))) {
R.s_HumEnable = EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset; R.s_HumEnable = EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset;
@ -1888,7 +1899,7 @@ bool ResmedLoader::ProcessSTRfiles(Machine *mach, QMap<QDate, STRFile> & STRmap,
R.s_Tube = EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset; R.s_Tube = EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset;
} }
if ((R.rms9_mode >= 2) && (R.rms9_mode <= 5)) { // S, ST, or T modes if ((R.rms9_mode >= 2) && (R.rms9_mode <= 5)) { // S, ST, or T modes
qDebug() << "BiLevel Mode found" << R.rms9_mode; //qDebug() << "BiLevel Mode found" << R.rms9_mode;
if (R.rms9_mode == 3) { // S mode only if (R.rms9_mode == 3) { // S mode only
if ((sig = str.lookupLabel("S.EasyBreathe"))) { if ((sig = str.lookupLabel("S.EasyBreathe"))) {
R.s_EasyBreathe = EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset; R.s_EasyBreathe = EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset;
@ -1919,19 +1930,19 @@ bool ResmedLoader::ProcessSTRfiles(Machine *mach, QMap<QDate, STRFile> & STRmap,
qDebug() << "vAuto mode found" << 6; qDebug() << "vAuto mode found" << 6;
if ((sig = str.lookupLabel("S.Cycle"))) { if ((sig = str.lookupLabel("S.Cycle"))) {
R.s_Cycle = EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset; R.s_Cycle = EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset;
qDebug() << "Cycle" << R.s_Cycle; // qDebug() << "Cycle" << R.s_Cycle;
} }
if ((sig = str.lookupLabel("S.Trigger"))) { if ((sig = str.lookupLabel("S.Trigger"))) {
R.s_Trigger = EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset; R.s_Trigger = EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset;
qDebug() << "Trigger" << R.s_Trigger; // qDebug() << "Trigger" << R.s_Trigger;
} }
if ((sig = str.lookupLabel("S.TiMax"))) { if ((sig = str.lookupLabel("S.TiMax"))) {
R.s_TiMax = EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset; R.s_TiMax = EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset;
qDebug() << QString("TiMax %1").arg( R.s_TiMax, 0, 'f', 1); // qDebug() << QString("TiMax %1").arg( R.s_TiMax, 0, 'f', 1);
} }
if ((sig = str.lookupLabel("S.TiMin"))) { if ((sig = str.lookupLabel("S.TiMin"))) {
R.s_TiMin = EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset; R.s_TiMin = EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset;
qDebug() << QString("TiMin %1").arg( R.s_TiMin, 0, 'f', 1); // qDebug() << QString("TiMin %1").arg( R.s_TiMin, 0, 'f', 1);
} }
} }
if ( R.min_pressure == 0 ) { if ( R.min_pressure == 0 ) {
@ -3571,9 +3582,10 @@ void ResmedLoader::ToTimeDelta(Session *sess, ResMedEDFInfo &edf, EDFSignal &es,
el->AddEvent(tt, c); el->AddEvent(tt, c);
if (forceDebug && ((code == CPAP_Pressure) || (code == CPAP_IPAP) || (code == CPAP_EPAP)) ) if (forceDebug && ((code == CPAP_Pressure) || (code == CPAP_IPAP) || (code == CPAP_EPAP)) )
qDebug() << "Last Event:" << tmp << QDateTime::fromMSecsSinceEpoch(tt).toString() << "Pos:" << (sptr-1) - es.dataArray; qDebug() << "Last Event:" << tmp << QDateTime::fromMSecsSinceEpoch(tt).toString() << "Pos:" << (sptr-1) - es.dataArray;
} else } else {
qDebug() << "Failed to add last event - Code:" << QString::number(code, 16) << "Value:" << tmp << qDebug() << "Failed to add last event - Code:" << QString::number(code, 16) << "Value:" << tmp <<
QDateTime::fromMSecsSinceEpoch(tt).toString() << "Pos:" << (sptr-1) - es.dataArray; QDateTime::fromMSecsSinceEpoch(tt).toString() << "Pos:" << (sptr-1) - es.dataArray;
}
sess->updateMin(code, min); sess->updateMin(code, min);
sess->updateMax(code, max); sess->updateMax(code, max);