diff --git a/SleepLib/common.h b/SleepLib/common.h index 02786ee2..6423b679 100644 --- a/SleepLib/common.h +++ b/SleepLib/common.h @@ -77,6 +77,7 @@ const QString STR_MACH_PRS1="PRS1"; const QString STR_MACH_Journal="Journal"; const QString STR_MACH_Intellipap="Intellipap"; const QString STR_MACH_FPIcon="FPIcon"; +const QString STR_MACH_MSeries="MSeries"; const QString STR_MACH_CMS50="CMS50"; const QString STR_MACH_ZEO="Zeo"; diff --git a/SleepLib/day.cpp b/SleepLib/day.cpp index fab3601a..f06ccb8b 100644 --- a/SleepLib/day.cpp +++ b/SleepLib/day.cpp @@ -7,6 +7,7 @@ #include "day.h" #include "profiles.h" #include +#include #include Day::Day(Machine *m) @@ -340,13 +341,41 @@ EventDataType Day::wavg(ChannelID code) qint64 Day::total_time() { qint64 d_totaltime=0; + // Sessions may overlap.. :( + QMultiMap range; + + //range.reserve(size()*2); + for (QVector::iterator s=begin();s!=end();s++) { if (!(*s)->enabled()) continue; Session & sess=*(*s); + range.insert(sess.first(),0); + range.insert(sess.last(),1); d_totaltime+=sess.length(); } - return d_totaltime; + + qint64 ti=0; + bool b; + int nest=0; + qint64 total=0; + for (QMultiMap::iterator it=range.begin();it!=range.end();it++) { + b=it.value(); + if (!b) { + if (!ti) ti=it.key(); + nest++; + } else { + if (--nest <= 0) { + total+=it.key()-ti; + ti=0; + } + } + } + + if (total!=d_totaltime) { + qDebug() << "Sessions Times overlaps!" << total << d_totaltime; + } + return total; //d_totaltime; } bool Day::hasEnabledSessions() { diff --git a/SleepLib/loader_plugins/icon_loader.cpp b/SleepLib/loader_plugins/icon_loader.cpp index 2c648516..841f6281 100644 --- a/SleepLib/loader_plugins/icon_loader.cpp +++ b/SleepLib/loader_plugins/icon_loader.cpp @@ -4,6 +4,7 @@ SleepLib Fisher & Paykel Icon Loader Implementation Author: Mark Watkins License: GPL +Copyright: (c)2012 Mark Watkins */ @@ -42,8 +43,6 @@ FPIconLoader::~FPIconLoader() int FPIconLoader::Open(QString & path,Profile *profile) { - // Check for SL directory - // Check for DV5MFirm.bin? QString newpath; if (path.endsWith("/")) @@ -288,13 +287,10 @@ bool FPIconLoader::OpenSummary(Machine * mach,QString filename, Profile * profil QDateTime datetime; - QDate date; - QTime time; int runtime,usage; int day,month,year,hour,minute,second; - quint32 tmp; do { in >> a1; in >> a2; @@ -318,9 +314,6 @@ bool FPIconLoader::OpenSummary(Machine * mach,QString filename, Profile * profil datetime=QDateTime(QDate(year,month,day),QTime(hour,minute,second)); ts=datetime.toTime_t(); - date=datetime.date(); - time=datetime.time(); - // the following two quite often match in value in >> a1; // 0x04 Run Time diff --git a/SleepLib/loader_plugins/icon_loader.h b/SleepLib/loader_plugins/icon_loader.h index 6492f416..c0c1f122 100644 --- a/SleepLib/loader_plugins/icon_loader.h +++ b/SleepLib/loader_plugins/icon_loader.h @@ -4,6 +4,7 @@ SleepLib Fisher & Paykel Icon Loader Implementation Author: Mark Watkins License: GPL +Copyright: (c)2012 Mark Watkins */ diff --git a/SleepLib/loader_plugins/intellipap_loader.cpp b/SleepLib/loader_plugins/intellipap_loader.cpp index 813433b2..3dd8bb74 100644 --- a/SleepLib/loader_plugins/intellipap_loader.cpp +++ b/SleepLib/loader_plugins/intellipap_loader.cpp @@ -4,6 +4,7 @@ SleepLib (DeVilbiss) Intellipap Loader Implementation Author: Mark Watkins License: GPL +Copyright: (c)2011 Mark Watkins Notes: Intellipap requires the SmartLink attachment to access this data. diff --git a/SleepLib/loader_plugins/intellipap_loader.h b/SleepLib/loader_plugins/intellipap_loader.h index 0d5242db..e9513795 100644 --- a/SleepLib/loader_plugins/intellipap_loader.h +++ b/SleepLib/loader_plugins/intellipap_loader.h @@ -1,7 +1,9 @@ /* Intellipap Loader Header - Copyright (c)2011 Mark Watkins + Author: Mark Watkins License: GPL + Copyright: (c)2011 Mark Watkins + */ diff --git a/SleepLib/loader_plugins/mseries_loader.cpp b/SleepLib/loader_plugins/mseries_loader.cpp new file mode 100644 index 00000000..deeba57a --- /dev/null +++ b/SleepLib/loader_plugins/mseries_loader.cpp @@ -0,0 +1,267 @@ +/* + +SleepLib RemStar M-Series Loader Implementation + +Author: Mark Watkins +License: GPL +Copyright: (c)2012 Mark Watkins + +*/ + +#include +#include + +#include "mseries_loader.h" +extern QProgressBar *qprogress; + + + +MSeries::MSeries(Profile *p,MachineID id) + :CPAP(p,id) +{ + m_class=mseries_class_name; + properties[STR_PROP_Brand]="Respironics"; + properties[STR_PROP_Model]=STR_MACH_MSeries; +} + +MSeries::~MSeries() +{ +} + +MSeriesLoader::MSeriesLoader() +{ +} + +MSeriesLoader::~MSeriesLoader() +{ + for (QHash::iterator i=MachList.begin(); i!=MachList.end(); i++) { + delete i.value(); + } +} + +//struct MSeriesHeader { +// quint8 b1; //0x52 +// quint32 a32; //0x00000049 +// quint16 u16[8]; +// quint8 b2; //0x02 +// char setname[16]; +// char firstname[25]; +// char lastname[25]; +// char serial[50]; +// quint16 b3; //0x00 +// quint16 b4; //0x66 +// quint16 b5; //0xff + +//} __attribute__((packed)); +/* + +blockLayoutOffsets { + cardInformationBlock = 0, + brandID = 0, + cardType = 2, + cardVersion = 3 + startUIDB = 4 + endUIDB = 6, + startCPB = 8, + endCPB = 10, + startCDCB = 12, + endCDCB = 14, + startCDB = 0x10, + endCDB = 0x12, + checksum = 20, + + userIDBlock = 0x15 + personalID = 1, + patientFName = 0x11, + patientLName = 0x2a, + serialNumber = 0x43, + modelNumber = 0x4d, + textData = 0x57 + checksum = 0x77, + + cardPrescriptionBlock = 0x8d, + + + cardDataControlBlock = 0xa3, + validFlagOne = 3, + headPtrOne = 4, + tailPtrOne = 6, + cdbChecksumOne = 8, + validFlagTwo = 9 + headPtrTwo = 10, + tailPtrTwo = 12, + cdbChecksumTwo = 14, + + cardDataBlock = 0xb2, + basicCompliance = 1, + fosq = 2, + Invalid = 0xff, + sleepProfile = 8, + sleepProfile2 = 10, + sleepProfile3 = 14, + sleepTrend = 9, + sleepTrend2 = 11, + sleepTrend3 = 15, + smartAutoCPAPProfile = 3, + smartAutoCPAPTrend = 4, + ventCompliance2 = 13, + ventilatorCompliance = 7, + ventilatorProfile = 6, + ventProfile2 = 12 + startChar = 0xfe, + stopChar = 0x7f + */ +int MSeriesLoader::Open(QString & path,Profile *profile) +{ + // Until a smartcard reader is written, this is not an auto-scanner.. it just opens a block file.. + + QFile file(path); + if (!file.exists()) return 0; + if (file.size()!=32768) // Check filesize matches smartcard? + return 0; + + if (!file.open(QFile::ReadOnly)) { + qDebug() << "Couldn't open M-Series file:" << path; + return 0; + } + QByteArray block=file.readAll(); + + + // Thanks to Phil Gillam for the pointers on this one.. + + const unsigned char * cardinfo=(unsigned char *)block.data(); + quint16 magic=cardinfo[0] << 8 | cardinfo[1]; + if (magic!=0x5249) { // "RI" Respironics Magic number + return 0; + } + quint8 cardtype=cardinfo[2]; + quint8 cardver=cardinfo[3]; + + quint16 user_offset=(cardinfo[4] << 8) | cardinfo[5]; + quint16 rx_offset=(cardinfo[8] << 8) | cardinfo[9]; + quint16 control_offset=(cardinfo[12] << 8) | cardinfo[13]; + quint16 data_offset=(cardinfo[16] << 8) | cardinfo[17]; + + + const char * userinfo=block.data()+user_offset; + QString setname=QString(userinfo+0x1); + QString firstname=QString(userinfo+0x11); + QString lastname=QString(userinfo+0x2a); + QString serial=QString(userinfo+0x43); + serial.truncate(10); + QString model=QString(userinfo+0x4d); + QString textdata=QString(userinfo+0x57); + quint8 userinfochk=*(userinfo+0x77); + quint8 tmp=0; + for (int i=0;i<0x77;i++) { + tmp+=userinfo[i]; + } + if (tmp!=userinfochk) { + qDebug() << "MSeries UserInfo block checksum failure" << path; + } + + const unsigned char * rxblock=(unsigned char *)block.data()+rx_offset; + + const unsigned char * controlblock=(unsigned char *)block.data()+control_offset; + + quint16 headptr1=controlblock[4] << 8 | controlblock[5]; + quint16 tailptr1=controlblock[6] << 8 | controlblock[7]; + quint16 headptr2=controlblock[10] << 8 | controlblock[11]; + quint16 tailptr2=controlblock[12] << 8 | controlblock[13]; +// validFlagOne = 3, +// headPtrOne = 4, +// tailPtrOne = 6, +// cdbChecksumOne = 8, +// validFlagTwo = 9 +// headPtrTwo = 10, +// tailPtrTwo = 12, +// cdbChecksumTwo = 14, + + const char * datablock=block.data()+data_offset; + quint8 basicCompliance=datablock[1]; + quint8 fosq=datablock[2]; + quint8 smartAutoCPAPProfile=datablock[3]; + quint8 smartAutoCPAPTrend=datablock[4]; + quint8 ventProfile=datablock[6]; + quint8 ventCompliance1=datablock[7]; + quint8 sleepProfile1=datablock[8]; + quint8 sleepTrend1=datablock[9]; + quint8 sleepProfile2=datablock[10]; + quint8 sleepTrend2=datablock[11]; + quint8 ventProfile2=datablock[12]; + quint8 ventCompliance2=datablock[13]; + quint8 sleepProfile3=datablock[14]; + quint8 sleepTrend3=datablock[15]; + +// basicCompliance = 1, +// fosq = 2, +// sleepProfile = 8, +// sleepProfile2 = 10, +// sleepProfile3 = 14, +// sleepTrend = 9, +// sleepTrend2 = 11, +// sleepTrend3 = 15, +// smartAutoCPAPProfile = 3, +// smartAutoCPAPTrend = 4, +// ventCompliance2 = 13, +// ventilatorCompliance = 7, +// ventilatorProfile = 6, +// ventProfile2 = 12 + +// Invalid = 0xff, +// startChar = 0xfe, +// stopChar = 0x7f + + + //Machine *mach=CreateMachine(serial,profile); + + + // 0xcount till next block (between f3 02... blocks) + // 0xc0 00 // varies + // 0xf3 02 f0 97 f2 ff f2 81 + + return 1; +} + +Machine *MSeriesLoader::CreateMachine(QString serial,Profile *profile) +{ + if (!profile) + return NULL; + qDebug() << "Create Machine " << serial; + + QList ml=profile->GetMachines(MT_CPAP); + bool found=false; + QList::iterator i; + for (i=ml.begin(); i!=ml.end(); i++) { + if (((*i)->GetClass()==mseries_class_name) && ((*i)->properties[STR_PROP_Serial]==serial)) { + MachList[serial]=*i; + found=true; + break; + } + } + if (found) return *i; + + Machine *m=new MSeries(profile,0); + + MachList[serial]=m; + profile->AddMachine(m); + + m->properties[STR_PROP_Serial]=serial; + m->properties[STR_PROP_DataVersion]=QString::number(mseries_data_version); + + QString path="{"+STR_GEN_DataFolder+"}/"+m->GetClass()+"_"+serial+"/"; + m->properties[STR_PROP_Path]=path; + m->properties[STR_PROP_BackupPath]=path+"Backup/"; + + return m; +} + +bool mseries_initialized=false; +void MSeriesLoader::Register() +{ + if (mseries_initialized) return; + qDebug() << "Registering RemStar M-Series Loader"; + RegisterLoader(new MSeriesLoader()); + //InitModelMap(); + mseries_initialized=true; +} diff --git a/SleepLib/loader_plugins/mseries_loader.h b/SleepLib/loader_plugins/mseries_loader.h new file mode 100644 index 00000000..674c7e14 --- /dev/null +++ b/SleepLib/loader_plugins/mseries_loader.h @@ -0,0 +1,67 @@ +/* + +SleepLib RemStar M-Series Loader Header + +Author: Mark Watkins +License: GPL +Copyright: (c)2012 Mark Watkins +*/ + +#ifndef MSERIES_LOADER_H +#define MSERIES_LOADER_H + +#include "SleepLib/machine.h" +#include "SleepLib/machine_loader.h" +#include "SleepLib/profiles.h" + +//******************************************************************************************** +/// IMPORTANT!!! +//******************************************************************************************** +// Please INCREMENT the following value when making changes to this loaders implementation. +// +const int mseries_data_version=2; +// +//******************************************************************************************** + +/*! \class MSeries + \brief RemStar M-Series customized machine object + */ +class MSeries:public CPAP +{ +public: + MSeries(Profile *p,MachineID id=0); + virtual ~MSeries(); +}; + + +const int mseries_load_buffer_size=1024*1024; + + +const QString mseries_class_name=STR_MACH_MSeries; + +class MSeriesLoader : public MachineLoader +{ +public: + MSeriesLoader(); + virtual ~MSeriesLoader(); + + //! \brief Opens M-Series block device + virtual int Open(QString & file,Profile *profile); + + //! \brief Returns the database version of this loader + virtual int Version() { return mseries_data_version; } + + //! \brief Return the ClassName, in this case "MSeries" + virtual const QString & ClassName() { return mseries_class_name; } + + //! \brief Create a new PRS1 machine record, indexed by Serial number. + Machine *CreateMachine(QString serial,Profile *profile); + + //! \brief Register this Module to the list of Loaders, so it knows to search for PRS1 data. + static void Register(); +protected: + QHash MachList; + +}; + +#endif // MSERIES_LOADER_H diff --git a/SleepLib/loader_plugins/prs1_loader.cpp b/SleepLib/loader_plugins/prs1_loader.cpp index 9aa0c672..1b70ce04 100644 --- a/SleepLib/loader_plugins/prs1_loader.cpp +++ b/SleepLib/loader_plugins/prs1_loader.cpp @@ -4,6 +4,8 @@ SleepLib PRS1 Loader Implementation Author: Mark Watkins License: GPL +Copyright: (c)2011 Mark Watkins + */ #include diff --git a/SleepLib/loader_plugins/prs1_loader.h b/SleepLib/loader_plugins/prs1_loader.h index da68a18f..05a4231d 100644 --- a/SleepLib/loader_plugins/prs1_loader.h +++ b/SleepLib/loader_plugins/prs1_loader.h @@ -4,6 +4,7 @@ SleepLib PRS1 Loader Header Author: Mark Watkins License: GPL +Copyright: (c)2011 Mark Watkins */ diff --git a/SleepLib/loader_plugins/resmed_loader.cpp b/SleepLib/loader_plugins/resmed_loader.cpp index de5828c3..0dcca176 100644 --- a/SleepLib/loader_plugins/resmed_loader.cpp +++ b/SleepLib/loader_plugins/resmed_loader.cpp @@ -4,6 +4,8 @@ SleepLib ResMed Loader Implementation Author: Mark Watkins License: GPL +Copyright: (c)2011 Mark Watkins + */ diff --git a/SleepLib/loader_plugins/resmed_loader.h b/SleepLib/loader_plugins/resmed_loader.h index 50aacd1d..c1486f7c 100644 --- a/SleepLib/loader_plugins/resmed_loader.h +++ b/SleepLib/loader_plugins/resmed_loader.h @@ -4,6 +4,8 @@ SleepLib RESMED Loader Header Author: Mark Watkins License: GPL +Copyright: (c)2011 Mark Watkins + */ #ifndef RESMED_LOADER_H diff --git a/SleepyHeadQT.pro b/SleepyHeadQT.pro index d9c1bf39..477c5c00 100644 --- a/SleepyHeadQT.pro +++ b/SleepyHeadQT.pro @@ -80,7 +80,8 @@ SOURCES += main.cpp\ quazip/JlCompress.cpp \ UpdaterWindow.cpp \ SleepLib/common.cpp \ - SleepLib/loader_plugins/icon_loader.cpp + SleepLib/loader_plugins/icon_loader.cpp \ + SleepLib/loader_plugins/mseries_loader.cpp unix:SOURCES += qextserialport/posix_qextserialport.cpp unix:!macx:SOURCES += qextserialport/qextserialenumerator_unix.cpp @@ -158,7 +159,8 @@ HEADERS += \ quazip/crypt.h \ UpdaterWindow.h \ SleepLib/common.h \ - SleepLib/loader_plugins/icon_loader.h + SleepLib/loader_plugins/icon_loader.h \ + SleepLib/loader_plugins/mseries_loader.h FORMS += \ diff --git a/mainwindow.cpp b/mainwindow.cpp index 927ed131..f4a81b4c 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -24,9 +24,12 @@ #include #include #include -#include #include +// Custom loaders that don't autoscan.. +#include +#include + #include "mainwindow.h" #include "ui_mainwindow.h" #include "newprofile.h" @@ -2660,3 +2663,23 @@ void MainWindow::on_actionImport_ZEO_Data_triggered() } + +void MainWindow::on_actionImport_RemStar_MSeries_Data_triggered() +{ + QFileDialog w; + w.setFileMode(QFileDialog::ExistingFiles); + w.setOption(QFileDialog::ShowDirsOnly, false); + w.setOption(QFileDialog::DontUseNativeDialog,true); + w.setFilters(QStringList("M-Series data file (*.bin)")); + + MSeriesLoader mseries; + if (w.exec()==QFileDialog::Accepted) { + QString filename=w.selectedFiles()[0]; + if (!mseries.Open(filename,p_profile)) { + Notify("There was a problem opening MSeries block File: "+filename); + return; + } + Notify("MSeries Import complete"); + daily->LoadDate(daily->getDate()); + } +} diff --git a/mainwindow.h b/mainwindow.h index 68d2dd06..28af5247 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -292,6 +292,8 @@ private slots: void on_actionImport_ZEO_Data_triggered(); + void on_actionImport_RemStar_MSeries_Data_triggered(); + private: void FreeSessions(); diff --git a/mainwindow.ui b/mainwindow.ui index d4ef299d..2993939c 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -1617,6 +1617,7 @@ + @@ -1822,6 +1823,11 @@ Import &ZEO Data + + + Import RemStar &MSeries Data + +