From 569f5794c71315ee7aea63117344e3ea175e2d49 Mon Sep 17 00:00:00 2001
From: Phil Olynyk <phil@pholynyk.ca>
Date: Sat, 31 Jul 2021 23:30:24 -0400
Subject: [PATCH] Logical and of channel type with FLAG, to prevent extra
 messages

---
 oscar/SleepLib/loader_plugins/resmed_loader.cpp | 10 ++++++++++
 oscar/SleepLib/loader_plugins/resmed_loader.h   | 13 +++++++++++--
 oscar/SleepLib/session.cpp                      |  2 +-
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/oscar/SleepLib/loader_plugins/resmed_loader.cpp b/oscar/SleepLib/loader_plugins/resmed_loader.cpp
index 9e95297f..89d3deb8 100644
--- a/oscar/SleepLib/loader_plugins/resmed_loader.cpp
+++ b/oscar/SleepLib/loader_plugins/resmed_loader.cpp
@@ -42,6 +42,16 @@ const QString STR_ResMed_AirCurve11 = "AirCurve 11";
 const QString STR_ResMed_S9 = "S9";
 const QString STR_UnknownModel = "Resmed ???";
 
+// TODO: See the PRSLoader::LogUnexpectedMessage TODO about generalizing this for other loaders.
+void ResmedLoader::LogUnexpectedMessage(const QString & message)
+{
+    m_importMutex.lock();
+    m_unexpectedMessages += message;
+    m_importMutex.unlock();
+}
+
+static const QVector<int> AS11TestedModels {39420, 0};
+
 ResmedLoader::ResmedLoader() {
 #ifndef UNITTEST_MODE
     const QString RMS9_ICON = ":/icons/rms9.png";
diff --git a/oscar/SleepLib/loader_plugins/resmed_loader.h b/oscar/SleepLib/loader_plugins/resmed_loader.h
index bf4da73c..8ccf90de 100644
--- a/oscar/SleepLib/loader_plugins/resmed_loader.h
+++ b/oscar/SleepLib/loader_plugins/resmed_loader.h
@@ -136,6 +136,8 @@ class ResmedLoader : public CPAPLoader
     ResDaySaveCallback saveCallback;
     int OpenWithCallback(const QString & dirpath, ResDaySaveCallback s);
 
+    void LogUnexpectedMessage(const QString & message);
+
 protected:
 //! \brief The STR.edf file is a unique edf file with many signals
     bool ProcessSTRfiles(Machine *, QMap<QDate, STRFile> &, QDate);
@@ -166,9 +168,16 @@ protected:
     volatile qint64 timeInAddWaveform;
     volatile qint64 timeInTimeDelta;
     QMutex timeMutex;
-
-
 #endif
+
+    // TODO: This really belongs in a generic location that all loaders can use.
+    // But that will require retooling the overall call structure so that there's
+    // a top-level import job that's managing a specific import. Right now it's
+    // essentially managed by the importCPAP method rather than an object instance
+    // with state.
+    QMutex m_importMutex;
+    QSet<QString> m_unexpectedMessages;
+
 };
 
 #endif // RESMED_LOADER_H
diff --git a/oscar/SleepLib/session.cpp b/oscar/SleepLib/session.cpp
index cc481f36..3ef97a20 100644
--- a/oscar/SleepLib/session.cpp
+++ b/oscar/SleepLib/session.cpp
@@ -1143,7 +1143,7 @@ void Session::updateCountSummary(ChannelID code)
         using namespace schema;
         Channel *ch_p = channel.channels[code];
         if (  ! ch_p->isNull() ) {
-            if ( ch_p->type() == FLAG )
+            if ( (ch_p->type() & FLAG) == FLAG )
                 return;
                 qDebug() << "No valuesummary for channel " << ch_p->label();
         }