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

Add PtView for AS11 in place of Essentials

Browse Source
This commit is contained in:
Phil Olynyk 2021-08-17 11:32:39 -04:00
parent 1d99b0c5d8
commit 40b465f588
2 changed files with 21 additions and 7 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

@ -130,6 +130,7 @@ public:
s_EPREnable = -1; s_EPREnable = -1;
s_PtAccess = -1; s_PtAccess = -1;
s_PtView = -1;
s_ABFilter = -1; s_ABFilter = -1;
s_Mask = -1; s_Mask = -1;
s_Tube = -1; s_Tube = -1;
@ -214,6 +215,7 @@ public:
int s_EPREnable; int s_EPREnable;
int s_PtAccess; int s_PtAccess;
int s_PtView;
int s_ABFilter; int s_ABFilter;
int s_Mask; int s_Mask;
int s_Tube; int s_Tube;

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

@ -32,8 +32,8 @@
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_SmartStop, RMS9_PtAccess, RMS9_Mask, RMS9_ABFilter, RMS9_ClimateControl, RMS9_TubeType, RMAS11_SmartStop,
RMS9_Temp, RMS9_TempEnable, RMS9_RampEnable, RMAS1x_Comfort; RMS9_Temp, RMS9_TempEnable, RMS9_RampEnable, RMAS1x_Comfort, RMAS11_PtView;
const QString STR_ResMed_AirSense10 = "AirSense 10"; const QString STR_ResMed_AirSense10 = "AirSense 10";
const QString STR_ResMed_AirSense11 = "AirSense 11"; const QString STR_ResMed_AirSense11 = "AirSense 11";
@ -203,12 +203,18 @@ void ResmedLoader::initChannels()
chan->addOption(0, QObject::tr("Soft")); // This must be verified chan->addOption(0, QObject::tr("Soft")); // This must be verified
chan->addOption(1, QObject::tr("Standard")); chan->addOption(1, QObject::tr("Standard"));
channel.add(GRP_CPAP, chan = new Channel(RMS9_SmartStop = 0xe20F, SETTING, MT_CPAP, SESSION, channel.add(GRP_CPAP, chan = new Channel(RMAS11_SmartStop = 0xe20F, SETTING, MT_CPAP, SESSION,
"RMS9_SmartStop", QObject::tr("SmartStop"), QObject::tr("Machine auto stops by breathing"), QObject::tr("Smart Stop"), "", LOOKUP, Qt::black)); "RMAS11_SmartStop", QObject::tr("SmartStop"), QObject::tr("Machine auto stops by breathing"), QObject::tr("Smart Stop"), "", LOOKUP, Qt::black));
chan->addOption(0, STR_TR_Off); chan->addOption(0, STR_TR_Off);
chan->addOption(1, STR_TR_On); chan->addOption(1, STR_TR_On);
channel.add(GRP_CPAP, chan = new Channel(RMAS11_PtView= 0xe210, SETTING, MT_CPAP, SESSION,
"RMAS11_PTView", QObject::tr("Pt. View"), QObject::tr("Pt. View"), QObject::tr("Pt. View"), "", LOOKUP, Qt::black));
chan->addOption(0, QObject::tr("Simple"));
chan->addOption(1, QObject::tr("Advanced"));
// Setup ResMeds signal name translation map // Setup ResMeds signal name translation map
setupResMedTranslationMap(); setupResMedTranslationMap();
} }
@ -1699,9 +1705,11 @@ bool ResmedLoader::ProcessSTRfiles(Machine *mach, QMap<QDate, STRFile> & STRmap,
R.s_Mask--; R.s_Mask--;
} }
if ((sig = str.lookupLabel("S.PtAccess"))) { if ((sig = str.lookupLabel("S.PtAccess"))) {
R.s_PtAccess = EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset; if ( AS_eleven ) {
if ( AS_eleven ) R.s_PtView = EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset;
R.s_PtAccess--; R.s_PtView--;
} else
R.s_PtAccess = EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset;
} }
if ((sig = str.lookupLabel("S.SmartStart"))) { if ((sig = str.lookupLabel("S.SmartStart"))) {
R.s_SmartStart = EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset; R.s_SmartStart = EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset;
@ -2282,6 +2290,10 @@ void StoreSettings(Session * sess, STRRecord & R)
sess->settings[RMS9_PtAccess] = R.s_PtAccess; sess->settings[RMS9_PtAccess] = R.s_PtAccess;
} }
if (R.s_PtView >= 0) {
sess->settings[RMAS11_PtView] = R.s_PtView;
}
if (R.s_HumEnable >= 0) { if (R.s_HumEnable >= 0) {
sess->settings[RMS9_HumidStatus] = (short)R.s_HumEnable; sess->settings[RMS9_HumidStatus] = (short)R.s_HumEnable;
if ((R.s_HumEnable >= 1) && (R.s_HumLevel >= 0)) { if ((R.s_HumEnable >= 1) && (R.s_HumLevel >= 0)) {