From ef26ab5e46b53f3b648f1281f124a501b04729bf Mon Sep 17 00:00:00 2001 From: Guy Scharf Date: Sun, 2 Feb 2020 22:19:23 -0700 Subject: [PATCH 01/10] Fix, again, the "-plus" notation in Windows build process. --- oscar/update_gitinfo.bat | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/oscar/update_gitinfo.bat b/oscar/update_gitinfo.bat index e19b0baf..756f7590 100755 --- a/oscar/update_gitinfo.bat +++ b/oscar/update_gitinfo.bat @@ -9,8 +9,8 @@ if "%GIT_DIR%"=="" goto GitDone for /f %%i in ('git rev-parse --abbrev-ref HEAD') do set GIT_BRANCH=%%i if "%GIT_BRANCH%"=="HEAD" set GIT_BRANCH="" for /f %%i in ('git rev-parse --short HEAD') do set GIT_REVISION=%%i -for /f %%i in ('git diff-index --quiet HEAD --') do set GIT_INDEX=%%i -if "%GIT_INDEX%"!=="" ( +git diff-index --quiet HEAD -- +if %ERRORLEVEL% NEQ 0 ( set GIT_REVISION=%GIT_REVISION%-plus set GIT_TAG= goto GitDone From cdeba58c5dd60eebcead129e58b3b6232253421d Mon Sep 17 00:00:00 2001 From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com> Date: Mon, 3 Feb 2020 11:43:13 -0500 Subject: [PATCH 02/10] Fix minor cleanup bugs in the Resmed regression tests that were causing crashes. --- oscar/SleepLib/profiles.cpp | 15 +++++++-------- oscar/tests/resmedtests.cpp | 2 +- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/oscar/SleepLib/profiles.cpp b/oscar/SleepLib/profiles.cpp index c58bd182..98e421dc 100644 --- a/oscar/SleepLib/profiles.cpp +++ b/oscar/SleepLib/profiles.cpp @@ -94,14 +94,6 @@ Profile::~Profile() removeLock(); } - delete user; - delete doctor; - delete cpap; - delete oxi; - delete appearance; - delete session; - delete general; - // delete machine objects... for (auto & mach : m_machlist) { delete mach; @@ -111,6 +103,13 @@ Profile::~Profile() delete day; } + delete user; + delete doctor; + delete cpap; + delete oxi; + delete appearance; + delete session; + delete general; } bool Profile::Save(QString filename) diff --git a/oscar/tests/resmedtests.cpp b/oscar/tests/resmedtests.cpp index 865bb0f5..6c6eb0c1 100644 --- a/oscar/tests/resmedtests.cpp +++ b/oscar/tests/resmedtests.cpp @@ -30,9 +30,9 @@ void ResmedTests::initTestCase(void) void ResmedTests::cleanupTestCase(void) { delete AppSetting; - delete p_pref; delete p_profile; p_profile = nullptr; + delete p_pref; } From f40428f9fef48954f99475b7fad7bfc1bf60abd7 Mon Sep 17 00:00:00 2001 From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com> Date: Mon, 3 Feb 2020 15:37:37 -0500 Subject: [PATCH 03/10] Identify previously unknown Viatom vibration field. --- oscar/SleepLib/loader_plugins/viatom_loader.cpp | 6 +++--- oscar/SleepLib/loader_plugins/viatom_loader.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/oscar/SleepLib/loader_plugins/viatom_loader.cpp b/oscar/SleepLib/loader_plugins/viatom_loader.cpp index abe9db14..fdd41e7b 100644 --- a/oscar/SleepLib/loader_plugins/viatom_loader.cpp +++ b/oscar/SleepLib/loader_plugins/viatom_loader.cpp @@ -352,9 +352,9 @@ QList ViatomFile::ReadData() // Read all Pulse, SPO2 and Motion data do { ViatomFile::Record rec; - in >> rec.spo2 >> rec.hr >> rec.oximetry_invalid >> rec.motion >> rec._unk; + in >> rec.spo2 >> rec.hr >> rec.oximetry_invalid >> rec.motion >> rec.vibration; CHECK_VALUES(rec.oximetry_invalid, 0, 0xFF); - CHECK_VALUE(rec._unk, 0); // maybe vibration, given column label in CSV + CHECK_VALUES(rec.vibration, 0, 0x80); // 0x80 when vibration is triggered if (rec.oximetry_invalid == 0xFF) { CHECK_VALUE(rec.spo2, 0xFF); CHECK_VALUE(rec.hr, 0xFF); @@ -375,7 +375,7 @@ QList ViatomFile::ReadData() || a.hr != b.hr || a.oximetry_invalid != b.oximetry_invalid || a.motion != b.motion - || a._unk != b._unk) { + || a.vibration != b.vibration) { all_are_duplicated = false; break; } diff --git a/oscar/SleepLib/loader_plugins/viatom_loader.h b/oscar/SleepLib/loader_plugins/viatom_loader.h index a919cb64..55fe88f3 100644 --- a/oscar/SleepLib/loader_plugins/viatom_loader.h +++ b/oscar/SleepLib/loader_plugins/viatom_loader.h @@ -66,7 +66,7 @@ public: unsigned char hr; unsigned char oximetry_invalid; unsigned char motion; - unsigned char _unk; + unsigned char vibration; }; ViatomFile(QFile & file); ~ViatomFile() = default; From c83de24dec85bc57f29621fcd945be9e44ef6079 Mon Sep 17 00:00:00 2001 From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com> Date: Tue, 4 Feb 2020 12:26:42 -0500 Subject: [PATCH 04/10] Update PRS1 loader based on peculiar EZ-Start sample data. It doesn't do anything differently yet, but it won't alert the user about untested data, now that we have a sample. --- oscar/SleepLib/loader_plugins/prs1_loader.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/oscar/SleepLib/loader_plugins/prs1_loader.cpp b/oscar/SleepLib/loader_plugins/prs1_loader.cpp index 878e6d5d..a8ddff75 100644 --- a/oscar/SleepLib/loader_plugins/prs1_loader.cpp +++ b/oscar/SleepLib/loader_plugins/prs1_loader.cpp @@ -6647,10 +6647,12 @@ bool PRS1DataChunk::ParseSettingsF0V6(const unsigned char* data, int size) CHECK_VALUE(data[pos], 0x80); // EZ-Start enabled this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_EZ_START, data[pos] != 0)); break; - case 0x42: // EZ-Start for Auto-CPAP? + case 0x42: // EZ-Start enabled for Auto-CPAP? // Seen on 500X110 before 0x2b when EZ-Start is enabled on Auto-CPAP CHECK_VALUE(len, 1); - CHECK_VALUE(data[pos], 0x80); // EZ-Start enabled + CHECK_VALUES(data[pos], 0x00, 0x80); // both seem to mean enabled, 0x00 appears when Opti-Start is used instead + // TODO: How to represent which one is active in practice? Should this always be "true" since + // either value means that the setting is enabled? this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_EZ_START, data[pos] != 0)); break; case 0x2b: // Ramp Type From 20495e4475d396cb21dd664d66820bf3ae270876 Mon Sep 17 00:00:00 2001 From: Guy Scharf Date: Thu, 6 Feb 2020 11:59:17 -0700 Subject: [PATCH 05/10] Third time's the charm -- fix "-plus" notation for Windows --- oscar/update_gitinfo.bat | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/oscar/update_gitinfo.bat b/oscar/update_gitinfo.bat index 756f7590..652a21fc 100755 --- a/oscar/update_gitinfo.bat +++ b/oscar/update_gitinfo.bat @@ -10,12 +10,15 @@ for /f %%i in ('git rev-parse --abbrev-ref HEAD') do set GIT_BRANCH=%%i if "%GIT_BRANCH%"=="HEAD" set GIT_BRANCH="" for /f %%i in ('git rev-parse --short HEAD') do set GIT_REVISION=%%i git diff-index --quiet HEAD -- -if %ERRORLEVEL% NEQ 0 ( - set GIT_REVISION=%GIT_REVISION%-plus - set GIT_TAG= - goto GitDone -) +set GIT_INDEX=%errorlevel% +if "%GIT_INDEX%"=="0" goto GitTag + +set GIT_REVISION=%GIT_REVISION%-plus +set GIT_TAG= +goto GitDone + +:GitTag for /f %%i in ('git describe --exact-match --tags') do set GIT_TAG=%%i :GitDone From 58a7f3f13d765753a2bed65fb38c1ee75457bded Mon Sep 17 00:00:00 2001 From: Phil Olynyk Date: Thu, 6 Feb 2020 17:25:43 -0500 Subject: [PATCH 06/10] add no-error=strict-aliasing for old compilers --- oscar/oscar.pro | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/oscar/oscar.pro b/oscar/oscar.pro index 480b46fb..24a68f10 100644 --- a/oscar/oscar.pro +++ b/oscar/oscar.pro @@ -488,7 +488,10 @@ QMAKE_CXXFLAGS += -Werror # Make deprecation warnings just warnings QMAKE_CFLAGS += -Wno-error=deprecated-declarations QMAKE_CXXFLAGS += -Wno-error=deprecated-declarations - +lessThan(QT_MAJOR_VERSION,5)|lessThan(QT_MINOR_VERSION,9) { + QMAKE_CFLAGS += -Wno-error=strict-aliasing + QMAKE_CXXFLAGS += -Wno-error=strict-aliasing +} # Create a debug GUI build by adding "CONFIG+=memdebug" to your qmake command memdebug { From 0afaec53b5e2a0c611dd35aa97e2199551d727c0 Mon Sep 17 00:00:00 2001 From: Phil Olynyk Date: Thu, 6 Feb 2020 21:34:04 -0500 Subject: [PATCH 07/10] In Preferences, ask if ResMed when no machines; force ResMed prefs when yes. Also in ResMed loader --- .../SleepLib/loader_plugins/resmed_loader.cpp | 3 +- oscar/SleepLib/profiles.cpp | 12 ++++++- oscar/SleepLib/profiles.h | 3 ++ oscar/preferencesdialog.cpp | 36 +++++++++++-------- 4 files changed, 38 insertions(+), 16 deletions(-) diff --git a/oscar/SleepLib/loader_plugins/resmed_loader.cpp b/oscar/SleepLib/loader_plugins/resmed_loader.cpp index 3cc929d1..1962a18a 100644 --- a/oscar/SleepLib/loader_plugins/resmed_loader.cpp +++ b/oscar/SleepLib/loader_plugins/resmed_loader.cpp @@ -360,6 +360,7 @@ int ResmedLoader::Open(const QString & dirpath) firstImportDay = lastDate.addDays(-1); } else { // Starting from new beginnings - new or purged qDebug() << "New machine or just purged"; + p_profile->forceResmedPrefs(); QDateTime ignoreBefore = p_profile->session->ignoreOlderSessionsDate(); bool ignoreOldSessions = p_profile->session->ignoreOlderSessions(); mach = p_profile->CreateMachine( info ); @@ -949,7 +950,7 @@ void ResmedLoader::ProcessSTRfiles(Machine *mach, QMap & STRmap, // if (ignoreOldSessions) { if (date < firstImport) { #ifdef SESSION_DEBUG - qDebug() << "Skipping" << date.toString() << "Before" << ignoreBefore.date().toString(); + qDebug() << "Skipping" << date.toString() << "Before" << firstImport.toString(); #endif continue; } diff --git a/oscar/SleepLib/profiles.cpp b/oscar/SleepLib/profiles.cpp index 98e421dc..edf94273 100644 --- a/oscar/SleepLib/profiles.cpp +++ b/oscar/SleepLib/profiles.cpp @@ -353,7 +353,17 @@ qint64 Profile::diskSpace() return (diskSpaceSummaries()+diskSpaceEvents()+diskSpaceBackups()); } - +void Profile::forceResmedPrefs() +{ + session->setBackupCardData(true); + session->setDaySplitTime(QTime(12,0,0)); + session->setIgnoreShortSessions(0); + session->setCombineCloseSessions(0); + session->setLockSummarySessions(true); + general->setPrefCalcPercentile(95.0); // 95% + general->setPrefCalcMiddle(0); // Median (50%) + general->setPrefCalcMax(1); // 99.9th percentile max +} #if defined(Q_OS_WIN) class Environment diff --git a/oscar/SleepLib/profiles.h b/oscar/SleepLib/profiles.h index 8ba9ed74..4c218082 100644 --- a/oscar/SleepLib/profiles.h +++ b/oscar/SleepLib/profiles.h @@ -57,6 +57,9 @@ class Profile : public Preferences qint64 diskSpaceBackups(); qint64 diskSpace(); + //! \brief Force some preferences for ResMed machines + virtual void forceResmedPrefs(); + //! \brief Returns hostname that locked profile, or empty string if unlocked QString checkLock(); diff --git a/oscar/preferencesdialog.cpp b/oscar/preferencesdialog.cpp index ff284be6..d6dcd8d9 100644 --- a/oscar/preferencesdialog.cpp +++ b/oscar/preferencesdialog.cpp @@ -52,12 +52,20 @@ PreferencesDialog::PreferencesDialog(QWidget *parent, Profile *_profile) : channeltype[schema::UNKNOWN] = tr("Always Minor"); bool haveResMed = false; QList machines = profile->GetMachines(MT_CPAP); - for (QList::iterator it = machines.begin(); it != machines.end(); ++it) { - const QString & mclass=(*it)->loaderName(); - if (mclass == STR_MACH_ResMed) { - haveResMed = true; - break; +// qDebug() << "Machile list size is" << machines.size(); + if ( machines.size() > 0 ) { + for (QList::iterator it = machines.begin(); it != machines.end(); ++it) { + const QString & mclass=(*it)->loaderName(); + if (mclass == STR_MACH_ResMed) { + haveResMed = true; + break; + } } + } else { + if (QMessageBox::question(this, tr("No CPAP machines detected"), + tr("Will you be using a ResMed brand machine?"), + QMessageBox::Yes, QMessageBox::No) == QMessageBox::Yes ) + haveResMed = true; } #ifdef LOCK_RESMED_SESSIONS @@ -66,21 +74,21 @@ PreferencesDialog::PreferencesDialog(QWidget *parent, Profile *_profile) : ui->ResMedWarning->setVisible(haveResMed); if (haveResMed) { + profile->forceResmedPrefs(); +// profile->session->setDaySplitTime(QTime(12,0,0)); +// profile->session->setIgnoreShortSessions(0); +// profile->session->setCombineCloseSessions(0); +// profile->session->setLockSummarySessions(true); +// p_profile->general->setPrefCalcPercentile(95.0); // 95% +// p_profile->general->setPrefCalcMiddle(0); // Median (50%) +// p_profile->general->setPrefCalcMax(1); // 99.9th percentile max +// p_profile->session->setBackupCardData(true); ui->sessionSplitWidget->setVisible(!haveResMed); - profile->session->setDaySplitTime(QTime(12,0,0)); - profile->session->setIgnoreShortSessions(0); - profile->session->setCombineCloseSessions(0); - profile->session->setLockSummarySessions(true); - p_profile->general->setPrefCalcPercentile(95.0); // 95% - p_profile->general->setPrefCalcMiddle(0); // Median (50%) - p_profile->general->setPrefCalcMax(1); // 99.9th percentile max ui->prefCalcMax->setEnabled(false); ui->prefCalcMiddle->setEnabled(false); ui->prefCalcPercentile->setEnabled(false); ui->showUnknownFlags->setEnabled(false); ui->calculateUnintentionalLeaks->setEnabled(false); - - p_profile->session->setBackupCardData(true); ui->createSDBackups->setChecked(true); ui->createSDBackups->setEnabled(false); From 77e2975ab2dce9b6f5d45fd597a3ba41102c8290 Mon Sep 17 00:00:00 2001 From: Guy Scharf Date: Fri, 7 Feb 2020 08:46:56 -0700 Subject: [PATCH 08/10] Rework update_gitinfo.bat There was a strange interaction between git rev-parse and git diff-index when run in a batch file. Reworked to change the way rev-parse command was handled. Also added check to make sure git.exe was in the path. --- oscar/update_gitinfo.bat | 41 +++++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/oscar/update_gitinfo.bat b/oscar/update_gitinfo.bat index 652a21fc..6b9314f4 100755 --- a/oscar/update_gitinfo.bat +++ b/oscar/update_gitinfo.bat @@ -1,29 +1,34 @@ @echo off setlocal EnableDelayedExpansion set DIR=%~dp0 +:::set DIR=\oscar\oscar-code\oscar\ cd %DIR% -for /f %%i in ('git rev-parse --git-dir') do set GIT_DIR=%%i -if "%GIT_DIR%"=="" goto GitDone +:: Check git in path and git directory can be found +where /Q git.exe +if errorlevel 1 goto GitFail -for /f %%i in ('git rev-parse --abbrev-ref HEAD') do set GIT_BRANCH=%%i -if "%GIT_BRANCH%"=="HEAD" set GIT_BRANCH="" -for /f %%i in ('git rev-parse --short HEAD') do set GIT_REVISION=%%i -git diff-index --quiet HEAD -- -set GIT_INDEX=%errorlevel% +git rev-parse --git-dir >nul 2>&1 +if errorlevel 1 goto GitFail -if "%GIT_INDEX%"=="0" goto GitTag - -set GIT_REVISION=%GIT_REVISION%-plus -set GIT_TAG= -goto GitDone - -:GitTag -for /f %%i in ('git describe --exact-match --tags') do set GIT_TAG=%%i + for /f %%i in ('git rev-parse --abbrev-ref HEAD') do set GIT_BRANCH=%%i + if "%GIT_BRANCH%"=="HEAD" set GIT_BRANCH="" + for /f %%i in ('git rev-parse --short HEAD') do set GIT_REVISION=%%i + git diff-index --quiet HEAD -- + if %errorlevel%==0 goto GitTag + set GIT_REVISION=%GIT_REVISION%-plus + set GIT_TAG= + goto GitDone + :GitTag + for /f %%i in ('git describe --exact-match --tags') do set GIT_TAG=%%i + goto GitDone + +:GitFail + set GIT_REVISION="private" :GitDone -@echo Update_gtinfo.bat: GIT_DIR=%GIT_DIR%, GIT_BRANCH=%GIT_BRANCH%, GIT_REVISION=%GIT_REVISION%, GIT_TAG=%GIT_TAG% +@echo Update_gtinfo.bat: GIT_BRANCH=%GIT_BRANCH%, GIT_REVISION=%GIT_REVISION%, GIT_TAG=%GIT_TAG% echo // This is an auto generated file > %DIR%git_info.new @@ -37,9 +42,6 @@ if "%GIT_TAG%"=="" goto DefinesDone echo #define GIT_TAG "%GIT_TAG%" >> %DIR%git_info.new :DefinesDone -:::type %DIR%git_info.new -:::set - fc %DIR%git_info.h %DIR%git_info.new 1>nul 2>nul && del /q %DIR%git_info.new || goto NewFile goto AllDone @@ -48,3 +50,4 @@ echo Updating %DIR%git_info.h move /y %DIR%git_info.new %DIR%git_info.h :AllDone +endlocal \ No newline at end of file From a497c0f3174f0d5f3b01fd7d36d18e5554902892 Mon Sep 17 00:00:00 2001 From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com> Date: Fri, 7 Feb 2020 13:54:28 -0500 Subject: [PATCH 09/10] Update Viatom loader based on newly observed O2Ring data in the header. --- oscar/SleepLib/loader_plugins/viatom_loader.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/oscar/SleepLib/loader_plugins/viatom_loader.cpp b/oscar/SleepLib/loader_plugins/viatom_loader.cpp index fdd41e7b..d6570c10 100644 --- a/oscar/SleepLib/loader_plugins/viatom_loader.cpp +++ b/oscar/SleepLib/loader_plugins/viatom_loader.cpp @@ -297,10 +297,12 @@ bool ViatomFile::ParseHeader() //int spo2_avg = header[17]; //int spo2_min = header[18]; //int spo2_3pct = header[19]; // number of events - //int spo2_4pct = header[20]; // number of events - CHECK_VALUE(header[21], 0); - //int time_under_90pct = header[22]; // in seconds - CHECK_VALUE(header[23], 0); + int spo2_4pct = header[20]; // number of events + if (header[21] > spo2_4pct) { + //CHECK_VALUE(header[21], 0); // sometimes nonzero; maybe spo2_5pct or something like that? + UNEXPECTED_VALUE(header[21], "< drops over 4%"); + } + //int time_under_90pct = header[22] | (header[23] << 8); // in seconds //int events_under_90pct = header[24]; // number of distinct events //float o2_score = header[25] * 0.1; CHECK_VALUE(header[26], 0); From 1b105c1588f4ca3915216e328bfd87e034c28b71 Mon Sep 17 00:00:00 2001 From: Phil Olynyk Date: Fri, 7 Feb 2020 16:00:58 -0500 Subject: [PATCH 10/10] Delete profile settings moved to profiles.cpp --- oscar/preferencesdialog.cpp | 8 -------- 1 file changed, 8 deletions(-) diff --git a/oscar/preferencesdialog.cpp b/oscar/preferencesdialog.cpp index d6dcd8d9..b8cc61c9 100644 --- a/oscar/preferencesdialog.cpp +++ b/oscar/preferencesdialog.cpp @@ -75,14 +75,6 @@ PreferencesDialog::PreferencesDialog(QWidget *parent, Profile *_profile) : if (haveResMed) { profile->forceResmedPrefs(); -// profile->session->setDaySplitTime(QTime(12,0,0)); -// profile->session->setIgnoreShortSessions(0); -// profile->session->setCombineCloseSessions(0); -// profile->session->setLockSummarySessions(true); -// p_profile->general->setPrefCalcPercentile(95.0); // 95% -// p_profile->general->setPrefCalcMiddle(0); // Median (50%) -// p_profile->general->setPrefCalcMax(1); // 99.9th percentile max -// p_profile->session->setBackupCardData(true); ui->sessionSplitWidget->setVisible(!haveResMed); ui->prefCalcMax->setEnabled(false); ui->prefCalcMiddle->setEnabled(false);