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

Merge branch 'master' into error-message-cleanup

Browse Source
This commit is contained in:
Phil Olynyk 2020-05-16 16:18:27 -04:00
commit 53d0c0fbe4
1 changed files with 3 additions and 3 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

@ -4906,7 +4906,7 @@ void PRS1DataChunk::ParseHumidifierSetting60Series(unsigned char humid1, unsigne
} else if (this->familyVersion == 1) { } else if (this->familyVersion == 1) {
// F5V1 // F5V1
if (tubepresent) { if (tubepresent) {
if (tubetemp == 4) UNEXPECTED_VALUE(tubetemp, "!= 4"); // all tube temperatures seen
if (tubetemp) { if (tubetemp) {
if (tubehumidlevel == 0 || tubehumidlevel > 3) UNEXPECTED_VALUE(tubehumidlevel, "1-3"); if (tubehumidlevel == 0 || tubehumidlevel > 3) UNEXPECTED_VALUE(tubehumidlevel, "1-3");
} }
@ -7108,9 +7108,9 @@ bool PRS1DataChunk::ParseSettingsF0V6(const unsigned char* data, int size)
CHECK_VALUE(len, 1); CHECK_VALUE(len, 1);
CHECK_VALUE(data[pos], 0xFF); CHECK_VALUE(data[pos], 0xFF);
break; break;
case 0x45: // new to 400G, only in last session? case 0x45: // new to 400G and 500G, appears right after 0x35 (humidifier setting)
CHECK_VALUE(len, 1); CHECK_VALUE(len, 1);
CHECK_VALUE(data[pos], 1); CHECK_VALUES(data[pos], 0, 1);
break; break;
default: default:
UNEXPECTED_VALUE(code, "known setting"); UNEXPECTED_VALUE(code, "known setting");