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

More fixes to the welcome screen pressures.

Browse Source 
PRS1 now seems correct across all modes.
This commit is contained in:
sawinglogz 2020-03-30 12:07:18 -04:00
parent f2f9019d5c
commit 5f2d4c206e
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
oscar/SleepLib/day.cpp
View File

@ -810,10 +810,12 @@ ChannelID Day::getPressureChannelID() {
// Determined the preferred pressure channel (CPAP_IPAP or CPAP_Pressure) // Determined the preferred pressure channel (CPAP_IPAP or CPAP_Pressure)
CPAPMode cpapmode = (CPAPMode)(int)settings_max(CPAP_Mode); CPAPMode cpapmode = (CPAPMode)(int)settings_max(CPAP_Mode);
// TODO: This is also an awful hack. Why would CPAP/APAP have IPAP channels but not Pressure channels? // TODO: PRS1 ventilators in CPAP mode report IPAP rather than pressure...but their pressure setting channel is CPAP_Pressure,
// so this currently gets fixed in the welcome screen manually.
// And why would ASV or AVAPS have Pressure channels? // And why would ASV or AVAPS have Pressure channels?
QList<ChannelID> preferredIDs = { CPAP_Pressure, CPAP_PressureSet, CPAP_IPAP, CPAP_IPAPSet }; QList<ChannelID> preferredIDs = { CPAP_Pressure, CPAP_PressureSet, CPAP_IPAP, CPAP_IPAPSet };
if (cpapmode == MODE_ASV || cpapmode == MODE_ASV_VARIABLE_EPAP || cpapmode == MODE_AVAPS) { if (cpapmode == MODE_ASV || cpapmode == MODE_ASV_VARIABLE_EPAP || cpapmode == MODE_AVAPS ||
cpapmode == MODE_BILEVEL_FIXED || cpapmode == MODE_BILEVEL_AUTO_FIXED_PS || cpapmode == MODE_BILEVEL_AUTO_VARIABLE_PS) {
preferredIDs = { CPAP_IPAP, CPAP_IPAPSet, CPAP_Pressure, CPAP_PressureSet }; preferredIDs = { CPAP_IPAP, CPAP_IPAPSet, CPAP_Pressure, CPAP_PressureSet };
} }

18
oscar/welcome.cpp
View File

@ -241,11 +241,18 @@ QString Welcome::GenerateCPAPHTML()
pressSettingChanID = pressChanID; pressSettingChanID = pressChanID;
} }
ChannelID epapDataChanID = CPAP_EPAP;
if (day->channelHasData(CPAP_EPAPSet)) {
epapDataChanID = CPAP_EPAPSet;
}
if (pressChanID == NoChannel) { if (pressChanID == NoChannel) {
qWarning() << "Unable to find pressure channel for welcome summary!"; qWarning() << "Unable to find pressure channel for welcome summary!";
} }
if (cpapmode == MODE_CPAP) { if (cpapmode == MODE_CPAP) {
pressSettingChanID = CPAP_Pressure; // DreamStation ventilators report EPAP/IPAP data, but the setting is Pressure
EventDataType pressure = day->settings_max(pressSettingChanID); EventDataType pressure = day->settings_max(pressSettingChanID);
qDebug() << pressSettingChanID << pressure;
html += tr("Your CPAP machine used a constant %1 %2 of air").arg(pressure).arg(schema::channel[pressChanID].units()); html += tr("Your CPAP machine used a constant %1 %2 of air").arg(pressure).arg(schema::channel[pressChanID].units());
} else if (cpapmode == MODE_APAP) { } else if (cpapmode == MODE_APAP) {
EventDataType pressure = day->percentile(pressChanID, perc/100.0); EventDataType pressure = day->percentile(pressChanID, perc/100.0);
@ -256,19 +263,18 @@ QString Welcome::GenerateCPAPHTML()
html += tr("Your machine used a constant %1-%2 %3 of air.").arg(epap).arg(ipap).arg(schema::channel[pressChanID].units()); html += tr("Your machine used a constant %1-%2 %3 of air.").arg(epap).arg(ipap).arg(schema::channel[pressChanID].units());
} else if (cpapmode == MODE_BILEVEL_AUTO_FIXED_PS) { } else if (cpapmode == MODE_BILEVEL_AUTO_FIXED_PS) {
EventDataType ipap = day->percentile(pressChanID, perc/100.0); EventDataType ipap = day->percentile(pressChanID, perc/100.0);
EventDataType epap = day->percentile(CPAP_EPAP, perc/100.0); EventDataType epap = day->percentile(epapDataChanID, perc/100.0);
html += tr("Your machine was under %1-%2 %3 for %4% of the time.").arg(epap).arg(ipap).arg(schema::channel[pressChanID].units()).arg(perc); html += tr("Your machine was under %1-%2 %3 for %4% of the time.").arg(epap).arg(ipap).arg(schema::channel[pressChanID].units()).arg(perc);
} else if (cpapmode == MODE_ASV || cpapmode == MODE_AVAPS){ } else if (cpapmode == MODE_ASV || cpapmode == MODE_AVAPS){
EventDataType ipap = day->percentile(pressChanID, perc/100.0); EventDataType ipap = day->percentile(pressChanID, perc/100.0);
EventDataType epap = qRound(day->settings_wavg(CPAP_EPAP)); EventDataType epap = qRound(day->settings_wavg(CPAP_EPAP));
html += tr("Your EPAP pressure fixed at %1 %2.").arg(epap).arg(schema::channel[epapDataChanID].units())+"<br/>";
html += tr("Your EPAP pressure fixed at %1 %2.").arg(epap).arg(schema::channel[CPAP_EPAP].units())+"<br/>";
html += tr("Your IPAP pressure was under %1 %2 for %3% of the time.").arg(ipap).arg(schema::channel[pressChanID].units()).arg(perc); html += tr("Your IPAP pressure was under %1 %2 for %3% of the time.").arg(ipap).arg(schema::channel[pressChanID].units()).arg(perc);
} else if (cpapmode == MODE_ASV_VARIABLE_EPAP){ } else if (cpapmode == MODE_ASV_VARIABLE_EPAP || cpapmode == MODE_BILEVEL_AUTO_VARIABLE_PS){
EventDataType ipap = day->percentile(pressChanID, perc/100.0); EventDataType ipap = day->percentile(pressChanID, perc/100.0);
EventDataType epap = day->percentile(CPAP_EPAP, perc/100.0); EventDataType epap = day->percentile(epapDataChanID, perc/100.0);
html += tr("Your EPAP pressure was under %1 %2 for %3% of the time.").arg(epap).arg(schema::channel[CPAP_EPAP].units()).arg(perc)+"<br/>"; html += tr("Your EPAP pressure was under %1 %2 for %3% of the time.").arg(epap).arg(schema::channel[epapDataChanID].units()).arg(perc)+"<br/>";
html += tr("Your IPAP pressure was under %1 %2 for %3% of the time.").arg(ipap).arg(schema::channel[pressChanID].units()).arg(perc); html += tr("Your IPAP pressure was under %1 %2 for %3% of the time.").arg(ipap).arg(schema::channel[pressChanID].units()).arg(perc);
} }
html += "<br/>"; html += "<br/>";