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 Comfort to StoreSettings

Browse Source
This commit is contained in:
Phil Olynyk 2021-07-09 17:39:23 -04:00
parent b29d8ae3f8
commit 8c18683274
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -82,7 +82,6 @@ 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;
@ -140,6 +139,7 @@ public:
s_TempEnable = -1; s_TempEnable = -1;
s_Temp = -1; s_Temp = -1;
s_SmartStart = -1; s_SmartStart = -1;
s_Comfort = -1;
ramp_pressure = -1; ramp_pressure = -1;
@ -171,7 +171,6 @@ 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;
@ -223,6 +222,7 @@ public:
int s_TempEnable; int s_TempEnable;
EventDataType s_Temp; EventDataType s_Temp;
int s_SmartStart; int s_SmartStart;
int s_Comfort;
}; };

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

@ -1507,7 +1507,7 @@ bool ResmedLoader::ProcessSTRfiles(Machine *mach, QMap<QDate, STRFile> & STRmap,
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 if ((sig = str.lookupLabel("S.AS.Comfort"))) { // first check machines opinion
a1x = true; a1x = true;
R.comfort = EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset; R.s_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;
@ -2065,6 +2065,9 @@ void StoreSettings(Session * sess, STRRecord & R)
if (R.min_ipap >= 0) sess->settings[CPAP_IPAPLo] = R.min_ipap; 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.min_ps >= 0) sess->settings[CPAP_PSMin] = R.min_ps;
if (R.max_ps >= 0) sess->settings[CPAP_PSMax] = R.max_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 { } else {
if (R.set_pressure >= 0) sess->settings[CPAP_Pressure] = R.set_pressure; if (R.set_pressure >= 0) sess->settings[CPAP_Pressure] = R.set_pressure;
@ -2131,6 +2134,9 @@ void StoreSettings(Session * sess, STRRecord & R)
sess->settings[RMS9_Temp] = (short)R.s_Temp; sess->settings[RMS9_Temp] = (short)R.s_Temp;
} }
} }
if (R.s_Comfort >= 0) {
sess->settings[RMAS1x_Comfort] = R.s_Comfort;
}
} }
struct OverlappingEDF { struct OverlappingEDF {