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

CMS50i PI test2

Browse Source
This commit is contained in:
Mark Watkins 2014-08-22 02:13:22 +10:00
parent b10365a7d2
commit 9c9408a4f2
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sleepyhead/Graphs/gLineChart.cpp
View File

@ -570,6 +570,11 @@ void gLineChart::paint(QPainter &painter, gGraph &w, const QRegion &region)
num_points += (*ni)->count(); num_points += (*ni)->count();
} }
if (code == CPAP_FlowRate) {
int i=5; Q_UNUSED(i);
}
total_points += num_points; total_points += num_points;
codepoints += num_points; codepoints += num_points;
@ -787,9 +792,6 @@ void gLineChart::paint(QPainter &painter, gGraph &w, const QRegion &region)
////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////
// Normal Waveform Plot // Normal Waveform Plot
////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////
if (code == CPAP_Ti) {
int i=5; Q_UNUSED(i);
}
// Prime first point // Prime first point
data = (*ptr + el.offset()) * gain; data = (*ptr + el.offset()) * gain;
lastpx = xst + ((time - minx) * xmult); lastpx = xst + ((time - minx) * xmult);

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

@ -460,12 +460,20 @@ void CMS50F37Loader::processBytes(QByteArray bytes)
buf[i] = (buf[i] & 0x7f) | (msb & 0x01 ? 0x80 : 0); buf[i] = (buf[i] & 0x7f) | (msb & 0x01 ? 0x80 : 0);
} }
quint16 pi = buf[idx + 4] | buf[idx + 5] << 8; quint16 pi1 = buf[idx + 4] | buf[idx + 5] << 8;
quint16 pi2 = buf[idx + 4] | ((char *)buf)[idx + 5] << 8;
quint16 pi3 = buf[idx + 4] | buf[idx + 5] << 7;
quint16 pi4 = buf[idx + 4] | ((char *)buf)[idx + 5] << 7;
qDebug() << "Pi1 =" << pi1
<< "Pi2 =" << pi2
<< "Pi3 =" << pi3
<< "Pi4 =" << pi4;
pulse = buf[3]; pulse = buf[3];
quint8 spo2 = buf[2]; quint8 spo2 = buf[2];
oxirec->append(((spo2 == 0) || (pulse == 0)) ? OxiRecord(0,0,0) : OxiRecord(pulse, spo2, pi)); oxirec->append(((spo2 == 0) || (pulse == 0)) ? OxiRecord(0,0,0) : OxiRecord(pulse, spo2, pi3));
} 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...

2
sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp
View File

@ -2286,7 +2286,7 @@ bool ResmedLoader::LoadPLD(Session *sess, const QString & path)
a = sess->AddEventList(code, EVL_Waveform, es.gain, es.offset, 0, 0, rate); a = sess->AddEventList(code, EVL_Waveform, es.gain, es.offset, 0, 0, rate);
a->AddWaveform(edf.startdate, es.data, recs, duration); a->AddWaveform(edf.startdate, es.data, recs, duration);
//a=ToTimeDelta(sess,edf,es, code,recs,duration,0,0); //a=ToTimeDelta(sess,edf,es, code,recs,duration,0,0);
} else if (es.label == "") { } else if (es.label == "") { // What the hell resmed??
if (emptycnt == 0) { if (emptycnt == 0) {
code = RMS9_E01; code = RMS9_E01;
ToTimeDelta(sess, edf, es, code, recs, duration); ToTimeDelta(sess, edf, es, code, recs, duration);