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

Rename PRS1 mask resistance lock and setting channels for clarity.

Browse Source
This commit is contained in:
sawinglogz 2020-03-23 13:07:08 -04:00
parent 3eb2ad4a7b
commit 77a34518bc
4 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4222,7 +4222,7 @@ bool PRS1Import::ImportCompliance()
session->settings[PRS1_HumidLevel] = e->m_value; session->settings[PRS1_HumidLevel] = e->m_value;
break; break;
case PRS1_SETTING_MASK_RESIST_LOCK: case PRS1_SETTING_MASK_RESIST_LOCK:
session->settings[PRS1_SysLock] = (bool) e->m_value; session->settings[PRS1_MaskResistLock] = (bool) e->m_value;
break; break;
case PRS1_SETTING_MASK_RESIST_SETTING: case PRS1_SETTING_MASK_RESIST_SETTING:
// Don't bother importing these for bricks, because they're always locked off. // Don't bother importing these for bricks, because they're always locked off.
@ -7548,10 +7548,10 @@ bool PRS1Import::ImportSummary()
session->settings[PRS1_HumidLevel] = e->m_value; session->settings[PRS1_HumidLevel] = e->m_value;
break; break;
case PRS1_SETTING_MASK_RESIST_LOCK: case PRS1_SETTING_MASK_RESIST_LOCK:
session->settings[PRS1_SysLock] = (bool) e->m_value; session->settings[PRS1_MaskResistLock] = (bool) e->m_value;
break; break;
case PRS1_SETTING_MASK_RESIST_SETTING: case PRS1_SETTING_MASK_RESIST_SETTING:
session->settings[PRS1_SysOneResistSet] = e->m_value; session->settings[PRS1_MaskResistSet] = e->m_value;
break; break;
case PRS1_SETTING_HOSE_DIAMETER: case PRS1_SETTING_HOSE_DIAMETER:
session->settings[PRS1_HoseDiam] = e->m_value; session->settings[PRS1_HoseDiam] = e->m_value;
@ -8712,11 +8712,11 @@ void PRS1Loader::initChannels()
chan->addOption(4, QObject::tr("4")); chan->addOption(4, QObject::tr("4"));
chan->addOption(5, QObject::tr("5")); chan->addOption(5, QObject::tr("5"));
channel.add(GRP_CPAP, chan = new Channel(PRS1_SysOneResistSet = 0xe104, SETTING, MT_CPAP, SESSION, channel.add(GRP_CPAP, chan = new Channel(PRS1_MaskResistSet = 0xe104, SETTING, MT_CPAP, SESSION,
"SysOneResistSet", "MaskResistSet",
QObject::tr("System One Resistance Setting"), QObject::tr("Mask Resistance Setting"),
QObject::tr("System One Mask Resistance Setting"), QObject::tr("Mask Resistance Setting"),
QObject::tr("Sys1 Resist. Set"), QObject::tr("Mask Resist."),
"", LOOKUP, Qt::green)); "", LOOKUP, Qt::green));
chan->addOption(0, STR_TR_Off); chan->addOption(0, STR_TR_Off);
chan->addOption(1, QObject::tr("x1")); chan->addOption(1, QObject::tr("x1"));
@ -8744,11 +8744,11 @@ void PRS1Loader::initChannels()
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(PRS1_SysLock = 0xe108, SETTING, MT_CPAP, SESSION, channel.add(GRP_CPAP, chan = new Channel(PRS1_MaskResistLock = 0xe108, SETTING, MT_CPAP, SESSION,
"SysOneLock", "MaskResistLock",
QObject::tr("System One Resistance Lock"), QObject::tr("Mask Resistance Lock"),
QObject::tr("Whether System One resistance settings are available to you."), QObject::tr("Whether mask resistance settings are available to you."),
QObject::tr("Sys1 Resist. Lock"), QObject::tr("Mask Resist. Lock"),
"", LOOKUP, Qt::black)); "", 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);

5
oscar/SleepLib/machine_common.cpp
View File

@ -31,9 +31,8 @@ ChannelID RMS9_E01, RMS9_E02, RMS9_SetPressure, RMS9_MaskOnTime;
ChannelID INTELLIPAP_Unknown1, INTELLIPAP_Unknown2; ChannelID INTELLIPAP_Unknown1, INTELLIPAP_Unknown2;
ChannelID PRS1_0E, CPAP_LargeLeak, ChannelID PRS1_0E, CPAP_LargeLeak,
PRS1_BND, PRS1_FlexMode, PRS1_FlexLevel, PRS1_HumidStatus, PRS1_HumidLevel, PRS1_SysLock, PRS1_BND, PRS1_FlexMode, PRS1_FlexLevel, PRS1_HumidStatus, PRS1_HumidLevel, PRS1_MaskResistLock,
PRS1_SysOneResistStat, PRS1_MaskResistSet, PRS1_HoseDiam, PRS1_AutoOn, PRS1_AutoOff, PRS1_MaskAlert, PRS1_ShowAHI;
PRS1_SysOneResistSet, PRS1_HoseDiam, PRS1_AutoOn, PRS1_AutoOff, PRS1_MaskAlert, PRS1_ShowAHI;
ChannelID OXI_Pulse, OXI_SPO2, OXI_Perf, OXI_PulseChange, OXI_SPO2Drop, OXI_Plethy; ChannelID OXI_Pulse, OXI_SPO2, OXI_Perf, OXI_PulseChange, OXI_SPO2Drop, OXI_Plethy;

5
oscar/SleepLib/machine_common.h
View File

@ -158,9 +158,8 @@ extern ChannelID CPAP_IPAP, CPAP_IPAPLo, CPAP_IPAPHi, CPAP_EPAP, CPAP_EPAPLo, CP
extern ChannelID RMS9_E01, RMS9_E02, RMS9_SetPressure, RMS9_MaskOnTime; extern ChannelID RMS9_E01, RMS9_E02, RMS9_SetPressure, RMS9_MaskOnTime;
extern ChannelID PRS1_0E, CPAP_LargeLeak, PRS1_BND, extern ChannelID PRS1_0E, CPAP_LargeLeak, PRS1_BND,
PRS1_FlexMode, PRS1_FlexLevel, PRS1_HumidStatus, PRS1_HumidLevel, CPAP_HumidSetting, PRS1_SysLock, PRS1_FlexMode, PRS1_FlexLevel, PRS1_HumidStatus, PRS1_HumidLevel, CPAP_HumidSetting, PRS1_MaskResistLock,
PRS1_SysOneResistStat, PRS1_MaskResistSet, PRS1_HoseDiam, PRS1_AutoOn, PRS1_AutoOff, PRS1_MaskAlert, PRS1_ShowAHI;
PRS1_SysOneResistSet, PRS1_HoseDiam, PRS1_AutoOn, PRS1_AutoOff, PRS1_MaskAlert, PRS1_ShowAHI;
extern ChannelID INTELLIPAP_Unknown1, INTELLIPAP_Unknown2; extern ChannelID INTELLIPAP_Unknown1, INTELLIPAP_Unknown2;

4
oscar/tests/sessiontests.cpp
View File

@ -87,8 +87,8 @@ static QString settingChannel(ChannelID i)
CHANNELNAME(PRS1_HumidMode); CHANNELNAME(PRS1_HumidMode);
CHANNELNAME(PRS1_TubeTemp); CHANNELNAME(PRS1_TubeTemp);
CHANNELNAME(PRS1_HumidLevel); CHANNELNAME(PRS1_HumidLevel);
CHANNELNAME(PRS1_SysLock); CHANNELNAME(PRS1_MaskResistLock);
CHANNELNAME(PRS1_SysOneResistSet); CHANNELNAME(PRS1_MaskResistSet);
CHANNELNAME(PRS1_TimedBreath); CHANNELNAME(PRS1_TimedBreath);
CHANNELNAME(PRS1_HoseDiam); CHANNELNAME(PRS1_HoseDiam);
CHANNELNAME(PRS1_AutoOn); CHANNELNAME(PRS1_AutoOn);