From 42833738236cfe5060d96ea1a561711816abe433 Mon Sep 17 00:00:00 2001 From: Phil Olynyk Date: Wed, 9 Mar 2022 16:42:39 -0500 Subject: [PATCH] Add channels for vAuto settings --- .../SleepLib/loader_plugins/resmed_EDFinfo.h | 20 +++++++++++-- .../SleepLib/loader_plugins/resmed_loader.cpp | 30 +++++++++++++++++++ 2 files changed, 48 insertions(+), 2 deletions(-) diff --git a/oscar/SleepLib/loader_plugins/resmed_EDFinfo.h b/oscar/SleepLib/loader_plugins/resmed_EDFinfo.h index b8774b3e..7f1b17c1 100644 --- a/oscar/SleepLib/loader_plugins/resmed_EDFinfo.h +++ b/oscar/SleepLib/loader_plugins/resmed_EDFinfo.h @@ -145,7 +145,15 @@ public: s_SmartStop = -1; s_Comfort = -1; - ramp_pressure = -1; + s_RampPressure = -1; + + s_EasyBreathe = -1; + s_RiseEnable = -1; + s_RiseTime = -1; + s_Cycle = -1; + s_Trigger = -1; + s_TiMax = -1; + s_TiMin = -1; date=QDate(); } @@ -208,7 +216,7 @@ public: EventDataType tgtipap95; EventDataType tgtipapmax; - EventDataType ramp_pressure; + EventDataType s_RampPressure; QDate date; EventDataType s_RampTime; @@ -230,6 +238,14 @@ public: int s_SmartStop; int s_Comfort; + int s_EasyBreathe; + int s_RiseEnable; + int s_RiseTime; + int s_Cycle; + int s_Trigger; + int s_TiMax; + int s_TiMin; + }; diff --git a/oscar/SleepLib/loader_plugins/resmed_loader.cpp b/oscar/SleepLib/loader_plugins/resmed_loader.cpp index 80219b4b..7d4502d0 100644 --- a/oscar/SleepLib/loader_plugins/resmed_loader.cpp +++ b/oscar/SleepLib/loader_plugins/resmed_loader.cpp @@ -35,6 +35,8 @@ ChannelID RMS9_EPR, RMS9_EPRLevel, RMS9_Mode, RMS9_SmartStart, RMS9_HumidStatus, RMS9_PtAccess, RMS9_Mask, RMS9_ABFilter, RMS9_ClimateControl, RMS9_TubeType, RMAS11_SmartStop, RMS9_Temp, RMS9_TempEnable, RMS9_RampEnable, RMAS1x_Comfort, RMAS11_PtView; +Channel_ID RMAS1x_EasyBreathe, RMAS1x_RiseEnable, RMAS1x_RiseTime, RMAS1x_Cycle, RMSA1x_Trigger, RMSA1x_TiMax, RMSA1x_TiMin; + const QString STR_ResMed_AirSense10 = "AirSense 10"; const QString STR_ResMed_AirSense11 = "AirSense 11"; const QString STR_ResMed_AirCurve10 = "AirCurve 10"; @@ -218,6 +220,34 @@ void ResmedLoader::initChannels() chan->addOption(0, QObject::tr("Advanced")); chan->addOption(1, QObject::tr("Simple")); + channel.add(GRP_CPAP, chan = new Channel(RMAS1x_EasyBreathe = 0xe211, SETTING, MT_CPAP, SESSION, + "RMAS1x_EasyBreathe", QObject::tr("EasyBreathe"), QObject::tr("EasyBreathe"), QObject::tr("EasyBreathe"), "", LOOKUP, Qt::black)); + chan->addOption(0, "0"); + + channel.add(GRP_CPAP, chan = new Channel(RMAS1x_RiseEnable = 0xe212, SETTING, MT_CPAP, SESSION, + "RMAS1x_RiseEnable", QObject::tr("RiseEnable"), QObject::tr("RiseEnable"), QObject::tr("RiseEnable"), "", LOOKUP, Qt::black)); + chan->addOption(0, "0"); + + channel.add(GRP_CPAP, chan = new Channel(RMAS1x_RiseTime = 0xe213, SETTING, MT_CPAP, SESSION, + "RMAS1x_RiseTime", QObject::tr("RiseTime"), QObject::tr("RiseTime"), QObject::tr("RiseTime"), "", LOOKUP, Qt::black)); + chan->addOption(0, "0"); + + channel.add(GRP_CPAP, chan = new Channel(RMAS1x_Cycle = 0xe214, SETTING, MT_CPAP, SESSION, + "RMAS1x_Cycle", QObject::tr("Cycle"), QObject::tr("Cycle"), QObject::tr("Cycle"), "", LOOKUP, Qt::black)); + chan->addOption(0, "0"); + + channel.add(GRP_CPAP, chan = new Channel(RMAS1x_Trigger = 0xe215, SETTING, MT_CPAP, SESSION, + "RMAS1x_Trigger", QObject::tr("Trigger"), QObject::tr("Trigger"), QObject::tr("Trigger"), "", LOOKUP, Qt::black)); + chan->addOption(0, "0"); + + channel.add(GRP_CPAP, chan = new Channel(RMAS1x_TiMax = 0xe216, SETTING, MT_CPAP, SESSION, + "RMAS1x_TiMax", QObject::tr("TiMax"), QObject::tr("TiMax"), QObject::tr("TiMax"), "", LOOKUP, Qt::black)); + chan->addOption(0, "0"); + + channel.add(GRP_CPAP, chan = new Channel(RMAS1x_TiMin = 0xe217, SETTING, MT_CPAP, SESSION, + "RMAS1x_TiMin", QObject::tr("TiMin"), QObject::tr("TiMin"), QObject::tr("TiMin"), "", LOOKUP, Qt::black)); + chan->addOption(0, "0"); + // Setup ResMeds signal name translation map setupResMedTranslationMap(); }