From 3939e4b437c86917495c2c84468b7eb9cd6edc0c Mon Sep 17 00:00:00 2001
From: Guy Scharf <guy.oscar@moxis.com>
Date: Sun, 2 Apr 2023 22:32:29 -0700
Subject: [PATCH] SleepStyle loader now reports OA and CA separately. We have
 now seen an InfoSmart report that separates CA and OA so were able to modify
 the loader to produce the same results.

---
 Htmldocs/release_notes.html                         | 3 ++-
 oscar/SleepLib/loader_plugins/sleepstyle_loader.cpp | 7 ++++---
 oscar/SleepLib/loader_plugins/sleepstyle_loader.h   | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Htmldocs/release_notes.html b/Htmldocs/release_notes.html
index af6fd8dc..4abb7abb 100644
--- a/Htmldocs/release_notes.html
+++ b/Htmldocs/release_notes.html
@@ -12,9 +12,10 @@
     <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.4.1-xxxx</b>
-    <br>Portions of OSCAR are © 2019-2022 by
+    <br>Portions of OSCAR are © 2019-2023 by
     <i>The OSCAR Team</i></p>
     <ul>
+      <li>[new] Fisher & Paykel Sleepstyle now reports Obestructive and Central apneas separately.<li>
       <li>[fix] Allow Graph and Event combo boxes to remain open after changes.<li>
       <li>[fix] Overview display of ResMed Oximeter events now works.<li>
     </ul>
diff --git a/oscar/SleepLib/loader_plugins/sleepstyle_loader.cpp b/oscar/SleepLib/loader_plugins/sleepstyle_loader.cpp
index 8aae96e3..8236c07b 100644
--- a/oscar/SleepLib/loader_plugins/sleepstyle_loader.cpp
+++ b/oscar/SleepLib/loader_plugins/sleepstyle_loader.cpp
@@ -924,7 +924,8 @@ bool SleepStyleLoader::OpenDetail(Machine *mach, const QString & filename)
 
 //fastleak        EventList *LK = sess->AddEventList(CPAP_LeakTotal, EVL_Event, 1);
         EventList *PR = sess->AddEventList(CPAP_Pressure, EVL_Event, 0.1F);
-        EventList *A = sess->AddEventList(CPAP_AllApnea, EVL_Event);
+        EventList *OA = sess->AddEventList(CPAP_Obstructive, EVL_Event);
+        EventList *CA = sess->AddEventList(CPAP_ClearAirway, EVL_Event);
         EventList *H =  sess->AddEventList(CPAP_Hypopnea, EVL_Event);
         EventList *FL = sess->AddEventList(CPAP_FlowLimit, EVL_Event);
         EventList *SA = sess->AddEventList(CPAP_SensAwake, EVL_Event);
@@ -966,8 +967,8 @@ bool SleepStyleLoader::OpenDetail(Machine *mach, const QString & filename)
                 bitmask = 1;
                 for (int k = 0; k < 6; k++) {  // There are 6 flag sets per 2 minutes
                     // TODO: Modify if all four channels are to be reported separately
-                    if (a1 & bitmask) {  A->AddEvent(ti+60000, 0); } // Grouped by F&P as A
-                    if (a2 & bitmask) {  A->AddEvent(ti+60000, 0); } // Grouped by F&P as A
+                    if (a1 & bitmask) { OA->AddEvent(ti+60000, 0); } // Grouped by F&P as A
+                    if (a2 & bitmask) { CA->AddEvent(ti+60000, 0); } // Grouped by F&P as A
                     if (a3 & bitmask) {  H->AddEvent(ti+60000, 0); } // Grouped by F&P as H
                     if (a4 & bitmask) {  H->AddEvent(ti+60000, 0); } // Grouped by F&P as H
                     if (a5 & bitmask) { FL->AddEvent(ti+60000, 0); }
diff --git a/oscar/SleepLib/loader_plugins/sleepstyle_loader.h b/oscar/SleepLib/loader_plugins/sleepstyle_loader.h
index 68615bae..e0c6f33c 100644
--- a/oscar/SleepLib/loader_plugins/sleepstyle_loader.h
+++ b/oscar/SleepLib/loader_plugins/sleepstyle_loader.h
@@ -21,7 +21,7 @@
 //********************************************************************************************
 // Please INCREMENT the following value when making changes to this loaders implementation.
 //
-const int sleepstyle_data_version = 1;
+const int sleepstyle_data_version = 2;
 //
 //********************************************************************************************