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

Yet more CMS50 fixes

Browse Source
This commit is contained in:
Mark Watkins 2014-08-20 13:42:42 +10:00
parent 569b94abf8
commit 59a936ec72
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -292,6 +292,7 @@ QDateTime CMS50F37Loader::getDateTime(int session)
void CMS50F37Loader::processBytes(QByteArray bytes) void CMS50F37Loader::processBytes(QByteArray bytes)
{ {
static quint8 resimport = 0;
int data; int data;
QString tmpstr; QString tmpstr;
@ -309,16 +310,27 @@ void CMS50F37Loader::processBytes(QByteArray bytes)
quint8 pulse; quint8 pulse;
do { do {
unsigned char res = buffer.at(idx); quint8 res = buffer.at(idx);
len = lengths[res & 0x1f]; len = lengths[res & 0x1f];
if (len > size) if ((idx+len) > size)
break; break;
if (started_reading && (res != resimport)) {
len = 0;
}
if (len == 0) { if (len == 0) {
// lost sync // lost sync
idx++; if (started_reading) {
do {
res = buffer.at(idx++);
} while (res != lastres || idx > size);
// add a dummy to make up for it.
qDebug() << "lost sync, padding...";
oxirec->append(OxiRecord(0,0,0));
}
continue; continue;
} }
for (int i = 1; i < len; i++) { for (int i = 1; i < len; i++) {
@ -432,6 +444,7 @@ void CMS50F37Loader::processBytes(QByteArray bytes)
cb_reset = 1; cb_reset = 1;
resetTimer.singleShot(2000,this,SLOT(resetImportTimeout())); resetTimer.singleShot(2000,this,SLOT(resetImportTimeout()));
resimport = res;
} }
break; break;
@ -453,7 +466,6 @@ void CMS50F37Loader::processBytes(QByteArray bytes)
quint8 spo2 = buf[2]; quint8 spo2 = buf[2];
oxirec->append(((spo2 == 0) || (pulse == 0) || (pi == 0xfff6)) ? OxiRecord(0,0,0) : OxiRecord(pulse, spo2, pi)); oxirec->append(((spo2 == 0) || (pulse == 0) || (pi == 0xfff6)) ? OxiRecord(0,0,0) : OxiRecord(pulse, spo2, pi));
} else if (res == 0x0f) { } else if (res == 0x0f) {
// f,80,de,c2,de,c2,de,c2 cms50F data... // f,80,de,c2,de,c2,de,c2 cms50F data...
@ -461,13 +473,10 @@ void CMS50F37Loader::processBytes(QByteArray bytes)
buffer[idx+i] = (buffer[idx+i] & 0x7f) | (msb & 0x01 ? 0x80 : 0); buffer[idx+i] = (buffer[idx+i] & 0x7f) | (msb & 0x01 ? 0x80 : 0);
} }
// pulse = buffer.at(idx+3) | ((mask & 2) << 6);
oxirec->append((pulse == 0xff) ? OxiRecord(0,0) : OxiRecord(buffer.at(idx+3), buffer.at(idx+2))); oxirec->append((pulse == 0xff) ? OxiRecord(0,0) : OxiRecord(buffer.at(idx+3), buffer.at(idx+2)));
// pulse = buffer.at(idx+5) | ((mask & 8) << 4);
oxirec->append((pulse == 0xff) ? OxiRecord(0,0) : OxiRecord(buffer.at(idx+5), buffer.at(idx+4))); oxirec->append((pulse == 0xff) ? OxiRecord(0,0) : OxiRecord(buffer.at(idx+5), buffer.at(idx+4)));
// pulse = buffer.at(idx+7) | ((mask & 0x20) << 2);
oxirec->append((pulse == 0xff) ? OxiRecord(0,0) : OxiRecord(buffer.at(idx+7), buffer.at(idx+6))); oxirec->append((pulse == 0xff) ? OxiRecord(0,0) : OxiRecord(buffer.at(idx+7), buffer.at(idx+6)));
} }