From 4b1a039acbb744429239041c34ea8429e14e3d0b Mon Sep 17 00:00:00 2001
From: Guy Scharf <guy.oscar@moxis.com>
Date: Thu, 7 Oct 2021 14:15:04 -0700
Subject: [PATCH 1/2] Fix minor error on Welcome page

---
 oscar/welcome.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/oscar/welcome.cpp b/oscar/welcome.cpp
index fb9f2cf4..ee640afe 100644
--- a/oscar/welcome.cpp
+++ b/oscar/welcome.cpp
@@ -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;

From 5cb93b011cf003e00a4e227a0bfdcbcc4e2391b7 Mon Sep 17 00:00:00 2001
From: Phil Olynyk <phil@pholynyk.ca>
Date: Thu, 7 Oct 2021 19:32:19 -0400
Subject: [PATCH 2/2] Fix mode names for BiLevel modes. Update release notes

---
 Htmldocs/release_notes.html                     |  1 +
 oscar/SleepLib/loader_plugins/resmed_loader.cpp | 10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Htmldocs/release_notes.html b/Htmldocs/release_notes.html
index 0d52aeeb..84dc7813 100644
--- a/Htmldocs/release_notes.html
+++ b/Htmldocs/release_notes.html
@@ -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>
diff --git a/oscar/SleepLib/loader_plugins/resmed_loader.cpp b/oscar/SleepLib/loader_plugins/resmed_loader.cpp
index 838c1f95..a0d4dc86 100644
--- a/oscar/SleepLib/loader_plugins/resmed_loader.cpp
+++ b/oscar/SleepLib/loader_plugins/resmed_loader.cpp
@@ -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,