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

Add support for 502G summary data.

Browse Source 
Not many changes, just some new unknown settings, and warning
when there's a 0-length slice.
This commit is contained in:
sawinglogz 2019-06-10 15:02:54 -04:00
parent a66dd145b8
commit 92f029a5f4
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
oscar/SleepLib/day.cpp
View File

@ -654,6 +654,9 @@ qint64 Day::total_time()
range.insert(first, 0);
range.insert(last, 1);
d_totaltime += sess->length();
if (sess->length() == 0) {
qWarning() << sess->s_session << "0 length session";
}
}
} else {
for (auto & slice : sess->m_slices) {
@ -661,6 +664,9 @@ qint64 Day::total_time()
range.insert(slice.start, 0);
range.insert(slice.end, 1);
d_totaltime += slice.end - slice.start;
if (slice.end - slice.start == 0) {
qWarning() << sess->s_session << "0 length slice";
}
}
}
}
@ -724,6 +730,9 @@ qint64 Day::total_time(MachineType type)
range.insert(first, 0);
range.insert(last, 1);
d_totaltime += sess->length();
if (sess->length() == 0) {
qWarning() << sess->s_session << "0 length session";
}
}
} else {
for (const auto & slice : sess->m_slices) {
@ -731,6 +740,9 @@ qint64 Day::total_time(MachineType type)
range.insert(slice.start, 0);
range.insert(slice.end, 1);
d_totaltime += slice.end - slice.start;
if (slice.end - slice.start == 0) {
qWarning() << sess->s_session << "0 length slice";
}
}
}
}

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

@ -236,7 +236,7 @@ static const PRS1TestedModel s_PRS1TestedModels[] = {
{ "400X150", 0, 6 },
{ "500X110", 0, 6 }, // "DreamStation Auto CPAP"
{ "500X150", 0, 6 },
{ "502G150", 0, 6 },
{ "502G150", 0, 6 }, // "DreamStation Go Auto"
{ "600X110", 0, 6 },
{ "700X110", 0, 6 },
@ -3926,7 +3926,7 @@ void PRS1DataChunk::ParseHumidifierSettingF0V6(unsigned char byte1, unsigned cha
// looks like a pressure in compliance files.
bool PRS1DataChunk::ParseSettingsF0V6(const unsigned char* data, int size)
{
static const QMap<int,int> expected_lengths = { {0x35,2} };
static const QMap<int,int> expected_lengths = { {0x0d,2}, {0x35,2} };
bool ok = true;
CPAPMode cpapmode = MODE_UNKNOWN;
@ -4057,7 +4057,13 @@ bool PRS1DataChunk::ParseSettingsF0V6(const unsigned char* data, int size)
CHECK_VALUES(data[pos], 0, 0x80); // 0x80 maybe auto-on?
break;
case 0x3f:
CHECK_VALUE(data[pos], 0);
CHECK_VALUE(data[pos], 0); // 0x80 in one 0-length session on 502G?
break;
case 0x43: // new to 502G, sessions 3-8, Auto-Trial is off, Opti-Start is missing
CHECK_VALUE(data[pos], 0x3C);
break;
case 0x44: // new to 502G, sessions 3-8, Auto-Trial is off, Opti-Start is missing
CHECK_VALUE(data[pos], 0xFF);
break;
case 0x45: // new to 400G, only in last session?
CHECK_VALUE(data[pos], 1);
@ -4108,7 +4114,7 @@ bool PRS1DataChunk::ParseSummaryF0V6(void)
}
const unsigned char * data = (unsigned char *)this->m_data.constData();
int chunk_size = this->m_data.size();
static const int minimum_sizes[] = { 1, 0x2e, 9, 4, 2, 4, 1, 4, 0x1b, 2, 4, 0x0b, 1, 2, 6 };
static const int minimum_sizes[] = { 1, 0x2b, 9, 4, 2, 4, 1, 4, 0x1b, 2, 4, 0x0b, 1, 2, 6 };
static const int ncodes = sizeof(minimum_sizes) / sizeof(int);
/*
for (int i = 0; i < ncodes; i++) {