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

Skip empty DS2 files.

Browse Source 
Also update comments based on further testing.
This commit is contained in:
sawinglogz 2021-12-09 12:23:08 -05:00
parent eac13160b9
commit 00974d4f49
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -413,6 +413,10 @@ bool PRDS2File::initializeKey()
bool PRDS2File::parseDS2Header() bool PRDS2File::parseDS2Header()
{ {
if (m_device.size() == 0) {
qWarning() << name() << "is empty, skipping";
return false;
}
int a = read16(); int a = read16();
int b = read16(); int b = read16();
int c = read16(); int c = read16();
@ -2551,11 +2555,9 @@ void PRS1Import::ImportWaveforms()
} }
if (s2 > 0) { if (s2 > 0) {
// NOTE: The 900X (F5V3) clamps the values at 127 (15.875 cmH2O) for some reason. // NOTE: The 900X (F5V3) firmware V1.0.1 clamps the values at 127 (15.875 cmH2O)
// // due to incorrectly treating this value as a signed integer. This bug is fixed
// Previous autoSV machines (950P-961P, F5V0-F5V2) didn't, nor do 1030X (F3V6). // in firmware V1.0.6.
// 1130X (also F3V6) is unknown, but likely follows the 1030X. Older ventilators
// (F3V3) are also unknown.
EventList * pres = session->AddEventList(CPAP_MaskPressureHi, EVL_Waveform, pressure_gain, 0.0f, 0.0f, 0.0f, double(dur) / double(s2)); EventList * pres = session->AddEventList(CPAP_MaskPressureHi, EVL_Waveform, pressure_gain, 0.0f, 0.0f, 0.0f, double(dur) / double(s2));
pres->AddWaveform(ti, (unsigned char *)data[1].data(), data[1].size(), dur); pres->AddWaveform(ti, (unsigned char *)data[1].data(), data[1].size(), dur);
} }

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

@ -1395,9 +1395,9 @@ static crc32_t CRC32(const unsigned char *data, size_t data_len, crc32_t crc)
} }
// Strangely, the PRS1 CRC32 appears to consider every byte a 32-bit wchar_t. // The PRS1 CRC32 considers every byte a 32-bit wchar_t, presumably due to
// Nothing like trying a bunch of encodings and CRC32 variants on PROP.TXT files // use of the STM32 CRC calculation unit, in which "CRC computation is done
// until you find a winner. // on the whole 32-bit data word, and not byte per byte".
static crc32_t CRC32wchar(const unsigned char *data, size_t data_len, crc32_t crc) static crc32_t CRC32wchar(const unsigned char *data, size_t data_len, crc32_t crc)
{ {