diff --git a/sleepyhead/SleepLib/loader_plugins/cms50f37_loader.cpp b/sleepyhead/SleepLib/loader_plugins/cms50f37_loader.cpp
index a10669ac..10571aa8 100644
--- a/sleepyhead/SleepLib/loader_plugins/cms50f37_loader.cpp
+++ b/sleepyhead/SleepLib/loader_plugins/cms50f37_loader.cpp
@@ -291,7 +291,6 @@ QDateTime CMS50F37Loader::getDateTime(int session)
}
-
void CMS50F37Loader::processBytes(QByteArray bytes)
{
static quint8 resimport = 0;
@@ -299,7 +298,7 @@ void CMS50F37Loader::processBytes(QByteArray bytes)
QString tmpstr;
- int lengths[32] = { 0, 0, 9, 9, 0, 9, 4, 8, 8, 6, 4, 0, 2, 0, 3, 8, 3, 9, 8, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
+ int lengths[32] = { 0, 0, 9, 9, 0, 9, 4, 8, 8, 6, 4, 4, 2, 0, 3, 8, 3, 9, 8, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
buffer.append(bytes);
int size = buffer.size();
@@ -395,6 +394,10 @@ void CMS50F37Loader::processBytes(QByteArray bytes)
session_count = buffer.at(idx+3);
break;
+ case 0x0b:
+ timectr++;
+ break;
+
// COMMAND_CMS50_HELLO1 && COMMAND_CMS50_HELLO2
case 0xc: // a7 & a2 // responds with: c,80
data = buffer.at(idx+1);
@@ -572,6 +575,49 @@ void CMS50F37Loader::sendCommand(quint8 c, quint8 c2)
}
}
+void CMS50F37Loader::syncClock()
+{
+ QDate date = QDate::currentDate();
+ int year = date.year();
+ quint8 yh = year / 100;
+ quint8 yl = year % 100;
+ quint8 mon = date.month();
+ quint8 day = date.day();
+ quint8 wd = date.dayOfWeek() % 7;
+
+ quint8 datecmd[] = { 0x7d, 0xb2, yh | 0x80, yl |0x80, mon|0x80, day|0x80, wd|0x80, 0x80, 0x80 };
+
+ timectr = 0;
+ if (serial.write((char *)datecmd, 9) == -1) {
+ qDebug() << "Couldn't write data reset bytes to CMS50";
+ }
+
+ QTime time;
+ time.start();
+ do {
+ QApplication::processEvents();
+ } while ((timectr == 0) && (time.elapsed() < TIMEOUT));
+
+
+ QTime ctime = QTime::currentTime();
+ quint8 h = ctime.hour();
+ quint8 m = ctime.minute();
+ quint8 s = ctime.second();
+
+ quint8 timecmd[] = { 0x7d, 0xb2, h | 0x80, m |0x80, s|0x80, 0x80, 0x80, 0x80, 0x80 };
+
+ timectr = 0;
+ if (serial.write((char *)timecmd, 9) == -1) {
+ qDebug() << "Couldn't write data reset bytes to CMS50";
+ }
+
+ time.start();
+ do {
+ QApplication::processEvents();
+ } while ((timectr == 0) && (time.elapsed() < TIMEOUT));
+}
+
+
void CMS50F37Loader::nextCommand()
{
if (++sequence < cms50_seqlength) {
diff --git a/sleepyhead/SleepLib/loader_plugins/cms50f37_loader.h b/sleepyhead/SleepLib/loader_plugins/cms50f37_loader.h
index 0d00da64..ce7174f9 100644
--- a/sleepyhead/SleepLib/loader_plugins/cms50f37_loader.h
+++ b/sleepyhead/SleepLib/loader_plugins/cms50f37_loader.h
@@ -58,6 +58,8 @@ Q_OBJECT
virtual int getSessionCount();
virtual int getOximeterInfo();
+ virtual void syncClock();
+
virtual void setDuration(int d) { duration=d; }
virtual bool commandDriven() { return true; }
@@ -65,6 +67,7 @@ Q_OBJECT
virtual void getSessionData(int session);
+
// Switch device to record transmission mode
void requestData();
@@ -136,6 +139,8 @@ protected:
int duration_divisor;
int selected_session;
+ int timectr;
+
};
diff --git a/sleepyhead/SleepLib/loader_plugins/prs1_loader.cpp b/sleepyhead/SleepLib/loader_plugins/prs1_loader.cpp
index 72b1c22b..d035add5 100644
--- a/sleepyhead/SleepLib/loader_plugins/prs1_loader.cpp
+++ b/sleepyhead/SleepLib/loader_plugins/prs1_loader.cpp
@@ -1759,8 +1759,6 @@ bool PRS1Import::ParseEvents()
// session->m_gain.erase(session->m_gain.find(CPAP_Pressure));
} else {
- session->setSummaryOnly(true);
-
if (!session->settings.contains(CPAP_Pressure) && !session->settings.contains(CPAP_PressureMin)) {
session->settings[CPAP_BrokenSummary] = true;
diff --git a/sleepyhead/SleepLib/profiles.h b/sleepyhead/SleepLib/profiles.h
index 63b759fc..666b2ce1 100644
--- a/sleepyhead/SleepLib/profiles.h
+++ b/sleepyhead/SleepLib/profiles.h
@@ -246,6 +246,7 @@ const QString STR_UI_DST = "DST";
// OxiSettings Strings
const QString STR_OS_EnableOximetry = "EnableOximetry";
const QString STR_OS_SyncOximetry = "SyncOximetry";
+const QString STR_OS_SyncOximeterClock = "SyncOximeterClock";
const QString STR_OS_OximeterType = "OximeterType";
const QString STR_OS_OxiDiscardThreshold = "OxiDiscardThreshold";
const QString STR_OS_SPO2DropDuration = "SPO2DropDuration";
@@ -312,6 +313,7 @@ const QString STR_AS_GraphTooltips = "GraphTooltips";
const QString STR_AS_LineThickness = "LineThickness";
const QString STR_AS_LineCursorMode = "LineCursorMode";
const QString STR_AS_CalendarVisible = "CalendarVisible";
+const QString STR_AS_RightSidebarVisible = "RightSidebarVisible";
// UserSettings Strings
const QString STR_US_UnitSystem = "UnitSystem";
@@ -465,6 +467,7 @@ class OxiSettings : public ProfileSettings
{
initPref(STR_OS_EnableOximetry, false);
initPref(STR_OS_SyncOximetry, true);
+ initPref(STR_OS_SyncOximeterClock, true);
initPref(STR_OS_OximeterType, "CMS50");
initPref(STR_OS_OxiDiscardThreshold, 0.0);
initPref(STR_OS_SPO2DropDuration, 8.0);
@@ -476,6 +479,7 @@ class OxiSettings : public ProfileSettings
bool oximetryEnabled() const { return getPref(STR_OS_EnableOximetry).toBool(); }
bool syncOximetry() const { return getPref(STR_OS_SyncOximetry).toBool(); }
+ bool syncOximeterClock() const { return getPref(STR_OS_SyncOximeterClock).toBool(); }
QString oximeterType() const { return getPref(STR_OS_OximeterType).toString(); }
double oxiDiscardThreshold() const { return getPref(STR_OS_OxiDiscardThreshold).toDouble(); }
double spO2DropDuration() const { return getPref(STR_OS_SPO2DropDuration).toDouble(); }
@@ -487,6 +491,7 @@ class OxiSettings : public ProfileSettings
void setOximetryEnabled(bool enabled) { setPref(STR_OS_EnableOximetry, enabled); }
void setSyncOximetry(bool synced) { setPref(STR_OS_SyncOximetry, synced); }
+ void setSyncOximeterClock(bool synced) { setPref(STR_OS_SyncOximeterClock, synced); }
void setOximeterType(QString oxitype) { setPref(STR_OS_OximeterType, oxitype); }
void setOxiDiscardThreshold(double thresh) { setPref(STR_OS_OxiDiscardThreshold, thresh); }
void setSpO2DropDuration(double duration) { setPref(STR_OS_SPO2DropDuration, duration); }
@@ -677,6 +682,7 @@ class AppearanceSettings : public ProfileSettings
initPref(STR_AS_LineThickness, 1.0);
initPref(STR_AS_LineCursorMode, false);
initPref(STR_AS_CalendarVisible, true);
+ initPref(STR_AS_RightSidebarVisible, true);
}
//! \brief Returns the normal (unscaled) height of a graph
@@ -701,6 +707,8 @@ class AppearanceSettings : public ProfileSettings
bool lineCursorMode() const { return getPref(STR_AS_LineCursorMode).toBool(); }
//! \brief Whether to show the calendar
bool calendarVisible() const { return getPref(STR_AS_CalendarVisible).toBool(); }
+ //! \brief Whether to show the right sidebar
+ bool rightSidebarVisible() const { return getPref(STR_AS_RightSidebarVisible).toBool(); }
//! \brief Returns the type of overlay flags (which are displayed over the Flow Waveform)
@@ -740,6 +748,8 @@ class AppearanceSettings : public ProfileSettings
void setLineCursorMode(bool b) { setPref(STR_AS_LineCursorMode, b); }
//! \brief Sets whether to display the (Daily View) Calendar
void setCalendarVisible(bool b) { setPref(STR_AS_CalendarVisible, b); }
+ //! \brief Sets whether to display the right sidebar
+ void setRightSidebarVisible(bool b) { setPref(STR_AS_RightSidebarVisible, b); }
};
/*! \class UserSettings
diff --git a/sleepyhead/SleepLib/serialoximeter.h b/sleepyhead/SleepLib/serialoximeter.h
index 3b533e8e..14406ad8 100644
--- a/sleepyhead/SleepLib/serialoximeter.h
+++ b/sleepyhead/SleepLib/serialoximeter.h
@@ -56,6 +56,7 @@ public:
virtual QString getVendor() { return QString(); }
virtual QString getDeviceString() { return QString(); }
virtual void getSessionData(int session) { Q_UNUSED(session); }
+ virtual void syncClock() {}
virtual bool commandDriven() { return false; }
diff --git a/sleepyhead/docs/release_notes.html b/sleepyhead/docs/release_notes.html
index 1b0f5373..3ed1bfab 100644
--- a/sleepyhead/docs/release_notes.html
+++ b/sleepyhead/docs/release_notes.html
@@ -4,16 +4,17 @@
Release Notes
Greetings!
-Here is a new and hopefully improved SleepyHead build.
+Here is a definitely new and improved SleepyHead build :)
I'm pleased to report that CMS50i and CMS50f oximeters finally work with SleepyHead, a huge thanks to François Revol and Michael Masterson for there assistance with this.
-Some of you German users will be pleased to learn that the (Pulox) PO-200, PO-300, and PO-400 oximeters are secretely Contecs CMS50's in disguise, (D+, E and F respectively)..
+German users will be pleased to learn that the (Pulox) PO-200, PO-300, and PO-400 oximeters are secretely Contecs CMS50's in disguise, (D+, E and F respectively)..
This build features recent code that modified the internal "Day" objects, so they can hold sessions from multiple machines.. which is a pretty significant change in how data is stored in memory.
This was done so Oximeter, CPAP, sleep stage, positional, etc.. Session's don't have to be handled individually.. Now for instance, I can compare oximetery and CPAP data in the same object,
leading to much more powerful calculation and graphing possibilities. Nerdy stuff end users won't know about, but you will. ;)
You will likely need to REBUILD YOUR CPAP MACHINE DATABASE from the Data menu to get the benefit of the latest goodies. This rebuild will be automatic in the final 0.9.7 public builds (well, they will face a forced reimport unless they are ResMed users, but anyway :/)
+Check out the new right click menu over the titlebar/yAxis area, you will find it useful.. Remember to click outside of the popup menu to make it go away.. Design feature. :P
I'd very much love to hear your comments on the latest changes, some of this is stuff I've been planning for ages.
Sleep Well, and good luck!
JediMark
@@ -21,6 +22,8 @@ leading to much more powerful calculation and graphing possibilities. Nerdy stuf
New features & bug fixes in v0.9.7
+New Feature: Added toggle-able linechart Event-flag overlays
+New Feature: Added toggle-able Graph Plots when multiple plots present
New Feature: Added toggle-able Dotted lines for each graph for various purposes
New Feature: Added right-click popup menu in Y-Axis and title graph area
Support for importing from CMS50F and CMS50I via cable
diff --git a/sleepyhead/mainwindow.cpp b/sleepyhead/mainwindow.cpp
index f4629957..00c0ec26 100644
--- a/sleepyhead/mainwindow.cpp
+++ b/sleepyhead/mainwindow.cpp
@@ -280,6 +280,10 @@ MainWindow::MainWindow(QWidget *parent) :
}
ui->toolBox->setCurrentIndex(0);
+ bool b = p_profile->appearance->rightSidebarVisible();
+ ui->action_Sidebar_Toggle->setChecked(b);
+ ui->toolBox->setVisible(b);
+
daily->graphView()->redraw();
if (p_profile->cpap->AHIWindow() < 30.0) {
@@ -2156,6 +2160,7 @@ void MainWindow::keyPressEvent(QKeyEvent *event)
void MainWindow::on_action_Sidebar_Toggle_toggled(bool visible)
{
ui->toolBox->setVisible(visible);
+ p_profile->appearance->setRightSidebarVisible(visible);
}
void MainWindow::on_recordsBox_linkClicked(const QUrl &linkurl)
diff --git a/sleepyhead/preferencesdialog.cpp b/sleepyhead/preferencesdialog.cpp
index eff20b6b..a11ae833 100644
--- a/sleepyhead/preferencesdialog.cpp
+++ b/sleepyhead/preferencesdialog.cpp
@@ -234,6 +234,7 @@ PreferencesDialog::PreferencesDialog(QWidget *parent, Profile *_profile) :
ui->overlayFlagsCombo->setCurrentIndex(profile->appearance->overlayType());
ui->overviewLinecharts->setCurrentIndex(profile->appearance->overviewLinechartMode());
+ ui->syncOximeterClock->setChecked(profile->oxi->syncOximeterClock());
ui->oximetrySync->setChecked(profile->oxi->syncOximetry());
ui->oximetrySync->setVisible(false);
int ot = ui->oximetryType->findText(profile->oxi->oximeterType(), Qt::MatchExactly);
@@ -547,6 +548,7 @@ bool PreferencesDialog::Save()
}
profile->oxi->setOximeterType(ui->oximetryType->currentText());
+ profile->oxi->setSyncOximeterClock(ui->syncOximeterClock->isChecked());
profile->oxi->setSpO2DropPercentage(ui->spo2Drop->value());
profile->oxi->setSpO2DropDuration(ui->spo2DropTime->value());
diff --git a/sleepyhead/preferencesdialog.ui b/sleepyhead/preferencesdialog.ui
index a07074e4..ac22bbef 100644
--- a/sleepyhead/preferencesdialog.ui
+++ b/sleepyhead/preferencesdialog.ui
@@ -1361,7 +1361,7 @@ Try to sync it to your PC's clock (which should be synced to a timeserver)
5
- -
+
-
Flag rapid changes in oximetry stats
@@ -1454,86 +1454,7 @@ Try to sync it to your PC's clock (which should be synced to a timeserver)
- -
-
-
-
- 0
- 0
-
-
-
- Tries to forces the oximetry data to link with CPAP when possible.
-
-
- Link Oximetry and CPAP graphs
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
-
-
- Contec CMS50D+/E/F
-
-
- -
-
- Contec CMS50F v3.7+
-
-
- -
-
- ChoiceMMed MD300W1
-
-
- -
-
- ResMed S9 Oximeter Module
-
-
-
-
-
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- Type
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- -
Other oximetry options
@@ -1616,6 +1537,95 @@ Try to sync it to your PC's clock (which should be synced to a timeserver)
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Type
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Tries to forces the oximetry data to link with CPAP when possible.
+
+
+ Link Oximetry and CPAP graphs
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
-
+
+ Contec CMS50D+/E/F
+
+
+ -
+
+ Contec CMS50F v3.7+
+
+
+ -
+
+ ChoiceMMed MD300W1
+
+
+ -
+
+ ResMed S9 Oximeter Module
+
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 40
+
+
+
+
+ -
+
+
+ If your oximeter supports it, SleepyHead will attempt to set your Oximeters clock from your computers time.
+
+
+ Update Oximeter Clock during import
+
+
+