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

PRS1Flex was mixed up with Humidifier Status

Browse Source
This commit is contained in:
Mark Watkins 2011-12-18 03:56:16 +10:00
parent aa931a99ff
commit 34699f2720
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Graphs/gSummaryChart.cpp
View File

@ -133,6 +133,9 @@ void SummaryChart::SetDay(Day * nullday)
type==ST_SESSIONS ||
day->settingExists(code) ||
day->hasData(code,type);
if (code==PRS1_FlexSet) {
int i=5;
}
if (hascode) {
m_days[dn]=day;

2
SleepLib/loader_plugins/prs1_loader.cpp
View File

@ -471,7 +471,7 @@ bool PRS1Loader::ParseSummary(Machine *mach, qint32 sequence, quint32 timestamp,
} else session->settings[PRS1_FlexMode]=(int)PR_CFLEX;
} else session->settings[PRS1_FlexMode]=(int)PR_NONE;
session->settings[PRS1_FlexSet]=(int)data[offset+0x08] & 3;
session->settings[PRS1_FlexSet]=(int)(data[offset+0x08] & 3);
session->settings[PRS1_HumidSetting]=(int)data[offset+0x09]&0x0f;
session->settings[PRS1_HumidStatus]=(data[offset+0x09]&0x80)==0x80;
session->settings["SysLock"]=(data[offset+0x0a]&0x80)==0x80;

2
SleepLib/machine_common.h
View File

@ -110,7 +110,7 @@ const QString PRS1_10="PRS1_10";
const QString PRS1_12="PRS1_12";
const QString PRS1_FlexMode="FlexMode";
const QString PRS1_FlexSet="FlexSet";
const QString PRS1_HumidStatus="FlexSet";
const QString PRS1_HumidStatus="HumidStat";
const QString PRS1_HumidSetting="HumidSet";
const QString OXI_Pulse="Pulse";

4
overview.cpp
View File

@ -170,8 +170,8 @@ Overview::Overview(QWidget *parent,gGraphView * shared) :
set=new SummaryChart("",GT_LINE);
//set->addSlice("SysOneResistSet",QColor("grey"),ST_SETAVG);
set->addSlice("HumidSet",QColor("blue"),ST_SETWAVG,true);
set->addSlice("FlexSet",QColor("red"),ST_SETWAVG,true);
set->addSlice(PRS1_HumidSetting,QColor("blue"),ST_SETWAVG,true);
set->addSlice(PRS1_FlexSet,QColor("red"),ST_SETWAVG,true);
set->addSlice("EPR",QColor("green"),ST_SETWAVG,true);
set->addSlice("SmartFlex",QColor("purple"),ST_SETWAVG,true);
SET->setRecMinY(0);