From 704d6d7c9ef47e17d011c364cbf302f4d99a5931 Mon Sep 17 00:00:00 2001
From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com>
Date: Fri, 10 Dec 2021 13:43:03 -0500
Subject: [PATCH] Add 401X150 to the list of tested machines.

Also update F0V6 warnings based on new test data.
---
 Htmldocs/release_notes.html                        | 1 +
 oscar/SleepLib/loader_plugins/prs1_loader.cpp      | 1 +
 oscar/SleepLib/loader_plugins/prs1_parser_xpap.cpp | 4 ++--
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Htmldocs/release_notes.html b/Htmldocs/release_notes.html
index e590c7f6..c54a4e63 100644
--- a/Htmldocs/release_notes.html
+++ b/Htmldocs/release_notes.html
@@ -19,6 +19,7 @@
         <ul>
           <li>REMstar Plus (System One 60 Series) (261P) <i>provides only limited information</i></li>
           <li>REMstar Pro (System One 60 Series) (460PBT)</li>
+          <li>DreamStation CPAP Pro with Auto-Trial (401X150)</li>
         </ul>
       </li>
       <li>[new] Add support for new settings codes in recently manufactured 700X110 DreamStations.</li>
diff --git a/oscar/SleepLib/loader_plugins/prs1_loader.cpp b/oscar/SleepLib/loader_plugins/prs1_loader.cpp
index eaf32e7b..5d8aadf2 100644
--- a/oscar/SleepLib/loader_plugins/prs1_loader.cpp
+++ b/oscar/SleepLib/loader_plugins/prs1_loader.cpp
@@ -112,6 +112,7 @@ static const PRS1TestedModel s_PRS1TestedModels[] = {
     { "400X120", 0, 6, "DreamStation CPAP Pro" },
     { "400X130", 0, 6, "DreamStation CPAP Pro" },
     { "400X150", 0, 6, "DreamStation CPAP Pro" },
+    { "401X150", 0, 6, "DreamStation CPAP Pro with Auto-Trial" },
     { "500X110", 0, 6, "DreamStation Auto CPAP" },
     { "500X120", 0, 6, "DreamStation Auto CPAP" },
     { "500X130", 0, 6, "DreamStation Auto CPAP" },
diff --git a/oscar/SleepLib/loader_plugins/prs1_parser_xpap.cpp b/oscar/SleepLib/loader_plugins/prs1_parser_xpap.cpp
index e11a8d47..a993a2f7 100644
--- a/oscar/SleepLib/loader_plugins/prs1_parser_xpap.cpp
+++ b/oscar/SleepLib/loader_plugins/prs1_parser_xpap.cpp
@@ -1870,8 +1870,8 @@ bool PRS1DataChunk::ParseSettingsF0V6(const unsigned char* data, int size)
                 // but curiously report the use of C-Flex+, even though Auto-CPAP uses A-Flex.
                 CHECK_VALUE(len, 3);
                 CHECK_VALUES(cpapmode, PRS1_MODE_CPAP, PRS1_MODE_CPAPCHECK);
-                if (data[pos] != 30 && data[pos] != 9) {
-                    CHECK_VALUES(data[pos], 5, 25);  // Auto-Trial Duration
+                if (data[pos] < 5 || data[pos] > 30) {  // We've seen 5, 9, 14, 25, and 30
+                    UNEXPECTED_VALUE(data[pos], "5-30");  // Auto-Trial Duration
                 }
                 this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_AUTO_TRIAL, data[pos]));
                 // If we want C-Flex+ to be reported as A-Flex, we can set cpapmode = PRS1_MODE_AUTOTRIAL here.