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

Merge branch 'master' into deploy3

Browse Source
This commit is contained in:
Guy Scharf 2020-02-06 12:00:47 -07:00
commit 34c545bb48
5 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
oscar/SleepLib/loader_plugins/prs1_loader.cpp
View File

@ -6647,10 +6647,12 @@ bool PRS1DataChunk::ParseSettingsF0V6(const unsigned char* data, int size)
CHECK_VALUE(data[pos], 0x80); // EZ-Start enabled CHECK_VALUE(data[pos], 0x80); // EZ-Start enabled
this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_EZ_START, data[pos] != 0)); this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_EZ_START, data[pos] != 0));
break; 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 // Seen on 500X110 before 0x2b when EZ-Start is enabled on Auto-CPAP
CHECK_VALUE(len, 1); 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)); this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_EZ_START, data[pos] != 0));
break; break;
case 0x2b: // Ramp Type case 0x2b: // Ramp Type

6
oscar/SleepLib/loader_plugins/viatom_loader.cpp
View File

@ -352,9 +352,9 @@ QList<ViatomFile::Record> ViatomFile::ReadData()
// Read all Pulse, SPO2 and Motion data // Read all Pulse, SPO2 and Motion data
do { do {
ViatomFile::Record rec; 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_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) { if (rec.oximetry_invalid == 0xFF) {
CHECK_VALUE(rec.spo2, 0xFF); CHECK_VALUE(rec.spo2, 0xFF);
CHECK_VALUE(rec.hr, 0xFF); CHECK_VALUE(rec.hr, 0xFF);
@ -375,7 +375,7 @@ QList<ViatomFile::Record> ViatomFile::ReadData()
|| a.hr != b.hr || a.hr != b.hr
|| a.oximetry_invalid != b.oximetry_invalid || a.oximetry_invalid != b.oximetry_invalid
|| a.motion != b.motion || a.motion != b.motion
|| a._unk != b._unk) { || a.vibration != b.vibration) {
all_are_duplicated = false; all_are_duplicated = false;
break; break;
} }

2
oscar/SleepLib/loader_plugins/viatom_loader.h
View File

@ -66,7 +66,7 @@ public:
unsigned char hr; unsigned char hr;
unsigned char oximetry_invalid; unsigned char oximetry_invalid;
unsigned char motion; unsigned char motion;
unsigned char _unk; unsigned char vibration;
}; };
ViatomFile(QFile & file); ViatomFile(QFile & file);
~ViatomFile() = default; ~ViatomFile() = default;

15
oscar/SleepLib/profiles.cpp
View File

@ -94,14 +94,6 @@ Profile::~Profile()
removeLock(); removeLock();
} }
delete user;
delete doctor;
delete cpap;
delete oxi;
delete appearance;
delete session;
delete general;
// delete machine objects... // delete machine objects...
for (auto & mach : m_machlist) { for (auto & mach : m_machlist) {
delete mach; delete mach;
@ -111,6 +103,13 @@ Profile::~Profile()
delete day; delete day;
} }
delete user;
delete doctor;
delete cpap;
delete oxi;
delete appearance;
delete session;
delete general;
} }
bool Profile::Save(QString filename) bool Profile::Save(QString filename)

2
oscar/tests/resmedtests.cpp
View File

@ -30,9 +30,9 @@ void ResmedTests::initTestCase(void)
void ResmedTests::cleanupTestCase(void) void ResmedTests::cleanupTestCase(void)
{ {
delete AppSetting; delete AppSetting;
delete p_pref;
delete p_profile; delete p_profile;
p_profile = nullptr; p_profile = nullptr;
delete p_pref;
} }