From 903482f5ac51f3cde72b4bf5c4c63b609e92a145 Mon Sep 17 00:00:00 2001 From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com> Date: Thu, 2 Apr 2020 20:56:30 -0400 Subject: [PATCH 01/10] Revert the HTML Tidy mangling of release_notes.html that broke OSCAR rendering. --- oscar/docs/release_notes.html | 519 ++++++++++++++++++---------------- 1 file changed, 275 insertions(+), 244 deletions(-) diff --git a/oscar/docs/release_notes.html b/oscar/docs/release_notes.html index c87b6fa9..e646855c 100644 --- a/oscar/docs/release_notes.html +++ b/oscar/docs/release_notes.html @@ -1,245 +1,276 @@ - - - - - - release_notes - - - - Changes and fixes in OSCAR v1.1.0-BETA-? - - Changes and fixes in OSCAR v1.1.0-beta-2 - - Changes and fixes in OSCAR v1.1.0-beta-1 - - Changes and fixes in OSCAR v1.1.0-testing-4 - - Changes and fixes in OSCAR v1.1.0-testing-3 - NOTE: Translations have NOT yet been updated for these changes - - Changes and fixes in OSCAR v1.1.0-testing-2 - NOTE: Translations have NOT yet been updated for these changes - - Changes and fixes in OSCAR v1.1.0-testing-1 - NOTE: Translations have NOT yet been updated for these changes - - Changes and fixes in OSCAR v1.0.1-r-1 - - Changes and fixes in OSCAR v1.0.0-beta-9 - - Changes and fixes in OSCAR v1.0.0-beta-8 - - Changes and fixes in OSCAR v1.0.0-beta-7 - - Changes and fixes in OSCAR v1.0.0-beta-6 - - Changes and fixes in OSCAR v1.0.0-beta-5 - - Changes and fixes in OSCAR v1.0.0-beta-4 - - Changes and fixes in OSCAR v1.0.0-beta-3 - - SleepyHead v1.1.0-unstable-0 - + + + + +

+Changes and fixes in OSCAR v1.1.0-BETA? +

+ +

+Changes and fixes in OSCAR v1.1.0-beta-2 +

+ +

+Changes and fixes in OSCAR v1.1.0-beta-1 +

+

+ +

+Changes and fixes in OSCAR v1.1.0-testing-4 +

+

+ +

+Changes and fixes in OSCAR v1.1.0-testing-3 +
NOTE: Translations have NOT yet been updated for these changes +

+

+ +

+Changes and fixes in OSCAR v1.1.0-testing-2 +
NOTE: Translations have NOT yet been updated for these changes +

+

+ +

+Changes and fixes in OSCAR v1.1.0-testing-1 +
NOTE: Translations have NOT yet been updated for these changes +

+

+ +

+Changes and fixes in OSCAR v1.0.1-r-1 +

+

+ +

+Changes and fixes in OSCAR v1.0.0-beta-9 +

+

+ +

+Changes and fixes in OSCAR v1.0.0-beta-8 +

+

+ +

+Changes and fixes in OSCAR v1.0.0-beta-7 +

+

+ +

+Changes and fixes in OSCAR v1.0.0-beta-6 +

+

+ +

+Changes and fixes in OSCAR v1.0.0-beta-5 +

+

+ +

+Changes and fixes in OSCAR v1.0.0-beta-4 +

+

+

+Changes and fixes in OSCAR v1.0.0-beta-3 +

+

+ +

+SleepyHead v1.1.0-unstable-0 +

+

+ From 1591feb2076634b30febab70e2839a0ac374e2e6 Mon Sep 17 00:00:00 2001 From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com> Date: Thu, 2 Apr 2020 21:15:13 -0400 Subject: [PATCH 02/10] Reapply Arie's many grammatical fixes to the release notes. --- oscar/docs/release_notes.html | 100 +++++++++++++++++----------------- 1 file changed, 49 insertions(+), 51 deletions(-) diff --git a/oscar/docs/release_notes.html b/oscar/docs/release_notes.html index e646855c..0e7100d4 100644 --- a/oscar/docs/release_notes.html +++ b/oscar/docs/release_notes.html @@ -1,9 +1,8 @@  - + -

-Changes and fixes in OSCAR v1.1.0-BETA? +Changes and fixes in OSCAR v1.1.0-BETA-?

Changes and fixes in OSCAR v1.1.0-testing-3 -
NOTE: Translations have NOT yet been updated for these changes +NOTE: Translations have NOT yet been updated for these changes

Changes and fixes in OSCAR v1.1.0-testing-2 -
NOTE: Translations have NOT yet been updated for these changes +NOTE: Translations have NOT yet been updated for these changes

Changes and fixes in OSCAR v1.1.0-testing-1 -
NOTE: Translations have NOT yet been updated for these changes +NOTE: Translations have NOT yet been updated for these changes

diff --git a/oscar/SleepLib/loader_plugins/prs1_loader.cpp b/oscar/SleepLib/loader_plugins/prs1_loader.cpp index acca00ac..3fdfdff3 100644 --- a/oscar/SleepLib/loader_plugins/prs1_loader.cpp +++ b/oscar/SleepLib/loader_plugins/prs1_loader.cpp @@ -272,6 +272,7 @@ static const PRS1TestedModel s_PRS1TestedModels[] = { { "400X110", 0, 6, "DreamStation CPAP Pro" }, { "400X150", 0, 6, "DreamStation CPAP Pro" }, { "500X110", 0, 6, "DreamStation Auto CPAP" }, + { "500X120", 0, 6, "DreamStation Auto CPAP" }, { "500X130", 0, 6, "DreamStation Auto CPAP" }, { "500X150", 0, 6, "DreamStation Auto CPAP" }, { "501X120", 0, 6, "DreamStation Auto CPAP with P-Flex" }, @@ -4973,7 +4974,7 @@ bool PRS1DataChunk::ParseSummaryF0V4(void) // That's represented by a mask-off event 19129 seconds after the mask-on, then a time-elapsed // event after 65535 seconds, then an equipment off event after another 616 seconds. tt += data[pos] | (data[pos+1] << 8); - // TODO: see if this event exists in other versions + // TODO: see if this event exists in earlier versions break; case 5: // Clock adjustment? CHECK_VALUE(pos, 1); // Always first @@ -6113,10 +6114,10 @@ bool PRS1DataChunk::ParseSummaryF5V012(void) CHECK_VALUE(chunk_size, 1); // and the only record in the session. if (this->sessionid == 1) UNEXPECTED_VALUE(this->sessionid, ">1"); break; - case 7: // ??? + case 7: // Time Elapsed? tt += data[pos] | (data[pos+1] << 8); // This adds to the total duration (otherwise it won't match report) break; - case 8: // ??? + case 8: // Time Elapsed? How is this different from 7? tt += data[pos] | (data[pos+1] << 8); // This also adds to the total duration (otherwise it won't match report) break; case 9: // Humidifier setting change @@ -7075,6 +7076,9 @@ bool PRS1DataChunk::ParseSummaryF0V6(void) //CHECK_VALUE(data[pos+3], 0); } break; + case 0x09: // Time Elapsed (event 4 in F0V4) + tt += data[pos] | (data[pos+1] << 8); + break; case 0x0a: // Humidifier setting change tt += data[pos] | (data[pos+1] << 8); // This adds to the total duration (otherwise it won't match report) this->ParseHumidifierSettingV3(data[pos+2], data[pos+3]); From f5bb5655e0cd7d9581d0226f24a5ea07536fa3eb Mon Sep 17 00:00:00 2001 From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com> Date: Sat, 4 Apr 2020 17:37:19 -0400 Subject: [PATCH 07/10] Enable the Daily tab/button after importing data from the Data menu. Previously only oximetry data imported via the wizard would update the button. (As would quitting/relaunching, or switching profiles.) --- oscar/mainwindow.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/oscar/mainwindow.cpp b/oscar/mainwindow.cpp index 53e8a30e..8d4007ea 100644 --- a/oscar/mainwindow.cpp +++ b/oscar/mainwindow.cpp @@ -2328,6 +2328,8 @@ void MainWindow::on_actionImport_ZEO_Data_triggered() Notify(tr("Imported %1 ZEO session(s) from\n\n%2").arg(c).arg(filename), tr("Import Success")); qDebug() << "Imported" << c << "ZEO sessions"; PopulatePurgeMenu(); + if (overview) overview->ReloadGraphs(); + if (welcome) welcome->refreshPage(); } else if (c == 0) { Notify(tr("Already up to date with ZEO data at\n\n%1").arg(filename), tr("Up to date")); } else { @@ -2357,6 +2359,8 @@ void MainWindow::on_actionImport_Dreem_Data_triggered() Notify(tr("Imported %1 Dreem session(s) from\n\n%2").arg(c).arg(filename), tr("Import Success")); qDebug() << "Imported" << c << "Dreem sessions"; PopulatePurgeMenu(); + if (overview) overview->ReloadGraphs(); + if (welcome) welcome->refreshPage(); } else if (c == 0) { Notify(tr("Already up to date with Dreem data at\n\n%1").arg(filename), tr("Up to date")); } else { @@ -2451,6 +2455,8 @@ void MainWindow::on_actionImport_Somnopose_Data_triggered() Notify(tr("Somnopause Data Import complete")); PopulatePurgeMenu(); + if (overview) overview->ReloadGraphs(); + if (welcome) welcome->refreshPage(); daily->LoadDate(daily->getDate()); } @@ -2477,6 +2483,8 @@ void MainWindow::on_actionImport_Viatom_Data_triggered() if (c > 0) { Notify(tr("Imported %1 oximetry session(s) from\n\n%2").arg(c).arg(filename), tr("Import Success")); PopulatePurgeMenu(); + if (overview) overview->ReloadGraphs(); + if (welcome) welcome->refreshPage(); } else if (c == 0) { Notify(tr("Already up to date with oximetry data at\n\n%1").arg(filename), tr("Up to date")); } else { From af99e603d9c0025f7a2b6a9934c10e90c4864348 Mon Sep 17 00:00:00 2001 From: Phil Olynyk Date: Sat, 4 Apr 2020 20:11:38 -0400 Subject: [PATCH 08/10] copy changes to Englist html files --- Htmldocs/about.html | 89 +++--- Htmldocs/credits.html | 93 +++--- Htmldocs/release_notes.html | 540 +++++++++++++++++----------------- oscar/docs/about.html | 57 ---- oscar/docs/about.xxxx | 68 +++++ oscar/docs/credits.html | 63 ---- oscar/docs/credits.xxxx | 48 +++ oscar/docs/release_notes.html | 275 ----------------- oscar/docs/release_notes.xxxx | 283 ++++++++++++++++++ 9 files changed, 762 insertions(+), 754 deletions(-) delete mode 100644 oscar/docs/about.html create mode 100644 oscar/docs/about.xxxx delete mode 100644 oscar/docs/credits.html create mode 100644 oscar/docs/credits.xxxx delete mode 100644 oscar/docs/release_notes.html create mode 100644 oscar/docs/release_notes.xxxx diff --git a/Htmldocs/about.html b/Htmldocs/about.html index f2d1d396..bd79c400 100644 --- a/Htmldocs/about.html +++ b/Htmldocs/about.html @@ -1,57 +1,68 @@ - + - about - + -
-

Welcome to OSCAR, -
the - Open - Source - CPAP - Analysis - Reporter

This software has been designed to assist you in reviewing the data produced by your CPAP devices and related equipment. +

Welcome to OSCAR,
-
Volunteers translated it into many languages. Click the Help tab to change the displayed language. -
-
- Any Chromium-based browser like - Google Chrome or - Microsoft Edge Chromium currently offers the best - automatic - translation options. -
You will find extensive help in the OSCAR Wiki. Open - http://www.apneaboard.com/wiki/index.php/OSCAR_Help. -
-
For questions visit - http://www.apneaboard.com or a local apnea forum. -
-
-

- PLEASE READ CAREFULLY -

-
+ the + Open + Source + CPAP + Analysis + Reporter +
+ This software has been designed to assist you in reviewing the data produced by your CPAP devices and related equipment. +
+
+ Volunteers translated it into many languages. Click the Help tab to change the displayed language. +
+
+ Any Chromium-based browser like + Google Chrome or + Microsoft Edge Chromium currently offers the best automatic translation options. +
+ You will find extensive help in the OSCAR Wiki. Open + http://www.apneaboard.com/wiki/index.php/OSCAR_Help. +
+
For questions visit + http://www.apneaboard.com or a local apnea forum. +
+
+
+

+ PLEASE READ CAREFULLY +

+
+
+
OSCAR is NOT a substitute for competent medical guidance from your Doctor.
-
Due to the lack of documentation released by manufacturers regarding file formats, the accuracy of data displayed in OSCAR can not in any way be guaranteed.
-
All reports generated are for + Due to the lack of documentation released by manufacturers regarding file formats, the accuracy of data displayed in OSCAR can not in any way be guaranteed. +
+
+ All reports generated are for PERSONAL USE ONLY and are intended to be as accurate as possible.
-
OSCAR reports are based on data reported by the CPAP machine. Acceptance of this data for compliance or other purposes is subject to the approval discretion of the reviewing agency. -
The use of this software is entirely at your own risk. The authors will not be held liable for anything related to the use or misuse of this software.
-
OSCAR is free (as in freedom) software, released under the GNU Public License v3, and comes with no warranty, and without ANY claims to fitness for any purpose. + OSCAR reports are based on data reported by the CPAP machine. Acceptance of this data for compliance or other purposes is subject to the approval discretion of the reviewing agency.
-
OSCAR is © 2019-2020 The OSCAR Team: a group of volunteer developers from the Apnea Community and members of multiple forums and various nationalities. + The use of this software is entirely at your own risk. The authors will not be held liable for + anything related to the use or misuse of this software.
-
OSCAR is a derivative of the SleepyHead program which is copyright © 2011-2018, Mark Watkins. -
+
+ OSCAR is free (as in freedom) software, released under the GNU Public License v3, and comes with no warranty, and without ANY claims to fitness for any purpose. +
+
+ OSCAR is © 2019-2020 The OSCAR Team: a group of volunteer developers from the Apnea Community and members of multiple forums and various nationalities. +
+
+ OSCAR is a derivative of the SleepyHead program which is copyright © 2011-2018, Mark Watkins. +
diff --git a/Htmldocs/credits.html b/Htmldocs/credits.html index 626e033a..ea471bb2 100644 --- a/Htmldocs/credits.html +++ b/Htmldocs/credits.html @@ -1,63 +1,48 @@ - + - credits - + - +

Credits

-
- OSCAR is a derivative of the SleepyHead program written by Mark Watkins, during the years 2011 to 2018. The current project is the combined effort of people from CPAPtalk.com, ApneaBoard.com, and other volunteers, starting in 2019. -
-
- OpenSource Libraries -
OSCAR uses the OpenSource version of the Qt cross-platform toolkit available from +
+

OSCAR is a derivative of the SleepyHead program written by Mark Watkins, during the years 2011 to 2018. The current project is the combined effort of people from CPAPtalk.com, ApneaBoard.com, and other volunteers, starting in 2019.

+

OpenSource Libraries
+ OSCAR uses the OpenSource version of the Qt cross-platform toolkit available from http://qt.io which itself draws from many smaller open source libraries. You can read the individual licensing for many of these components that are used under the hood of OSCAR at - https://doc.qt.io/qt-5/licenses-used-in-qt.html -
-
- Data formats -
The CPAP device data formats are mostly undocumented. Getting them working in OSCAR involved a lot of investigation, together with a lot of SD card data samples, many patient users willing to put up with crashes and data issues, and plenty of help from fellow developers out there who shared in the workload of decoding data formats. Thanks to all of you who have helped in the fight to protect our right to keep our own data open and accessible! -
-
-

The current OSCAR team consists of the following:

- Fred Bonjour: Project Manager & Lead Tester, - Phil Olynyk: Lead Developer, - Arie Klerk: Translations Team Coordinator -
-
- Developers: -
- Phil Olynyk (Lead Developer), GuyScharf, sawinglogz -
-
- Reporters: -
AlanE, BrandonA, Crimson Nape, foxfire, Heyns, jeremieb, jaswilliams, palerider, patl -
-
- Testers: -
- Fred Bonjour (Lead Tester), Beej, DeepBreathing, Fastlane, GuyScharf, JJJ, LookingForward, Pollcat, Ruth Catrin, SarcasticDave94 -
- -
Advisors: -
aviB, SkepticDoc, Sleeprider, SleepyProgrammer, srlevine1, LunaFerret, harre, mdhamptom, mitchcampbell, rtannerf -
-
- Translators: -
- Arie Klerk (Translations Team Coordinator, Dutch), 1st.qwerty (Polish) delta (Romanian), drol (French), FaureCourtet (French), fossegrim (Norwegian), hearsay73 (Filipino), Heyns (African), jaswilliams (British), johanh (Finnish), koimark (Finnish), Lazer1234 (Swedish), Mac_Sheepcounter (German), Perchas (Spanish), refurbished (Polish), Ristraus (Brazilian Portugese), ShaunBlake (British), steffenreitz (German), tolnaiz (Hungarian), unidee (Finnish), untoutseul05 (French), yrnkrn (Hebrew). -
- Thank you very much for your continuous effort! -
-
- OSCAR is always looking for help: programmers, testers, or translators. If you are interested, please PM 'bonjour' on the Apnea Board Forum. -
-
A special mention to the ApneaBoard for providing a development forum for OSCAR and for providing the primary download site for OSCAR at + https://doc.qt.io/qt-5/licenses-used-in-qt.html

+

Data formats
+ The CPAP device data formats are mostly undocumented. Getting them working in OSCAR involved a lot of investigation, together with a lot of SD card data samples, many patient users willing to put up with crashes and data issues, and plenty of help from fellow developers out there who shared in the workload of decoding data formats. + Thanks to all of you who have helped in the fight to protect our right to keep our own data open and accessible!

+

The current OSCAR team consists of the following:
+ Fred Bonjour : Project Manager & Lead Tester, + Phil Olynyk : Lead Developer, + Arie Klerk : Translations Team Coordinator +

+

Developers
+ Phil Olynyk (Lead Developer), GuyScharf, sawinglogz +

+

Reporters
+ AlanE, BrandonA, Crimson Nape, foxfire, Heyns, jeremieb, jaswilliams, palerider, patl +

+

Testers
+ Fred Bonjour (Lead Tester), Beej, DeepBreathing, Fastlane, GuyScharf, JJJ, LookingForward, Pollcat, Ruth Catrin, SarcasticDave94 +

+

Advisors
+ aviB, SkepticDoc, Sleeprider, SleepyProgrammer, srlevine1, LunaFerret, harre, mdhamptom, mitchcampbell, rtannerf +

+

Translators
+ Arie Klerk (Translations Team Coordinator, Dutch), 1st.qwerty (Polish) delta (Romanian), drol (French), FaureCourtet (French), fossegrim (Norwegian), hearsay73 (Filipino), Heyns (African), jaswilliams (British), johanh (Finnish), koimark (Finnish), Lazer1234 (Swedish), Mac_Sheepcounter (German), Perchas (Spanish), refurbished (Polish), Ristraus (Brazilian Portugese), ShaunBlake (British), steffenreitz (German), tolnaiz (Hungarian), unidee (Finnish), untoutseul05 (French), yrnkrn (Hebrew). +

+

Thank you very much for your continuous effort!

+

OSCAR is always looking for help: programmers, testers, or translators. If you are interested, please PM 'bonjour' on the Apnea Board Forum. +

+
+

A special mention to the ApneaBoard for providing a development forum for OSCAR and for providing the primary download site for OSCAR at https:\\sleepfiles.com\OSCAR. -
Also acknowledging ApneaBoard for their support of software for CPAP users for many years. -
+

+

Also acknowledging ApneaBoard for their support of software for CPAP users for many years.

+ diff --git a/Htmldocs/release_notes.html b/Htmldocs/release_notes.html index dc79f685..50b92575 100644 --- a/Htmldocs/release_notes.html +++ b/Htmldocs/release_notes.html @@ -1,275 +1,283 @@ - + - release_notes - + - - Changes and fixes in OSCAR v1.1.0-rc-1 + + +

+Changes and fixes in OSCAR v1.1.0-rc-1 +

+

+ +

+Changes and fixes in OSCAR v1.1.0-beta-2 +

+
  • [new] Add a menu option to create a zip from an SD card
    • +
  • [new] Ask where to save screenshots
    • +
  • [new] Alert users when unexpected Philips Respironics data is encountered during import
    • +
  • [fix] Add support for CPAP mode on DreamStation BiPAP S/T and AVAPS
    • +
  • [fix] Pinch-to-zoom now works as expected
    • +
  • [fix] The Philips Respironics loader now respects the "ignore old sessions" preference
    • +
  • [fix] Improved handling of discontinuous Philips Respironics data
    • +
  • [fix] Improved import of Philips Respironics flex and humidification settings
    • +
  • [fix] Fix incorrect display of tube diameter on some Philips Respironics devices
    • +
  • [fix] Fix missing "Bi-Flex" label for bi-level DreamStations
    • +
  • [fix] Fix crashes in ZEO loader
    • +
  • [fix] Fix several memory leaks
    • + +

    + +

    +Changes and fixes in OSCAR v1.1.0-beta-1 +

    +

    + +

    +Changes and fixes in OSCAR v1.1.0-testing-4 +

    +

    + +

    +Changes and fixes in OSCAR v1.1.0-testing-3 +NOTE: Translations have NOT yet been updated for these changes +

    +

    + +

    +Changes and fixes in OSCAR v1.1.0-testing-2 +NOTE: Translations have NOT yet been updated for these changes +

    +

    + +

    +Changes and fixes in OSCAR v1.1.0-testing-1 +NOTE: Translations have NOT yet been updated for these changes +

    +

    + +

    +Changes and fixes in OSCAR v1.0.1-r-1 +

    +

    + +

    +Changes and fixes in OSCAR v1.0.0-beta-9 +

    +

    + +

    +Changes and fixes in OSCAR v1.0.0-beta-8 +

    +

    + +

    +Changes and fixes in OSCAR v1.0.0-beta-7 +

    +

    + +

    +Changes and fixes in OSCAR v1.0.0-beta-6 +

    +

    + +

    +Changes and fixes in OSCAR v1.0.0-beta-5 +

    +

    + +

    +Changes and fixes in OSCAR v1.0.0-beta-4 +

    +

    +

    +Changes and fixes in OSCAR v1.0.0-beta-3 +

    +

    + +

    +SleepyHead v1.1.0-unstable-0 +

    +

    + diff --git a/oscar/docs/about.html b/oscar/docs/about.html deleted file mode 100644 index f2d1d396..00000000 --- a/oscar/docs/about.html +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - about - - - -
    -

    Welcome to OSCAR, -
    the - Open - Source - CPAP - Analysis - Reporter

    This software has been designed to assist you in reviewing the data produced by your CPAP devices and related equipment. -
    -
    Volunteers translated it into many languages. Click the Help tab to change the displayed language. -
    -
    - Any Chromium-based browser like - Google Chrome or - Microsoft Edge Chromium currently offers the best - automatic - translation options. -
    You will find extensive help in the OSCAR Wiki. Open - http://www.apneaboard.com/wiki/index.php/OSCAR_Help. -
    -
    For questions visit - http://www.apneaboard.com or a local apnea forum. -
    -
    -

    - PLEASE READ CAREFULLY -

    -
    - OSCAR is - NOT a substitute for competent medical guidance from your Doctor. -
    -
    Due to the lack of documentation released by manufacturers regarding file formats, the accuracy of data displayed in OSCAR can not in any way be guaranteed. -
    -
    All reports generated are for - PERSONAL USE ONLY and are intended to be as accurate as possible. -
    -
    OSCAR reports are based on data reported by the CPAP machine. Acceptance of this data for compliance or other purposes is subject to the approval discretion of the reviewing agency. -
    The use of this software is entirely at your own risk. The authors will not be held liable for anything related to the use or misuse of this software. -
    -
    OSCAR is free (as in freedom) software, released under the GNU Public License v3, and comes with no warranty, and without ANY claims to fitness for any purpose. -
    -
    OSCAR is © 2019-2020 The OSCAR Team: a group of volunteer developers from the Apnea Community and members of multiple forums and various nationalities. -
    -
    OSCAR is a derivative of the SleepyHead program which is copyright © 2011-2018, Mark Watkins. -
    - - diff --git a/oscar/docs/about.xxxx b/oscar/docs/about.xxxx new file mode 100644 index 00000000..bd79c400 --- /dev/null +++ b/oscar/docs/about.xxxx @@ -0,0 +1,68 @@ + + + + + about + + + +

    Welcome to OSCAR, +
    + the + Open + Source + CPAP + Analysis + Reporter

    +
    + This software has been designed to assist you in reviewing the data produced by your CPAP devices and related equipment. +
    +
    + Volunteers translated it into many languages. Click the Help tab to change the displayed language. +
    +
    + Any Chromium-based browser like + Google Chrome or + Microsoft Edge Chromium currently offers the best automatic translation options. +
    + You will find extensive help in the OSCAR Wiki. Open + http://www.apneaboard.com/wiki/index.php/OSCAR_Help. +
    +
    For questions visit + http://www.apneaboard.com or a local apnea forum. +
    +
    +
    +

    + PLEASE READ CAREFULLY +

    +
    +
    +
    + OSCAR is + NOT a substitute for competent medical guidance from your Doctor. +
    +
    + Due to the lack of documentation released by manufacturers regarding file formats, the accuracy of data displayed in OSCAR can not in any way be guaranteed. +
    +
    + All reports generated are for + PERSONAL USE ONLY and are intended to be as accurate as possible. +
    +
    + OSCAR reports are based on data reported by the CPAP machine. Acceptance of this data for compliance or other purposes is subject to the approval discretion of the reviewing agency. +
    + The use of this software is entirely at your own risk. The authors will not be held liable for + anything related to the use or misuse of this software. +
    +
    + OSCAR is free (as in freedom) software, released under the GNU Public License v3, and comes with no warranty, and without ANY claims to fitness for any purpose. +
    +
    + OSCAR is © 2019-2020 The OSCAR Team: a group of volunteer developers from the Apnea Community and members of multiple forums and various nationalities. +
    +
    + OSCAR is a derivative of the SleepyHead program which is copyright © 2011-2018, Mark Watkins. +
    + + diff --git a/oscar/docs/credits.html b/oscar/docs/credits.html deleted file mode 100644 index 626e033a..00000000 --- a/oscar/docs/credits.html +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - credits - - - -

    Credits

    -
    - OSCAR is a derivative of the SleepyHead program written by Mark Watkins, during the years 2011 to 2018. The current project is the combined effort of people from CPAPtalk.com, ApneaBoard.com, and other volunteers, starting in 2019. -
    -
    - OpenSource Libraries -
    OSCAR uses the OpenSource version of the Qt cross-platform toolkit available from - http://qt.io which itself draws from many smaller open source libraries. You can read the individual licensing for many of these components that are used under the hood of OSCAR at - https://doc.qt.io/qt-5/licenses-used-in-qt.html -
    -
    - Data formats -
    The CPAP device data formats are mostly undocumented. Getting them working in OSCAR involved a lot of investigation, together with a lot of SD card data samples, many patient users willing to put up with crashes and data issues, and plenty of help from fellow developers out there who shared in the workload of decoding data formats. Thanks to all of you who have helped in the fight to protect our right to keep our own data open and accessible! -
    -
    -

    The current OSCAR team consists of the following:

    - Fred Bonjour: Project Manager & Lead Tester, - Phil Olynyk: Lead Developer, - Arie Klerk: Translations Team Coordinator -
    -
    - Developers: -
    - Phil Olynyk (Lead Developer), GuyScharf, sawinglogz -
    -
    - Reporters: -
    AlanE, BrandonA, Crimson Nape, foxfire, Heyns, jeremieb, jaswilliams, palerider, patl -
    -
    - Testers: -
    - Fred Bonjour (Lead Tester), Beej, DeepBreathing, Fastlane, GuyScharf, JJJ, LookingForward, Pollcat, Ruth Catrin, SarcasticDave94 -
    - -
    Advisors:     -
    aviB, SkepticDoc, Sleeprider, SleepyProgrammer, srlevine1, LunaFerret, harre, mdhamptom, mitchcampbell, rtannerf -
    -
    - Translators: -
    - Arie Klerk (Translations Team Coordinator, Dutch), 1st.qwerty (Polish) delta (Romanian), drol (French), FaureCourtet (French), fossegrim (Norwegian), hearsay73 (Filipino), Heyns (African), jaswilliams (British), johanh (Finnish), koimark (Finnish), Lazer1234 (Swedish), Mac_Sheepcounter (German), Perchas (Spanish), refurbished (Polish), Ristraus (Brazilian Portugese), ShaunBlake (British), steffenreitz (German), tolnaiz (Hungarian), unidee (Finnish), untoutseul05 (French), yrnkrn (Hebrew). -
    - Thank you very much for your continuous effort! -
    -
    - OSCAR is always looking for help: programmers, testers, or translators. If you are interested, please PM 'bonjour' on the Apnea Board Forum. -
    -
    A special mention to the ApneaBoard for providing a development forum for OSCAR and for providing the primary download site for OSCAR at - https:\\sleepfiles.com\OSCAR. -
    Also acknowledging ApneaBoard for their support of software for CPAP users for many years. -
    - diff --git a/oscar/docs/credits.xxxx b/oscar/docs/credits.xxxx new file mode 100644 index 00000000..ea471bb2 --- /dev/null +++ b/oscar/docs/credits.xxxx @@ -0,0 +1,48 @@ + + + + + credits + + + +

    Credits

    +
    +

    OSCAR is a derivative of the SleepyHead program written by Mark Watkins, during the years 2011 to 2018. The current project is the combined effort of people from CPAPtalk.com, ApneaBoard.com, and other volunteers, starting in 2019.

    +

    OpenSource Libraries
    + OSCAR uses the OpenSource version of the Qt cross-platform toolkit available from + http://qt.io which itself draws from many smaller open source libraries. You can read the individual licensing for many of these components that are used under the hood of OSCAR at + https://doc.qt.io/qt-5/licenses-used-in-qt.html

    +

    Data formats
    + The CPAP device data formats are mostly undocumented. Getting them working in OSCAR involved a lot of investigation, together with a lot of SD card data samples, many patient users willing to put up with crashes and data issues, and plenty of help from fellow developers out there who shared in the workload of decoding data formats. + Thanks to all of you who have helped in the fight to protect our right to keep our own data open and accessible!

    +

    The current OSCAR team consists of the following:
    + Fred Bonjour : Project Manager & Lead Tester, + Phil Olynyk : Lead Developer, + Arie Klerk : Translations Team Coordinator +

    +

    Developers
    + Phil Olynyk (Lead Developer), GuyScharf, sawinglogz +

    +

    Reporters
    + AlanE, BrandonA, Crimson Nape, foxfire, Heyns, jeremieb, jaswilliams, palerider, patl +

    +

    Testers
    + Fred Bonjour (Lead Tester), Beej, DeepBreathing, Fastlane, GuyScharf, JJJ, LookingForward, Pollcat, Ruth Catrin, SarcasticDave94 +

    +

    Advisors
    + aviB, SkepticDoc, Sleeprider, SleepyProgrammer, srlevine1, LunaFerret, harre, mdhamptom, mitchcampbell, rtannerf +

    +

    Translators
    + Arie Klerk (Translations Team Coordinator, Dutch), 1st.qwerty (Polish) delta (Romanian), drol (French), FaureCourtet (French), fossegrim (Norwegian), hearsay73 (Filipino), Heyns (African), jaswilliams (British), johanh (Finnish), koimark (Finnish), Lazer1234 (Swedish), Mac_Sheepcounter (German), Perchas (Spanish), refurbished (Polish), Ristraus (Brazilian Portugese), ShaunBlake (British), steffenreitz (German), tolnaiz (Hungarian), unidee (Finnish), untoutseul05 (French), yrnkrn (Hebrew). +

    +

    Thank you very much for your continuous effort!

    +

    OSCAR is always looking for help: programmers, testers, or translators. If you are interested, please PM 'bonjour' on the Apnea Board Forum. +

    +
    +

    A special mention to the ApneaBoard for providing a development forum for OSCAR and for providing the primary download site for OSCAR at + https:\\sleepfiles.com\OSCAR. +

    +

    Also acknowledging ApneaBoard for their support of software for CPAP users for many years.

    + + diff --git a/oscar/docs/release_notes.html b/oscar/docs/release_notes.html deleted file mode 100644 index dc79f685..00000000 --- a/oscar/docs/release_notes.html +++ /dev/null @@ -1,275 +0,0 @@ - - - - - - release_notes - - - - Changes and fixes in OSCAR v1.1.0-rc-1 - -
    - Changes and fixes in OSCAR v1.1.0-beta-2 -
    Portions of OSCAR are © 2019-2020 by - The OSCAR Team - -
    - Changes and fixes in OSCAR v1.1.0-beta-1 -
    Portions of OSCAR are © 2019 by - The OSCAR Team - -
    - Changes and fixes in OSCAR v1.1.0-testing-4 -
    Portions of OSCAR are © 2019 by - The OSCAR Team - -
    - Changes and fixes in OSCAR v1.1.0-testing-3 -
    - NOTE: Translations have NOT yet been updated for these changes -
    Portions of OSCAR are © 2019 by - The OSCAR Team - -
    - Changes and fixes in OSCAR v1.1.0-testing-2 -
    - NOTE: Translations have NOT yet been updated for these changes -
    Portions of OSCAR are © 2019 by - The OSCAR Team - -
    - Changes and fixes in OSCAR v1.1.0-testing-1 -
    - NOTE: Translations have NOT yet been updated for these changes -
    Portions of OSCAR are © 2019 by - The OSCAR Team - -
    - Changes and fixes in OSCAR v1.0.1-r-1 -
    Portions of OSCAR are © 2019 by - The OSCAR Team - -
    - Changes and fixes in OSCAR v1.0.0-beta-9 -
    Portions of OSCAR are © 2019 by - The OSCAR Team - -
    - Changes and fixes in OSCAR v1.0.0-beta-8 -
    Portions of OSCAR are © 2019 by - The OSCAR Team - -
    - Changes and fixes in OSCAR v1.0.0-beta-7 -
    Portions of OSCAR are © 2019 by - The OSCAR Team - -
    - Changes and fixes in OSCAR v1.0.0-beta-6 -
    Portions of OSCAR are © 2019 by - The OSCAR Team - -
    - Changes and fixes in OSCAR v1.0.0-beta-5 -
    Portions of OSCAR are © 2019 by - The OSCAR Team - -
    - Changes and fixes in OSCAR v1.0.0-beta-4 -
    Portions of OSCAR are © 2019 by - The OSCAR Team - -
    - Changes and fixes in OSCAR v1.0.0-beta-3 -
    Portions of OSCAR are © 2019 by - The OSCAR Team and members of the apnea community - -
    - SleepyHead v1.1.0-unstable-0 - - diff --git a/oscar/docs/release_notes.xxxx b/oscar/docs/release_notes.xxxx new file mode 100644 index 00000000..50b92575 --- /dev/null +++ b/oscar/docs/release_notes.xxxx @@ -0,0 +1,283 @@ + + + + + release_notes + + + + +

    +Changes and fixes in OSCAR v1.1.0-rc-1 +

    +

    + +

    +Changes and fixes in OSCAR v1.1.0-beta-2 +

    +

    + +

    +Changes and fixes in OSCAR v1.1.0-beta-1 +

    +

    + +

    +Changes and fixes in OSCAR v1.1.0-testing-4 +

    +

    + +

    +Changes and fixes in OSCAR v1.1.0-testing-3 +NOTE: Translations have NOT yet been updated for these changes +

    +

    + +

    +Changes and fixes in OSCAR v1.1.0-testing-2 +NOTE: Translations have NOT yet been updated for these changes +

    +

    + +

    +Changes and fixes in OSCAR v1.1.0-testing-1 +NOTE: Translations have NOT yet been updated for these changes +

    +

    + +

    +Changes and fixes in OSCAR v1.0.1-r-1 +

    +

    + +

    +Changes and fixes in OSCAR v1.0.0-beta-9 +

    +

    + +

    +Changes and fixes in OSCAR v1.0.0-beta-8 +

    +

    + +

    +Changes and fixes in OSCAR v1.0.0-beta-7 +

    +

    + +

    +Changes and fixes in OSCAR v1.0.0-beta-6 +

    +

    + +

    +Changes and fixes in OSCAR v1.0.0-beta-5 +

    +

    + +

    +Changes and fixes in OSCAR v1.0.0-beta-4 +

    +

    +

    +Changes and fixes in OSCAR v1.0.0-beta-3 +

    +

    + +

    +SleepyHead v1.1.0-unstable-0 +

    +

    + + From 5764b27ad68ea5d2af81b3ebed0e47c828e3e277 Mon Sep 17 00:00:00 2001 From: Phil Olynyk Date: Sat, 4 Apr 2020 21:48:14 -0400 Subject: [PATCH 09/10] Tweak some credits and about files, remove HtmlTidy reference. --- Htmldocs/about-af.html | 6 +----- Htmldocs/about-ar.html | 6 +----- Htmldocs/about-bg.html | 6 +----- Htmldocs/about-da.html | 6 +----- Htmldocs/about-de.html | 6 +----- Htmldocs/about-el.html | 4 +--- Htmldocs/about-es.html | 3 +-- Htmldocs/about-fi.html | 3 +-- Htmldocs/about-fr.html | 3 +-- Htmldocs/credits-af.html | 11 +++++------ 10 files changed, 14 insertions(+), 40 deletions(-) diff --git a/Htmldocs/about-af.html b/Htmldocs/about-af.html index 9a2f263e..0530ed1f 100644 --- a/Htmldocs/about-af.html +++ b/Htmldocs/about-af.html @@ -1,14 +1,10 @@ - about_af - +

    Welkom by OSCAR,
    diff --git a/Htmldocs/about-ar.html b/Htmldocs/about-ar.html index 8951f058..26a26c0d 100644 --- a/Htmldocs/about-ar.html +++ b/Htmldocs/about-ar.html @@ -1,14 +1,10 @@ - about_ar - +
    diff --git a/Htmldocs/about-bg.html b/Htmldocs/about-bg.html index d0dd749f..1beee5d3 100644 --- a/Htmldocs/about-bg.html +++ b/Htmldocs/about-bg.html @@ -1,14 +1,10 @@ - about_bg - +
    diff --git a/Htmldocs/about-da.html b/Htmldocs/about-da.html index a2ecd767..0fb2a4d2 100644 --- a/Htmldocs/about-da.html +++ b/Htmldocs/about-da.html @@ -1,14 +1,10 @@ - about-da - +
    diff --git a/Htmldocs/about-de.html b/Htmldocs/about-de.html index 932e9ee3..b911f07b 100644 --- a/Htmldocs/about-de.html +++ b/Htmldocs/about-de.html @@ -1,14 +1,10 @@ - about_de - +
    diff --git a/Htmldocs/about-el.html b/Htmldocs/about-el.html index 7fe98cd9..b0b1cffc 100644 --- a/Htmldocs/about-el.html +++ b/Htmldocs/about-el.html @@ -4,9 +4,7 @@ about-el - +
    diff --git a/Htmldocs/about-es.html b/Htmldocs/about-es.html index 1b1c6938..908733f4 100644 --- a/Htmldocs/about-es.html +++ b/Htmldocs/about-es.html @@ -1,5 +1,4 @@ - + diff --git a/Htmldocs/about-fi.html b/Htmldocs/about-fi.html index 8be83661..1317f940 100644 --- a/Htmldocs/about-fi.html +++ b/Htmldocs/about-fi.html @@ -1,5 +1,4 @@ - + diff --git a/Htmldocs/about-fr.html b/Htmldocs/about-fr.html index b9a843b6..449bab7b 100644 --- a/Htmldocs/about-fr.html +++ b/Htmldocs/about-fr.html @@ -1,5 +1,4 @@ - + diff --git a/Htmldocs/credits-af.html b/Htmldocs/credits-af.html index 8e6f510c..0b7022f2 100644 --- a/Htmldocs/credits-af.html +++ b/Htmldocs/credits-af.html @@ -1,8 +1,6 @@ - + - credits-af @@ -42,7 +40,7 @@
    Toetsers:
    - F red Bonjour (Lead Tester), Beej, DeepBreathing, Fastlane, GuyScharf, JJJ, LookingForward, Pollcat, Ruth Catrin, SarcasticDave94 + Fred Bonjour (hooftoetser), Beej, DeepBreathing, Fastlane, GuyScharf, JJJ, LookingForward, Pollcat, Ruth Catrin, SarcasticDave94

    Adviseurs:     @@ -57,8 +55,9 @@
    OSCAR is altyd op soek na hulp: programmeerders, toetsers of vertalers. Stuur 'n privaat boodskap aan 'bonjour' op die Apnea Board Forum as u belangstel.
    -
    'n Spesiale vermelding aan die ApneaBoard vir die verskaffing van 'n ontwikkelingsforum vir OSCAR en die verskaffing van die primêre aflaai-webwerf vir OSCAR op +
    + 'n Spesiale vermelding aan die ApneaBoard vir die verskaffing van 'n ontwikkelingsforum vir OSCAR en die verskaffing van die primêre aflaai-webwerf vir OSCAR op https://sleepfiles.com/OSCAR.
    Ons erken ook ApneaBoard vir hul ondersteuning van sagteware vir CPAP-gebruikers vir baie jare. -
    + From 3e2c1db19e3f09232a49810af9aaa084a6bb728b Mon Sep 17 00:00:00 2001 From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com> Date: Sun, 5 Apr 2020 17:19:15 -0400 Subject: [PATCH 10/10] Update PRS1 900X warnings based on new test data. --- oscar/SleepLib/loader_plugins/prs1_loader.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/oscar/SleepLib/loader_plugins/prs1_loader.cpp b/oscar/SleepLib/loader_plugins/prs1_loader.cpp index 3fdfdff3..c00d49f6 100644 --- a/oscar/SleepLib/loader_plugins/prs1_loader.cpp +++ b/oscar/SleepLib/loader_plugins/prs1_loader.cpp @@ -6629,7 +6629,7 @@ void PRS1DataChunk::ParseHumidifierSettingV3(unsigned char byte1, unsigned char } } else if (family == 5) { if (tubepresent) { - if (tubetemp != 0 && tubetemp > 3) UNEXPECTED_VALUE(tubetemp, "<= 3"); + if (tubetemp != 0 && tubetemp > 4) UNEXPECTED_VALUE(tubetemp, "<= 4"); } CHECK_VALUE(humidfixed, false); } else if (family == 3) { @@ -7319,6 +7319,7 @@ bool PRS1DataChunk::ParseSettingsF5V3(const unsigned char* data, int size) int max_ps = 0; int min_epap = 0; int max_epap = 0; + int rise_time; int breath_rate; int timed_inspiration; @@ -7393,8 +7394,8 @@ bool PRS1DataChunk::ParseSettingsF5V3(const unsigned char* data, int size) case 2: // Breath Rate (fixed BPM) breath_rate = data[pos+1]; timed_inspiration = data[pos+2]; - CHECK_VALUE(breath_rate, 10); - CHECK_VALUE(timed_inspiration, 24); + if (breath_rate < 4 || breath_rate > 10) UNEXPECTED_VALUE(breath_rate, "4-10"); + if (timed_inspiration < 12 || timed_inspiration > 24) UNEXPECTED_VALUE(timed_inspiration, "12-24"); this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_BACKUP_BREATH_MODE, PRS1Backup_Fixed)); this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_BACKUP_BREATH_RATE, breath_rate)); // BPM this->AddEvent(new PRS1ScaledSettingEvent(PRS1_SETTING_BACKUP_TIMED_INSPIRATION, timed_inspiration, 0.1)); @@ -7435,8 +7436,9 @@ bool PRS1DataChunk::ParseSettingsF5V3(const unsigned char* data, int size) break; case 0x20: // Rise Time // [0x20, 0x03] for no flex, rise time setting = 3, no rise lock - CHECK_VALUE(data[pos+1], 3); - this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_RISE_TIME, data[pos+1])); + rise_time = data[pos+1]; + if (rise_time < 1 || rise_time > 6) UNEXPECTED_VALUE(rise_time, "1-6"); + this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_RISE_TIME, rise_time)); break; default: CHECK_VALUES(data[pos], 0, 0x20);