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

Ugh.. This bug won't die.. (I'm hopping between PC's a lot here)

Browse Source
This commit is contained in:
Mark Watkins 2011-12-04 03:06:36 +10:00
parent 63b002e8d2
commit 9817fb9df1
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
oximetry.cpp
View File

@ -630,11 +630,11 @@ void CMS50Serial::ReadyRead()
} }
void CMS50Serial::resetDevice() void CMS50Serial::resetDevice()
{ {
m_port->flush();
static unsigned char b1[3]={0xf6,0xf6,0xf6}; static unsigned char b1[3]={0xf6,0xf6,0xf6};
if (m_port->write((char *)b1,3)==-1) { if (m_port->write((char *)b1,3)==-1) {
qDebug() << "Couldn't write closing bytes to CMS50"; qDebug() << "Couldn't write closing bytes to CMS50";
} }
m_port->flush();
} }
void CMS50Serial::requestData() void CMS50Serial::requestData()
@ -644,16 +644,16 @@ void CMS50Serial::requestData()
if (m_port->write((char *)b1,2)==-1) { if (m_port->write((char *)b1,2)==-1) {
qDebug() << "Couldn't write data request bytes to CMS50"; qDebug() << "Couldn't write data request bytes to CMS50";
} }
m_port->flush();
} }
bool CMS50Serial::startImport() bool CMS50Serial::startImport()
{ {
m_mode=SO_WAIT; m_mode=SO_WAIT;
if (!Open(QextSerialPort::EventDriven)) return false; if (!Open(QextSerialPort::EventDriven))
return false;
QTimer::singleShot(200,this,SLOT(startImportTimeout())); QTimer::singleShot(250,this,SLOT(startImportTimeout()));
//make sure there is a data stream first.. //make sure there is a data stream first..
createSession(); createSession();
@ -664,16 +664,19 @@ void CMS50Serial::startImportTimeout()
{ {
if (m_callbacks>0) { if (m_callbacks>0) {
connect(this,SIGNAL(importProcess()),this,SLOT(import_process())); connect(this,SIGNAL(importProcess()),this,SLOT(import_process()));
m_mode=SO_IMPORT;
import_mode=true; import_mode=true;
waitf6=true; waitf6=true;
done_import=false; done_import=false;
cntf6=0; cntf6=0;
failcnt=0; failcnt=0;
m_mode=SO_IMPORT;
requestData(); requestData();
} else { } else {
resetDevice(); resetDevice();
delete session; //delete session;
qDebug() << "No oximeter signal!!!!!!!!!!!!!!!!"; qDebug() << "No oximeter signal!!!!!!!!!!!!!!!!";
emit(importAborted()); emit(importAborted());
} }
@ -1038,7 +1041,7 @@ void Oximetry::on_ImportButton_clicked()
//qDebug() << "Error starting oximetry serial import process"; //qDebug() << "Error starting oximetry serial import process";
return; return;
} }
QTimer::singleShot(1000,this,SLOT(oximeter_running_check())); //QTimer::singleShot(1000,this,SLOT(oximeter_running_check()));
day->getSessions().clear(); day->getSessions().clear();
day->AddSession(oximeter->getSession()); day->AddSession(oximeter->getSession());