From 87369f6cf78324f926e0991192b46c9d09715b28 Mon Sep 17 00:00:00 2001 From: Phil Olynyk Date: Thu, 28 May 2020 13:25:09 -0400 Subject: [PATCH 1/5] Update version to rc-4, and fix a typo --- oscar/UpdaterWindow.cpp | 2 +- oscar/VERSION | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/oscar/UpdaterWindow.cpp b/oscar/UpdaterWindow.cpp index 5a5edcdf..5f7e81f5 100644 --- a/oscar/UpdaterWindow.cpp +++ b/oscar/UpdaterWindow.cpp @@ -155,7 +155,7 @@ void UpdaterWindow::updateFinished(QNetworkReply *reply) if (reply->error() != QNetworkReply::NoError) { qDebug() << "Update Check Error: "+reply->errorString(); disconnect(netmanager, SIGNAL(finished(QNetworkReply *)), this, SLOT(updateFinished(QNetworkReply *))); - mainwin->Notify(tr("OSCAR Updates are currently unvailable for this platform"),tr("OSCAR Updates")); + mainwin->Notify(tr("OSCAR Updates are currently unavailable for this platform"),tr("OSCAR Updates")); } else { QUrl redirectUrl = reply->attribute(QNetworkRequest::RedirectionTargetAttribute).toUrl(); diff --git a/oscar/VERSION b/oscar/VERSION index 91d81eb6..d47fec73 100644 --- a/oscar/VERSION +++ b/oscar/VERSION @@ -1,5 +1,5 @@ // Update the string below to set OSCAR's version and release status. // See https://semver.org/spec/v2.0.0.html for details on format. -#define VERSION "1.1.1-rc-3" +#define VERSION "1.1.1-rc-4" From 11cefbd799a23773f13add8ad5e400f22482fd6c Mon Sep 17 00:00:00 2001 From: Guy Scharf Date: Thu, 28 May 2020 12:41:32 -0700 Subject: [PATCH 2/5] Rename Turkish language and add native language name to list of names. --- Translations/{Türkçe.tr.ts => Turkish.tr.ts} | 0 oscar/translation.cpp | 3 ++- 2 files changed, 2 insertions(+), 1 deletion(-) rename Translations/{Türkçe.tr.ts => Turkish.tr.ts} (100%) diff --git a/Translations/Türkçe.tr.ts b/Translations/Turkish.tr.ts similarity index 100% rename from Translations/Türkçe.tr.ts rename to Translations/Turkish.tr.ts diff --git a/oscar/translation.cpp b/oscar/translation.cpp index eae9c44c..0a366d1b 100644 --- a/oscar/translation.cpp +++ b/oscar/translation.cpp @@ -58,7 +58,8 @@ void initTranslations() langNames["pt"] = "Português"; langNames["pt_BR"] = "Português (Brazil)"; langNames["ro"] = "Românește"; - langNames["zh"] = "\xe6\xbc\xa2\xe8\xaa\x9e\xe7\xb9\x81\xe9\xab\x94\xe5\xad\x97"; + langNames["tr"] = "Türkçe"; + langNames["zh"] = "\xe6\xbc\xa2\xe8\xaa\x9e\xe7\xb9\x81\xe9\xab\x94\xe5\xad\x97"; langNames[DefaultLanguage]="English (US)"; From 4507f8d7a835ed26b2aa9f9a3f1878bbd6c5f07b Mon Sep 17 00:00:00 2001 From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com> Date: Thu, 28 May 2020 22:11:28 -0400 Subject: [PATCH 3/5] Fix crash when trying to import Weinmann SOMNObalance e. This patch only addresses the crash, it doesn't add support for the machine. --- oscar/SleepLib/loader_plugins/weinmann_loader.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/oscar/SleepLib/loader_plugins/weinmann_loader.cpp b/oscar/SleepLib/loader_plugins/weinmann_loader.cpp index 9516ebce..4fd6c4ab 100644 --- a/oscar/SleepLib/loader_plugins/weinmann_loader.cpp +++ b/oscar/SleepLib/loader_plugins/weinmann_loader.cpp @@ -1,6 +1,7 @@ -/* SleepLib Weinmann SOMNOsoft/Balance Loader Implementation +/* SleepLib Weinmann SOMNOsoft/Balance Loader Implementation * * Copyright (c) 2011-2018 Mark Watkins + * Copyright (c) 2020 The OSCAR Team * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the source code @@ -179,6 +180,12 @@ int WeinmannLoader::Open(const QString & dirpath) int comp_end = index[FlowOffset]; int comp_size = comp_end - comp_start; + // TODO: This entire loader needs significant work. For now just + // hard-code values here to make sure we don't crash in the loop below. + if (comp_size < 5 * 0xd6) { + qWarning() << "Weinmann loader comp_size too short:" << comp_size; + return -1; + } quint8 * comp = new quint8 [comp_size]; memset((char *)comp, 0, comp_size); From d01c183ae36ce33133cc96c13a8d07fa8d544cae Mon Sep 17 00:00:00 2001 From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com> Date: Fri, 29 May 2020 12:38:39 -0400 Subject: [PATCH 4/5] Add 400X130 to the list of tested machines. --- Htmldocs/release_notes.html | 1 + oscar/SleepLib/loader_plugins/prs1_loader.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/Htmldocs/release_notes.html b/Htmldocs/release_notes.html index dc6a63ba..bc00700d 100644 --- a/Htmldocs/release_notes.html +++ b/Htmldocs/release_notes.html @@ -16,6 +16,7 @@
  • BiPAP S/T (C Series) (1061401)
  • REMstar Pro (System One 60 Series) (461CA)
    • +
  • DreamStation CPAP Pro (400X130)
  • DreamStation BiPAP Pro (600X150)
  • DreamStation Auto BiPAP (700X120, 700X150)
  • Note: Ventilator alarms are not currently imported.
    • diff --git a/oscar/SleepLib/loader_plugins/prs1_loader.cpp b/oscar/SleepLib/loader_plugins/prs1_loader.cpp index d228076a..522d70cd 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[] = { { "200X110", 0, 6, "DreamStation CPAP" }, // (brick) { "400G110", 0, 6, "DreamStation Go" }, { "400X110", 0, 6, "DreamStation CPAP Pro" }, + { "400X130", 0, 6, "DreamStation CPAP Pro" }, { "400X150", 0, 6, "DreamStation CPAP Pro" }, { "500X110", 0, 6, "DreamStation Auto CPAP" }, { "500X120", 0, 6, "DreamStation Auto CPAP" }, From 198bc166dbeac4a40900252ea7cc467bb3abeff0 Mon Sep 17 00:00:00 2001 From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com> Date: Fri, 29 May 2020 12:47:35 -0400 Subject: [PATCH 5/5] Update release notes from wiki. --- Htmldocs/release_notes.html | 1 + 1 file changed, 1 insertion(+) diff --git a/Htmldocs/release_notes.html b/Htmldocs/release_notes.html index bc00700d..cb0a2ad6 100644 --- a/Htmldocs/release_notes.html +++ b/Htmldocs/release_notes.html @@ -24,6 +24,7 @@
  • [new] Add the "peak flow" channel reported by pre-DreamStation ventilators.
  • [new] Automatically detect and resolve graphics-related crashes on Windows.
  • [new] Support AVAPS in the Overview pressure chart.
    • +
  • [new] Added Italian and Turkish translations.
  • [fix] Fix missing bars in the Overview pressure chart for Philips Respironics devices.
  • [fix] Add missing Philips Respironics pressure channels to CSV export.
  • [fix] Fix zero Philips Respironics AHI in CSV session export.