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

Get CMS50IW model string properly

Browse Source
This commit is contained in:
Mark Watkins 2014-09-19 13:19:11 +10:00
parent c250ec40aa
commit 55390d9831
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -215,14 +215,16 @@ QString CMS50F37Loader::getModel()
{ {
if (!model.isEmpty()) return model; if (!model.isEmpty()) return model;
modelsegments = 0;
sendCommand(COMMAND_GET_OXIMETER_MODEL); sendCommand(COMMAND_GET_OXIMETER_MODEL);
QTime time; QTime time;
time.start(); time.start();
do { do {
QApplication::processEvents(); QApplication::processEvents();
} while (model.isEmpty() && (time.elapsed() < TIMEOUT)); } while ((modelsegments < 2) && (time.elapsed() < TIMEOUT));
// Give a little more time for the second one..
QThread::msleep(100); QThread::msleep(100);
QApplication::processEvents(); QApplication::processEvents();
@ -368,9 +370,12 @@ void CMS50F37Loader::processBytes(QByteArray bytes)
data = buffer.at(idx+1); data = buffer.at(idx+1);
if (data == 0) { if (data == 0) {
model = QString(buffer.mid(idx+3, 6)); model = QString(buffer.mid(idx+3, 6));
qDebug() << "Model:" << model; modelsegments++;
} else { } else {
qDebug() << "Extra Model:" << data; QString extra = QString(buffer.mid(idx+3, 6));
model += extra.trimmed();
modelsegments++;
qDebug() << "Model:" << model;
} }
break; break;
case 0x03: // Vendor string case 0x03: // Vendor string

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

@ -146,6 +146,8 @@ protected:
int timectr; int timectr;
int modelsegments;
}; };

2
sleepyhead/SleepLib/serialoximeter.cpp
View File

@ -25,7 +25,7 @@ QList<SerialOximeter *> GetOxiLoaders()
return oxiloaders; return oxiloaders;
} }
bool SerialOximeter::scanDevice(QString keyword,quint16 vendor_id, quint16 product_id) bool SerialOximeter::scanDevice(QString keyword, quint16 vendor_id, quint16 product_id)
{ {
static bool dumponce = true; static bool dumponce = true;
QStringList ports; QStringList ports;