Add support for CheckMe O2 Max.

Technically it was already supported, but it generated a lot of warnings
because of data we had never seen or tested. Now that we have test data,
those warnings can go away.

Htmldocs/release_notes.html

@@ -18,6 +18,7 @@
       <li>[new] Skip first 20 seconds of TiVol, RR, and MinVent in ResMed loader.</li>
       <li>[new] Add ResMed 39423 Canadian Autoset to tested list.</li>
       <li>[new] Show channel description when hovering over index name on Daily page.</li>
+      <li>[new] Add full support for Wellue CheckMe O2 Max.</li>
       <li>[fix] Fix pressure values for AutoForHer mode on AS1x.</li>
       <li>[fix] Fix missing oximetry and motion waveforms on Overview pages.</li>
       <li>[fix] Fix rare problem of minimum pressure shown as zero on Overview and Statistics pages.</li>

oscar/SleepLib/loader_plugins/viatom_loader.cpp

@@ -287,14 +287,15 @@ bool ViatomFile::ParseHeader()
 
     switch (sig) {
     case 0x0003:
-    case 0x0005:
+    case 0x0005:  // CheckMe O2 Max
         break;
     default:
         qDebug() << m_file.fileName() << "invalid signature for Viatom data file" << sig;
         return false;
         break;
     }
-    CHECK_VALUE(sig, 3);  // We have only a single sample of 5, without a corresponding PDF. We need more samples.
+    m_sig = sig;
+    CHECK_VALUES(m_sig, 3, 5);
 
     if ((year < 2015 || year > 2059) || (month < 1 || month > 12) || (day < 1 || day > 31) ||
         (hour > 23) || (min > 59) || (sec > 59)) {
@@ -332,8 +333,7 @@ bool ViatomFile::ParseHeader()
     m_timestamp = data_timestamp.toMSecsSinceEpoch();
     m_sessionid = m_timestamp / 1000L;
 
-    int filesize = header[9] | (header[10] << 8);  // possibly 32-bit
+    int filesize = header[9] | (header[10] << 8) | (header[11] << 16);  // possibly 32-bit
-    CHECK_VALUE(header[11], 0);
     CHECK_VALUE(header[12], 0);
 
     m_duration   = header[13] | (header[14] << 8);  // possibly 32-bit
@@ -367,7 +367,7 @@ bool ViatomFile::ParseHeader()
     qint64 datasize = m_file.size() - HEADER_SIZE;
     m_record_count = datasize / RECORD_SIZE;
     m_resolution = m_duration / m_record_count * 1000L;
-    if (m_resolution == 2000) {
+    if (m_resolution == 2000 && m_sig == 3) {
         // Interestingly the file size in the header corresponds the number of
         // distinct samples. These files actually double-report each sample!
         // So this resolution isn't really the real one. The importer should
@@ -413,7 +413,7 @@ QList<ViatomFile::Record> ViatomFile::ReadData()
         records.append(rec);
     } while (records.size() < m_record_count);
 
-    // It turns out 2s files are actually just double-reported samples!
+    // It turns out 2s files are actually just double-reported samples on older models!
     if (m_resolution == 2000) {
         QList<ViatomFile::Record> dedup;
         bool all_are_duplicated = true;
@@ -432,20 +432,24 @@ QList<ViatomFile::Record> ViatomFile::ReadData()
             }
             dedup.append(a);
         }
-        CHECK_VALUE(all_are_duplicated, true);
+        if (m_sig == 5) {
+            // Confirm that CheckMe O2 Max is a true 2s sample rate.
+            CHECK_VALUE(all_are_duplicated, false);
+        } else {
+            // Confirm that older models are actually a 4s sample rate.
+            CHECK_VALUE(m_sig, 3);
+            CHECK_VALUE(all_are_duplicated, true);
+        }
         if (all_are_duplicated) {
             // Return the deduplicated list.
             records = dedup;
         }
     }
-    /* TODO: Test against CheckMe sample data
+    if (m_sig == 5) {
-    int iCheckMeAdj; // Allows for an odd number in the CheckMe  duration/# of records return
+        CHECK_VALUES(duration() / records.size(), 2, 4);  // We've seen 2s and 4s resolution.
-    iCheckMeAdj = duration() / records.size();
+    } else {
-    if(iCheckMeAdj == 3) iCheckMeAdj = 4; // CN - Sanity check for CheckMe devices since their files do not always terminate on an even number.
+        CHECK_VALUE(duration() / records.size(), 4);  // We've only seen 4s true resolution so far.
-
+    }
-    CHECK_VALUE(iCheckMeAdj, 4);  // Crimson Nape - Changed to accomadate the CheckMe data files.
-    */
-    CHECK_VALUE(duration() / records.size(), 4);  // We've only seen 4s true resolution so far.
 
     return records;
 }

oscar/SleepLib/loader_plugins/viatom_loader.h

@@ -82,6 +82,7 @@ public:
 protected:
     static const int RECORD_SIZE = 5;
     QFile & m_file;
+    int m_sig;
     quint64 m_timestamp;
     int m_duration;
     int m_record_count;