From 2a9256939390626c356ee91da2e425a1370f53f2 Mon Sep 17 00:00:00 2001
From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com>
Date: Tue, 12 May 2020 14:08:24 -0400
Subject: [PATCH] Add 461CA and 700X120 to the list of tested machines, and
 refine unexpected data warnings.

---
 Htmldocs/release_notes.html                   | 3 ++-
 oscar/SleepLib/loader_plugins/prs1_loader.cpp | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Htmldocs/release_notes.html b/Htmldocs/release_notes.html
index 1113ce31..3179d260 100644
--- a/Htmldocs/release_notes.html
+++ b/Htmldocs/release_notes.html
@@ -15,8 +15,9 @@
       <li>[new] Additional Philips Respironics devices tested and fully supported:</li>
         <ul>
           <li>BiPAP S/T (C Series) (1061401)</li>
+          <li>REMstar Pro (System One 60 Series) (461CA)</li>
           <li>DreamStation BiPAP Pro (600X150)</li>
-          <li>DreamStation Auto BiPAP (700X150)</li>
+          <li>DreamStation Auto BiPAP (700X120, 700X150)</li>
           <li><i>Note: Ventilator alarms are not currently imported.</i></li>
         </ul>
       <li>[new] Add the "peak flow" channel reported by pre-DreamStation ventilators.</li>
diff --git a/oscar/SleepLib/loader_plugins/prs1_loader.cpp b/oscar/SleepLib/loader_plugins/prs1_loader.cpp
index cbd835e0..ea1774d9 100644
--- a/oscar/SleepLib/loader_plugins/prs1_loader.cpp
+++ b/oscar/SleepLib/loader_plugins/prs1_loader.cpp
@@ -261,6 +261,7 @@ static const PRS1TestedModel s_PRS1TestedModels[] = {
 
     { "460P",   0, 4, "REMstar Pro (System One 60 Series)" },
     { "461P",   0, 4, "REMstar Pro (System One 60 Series)" },
+    { "461CA",  0, 4, "REMstar Pro (System One 60 Series)" },
     { "560P",   0, 4, "REMstar Auto (System One 60 Series)" },
     { "560PBT", 0, 4, "REMstar Auto (System One 60 Series)" },
     { "561P",   0, 4, "REMstar Auto (System One 60 Series)" },
@@ -283,6 +284,7 @@ static const PRS1TestedModel s_PRS1TestedModels[] = {
     { "600X110", 0, 6, "DreamStation BiPAP Pro" },
     { "600X150", 0, 6, "DreamStation BiPAP Pro" },
     { "700X110", 0, 6, "DreamStation Auto BiPAP" },
+    { "700X120", 0, 6, "DreamStation Auto BiPAP" },
     { "700X150", 0, 6, "DreamStation Auto BiPAP" },
     
     { "950P",    5, 0, "BiPAP AutoSV Advanced System One" },
@@ -7208,8 +7210,8 @@ bool PRS1DataChunk::ParseSummaryF0V6(void)
                 //CHECK_VALUE(data[pos+9], 0x00);
                 //CHECK_VALUES(data[pos+0xa], 0xbb, 0x00);  // 16-bit minutes in large leak
                 //CHECK_VALUE(data[pos+0xb], 0x00);
-                //CHECK_VALUES(data[pos+0xc], 0x15, 0x02);  // probably 16-bit value
-                CHECK_VALUE(data[pos+0xd], 0x00);
+                //CHECK_VALUES(data[pos+0xc], 0x15, 0x02);  // 16-bit minutes in PB
+                //CHECK_VALUE(data[pos+0xd], 0x00);
                 //CHECK_VALUES(data[pos+0xe], 0x01, 0x00);  // 16-bit VS count
                 //CHECK_VALUE(data[pos+0xf], 0x00);
                 //CHECK_VALUES(data[pos+0x10], 0x21, 5);  // probably 16-bit value, maybe H count?