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

Merge branch 'master' into somno-split

Browse Source
This commit is contained in:
kappa44 2021-08-23 09:29:53 +10:00
commit 47436ae517
7 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
oscar/SleepLib/common.cpp
View File

@ -642,6 +642,7 @@ QString STR_TR_Start;
QString STR_TR_End;
QString STR_TR_On;
QString STR_TR_Off;
QString STR_TR_Auto;
QString STR_TR_Yes;
QString STR_TR_No;
@ -850,6 +851,7 @@ void initializeStrings()
STR_TR_End = QObject::tr("End");
STR_TR_On = QObject::tr("On");
STR_TR_Off = QObject::tr("Off");
STR_TR_Auto = QObject::tr("Auto");
STR_TR_Yes = QObject::tr("Yes");
STR_TR_No = QObject::tr("No");

1
oscar/SleepLib/common.h
View File

@ -362,6 +362,7 @@ extern QString STR_TR_Start;
extern QString STR_TR_End;
extern QString STR_TR_On;
extern QString STR_TR_Off;
extern QString STR_TR_Auto;
extern QString STR_TR_Yes;
extern QString STR_TR_No;

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

@ -109,7 +109,7 @@ void ResmedLoader::initChannels()
chan->addOption(6, QObject::tr("VPAPauto"));
chan->addOption(7, QObject::tr("ASV"));
chan->addOption(8, QObject::tr("ASVAuto"));
chan->addOption(9, QObject::tr("?9?"));
chan->addOption(9, QObject::tr("iVAPS"));
chan->addOption(10, QObject::tr("?10?"));
chan->addOption(11, QObject::tr("Auto for Her"));
@ -161,9 +161,8 @@ void ResmedLoader::initChannels()
"RMS9_TempEnable", QObject::tr("Temp. Enable"), QObject::tr("ClimateLine Temperature Enable"), QObject::tr("Temperature Enable"), "", LOOKUP, Qt::black));
chan->addOption(0, STR_TR_Off);
// chan->addOption(1, "1");
// chan->addOption(2, "2");
// chan->addOption(3, "3");
chan->addOption(1, STR_TR_On);
chan->addOption(2, STR_TR_Auto);
channel.add(GRP_CPAP, chan = new Channel(RMS9_ABFilter= 0xe209, SETTING, MT_CPAP, SESSION,
"RMS9_ABFilter", QObject::tr("AB Filter"), QObject::tr("Antibacterial Filter"), QObject::tr("Antibacterial Filter"), "", LOOKUP, Qt::black));
@ -180,7 +179,7 @@ void ResmedLoader::initChannels()
channel.add(GRP_CPAP, chan = new Channel(RMS9_ClimateControl= 0xe20B, SETTING, MT_CPAP, SESSION,
"RMS9_ClimateControl", QObject::tr("Climate Control"), QObject::tr("Climate Control"), QObject::tr("Climate Control"), "", LOOKUP, Qt::black));
chan->addOption(0, QObject::tr("Auto"));
chan->addOption(0, STR_TR_Auto);
chan->addOption(1, QObject::tr("Manual"));
channel.add(GRP_CPAP, chan = new Channel(RMS9_Mask= 0xe20C, SETTING, MT_CPAP, SESSION,
@ -189,13 +188,14 @@ void ResmedLoader::initChannels()
chan->addOption(0, QObject::tr("Pillows"));
chan->addOption(1, QObject::tr("Full Face"));
chan->addOption(2, QObject::tr("Nasal"));
chan->addOption(3, QObject::tr("Unknown"));
channel.add(GRP_CPAP, chan = new Channel(RMS9_RampEnable = 0xe20D, SETTING, MT_CPAP, SESSION,
"RMS9_RampEnable", QObject::tr("Ramp"), QObject::tr("Ramp Enable"), QObject::tr("Ramp"), "", LOOKUP, Qt::black));
chan->addOption(0, STR_TR_Off);
chan->addOption(1, STR_TR_On);
chan->addOption(2, QObject::tr("Auto"));
chan->addOption(2, STR_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));
@ -1280,7 +1280,6 @@ bool ResmedLoader::ProcessSTRfiles(Machine *mach, QMap<QDate, STRFile> & STRmap,
// // }
int recstart = rec * maskon->sampleCnt;
qDebug() << "MaskOn SampleCount is" << maskon->sampleCnt;
bool validday = false;
for (int s = 0; s < maskon->sampleCnt; ++s) {
@ -1358,7 +1357,7 @@ bool ResmedLoader::ProcessSTRfiles(Machine *mach, QMap<QDate, STRFile> & STRmap,
R.rms9_mode = mod;
if (mod == 11) {
mode = MODE_A4Her; // For her
mode = MODE_APAP; // For her is a special apap
} else if (mod == 9) {
mode = MODE_AVAPS;
} else if (mod == 8) { // mod 8 == vpap adapt variable epap
@ -1367,9 +1366,9 @@ bool ResmedLoader::ProcessSTRfiles(Machine *mach, QMap<QDate, STRFile> & STRmap,
mode = MODE_ASV;
} else if (mod == 6) { // mod 6 == vpap auto (Min EPAP, Max IPAP, PS)
mode = MODE_BILEVEL_AUTO_FIXED_PS;
} else if (mod == 3) {// mod 3 == vpap s fixed pressure (EPAP, IPAP, No PS)
} else if (mod >= 3) { // mod 3 == vpap s fixed pressure (EPAP, IPAP, No PS)
// 4,5 are S/T types...
mode = MODE_BILEVEL_FIXED;
// 4,5 are S/T types...
} else if (mod == 1) {
mode = MODE_APAP; // mod 1 == apap
// not sure what mode 2 is ?? split ?
@ -1393,7 +1392,8 @@ bool ResmedLoader::ProcessSTRfiles(Machine *mach, QMap<QDate, STRFile> & STRmap,
// Bilevel Starting Pressure
R.ramp_pressure = EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset;
}
if (((R.mode == MODE_ASV) || (R.mode == MODE_ASV_VARIABLE_EPAP)) && (sig = str.lookupLabel("S.VA.StartPress"))) {
if (((R.mode == MODE_ASV) || (R.mode == MODE_ASV_VARIABLE_EPAP) ||
(R.mode == MODE_BILEVEL_AUTO_FIXED_PS)) && (sig = str.lookupLabel("S.VA.StartPress"))) {
// Bilevel Starting Pressure
R.ramp_pressure = EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset;
}
@ -1591,7 +1591,7 @@ bool ResmedLoader::ProcessSTRfiles(Machine *mach, QMap<QDate, STRFile> & STRmap,
EventDataType epr = -1, epr_level = -1;
bool a1x = false; // AS-10 or AS-11
if ((mode == MODE_CPAP) || (mode == MODE_APAP) || (mode == MODE_A4Her)) {
if ((mode == MODE_CPAP) || (mode == MODE_APAP) ) {
if ((sig = str.lookupSignal(RMS9_EPR))) {
epr= EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset;
if ( AS_eleven )
@ -1715,11 +1715,13 @@ bool ResmedLoader::ProcessSTRfiles(Machine *mach, QMap<QDate, STRFile> & STRmap,
R.s_SmartStart = EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset;
if ( AS_eleven )
R.s_SmartStart--;
// qDebug() << "SmartStart is set to" << R.s_SmartStart;
}
if ((sig = str.lookupLabel("S.SmartStop"))) {
R.s_SmartStop = EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset;
if ( AS_eleven )
R.s_SmartStop--;
qDebug() << "SmartStop is set to" << R.s_SmartStop;
}
if ((sig = str.lookupLabel("S.HumEnable"))) {
R.s_HumEnable = EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset;
@ -2233,9 +2235,6 @@ void StoreSettings(Session * sess, STRRecord & R)
if (R.min_ipap >= 0) sess->settings[CPAP_IPAPLo] = R.min_ipap;
if (R.min_ps >= 0) sess->settings[CPAP_PSMin] = R.min_ps;
if (R.max_ps >= 0) sess->settings[CPAP_PSMax] = R.max_ps;
} else if (R.mode == MODE_A4Her) {
if (R.min_pressure >= 0) sess->settings[CPAP_PressureMin] = R.min_pressure;
if (R.max_pressure >= 0) sess->settings[CPAP_PressureMax] = R.max_pressure;
}
} else {
if (R.set_pressure >= 0) sess->settings[CPAP_Pressure] = R.set_pressure;
@ -2277,6 +2276,9 @@ void StoreSettings(Session * sess, STRRecord & R)
if (R.s_SmartStart >= 0) {
sess->settings[RMS9_SmartStart] = R.s_SmartStart;
}
if (R.s_SmartStop >= 0) {
sess->settings[RMAS11_SmartStop] = R.s_SmartStop;
}
if (R.s_ABFilter >= 0) {
sess->settings[RMS9_ABFilter] = R.s_ABFilter;
}

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

@ -22,7 +22,7 @@
//********************************************************************************************
// Please INCREMENT the following value when making changes to this loaders implementation.
//
const int resmed_data_version = 14;
const int resmed_data_version = 15;
//
//********************************************************************************************

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
*/
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_A4Her
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
};
/*! \enum PRTypes

2
oscar/SleepLib/session.cpp
View File

@ -1143,7 +1143,7 @@ void Session::updateCountSummary(ChannelID code)
using namespace schema;
Channel *ch_p = channel.channels[code];
if ( ! ch_p->isNull() ) { // the channel was found in the channel list
if ( ! ((ch_p->type() & FLAG) == FLAG) ) { // the channel is not a flag type
if ( ((ch_p->type() & (FLAG|SPAN)) == 0) ) { // the channel is not a flag or span type
qDebug() << "No valuesummary for channel " << ch_p->label(); // so tell about missing summary
}
} else {

2
oscar/VERSION
View File

@ -1,4 +1,4 @@
// Update the string below to set OSCAR's version and release status.
// See https://semver.org/spec/v2.0.0.html for details on format.
#define VERSION "1.3.0-alpha.1"
#define VERSION "1.3.0-alpha.2"