diff --git a/sleepyhead/SleepLib/loader_plugins/prs1_loader.cpp b/sleepyhead/SleepLib/loader_plugins/prs1_loader.cpp index 827eac60..ccce8aba 100644 --- a/sleepyhead/SleepLib/loader_plugins/prs1_loader.cpp +++ b/sleepyhead/SleepLib/loader_plugins/prs1_loader.cpp @@ -2616,16 +2616,30 @@ bool PRS1Import::ParseSummaryF5V2() bool PRS1Import::ParseSummaryF5V3() { - const unsigned char * data = (unsigned char *)summary->m_data.constData(); + unsigned char * pressureBlock = (unsigned char *)mainblock[0x0a].data(); - if (data[0x00] > 0) { - return false; - } + EventDataType epapHi = pressureBlock[0]; + EventDataType epapRange = pressureBlock[2]; + EventDataType epapLo = epapHi - epapRange; - session->set_first(qint64(summary->timestamp) * 1000L); + EventDataType minps = pressureBlock[3] ; + EventDataType maxps = pressureBlock[4]+epapLo; - //CPAPMode cpapmode = MODE_UNKNOWN; - summary_duration = data[0x48] | data[0x49] << 8; + + + CPAPMode cpapmode = MODE_ASV_VARIABLE_EPAP; + + session->settings[CPAP_Mode] = (int)cpapmode; + + session->settings[CPAP_EPAPLo] = epapLo/10.0f; + session->settings[CPAP_EPAPHi] = epapHi/10.0f; + session->settings[CPAP_IPAPLo] = (epapLo + minps)/10.0f; + session->settings[CPAP_IPAPHi] = qMin(25.0f, (epapHi+maxps)/10.0f); + session->settings[CPAP_PSMin] = minps/10.0f; + session->settings[CPAP_PSMax] = maxps/10.0f; + + unsigned char * durBlock = (unsigned char *)hbdata[4].data(); + summary_duration = durBlock[0] | durBlock[1] << 8; return true; } @@ -2796,7 +2810,7 @@ bool PRS1Import::ParseSummary() if (summary->m_data.constData()[0] != 0) { qDebug() << "Non zero hblock[0] indicator"; return false; - } + } session->set_first(qint64(summary->timestamp) * 1000L); @@ -2826,10 +2840,12 @@ bool PRS1Import::ParseSummary() break; } bsize = it.value(); + if (val != 1) { + // store the data block for later reference hbdata[val] = QByteArray((const char *)(&data[pos]), bsize); } else { - // Parse nested data structure which contains pressure block + // Parse the nested data structure which contains settings int p2 = 0; do { val = data[pos + p2++]; diff --git a/sleepyhead/docs/release_notes.html b/sleepyhead/docs/release_notes.html index 91dfde69..5c5bfcb1 100644 --- a/sleepyhead/docs/release_notes.html +++ b/sleepyhead/docs/release_notes.html @@ -4,6 +4,7 @@

Changes and fixes in v1.1.0-unstable-0 +

  • New help browser with indexing and multilanguage support
  • Killed off dependency on Webkit... (or as I prefer to call it "murderalized with extreme prejudice"!)
  • Combined release notes and about into mega dialog
  • Added brand new live Profile switcher and cleaned up a lot of forced restart conditions
    • diff --git a/sleepyhead/help/help_en/reportingbugs.html b/sleepyhead/help/help_en/reportingbugs.html new file mode 100644 index 00000000..81842915 --- /dev/null +++ b/sleepyhead/help/help_en/reportingbugs.html @@ -0,0 +1,12 @@ + + + + + +

    Reporting Bugs

    +

    Software glitches are inevitable... All software has them.

    + + + + + diff --git a/sleepyhead/sleepyhead.pro b/sleepyhead/sleepyhead.pro index 5701ac8d..59073df5 100644 --- a/sleepyhead/sleepyhead.pro +++ b/sleepyhead/sleepyhead.pro @@ -68,7 +68,7 @@ QMAKE_EXTRA_TARGETS += gitinfotarget #Comment out for official builds DEFINES += BETA_BUILD - +#Build the help documentation system(qcollectiongenerator help/help.qhcp -o help/help.qhc) unix:!macx:!haiku { @@ -105,6 +105,7 @@ win32 { } } +#copy the Translation and Help files to where the test binary wants them macx { TransFiles.files = $$files(../Translations/*.qm) TransFiles.path = Contents/Resources/Translations @@ -359,4 +360,5 @@ DISTFILES += \ help/help_nl/supported.html \ help/help_nl/tipsntricks.html \ help/help_nl/help_nl.qhp \ - help/help_en/help_en.qhp + help/help_en/help_en.qhp \ + help/help_en/reportingbugs.html