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

Split settings from summary parsing for F5V012 and F3V3.

Browse Source
This commit is contained in:
sawinglogz 2019-10-01 11:38:16 -04:00
parent 346d0a8e60
commit fe6c1ec2fa
2 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4496,10 +4496,18 @@ bool PRS1DataChunk::ParseSummaryF0V4(void)
// TODO: Add support for F3V3 (1061T, 1160P). This is just a stub. // TODO: Add support for F3V3 (1061T, 1160P). This is just a stub.
bool PRS1DataChunk::ParseSummaryF3V3(void) bool PRS1DataChunk::ParseSettingsF3V3(const unsigned char* /*data*/, int /*size*/)
{ {
PRS1Mode cpapmode = PRS1_MODE_UNKNOWN; PRS1Mode cpapmode = PRS1_MODE_UNKNOWN;
this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_CPAP_MODE, (int) cpapmode)); this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_CPAP_MODE, (int) cpapmode));
return true;
}
bool PRS1DataChunk::ParseSummaryF3V3(void)
{
const unsigned char * data = (unsigned char *)this->m_data.constData();
this->ParseSettingsF3V3(data, 0);
this->duration = 0; this->duration = 0;
return true; return true;
} }
@ -4878,10 +4886,8 @@ bool PRS1DataChunk::ParseSettingsF3V6(const unsigned char* data, int size)
} }
bool PRS1DataChunk::ParseSummaryF5V012(void) bool PRS1DataChunk::ParseSettingsF5V012(const unsigned char* data, int /*size*/)
{ {
const unsigned char * data = (unsigned char *)this->m_data.constData();
PRS1Mode cpapmode = PRS1_MODE_UNKNOWN; PRS1Mode cpapmode = PRS1_MODE_UNKNOWN;
int imin_epap = data[0x3]; int imin_epap = data[0x3];
@ -4912,6 +4918,16 @@ bool PRS1DataChunk::ParseSummaryF5V012(void)
int humid = data[0x0d]; int humid = data[0x0d];
this->ParseHumidifierSettingV2(humid); this->ParseHumidifierSettingV2(humid);
return true;
}
bool PRS1DataChunk::ParseSummaryF5V012(void)
{
const unsigned char * data = (unsigned char *)this->m_data.constData();
this->ParseSettingsF5V012(data, 0xc);
this->duration = data[0x18] | data[0x19] << 8; this->duration = data[0x18] | data[0x19] << 8;
return true; return true;

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

@ -222,9 +222,15 @@ protected:
//! \brief Parse a settings slice from a .000 and .001 file //! \brief Parse a settings slice from a .000 and .001 file
bool ParseSettingsF0V6(const unsigned char* data, int size); bool ParseSettingsF0V6(const unsigned char* data, int size);
//! \brief Parse a settings slice from a .000 and .001 file
bool ParseSettingsF5V012(const unsigned char* data, int size);
//! \brief Parse a settings slice from a .000 and .001 file //! \brief Parse a settings slice from a .000 and .001 file
bool ParseSettingsF5V3(const unsigned char* data, int size); bool ParseSettingsF5V3(const unsigned char* data, int size);
//! \brief Parse a settings slice from a .000 and .001 file
bool ParseSettingsF3V3(const unsigned char* data, int size);
//! \brief Parse a settings slice from a .000 and .001 file //! \brief Parse a settings slice from a .000 and .001 file
bool ParseSettingsF3V6(const unsigned char* data, int size); bool ParseSettingsF3V6(const unsigned char* data, int size);
}; };