chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-19 04:00:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

CMS50I session select test 3

Browse Source
This commit is contained in:
Mark Watkins 2014-08-19 14:01:31 +10:00
parent 9754c0c5b3
commit 0a57a08bd5
4 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sleepyhead/SleepLib/loader_plugins/cms50f37_loader.cpp
View File

@ -45,7 +45,6 @@ CMS50F37Loader::CMS50F37Loader()
m_vendorID = 0x10c4; m_vendorID = 0x10c4;
m_productID = 0xea60; m_productID = 0xea60;
cms50dplus = false;
oxirec = nullptr; oxirec = nullptr;
@ -86,6 +85,10 @@ bool CMS50F37Loader::openDevice()
// connect relevant signals // connect relevant signals
connect(&serial,SIGNAL(readyRead()), this, SLOT(dataAvailable())); connect(&serial,SIGNAL(readyRead()), this, SLOT(dataAvailable()));
started_import = false;
started_reading = false;
finished_import = false;
resetDevice(); resetDevice();
return true; 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); cmd[2] |= (c & 0x7f);
QString out; 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[2] |= (c & 0x7f);
cmd[4] |= (c2 & 0x7f); cmd[4] |= (c2 & 0x7f);

7
sleepyhead/SleepLib/loader_plugins/cms50f37_loader.h
View File

@ -46,7 +46,7 @@ Q_OBJECT
virtual void process(); virtual void process();
virtual bool isStartTimeValid() { return !cms50dplus; } virtual bool isStartTimeValid() { return true; }
virtual QString getUser(); virtual QString getUser();
virtual QString getModel(); virtual QString getModel();
@ -88,8 +88,8 @@ protected:
virtual void killTimers(); virtual void killTimers();
void sendCommand(unsigned char c); void sendCommand(quint8 c);
void sendCommand(unsigned char c, unsigned char c2); void sendCommand(quint8 c, quint8 c2);
// Switch device to live streaming mode // Switch device to live streaming mode
@ -111,7 +111,6 @@ protected:
bool started_import; bool started_import;
bool finished_import; bool finished_import;
bool started_reading; bool started_reading;
bool cms50dplus;
int cb_reset,imp_callbacks; int cb_reset,imp_callbacks;

3
sleepyhead/SleepLib/serialoximeter.h
View File

@ -91,6 +91,8 @@ public:
virtual qint64 liveResolution() { return 20; } virtual qint64 liveResolution() { return 20; }
void trashRecords(); void trashRecords();
virtual void resetDevice() {}
signals: signals:
void noDeviceFound(); void noDeviceFound();
@ -111,7 +113,6 @@ protected:
virtual void processBytes(QByteArray buffer) { Q_UNUSED(buffer) } virtual void processBytes(QByteArray buffer) { Q_UNUSED(buffer) }
virtual void killTimers() {} virtual void killTimers() {}
virtual void resetDevice() {}
virtual void requestData() {} virtual void requestData() {}
QString port; QString port;

1
sleepyhead/oximeterimport.cpp
View File

@ -222,6 +222,7 @@ void OximeterImport::on_directImportButton_clicked()
if (!oximodule) if (!oximodule)
return; return;
oximodule->resetDevice();
int session_count = oximodule->getSessionCount(); int session_count = oximodule->getSessionCount();
if (session_count > 1) { if (session_count > 1) {