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

Hopefully the last of the horrid oximetry freeze bug

Browse Source
This commit is contained in:
Mark Watkins 2011-12-04 03:42:26 +10:00
parent 9817fb9df1
commit b6ba491feb
2 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
oximetry.cpp
View File

@ -45,6 +45,8 @@ SerialOximeter::SerialOximeter(QObject * parent,QString oxiname, QString portnam
} }
timer=new QTimer(this); timer=new QTimer(this);
connect(timer,SIGNAL(timeout()),this,SLOT(Timeout())); connect(timer,SIGNAL(timeout()),this,SLOT(Timeout()));
import_mode=false;
m_mode=SO_WAIT;
} }
SerialOximeter::~SerialOximeter() SerialOximeter::~SerialOximeter()
@ -325,10 +327,10 @@ Session *SerialOximeter::createSession()
bool SerialOximeter::startLive() bool SerialOximeter::startLive()
{ {
m_mode=SO_LIVE;
import_mode=false; import_mode=false;
m_mode=SO_LIVE;
if (!Open(QextSerialPort::EventDriven)) return false; if (!m_opened && !Open(QextSerialPort::EventDriven)) return false;
createSession(); createSession();
return true; return true;
@ -337,7 +339,7 @@ bool SerialOximeter::startLive()
void SerialOximeter::stopLive() void SerialOximeter::stopLive()
{ {
if (timer->isActive()) timer->stop(); if (timer->isActive()) timer->stop();
Close(); m_mode=SO_WAIT;
if (session) { if (session) {
compactAll(); compactAll();
calcSPO2Drop(session); calcSPO2Drop(session);
@ -348,7 +350,6 @@ void SerialOximeter::stopLive()
CMS50Serial::CMS50Serial(QObject * parent, QString portname="") : CMS50Serial::CMS50Serial(QObject * parent, QString portname="") :
SerialOximeter(parent,"CMS50", portname, BAUD19200, FLOW_OFF, PAR_ODD, DATA_8, STOP_1) SerialOximeter(parent,"CMS50", portname, BAUD19200, FLOW_OFF, PAR_ODD, DATA_8, STOP_1)
{ {
import_mode=false;
} }
CMS50Serial::~CMS50Serial() CMS50Serial::~CMS50Serial()
@ -613,7 +614,7 @@ void CMS50Serial::ReadyRead()
if (failcnt>4) { if (failcnt>4) {
// Device missed the 0xf5 code sequence somehow.. // Device missed the 0xf5 code sequence somehow..
Close(); m_mode=SO_WAIT;
emit(importAborted()); emit(importAborted());
return; return;
} }
@ -623,7 +624,7 @@ void CMS50Serial::ReadyRead()
else if (done_import) { else if (done_import) {
qDebug() << "End"; qDebug() << "End";
resetDevice(); resetDevice();
Close(); m_mode=SO_WAIT;
emit(importProcess()); emit(importProcess());
} }
@ -650,9 +651,12 @@ bool CMS50Serial::startImport()
{ {
m_mode=SO_WAIT; m_mode=SO_WAIT;
if (!Open(QextSerialPort::EventDriven)) if (!m_opened && !Open(QextSerialPort::EventDriven))
return false; return false;
m_callbacks=0;
import_fails=0;
QTimer::singleShot(250,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();
@ -671,14 +675,15 @@ void CMS50Serial::startImportTimeout()
failcnt=0; failcnt=0;
m_mode=SO_IMPORT; m_mode=SO_IMPORT;
requestData(); requestData();
} else { } else {
resetDevice(); import_fails++;
//delete session; if (import_fails<5) {
qDebug() << "No oximeter signal!!!!!!!!!!!!!!!!"; resetDevice();
emit(importAborted()); QTimer::singleShot(250,this,SLOT(startImportTimeout()));
} else {
qDebug() << "No oximeter signal!!!!!!!!!!!!!!!!";
emit(importAborted());
}
} }
} }
@ -775,6 +780,7 @@ Oximetry::Oximetry(QWidget *parent,gGraphView * shared) :
Oximetry::~Oximetry() Oximetry::~Oximetry()
{ {
delete oximeter;
GraphView->SaveSettings("Oximetry"); GraphView->SaveSettings("Oximetry");
delete ui; delete ui;
} }

1
oximetry.h
View File

@ -149,6 +149,7 @@ protected:
int datasize; int datasize;
int received_bytes; int received_bytes;
int import_fails;
}; };
namespace Ui { namespace Ui {