From e3a87a31481d36e3a7365ddbb6bc9c2fe9c46d6c Mon Sep 17 00:00:00 2001
From: Guy Scharf <guy.oscar@moxis.com>
Date: Sun, 4 Apr 2021 04:56:06 -0700
Subject: [PATCH 1/2] Update release notes with recent changes.

---
 Htmldocs/release_notes.html | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/Htmldocs/release_notes.html b/Htmldocs/release_notes.html
index e2dd1c9b..304a8ca6 100644
--- a/Htmldocs/release_notes.html
+++ b/Htmldocs/release_notes.html
@@ -12,16 +12,20 @@
     <br><a href=http://www.apneaboard.com/wiki/index.php/OSCAR_Release_Notes>http://www.apneaboard.com/wiki/index.php/OSCAR_Release_Notes</a></p>
     <p>
     <b>Changes and fixes in OSCAR v1.X.Y</b>
-    <br>Portions of OSCAR are © 2019-2020 by
+    <br>Portions of OSCAR are © 2019-2021 by
     <i>The OSCAR Team</i></p>
     <ul>
+      <li>[new] Add support for DeVilbiss BLUE (DV6x) CPAP machines [experimental].</li>
       <li>[new] Additional Philips Respironics devices tested and fully supported:
         <ul>
           <li>DreamStation Go Auto (500G120)</li>
           <li>DreamStation Auto CPAP with A-Flex (500X140)</li>
+          <li>DreamStation BiPAP AVAPS 30 (1130X200)</li>
         </ul>
       </li>
       <li>[new] Add support for DreamStation Go humidifier Target Time setting.</li>
+      <li>[new] Add Bulgarian translation; update other languages.</li>
+      <li>[new] Improve Somnopose import options.</li>
       <li>[fix] Correct calculation of average leak rate on Welcome page.</li>
       <li>[fix] Correct installation of non-English Release Notes on Windows.</li>
       <li>[fix] About/Credits page now offers Google translations to other languages.</li>
@@ -33,6 +37,10 @@
       <li>[fix] Purge currently selected day no longer deletes bookmarks for that day.</li>
       <li>[fix] Remove warning from Chromebook when importing from previously used local folder.</li>
       <li>[fix] Update link to Contec drivers.</li>
+      <li>[fix] Fix display problems for short duration events.</li>
+      <li>[fix] Statistics headings will now be 99.5% or Max, depending on machine type and preference settings.</li>
+      <li>[fix] Mark exported Journal backup file as UTF-8.</li>
+      <li>[fix] Improve error message when unable to access OSCAR database.</li>
     </ul>
     <p>
     <b>Changes and fixes in OSCAR v1.2.0</b>

From 3114cf517d00b59b0664d510e73193ea220d681e Mon Sep 17 00:00:00 2001
From: Guy Scharf <guy.oscar@moxis.com>
Date: Sun, 4 Apr 2021 04:56:39 -0700
Subject: [PATCH 2/2] Improve file identification in Icon loader    Will no
 longer attempt to process SleepStyle data with Icon loader    A new loader
 for SleepStyle machines is forthcoming.

---
 oscar/SleepLib/loader_plugins/icon_loader.cpp | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/oscar/SleepLib/loader_plugins/icon_loader.cpp b/oscar/SleepLib/loader_plugins/icon_loader.cpp
index f2ad2963..097d1e85 100644
--- a/oscar/SleepLib/loader_plugins/icon_loader.cpp
+++ b/oscar/SleepLib/loader_plugins/icon_loader.cpp
@@ -66,6 +66,26 @@ bool FPIconLoader::Detect(const QString & givenpath)
         return false;
     }
 
+    // ICON serial numbers (directory names) are all digits (SleepStyle are mixed alpha and numeric)
+    QString serialDir(dir.path() + "/FPHCARE/ICON");
+    QDir iconDir(serialDir);
+
+    iconDir.setFilter(QDir::NoDotAndDotDot | QDir::Dirs | QDir::Files | QDir::Hidden | QDir::NoSymLinks);
+    iconDir.setSorting(QDir::Name);
+    QFileInfoList flist = iconDir.entryInfoList();
+
+    bool ok;
+
+    for (int i = 0; i < flist.size(); i++) {
+        QFileInfo fi = flist.at(i);
+        QString filename = fi.fileName();
+
+        filename.toInt(&ok);
+
+        if (!ok) {
+            return false;
+        }
+    }
     return true;
 }