From 809779af27afce5b65a3d5be45a23be0a7c10fcd Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Fri, 22 Aug 2014 02:29:46 +1000 Subject: [PATCH] CMS50i PI test3 --- .../SleepLib/loader_plugins/cms50f37_loader.cpp | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/sleepyhead/SleepLib/loader_plugins/cms50f37_loader.cpp b/sleepyhead/SleepLib/loader_plugins/cms50f37_loader.cpp index 5395beec..680230c2 100644 --- a/sleepyhead/SleepLib/loader_plugins/cms50f37_loader.cpp +++ b/sleepyhead/SleepLib/loader_plugins/cms50f37_loader.cpp @@ -454,26 +454,19 @@ void CMS50F37Loader::processBytes(QByteArray bytes) } if (res == 0x09) { - quint8 * buf = &((quint8 *)buffer.data())[idx]; // 9,80,e1,c4,ce,82 // cms50i data - for (int i = 3, msb = buf[1]; i < len-1; i++, msb>>= 1) { + + quint8 * buf = &((quint8 *)buffer.data())[idx]; + for (int i = 3, msb = buf[1]; i < len-2; i++, msb>>= 1) { buf[i] = (buf[i] & 0x7f) | (msb & 0x01 ? 0x80 : 0); } - 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; + quint16 pi = buffer.at(idx + 4) | (buffer.at(idx + 5) << 8); pulse = buf[3]; quint8 spo2 = buf[2]; - oxirec->append(((spo2 == 0) || (pulse == 0)) ? OxiRecord(0,0,0) : OxiRecord(pulse, spo2, pi3)); + oxirec->append(((spo2 == 0) || (pulse == 0)) ? OxiRecord(0,0,0) : OxiRecord(pulse, spo2, pi)); } else if (res == 0x0f) { // f,80,de,c2,de,c2,de,c2 cms50F data...