chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-05 02:30:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Preliminary S10 channels, CMS50f/i clock set option

Browse Source
This commit is contained in:
Mark Watkins 2014-08-24 12:26:53 +10:00
parent 234f2001a3
commit 09ccf1984c
4 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sleepyhead/Graphs/gGraphView.cpp
View File

@ -1689,6 +1689,7 @@ void gGraphView::populateMenu(gGraph * graph)
QCheckBox *chbox = new QCheckBox(chan.calc[dot.type].label(), context_menu);
chbox->setMouseTracking(true);
chbox->setStyleSheet(QString("QCheckBox:hover { background: %1; }").arg(QApplication::palette().highlight().color().name()));
widget->setDefaultWidget(chbox);
@ -1742,6 +1743,8 @@ void gGraphView::populateMenu(gGraph * graph)
QCheckBox *chbox = new QCheckBox(schema::channel[code].label(), context_menu);
chbox->setMouseTracking(true);
chbox->setToolTip(schema::channel[code].description());
chbox->setStyleSheet(QString("QCheckBox:hover { background: %1; }").arg(QApplication::palette().highlight().color().name()));
widget->setDefaultWidget(chbox);
@ -1788,8 +1791,6 @@ void gGraphView::populateMenu(gGraph * graph)
QHash<MachineType, int> Vis;
if (chans.size() > 0) {
}
for (int i=0; i < chans.size() ; ++i) {
ChannelID code = chans.at(i);
schema::Channel & chan = schema::channel[code];
@ -1797,8 +1798,11 @@ void gGraphView::populateMenu(gGraph * graph)
QWidgetAction * widget = new QWidgetAction(context_menu);
QCheckBox *chbox = new QCheckBox(schema::channel[code].fullname(), context_menu);
chbox->setPalette(context_menu->palette());
chbox->setMouseTracking(true);
chbox->setToolTip(schema::channel[code].description());
chbox->setStyleSheet(QString("QCheckBox:hover { background: %1; }").arg(QApplication::palette().highlight().color().name()));
widget->setDefaultWidget(chbox);

4
sleepyhead/SleepLib/loader_plugins/cms50f37_loader.cpp
View File

@ -585,7 +585,7 @@ void CMS50F37Loader::syncClock()
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 };
quint8 datecmd[] = { 0x7d, 0x81, 0xb2, yh | 0x80, yl |0x80, mon|0x80, day|0x80, wd|0x80, 0x80 };
timectr = 0;
if (serial.write((char *)datecmd, 9) == -1) {
@ -604,7 +604,7 @@ void CMS50F37Loader::syncClock()
quint8 m = ctime.minute();
quint8 s = ctime.second();
quint8 timecmd[] = { 0x7d, 0xb2, h | 0x80, m |0x80, s|0x80, 0x80, 0x80, 0x80, 0x80 };
quint8 timecmd[] = { 0x7d, 0x81, 0xb1, h | 0x80, m |0x80, s|0x80, 0x80, 0x80, 0x80 };
timectr = 0;
if (serial.write((char *)timecmd, 9) == -1) {

21
sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp
View File

@ -2441,6 +2441,27 @@ void ResInitModelMap()
resmed_codes[CPAP_PressureMin].push_back("\xE6\x9C\x80\xE5\xB0\x8F\xE5\x8E\x8B\xE5\x8A\x9B"); // Chinese
resmed_codes[CPAP_PressureMin].push_back("Pression min.");
resmed_codes[CPAP_PressureMin].push_back("Min tryck");
// BRP file
resmed_codes[CPAP_FlowRate].push_back("Flow.40ms");
resmed_codes[CPAP_MaskPressureHi].push_back("Pres.40ms");
// SAD file
resmed_codes[OXI_Pulse].push_back("Pulse.1s");
resmed_codes[OXI_SPO2].push_back("SpO2.1s");
// PLD file
resmed_codes[CPAP_MaskPressure].push_back("MaskPress.2s");
resmed_codes[CPAP_Pressure].push_back("Press.2s");
//resmed_codes[RMS9_EPRPressure].push_back("EPRPress.2s");
resmed_codes[CPAP_Leak].push_back("Leak.2s");
resmed_codes[CPAP_RespRate].push_back("RespRate.2s");
resmed_codes[CPAP_TidalVolume].push_back("TidVol.2s");
resmed_codes[CPAP_MinuteVent].push_back("MinVent.2s");
resmed_codes[CPAP_Snore].push_back("Snore.2s");
resmed_codes[CPAP_FLG].push_back("FlowLim.2s");
}
ChannelID ResmedLoader::PresReliefMode() { return RMS9_EPR; }

4
sleepyhead/oximeterimport.cpp
View File

@ -225,6 +225,10 @@ void OximeterImport::on_directImportButton_clicked()
QString model = oximodule->getModel();
QString user = oximodule->getUser();
if (p_profile->oxi->syncOximeterClock()) {
oximodule->syncClock();
}
oximodule->resetDevice();
int session_count = oximodule->getSessionCount();