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

Add AS11 STR strings to ProcessSTRfiles

Browse Source
This commit is contained in:
Phil Olynyk 2021-07-08 14:27:22 -04:00
parent 10b3340359
commit b29d8ae3f8
3 changed files with 37 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
oscar/SleepLib/loader_plugins/resmed_EDFinfo.h
View File

@ -82,6 +82,7 @@ public:
min_ipap = -1; min_ipap = -1;
epr = -1; epr = -1;
epr_level = -1; epr_level = -1;
comfort = -1;
sessionid = 0; sessionid = 0;
ahi = -1; ahi = -1;
@ -170,6 +171,7 @@ public:
EventDataType min_ipap; EventDataType min_ipap;
EventDataType epr; EventDataType epr;
EventDataType epr_level; EventDataType epr_level;
EventDataType comfort;
quint32 sessionid; quint32 sessionid;
EventDataType ahi; EventDataType ahi;
EventDataType oai; EventDataType oai;

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

@ -31,10 +31,12 @@
ChannelID RMS9_EPR, RMS9_EPRLevel, RMS9_Mode, RMS9_SmartStart, RMS9_HumidStatus, RMS9_HumidLevel, ChannelID RMS9_EPR, RMS9_EPRLevel, RMS9_Mode, RMS9_SmartStart, RMS9_HumidStatus, RMS9_HumidLevel,
RMS9_PtAccess, RMS9_Mask, RMS9_ABFilter, RMS9_ClimateControl, RMS9_TubeType, RMS9_PtAccess, RMS9_Mask, RMS9_ABFilter, RMS9_ClimateControl, RMS9_TubeType,
RMS9_Temp, RMS9_TempEnable, RMS9_RampEnable; RMS9_Temp, RMS9_TempEnable, RMS9_RampEnable, RMAS1x_Comfort;
const QString STR_ResMed_AirSense10 = "AirSense 10"; const QString STR_ResMed_AirSense10 = "AirSense 10";
const QString STR_ResMed_AirCurve10= "AirCurve 10"; const QString STR_ResMed_AirSense11 = "AirSense 11";
const QString STR_ResMed_AirCurve10 = "AirCurve 10";
const QString STR_ResMed_AirCurve11 = "AirCurve 11";
const QString STR_ResMed_S9 = "S9"; const QString STR_ResMed_S9 = "S9";
const QString STR_UnknownModel = "Resmed ???"; const QString STR_UnknownModel = "Resmed ???";
@ -183,6 +185,12 @@ void ResmedLoader::initChannels()
chan->addOption(1, STR_TR_On); chan->addOption(1, STR_TR_On);
chan->addOption(2, QObject::tr("Auto")); chan->addOption(2, QObject::tr("Auto"));
channel.add(GRP_CPAP, chan = new Channel(RMAS1x_Comfort = 0xe20E, SETTING, MT_CPAP, SESSION,
"RMAS1x_Comfort", QObject::tr("Comfort"), QObject::tr("Comfort"), QObject::tr("Comfort"), "", LOOKUP, Qt::black));
chan->addOption(0, STR_TR_Off); // This must be verified
chan->addOption(1, STR_TR_On);
// Setup ResMeds signal name translation map // Setup ResMeds signal name translation map
setupResMedTranslationMap(); setupResMedTranslationMap();
} }
@ -1146,7 +1154,7 @@ bool ResmedLoader::ProcessSTRfiles(Machine *mach, QMap<QDate, STRFile> & STRmap,
// ResMed and their consistent naming and spacing... :/ // ResMed and their consistent naming and spacing... :/
EDFSignal *maskon = str.lookupLabel("Mask On"); // Series 9 machines EDFSignal *maskon = str.lookupLabel("Mask On"); // Series 9 machines
if (!maskon) { if (!maskon) {
maskon = str.lookupLabel("MaskOn"); // Series 10 machines maskon = str.lookupLabel("MaskOn"); // Series 1x machines
} }
EDFSignal *maskoff = str.lookupLabel("Mask Off"); EDFSignal *maskoff = str.lookupLabel("Mask Off");
if (!maskoff) { if (!maskoff) {
@ -1176,7 +1184,7 @@ bool ResmedLoader::ProcessSTRfiles(Machine *mach, QMap<QDate, STRFile> & STRmap,
} }
// This is not what we want to check, we must look at this day in the database files... // This is not what we want to check, we must look at this day in the database files...
// Found the plce in checkSummaryDay to compare session count with maskevents divided by 2 // Found the place in checkSummaryDay to compare session count with maskevents divided by 2
#ifdef SESSION_DEBUG #ifdef SESSION_DEBUG
qDebug() << "ResdayList size is" << resdayList.size(); qDebug() << "ResdayList size is" << resdayList.size();
#endif #endif
@ -1198,6 +1206,7 @@ bool ResmedLoader::ProcessSTRfiles(Machine *mach, QMap<QDate, STRFile> & STRmap,
// // } // // }
int recstart = rec * maskon->sampleCnt; int recstart = rec * maskon->sampleCnt;
qDebug() << "MaskOn SampleCount is" << maskon->sampleCnt;
bool validday = false; bool validday = false;
for (int s = 0; s < maskon->sampleCnt; ++s) { for (int s = 0; s < maskon->sampleCnt; ++s) {
@ -1210,9 +1219,7 @@ bool ResmedLoader::ProcessSTRfiles(Machine *mach, QMap<QDate, STRFile> & STRmap,
} }
if ( ! validday) { if ( ! validday) {
// There are no mask on/off events, so this STR day is useless. // There are no mask on/off events, so this STR day is useless.
#ifdef SESSION_DEBUG
qDebug() << "Skipping" << date.toString() << "No mask events"; qDebug() << "Skipping" << date.toString() << "No mask events";
#endif
continue; continue;
} }
@ -1240,7 +1247,7 @@ bool ResmedLoader::ProcessSTRfiles(Machine *mach, QMap<QDate, STRFile> & STRmap,
int lastOff = -1; int lastOff = -1;
for (int s = 0; s < maskon->sampleCnt; ++s) { for (int s = 0; s < maskon->sampleCnt; ++s) {
qint32 on = maskon->dataArray[recstart + s]; // these on/off times are minutes since noon qint32 on = maskon->dataArray[recstart + s]; // these on/off times are minutes since noon
qint32 off = maskoff->dataArray[recstart + s]; qint32 off = maskoff->dataArray[recstart + s]; // we want the actual time in seconds
if ( (on > 24*60) || (off > 24*60) ) { if ( (on > 24*60) || (off > 24*60) ) {
qWarning().noquote() << "Mask times are out of range. Possible SDcard corruption" << "date" << date << "on" << on << "off" <<off; qWarning().noquote() << "Mask times are out of range. Possible SDcard corruption" << "date" << date << "on" << on << "off" <<off;
continue; continue;
@ -1262,8 +1269,6 @@ bool ResmedLoader::ProcessSTRfiles(Machine *mach, QMap<QDate, STRFile> & STRmap,
if ((R.maskon[0]==0) && (R.maskoff[0]>0)) { if ((R.maskon[0]==0) && (R.maskoff[0]>0)) {
R.maskon[0] = noonstamp; R.maskon[0] = noonstamp;
} }
// TODO This should be last non-zero sample, not the last sample in the array
// DONE
if ( (lastOn >= 0) && (lastOff >= 0) ) { if ( (lastOn >= 0) && (lastOff >= 0) ) {
if ((R.maskon[lastOn] > 0) && (R.maskoff[lastOff] == 0)) { if ((R.maskon[lastOn] > 0) && (R.maskoff[lastOff] == 0)) {
R.maskoff[lastOff] = QDateTime(date,QTime(12,0,0), EDFInfo::localNoDST).addDays(1).toTime_t() - 1; R.maskoff[lastOff] = QDateTime(date,QTime(12,0,0), EDFInfo::localNoDST).addDays(1).toTime_t() - 1;
@ -1279,7 +1284,7 @@ bool ResmedLoader::ProcessSTRfiles(Machine *mach, QMap<QDate, STRFile> & STRmap,
R.rms9_mode = mod; R.rms9_mode = mod;
if (mod == 11) { if (mod == 11) {
mode = MODE_APAP; // For her mode = MODE_A4Her; // For her
} else if (mod >= 8) { // mod 8 == vpap adapt variable epap } else if (mod >= 8) { // mod 8 == vpap adapt variable epap
mode = MODE_ASV_VARIABLE_EPAP; mode = MODE_ASV_VARIABLE_EPAP;
} else if (mod >= 7) { // mod 7 == vpap adapt } else if (mod >= 7) { // mod 7 == vpap adapt
@ -1302,7 +1307,10 @@ bool ResmedLoader::ProcessSTRfiles(Machine *mach, QMap<QDate, STRFile> & STRmap,
R.ramp_pressure = EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset; R.ramp_pressure = EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset;
} }
// Settings.Adaptive Starting Pressure? // mode 11 = APAP for her? // Settings.Adaptive Starting Pressure? // mode 11 = APAP for her?
if (((mod == 1) || (mod == 11)) && (sig = str.lookupLabel("S.AS.StartPress"))) { if ( (mod == 1) && ((sig = str.lookupLabel("S.AS.StartPress")) || (sig = str.lookupLabel("S.A.StartPress"))) ) {
R.ramp_pressure = EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset;
}
if ( (mod == 11) && (sig = str.lookupLabel("S.AFH.StartPress"))) {
R.ramp_pressure = EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset; R.ramp_pressure = EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset;
} }
if ((R.mode == MODE_BILEVEL_FIXED) && (sig = str.lookupLabel("S.BL.StartPress"))) { if ((R.mode == MODE_BILEVEL_FIXED) && (sig = str.lookupLabel("S.BL.StartPress"))) {
@ -1315,7 +1323,7 @@ bool ResmedLoader::ProcessSTRfiles(Machine *mach, QMap<QDate, STRFile> & STRmap,
} }
} }
if ((sig = str.lookupLabel("Mask Dur"))) { if ((sig = str.lookupLabel("Mask Dur")) || (sig = str.lookupLabel("Duration"))) {
R.maskdur = EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset; R.maskdur = EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset;
} }
if ((sig = str.lookupLabel("Leak Med")) || (sig = str.lookupLabel("Leak.50"))) { if ((sig = str.lookupLabel("Leak Med")) || (sig = str.lookupLabel("Leak.50"))) {
@ -1495,8 +1503,12 @@ bool ResmedLoader::ProcessSTRfiles(Machine *mach, QMap<QDate, STRFile> & STRmap,
} }
EventDataType epr = -1, epr_level = -1; EventDataType epr = -1, epr_level = -1;
bool a10 = false; bool a1x = false;
if ((mode == MODE_CPAP) || (mode == MODE_APAP)) { if ((mode == MODE_CPAP) || (mode == MODE_APAP)) {
if ((sig = str.lookupLabel("S.AS.Comfort"))) { // first check machines opinion
a1x = true;
R.comfort = EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset;
}
if ((sig = str.lookupSignal(RMS9_EPR))) { if ((sig = str.lookupSignal(RMS9_EPR))) {
epr= EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset; epr= EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset;
} }
@ -1504,20 +1516,20 @@ bool ResmedLoader::ProcessSTRfiles(Machine *mach, QMap<QDate, STRFile> & STRmap,
epr_level= EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset; epr_level= EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset;
} }
if ((sig = str.lookupLabel("S.EPR.EPRType"))) { if ((sig = str.lookupLabel("S.EPR.EPRType"))) {
a10 = true; a1x = true;
epr = EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset; epr = EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset;
epr += 1; epr += 1;
} }
int epr_on=0, clin_epr_on=0; int epr_on=0, clin_epr_on=0;
if ((sig = str.lookupLabel("S.EPR.EPREnable"))) { // first check machines opinion if ((sig = str.lookupLabel("S.EPR.EPREnable"))) { // first check machines opinion
a10 = true; a1x = true;
epr_on = EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset; epr_on = EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset;
} }
if (epr_on && (sig = str.lookupLabel("S.EPR.ClinEnable"))) { if (epr_on && (sig = str.lookupLabel("S.EPR.ClinEnable"))) {
a10 = true; a1x = true;
clin_epr_on = EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset; clin_epr_on = EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset;
} }
if (a10 && !(epr_on && clin_epr_on)) { if (a1x && !(epr_on && clin_epr_on)) {
epr = 0; epr = 0;
epr_level = 0; epr_level = 0;
} }
@ -3259,6 +3271,7 @@ void setupResMedTranslationMap()
{ {
//////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////
// Translation lookup table for non-english machines // Translation lookup table for non-english machines
// Also combine S9, AS10, and AS11 variants
//////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////
// Only put the first part, enough to be identifiable, because ResMed likes // Only put the first part, enough to be identifiable, because ResMed likes
@ -3303,12 +3316,14 @@ void setupResMedTranslationMap()
resmed_codes[CPAP_Apnea] = QStringList { "Apnea" }; resmed_codes[CPAP_Apnea] = QStringList { "Apnea" };
resmed_codes[CPAP_RERA] = QStringList { "Arousal" }; resmed_codes[CPAP_RERA] = QStringList { "Arousal" };
resmed_codes[CPAP_ClearAirway] = QStringList { "Central apnea" }; resmed_codes[CPAP_ClearAirway] = QStringList { "Central apnea" };
// STR signals
resmed_codes[CPAP_Mode] = QStringList { "Mode", "Modus", "Funktion", "\xE6\xA8\xA1\xE5\xBC\x8F", "Mod" }; resmed_codes[CPAP_Mode] = QStringList { "Mode", "Modus", "Funktion", "\xE6\xA8\xA1\xE5\xBC\x8F", "Mod" };
resmed_codes[RMS9_SetPressure] = QStringList { "Set Pressure", "Eingest. Druck", "Ingestelde druk", "\xE8\xAE\xBE\xE5\xAE\x9A\xE5\x8E\x8B\xE5\x8A\x9B", "Pres. prescrite", "Inställt tryck", "Inställt tryck", "S.C.Press", "Basıncı Ayarl" }; resmed_codes[RMS9_SetPressure] = QStringList { "Set Pressure", "Eingest. Druck", "Ingestelde druk", "\xE8\xAE\xBE\xE5\xAE\x9A\xE5\x8E\x8B\xE5\x8A\x9B", "Pres. prescrite", "Inställt tryck", "Inställt tryck", "S.C.Press", "Basıncı Ayarl" };
resmed_codes[RMS9_EPR] = QStringList { "EPR", "\xE5\x91\xBC\xE6\xB0\x94\xE9\x87\x8A\xE5\x8E\x8B\x28\x45\x50" }; resmed_codes[RMS9_EPR] = QStringList { "EPR", "\xE5\x91\xBC\xE6\xB0\x94\xE9\x87\x8A\xE5\x8E\x8B\x28\x45\x50" };
resmed_codes[RMS9_EPRLevel] = QStringList { "EPR Level", "EPR-Stufe", "EPR-niveau", "\x45\x50\x52\x20\xE6\xB0\xB4\xE5\xB9\xB3", "Niveau EPR", "EPR-nivå", "EPR-nivÃ¥", "S.EPR.Level", "EPR Düzeyi" }; resmed_codes[RMS9_EPRLevel] = QStringList { "EPR Level", "EPR-Stufe", "EPR-niveau", "\x45\x50\x52\x20\xE6\xB0\xB4\xE5\xB9\xB3", "Niveau EPR", "EPR-nivå", "EPR-nivÃ¥", "S.EPR.Level", "EPR Düzeyi" };
resmed_codes[CPAP_PressureMax] = QStringList { "Max Pressure", "Max. Druck", "Max druk", "\xE6\x9C\x80\xE5\xA4\xA7\xE5\x8E\x8B\xE5\x8A\x9B", "Pression max.", "Max tryck", "S.AS.MaxPress", "Azami Basınç" }; resmed_codes[CPAP_PressureMax] = QStringList { "Max Pressure", "Max. Druck", "Max druk", "\xE6\x9C\x80\xE5\xA4\xA7\xE5\x8E\x8B\xE5\x8A\x9B", "Pression max.", "Max tryck", "S.AS.MaxPress", "S.A.MaxPress", "Azami Basınç" };
resmed_codes[CPAP_PressureMin] = QStringList { "Min Pressure", "Min. Druck", "Min druk", "\xE6\x9C\x80\xE5\xB0\x8F\xE5\x8E\x8B\xE5\x8A\x9B", "Pression min.", "Min tryck", "S.AS.MinPress", "Min Basınç" }; resmed_codes[CPAP_PressureMin] = QStringList { "Min Pressure", "Min. Druck", "Min druk", "\xE6\x9C\x80\xE5\xB0\x8F\xE5\x8E\x8B\xE5\x8A\x9B", "Pression min.", "Min tryck", "S.AS.MinPress", "S.A.MinPress", "Min Basınç" };
//resmed_codes[RMS9_EPR].push_back("S.EPR.EPRType"); //resmed_codes[RMS9_EPR].push_back("S.EPR.EPRType");
} }

2
oscar/SleepLib/machine_common.h
View File

@ -94,7 +94,7 @@ const quint32 PAP_SplitNight = 0x8000; // Split night capabilities
\brief CPAP Machines mode of operation \brief CPAP Machines mode of operation
*/ */
enum CPAPMode { //:short enum CPAPMode { //:short
MODE_UNKNOWN = 0, MODE_CPAP, MODE_APAP, MODE_BILEVEL_FIXED, MODE_BILEVEL_AUTO_FIXED_PS, MODE_BILEVEL_AUTO_VARIABLE_PS, MODE_ASV, MODE_ASV_VARIABLE_EPAP, MODE_AVAPS MODE_UNKNOWN = 0, MODE_CPAP, MODE_APAP, MODE_BILEVEL_FIXED, MODE_BILEVEL_AUTO_FIXED_PS, MODE_BILEVEL_AUTO_VARIABLE_PS, MODE_ASV, MODE_ASV_VARIABLE_EPAP, MODE_AVAPS, MODE_A4Her
}; };
/*! \enum PRTypes /*! \enum PRTypes