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

Merge branch 'master' into translations

Browse Source
This commit is contained in:
Arie Klerk Hotmail 2021-10-09 10:29:25 +02:00
commit 3d05e10db2
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Htmldocs/release_notes.html
View File

@ -24,6 +24,7 @@
<br>Portions of OSCAR are © 2019-2021 by
<i>The OSCAR Team</i></p>
<ul>
<li>{new} Correct the mode names for BiLevel ResMed machines.</li>
<li>[new] Add support for additional Viatom/Wellue filename conventions.</li>
<li>[new] Add support for unreadably low SpO2 samples on Viatom/Wellue oximeters.</li>
<li>[fix] Fix AVAPS pressure settings.</li>

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

@ -102,15 +102,15 @@ void ResmedLoader::initChannels()
chan->addOption(0, QObject::tr("CPAP"));
chan->addOption(1, QObject::tr("APAP"));
chan->addOption(2, QObject::tr("VPAP-T"));
chan->addOption(3, QObject::tr("VPAP-S"));
chan->addOption(4, QObject::tr("VPAP-S/T"));
chan->addOption(5, QObject::tr("?5?"));
chan->addOption(2, QObject::tr("BiPAP-T"));
chan->addOption(3, QObject::tr("BiPAP-S"));
chan->addOption(4, QObject::tr("BiPAP-S/T"));
chan->addOption(5, QObject::tr("BiPAP-T"));
chan->addOption(6, QObject::tr("VPAPauto"));
chan->addOption(7, QObject::tr("ASV"));
chan->addOption(8, QObject::tr("ASVAuto"));
chan->addOption(9, QObject::tr("iVAPS"));
chan->addOption(10, QObject::tr("?10?"));
chan->addOption(10, QObject::tr("PAC"));
chan->addOption(11, QObject::tr("Auto for Her"));
channel.add(GRP_CPAP, chan = new Channel(RMS9_EPR = 0xe201, SETTING, MT_CPAP, SESSION,

2
oscar/welcome.cpp
View File

@ -308,7 +308,7 @@ QString Welcome::GenerateCPAPHTML()
comp = under;
} else if ((leak > leakdays) && ((leak - leakdays) >= 0.1)) {
comp = over;
} else if ((fabs(ahi > ahidays) >= 0.01) ) {
} else if ((fabs(leak - leakdays) >= 0.01) ) {
comp = close;
} else {
comp = equal;