From a838e343ce48d0ee3da7122ea58a6b6de9a6f786 Mon Sep 17 00:00:00 2001
From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com>
Date: Thu, 28 Oct 2021 14:14:06 -0400
Subject: [PATCH] Add support for new tubing type setting code on 700X110 v1.2.

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

diff --git a/Htmldocs/release_notes.html b/Htmldocs/release_notes.html
index a0bd1afd..a6fc9ce3 100644
--- a/Htmldocs/release_notes.html
+++ b/Htmldocs/release_notes.html
@@ -15,6 +15,7 @@
     <br>Portions of OSCAR are © 2019-2022 by
     <i>The OSCAR Team</i></p>
     <ul>
+      <li>[new] Add support for new settings codes in recently manufactured 700X110 DreamStations.</li>
       <li>[fix] Correct SleepStyle machines sometimes identified as Icon machines.</li>
       <li>[fix] Update copyright notices in html files.</li>
       <li>[fix] Correct value display on exact data points, and near session boundaries with drift.</li>
diff --git a/oscar/SleepLib/loader_plugins/prs1_parser_xpap.cpp b/oscar/SleepLib/loader_plugins/prs1_parser_xpap.cpp
index 9f2e9b6f..fb5cbaf5 100644
--- a/oscar/SleepLib/loader_plugins/prs1_parser_xpap.cpp
+++ b/oscar/SleepLib/loader_plugins/prs1_parser_xpap.cpp
@@ -2061,6 +2061,11 @@ bool PRS1DataChunk::ParseSettingsF0V6(const unsigned char* data, int size)
                 }
                 this->AddEvent(new PRS1ScaledSettingEvent(PRS1_SETTING_HUMID_TARGET_TIME, data[pos], 0.1));
                 break;
+            case 0x46:  // Tubing Type (alternate, seen instead of 0x3b on 700X110 v1.2 firmware)
+                CHECK_VALUE(len, 1);
+                CHECK_VALUE(data[pos], 2);  // 15HT = 2 based on user report
+                this->ParseTubingTypeV3(data[pos]);  // Since 15HT matches 0x3b above, assume the rest do (but warn)
+                break;
             default:
                 UNEXPECTED_VALUE(code, "known setting");
                 qDebug() << "Unknown setting:" << hex << code << "in" << this->sessionid << "at" << pos;