From 0a57a08bd5d60ae8bc5319e56aea585b413ea364 Mon Sep 17 00:00:00 2001
From: Mark Watkins <jedimark@users.sourceforge.net>
Date: Tue, 19 Aug 2014 14:01:31 +1000
Subject: [PATCH] CMS50I session select test 3

---
 .../SleepLib/loader_plugins/cms50f37_loader.cpp     | 13 ++++++++-----
 .../SleepLib/loader_plugins/cms50f37_loader.h       |  7 +++----
 sleepyhead/SleepLib/serialoximeter.h                |  3 ++-
 sleepyhead/oximeterimport.cpp                       |  1 +
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/sleepyhead/SleepLib/loader_plugins/cms50f37_loader.cpp b/sleepyhead/SleepLib/loader_plugins/cms50f37_loader.cpp
index 00057e05..d2387f77 100644
--- a/sleepyhead/SleepLib/loader_plugins/cms50f37_loader.cpp
+++ b/sleepyhead/SleepLib/loader_plugins/cms50f37_loader.cpp
@@ -45,7 +45,6 @@ CMS50F37Loader::CMS50F37Loader()
 
     m_vendorID = 0x10c4;
     m_productID = 0xea60;
-    cms50dplus = false;
 
     oxirec = nullptr;
 
@@ -86,6 +85,10 @@ bool CMS50F37Loader::openDevice()
     // connect relevant signals
     connect(&serial,SIGNAL(readyRead()), this, SLOT(dataAvailable()));
 
+    started_import = false;
+    started_reading = false;
+    finished_import = false;
+
     resetDevice();
     return true;
 }
@@ -519,9 +522,9 @@ void CMS50F37Loader::processBytes(QByteArray bytes)
 //}
 
 
-void CMS50F37Loader::sendCommand(unsigned char c)
+void CMS50F37Loader::sendCommand(quint8 c)
 {
-    static unsigned char cmd[] = { 0x7d, 0x81, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80 };
+    quint8 cmd[] = { 0x7d, 0x81, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80 };
     cmd[2] |= (c & 0x7f);
 
     QString out;
@@ -533,9 +536,9 @@ void CMS50F37Loader::sendCommand(unsigned char c)
     }
 }
 
-void CMS50F37Loader::sendCommand(unsigned char c, unsigned char c2)
+void CMS50F37Loader::sendCommand(quint8 c, quint8 c2)
 {
-    static unsigned char cmd[] = { 0x7d, 0x81, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80 };
+    quint8 cmd[] = { 0x7d, 0x81, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80 };
     cmd[2] |= (c & 0x7f);
     cmd[4] |= (c2 & 0x7f);
 
diff --git a/sleepyhead/SleepLib/loader_plugins/cms50f37_loader.h b/sleepyhead/SleepLib/loader_plugins/cms50f37_loader.h
index 1b8e8065..3de5d042 100644
--- a/sleepyhead/SleepLib/loader_plugins/cms50f37_loader.h
+++ b/sleepyhead/SleepLib/loader_plugins/cms50f37_loader.h
@@ -46,7 +46,7 @@ Q_OBJECT
 
     virtual void process();
 
-    virtual bool isStartTimeValid() { return !cms50dplus; }
+    virtual bool isStartTimeValid() { return true; }
 
     virtual QString getUser();
     virtual QString getModel();
@@ -88,8 +88,8 @@ protected:
 
     virtual void killTimers();
 
-    void sendCommand(unsigned char c);
-    void sendCommand(unsigned char c, unsigned char c2);
+    void sendCommand(quint8 c);
+    void sendCommand(quint8 c, quint8 c2);
 
 
     // Switch device to live streaming mode
@@ -111,7 +111,6 @@ protected:
     bool started_import;
     bool finished_import;
     bool started_reading;
-    bool cms50dplus;
 
     int cb_reset,imp_callbacks;
 
diff --git a/sleepyhead/SleepLib/serialoximeter.h b/sleepyhead/SleepLib/serialoximeter.h
index 7acc0438..18957ad2 100644
--- a/sleepyhead/SleepLib/serialoximeter.h
+++ b/sleepyhead/SleepLib/serialoximeter.h
@@ -91,6 +91,8 @@ public:
     virtual qint64 liveResolution() { return 20; }
 
     void trashRecords();
+    virtual void resetDevice() {}
+
 
 signals:
     void noDeviceFound();
@@ -111,7 +113,6 @@ protected:
     virtual void processBytes(QByteArray buffer) { Q_UNUSED(buffer) }
 
     virtual void killTimers() {}
-    virtual void resetDevice() {}
     virtual void requestData() {}
 
     QString port;
diff --git a/sleepyhead/oximeterimport.cpp b/sleepyhead/oximeterimport.cpp
index d313fc96..acbba050 100644
--- a/sleepyhead/oximeterimport.cpp
+++ b/sleepyhead/oximeterimport.cpp
@@ -222,6 +222,7 @@ void OximeterImport::on_directImportButton_clicked()
     if (!oximodule)
         return;
 
+    oximodule->resetDevice();
     int session_count = oximodule->getSessionCount();
 
     if (session_count > 1) {