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

Fix date and time handling for new CMS50Dplus model

Browse Source
This commit is contained in:
Phil Olynyk 2019-06-15 15:42:47 -04:00
parent 589eec69ec
commit 73a225556a
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
oscar/SleepLib/loader_plugins/cms50f37_loader.cpp
View File

@ -578,9 +578,11 @@ void CMS50F37Loader::processBytes(QByteArray bytes)
if (!started_import) { if (!started_import) {
// startTimer.singleShot(2000, this, SLOT(requestData())); // startTimer.singleShot(2000, this, SLOT(requestData()));
importCount = 0;
qDebug() << "cms50f37 - pB: Read:" << len << size << str.join(","); qDebug() << "cms50f37 - pB: Read:" << len << size << str.join(",");
} else { } else {
qDebug() << "cms50f37 - pB: Import:" << len << size << str.join(","); importCount++;
// qDebug() << "cms50f37 - pB: Import:" << len << size << str.join(",");
} }
idx += len; idx += len;
@ -827,9 +829,11 @@ void CMS50F37Loader::resetImportTimeout()
if (resetTimer.isActive()) if (resetTimer.isActive())
resetTimer.stop(); resetTimer.stop();
if (!finished_import) resetTimer.singleShot(2000, this, SLOT(resetImportTimeout())); if (!finished_import)
resetTimer.singleShot(2000, this, SLOT(resetImportTimeout()));
} else { } else {
qDebug() << "cms50f37 - Oximeter device stopped transmitting.. Transfer complete"; qDebug() << "cms50f37 - Oximeter device stopped transmitting.. Transfer complete";
qDebug() << "cms50f37 - Import packet count: " << importCount;
// We were importing, but now are done // We were importing, but now are done
if (!finished_import && (started_import && started_reading)) { if (!finished_import && (started_import && started_reading)) {
qDebug() << "cms50f37 - Switching CMS50F37 back to live mode and finalizing import"; qDebug() << "cms50f37 - Switching CMS50F37 back to live mode and finalizing import";

8
oscar/SleepLib/loader_plugins/cms50f37_loader.h
View File

@ -82,14 +82,10 @@ protected slots:
virtual void resetImportTimeout(); virtual void resetImportTimeout();
virtual void startImportTimeout(); virtual void startImportTimeout();
virtual void shutdownPorts(); virtual void shutdownPorts();
void nextCommand(); void nextCommand();
protected: protected:
bool readSpoRFile(const QString & path); bool readSpoRFile(const QString & path);
virtual void processBytes(QByteArray bytes); virtual void processBytes(QByteArray bytes);
@ -100,12 +96,9 @@ protected:
void sendCommand(quint8 c); void sendCommand(quint8 c);
void sendCommand(quint8 c, quint8 c2); void sendCommand(quint8 c, quint8 c2);
// Switch device to live streaming mode // Switch device to live streaming mode
virtual void resetDevice(); virtual void resetDevice();
private: private:
int sequence; int sequence;
@ -125,6 +118,7 @@ protected:
int cb_reset,imp_callbacks; int cb_reset,imp_callbacks;
int received_bytes; int received_bytes;
int importCount;
int m_itemCnt; int m_itemCnt;
int m_itemTotal; int m_itemTotal;

4
oscar/oximeterimport.cpp
View File

@ -647,11 +647,11 @@ void OximeterImport::on_radioSyncOximeter_clicked()
ui->syncCPAPGroup->setVisible(false); ui->syncCPAPGroup->setVisible(false);
if ( oximodule ) { if ( oximodule ) {
if (oximodule->isStartTimeValid()) { if (oximodule->isStartTimeValid()) {
qDebug() << "oximod - Oximeter time is valid " << oximodule->startTime().toString("yyyy-MMM-dd HH:mm:ssap"); qDebug() << "oximod - Oximeter time is " << oximodule->startTime().toString("yyyy-MMM-dd HH:mm:ssap");
ui->calendarWidget->setSelectedDate(oximodule->startTime().date()); ui->calendarWidget->setSelectedDate(oximodule->startTime().date());
ui->dateTimeEdit->setDateTime(oximodule->startTime()); ui->dateTimeEdit->setDateTime(oximodule->startTime());
} else { } else {
qDebug() << "oximod - Oximeter time is not valid" << oximodule->startTime().toString("yyyy-MMM-dd HH:mm:ssap"); qDebug() << "oximod - Oximeter time is faked" << oximodule->startTime().toString("yyyy-MMM-dd HH:mm:ssap");
ui->calendarWidget->setSelectedDate(oximodule->startTime().date()); ui->calendarWidget->setSelectedDate(oximodule->startTime().date());
ui->dateTimeEdit->setDateTime(oximodule->startTime()); ui->dateTimeEdit->setDateTime(oximodule->startTime());
} }