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

Detect DreamStation 2 cards and alert the user.

Browse Source
This commit is contained in:
sawinglogz 2021-05-13 14:20:54 -04:00
parent 66e06af211
commit 505264a200
2 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Htmldocs/release_notes.html
View File

@ -25,6 +25,7 @@
</ul> </ul>
</li> </li>
<li>[new] Add support for DreamStation Go humidifier Target Time setting.</li> <li>[new] Add support for DreamStation Go humidifier Target Time setting.</li>
<li>[new] Detect DreamStation 2 cards, which are still unsupported.</li>
<li>[new] Add Bulgarian translation; update other languages.</li> <li>[new] Add Bulgarian translation; update other languages.</li>
<li>[new] Improve Somnopose import options.</li> <li>[new] Improve Somnopose import options.</li>
<li>[new] Purge Current Selected Day allows purge of each machine type separately</li> <li>[new] Purge Current Selected Day allows purge of each machine type separately</li>

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

@ -502,6 +502,10 @@ QStringList PRS1Loader::FindMachinesOnCard(const QString & cardPath)
// Found a properties file, this is a machine folder // Found a properties file, this is a machine folder
propertyfiles.append(mfi); propertyfiles.append(mfi);
} }
if (QDir::match("PROP.BIN", mfi.fileName())) {
// Found a DreamStation 2 properties file, this is a machine folder
propertyfiles.append(mfi);
}
} }
} }
} }
@ -648,7 +652,15 @@ MachineInfo PRS1Loader::PeekInfo(const QString & path)
MachineInfo info = newInfo(); MachineInfo info = newInfo();
if (!PeekProperties(info, newpath+"/properties.txt")) { if (!PeekProperties(info, newpath+"/properties.txt")) {
if (!PeekProperties(info, newpath+"/PROP.TXT")) { if (!PeekProperties(info, newpath+"/PROP.TXT")) {
qWarning() << "No properties file found in" << newpath; // Detect (unsupported) DreamStation 2
QString filepath(newpath + "/PROP.BIN");
QFile f(filepath);
if (f.exists()) {
info.series = "DreamStation 2";
qWarning() << "DreamStation 2 not supported:" << filepath;
} else {
qWarning() << "No properties file found in" << newpath;
}
} }
} }
return info; return info;
@ -784,6 +796,9 @@ int PRS1Loader::FindSessionDirsAndProperties(const QString & path, QStringList &
} else if (filename.compare("PROP.TXT",Qt::CaseInsensitive) == 0) { } else if (filename.compare("PROP.TXT",Qt::CaseInsensitive) == 0) {
sessionid_base = 16; sessionid_base = 16;
propertyfile = fi.canonicalFilePath(); propertyfile = fi.canonicalFilePath();
} else if (filename.compare("PROP.BIN", Qt::CaseInsensitive) == 0) {
sessionid_base = 16;
propertyfile = fi.canonicalFilePath();
} }
} }
return sessionid_base; return sessionid_base;
@ -792,6 +807,18 @@ int PRS1Loader::FindSessionDirsAndProperties(const QString & path, QStringList &
Machine* PRS1Loader::CreateMachineFromProperties(QString propertyfile) Machine* PRS1Loader::CreateMachineFromProperties(QString propertyfile)
{ {
if (propertyfile.endsWith("PROP.BIN")) {
qWarning() << "DreamStation 2 not supported:" << propertyfile;
#ifndef UNITTEST_MODE
QMessageBox::information(QApplication::activeWindow(),
QObject::tr("Machine Unsupported"),
QObject::tr("Sorry, your Philips Respironics DreamStation 2 is not supported yet.") +"\n\n"+
QObject::tr("The developers needs a .zip copy of this machine's SD card and matching DreamMapper screenshots to make it work with OSCAR.")
,QMessageBox::Ok);
#endif
return nullptr;
}
QHash<QString,QString> props; QHash<QString,QString> props;
PeekProperties(propertyfile, props); PeekProperties(propertyfile, props);