AVAPS Pressure and Mode settings

sleepyhead/SleepLib/common.cpp

@@ -199,6 +199,7 @@ QString STR_TR_IPAPLo;  // Inspiratory Positive Airway Pressure, Low
 QString STR_TR_IPAPHi;  // Inspiratory Positive Airway Pressure, High
 QString STR_TR_APAP;    // Automatic Positive Airway Pressure
 QString STR_TR_ASV;     // Assisted Servo Ventilator
+QString STR_TR_AVAPS;   // Average Volume Assured Pressure Support
 QString STR_TR_STASV;
 
 QString STR_TR_Humidifier;
@@ -389,6 +390,7 @@ void initializeStrings()
     STR_TR_IPAPHi = QObject::tr("Max IPAP"); // Higher Inspiratory Positive Airway Pressure
     STR_TR_APAP = QObject::tr("APAP");    // Automatic Positive Airway Pressure
     STR_TR_ASV = QObject::tr("ASV");      // Assisted Servo Ventilator
+    STR_TR_AVAPS = QObject::tr("AVAPS");  // Average Volume Assured Pressure Support
     STR_TR_STASV = QObject::tr("ST/ASV");
 
     STR_TR_Humidifier = QObject::tr("Humidifier");

sleepyhead/SleepLib/common.h

@@ -222,6 +222,7 @@ extern QString STR_TR_IPAPLo;  // Inspiratory Positive Airway Pressure, Low
 extern QString STR_TR_IPAPHi;  // Inspiratory Positive Airway Pressure, High
 extern QString STR_TR_APAP;    // Automatic Positive Airway Pressure
 extern QString STR_TR_ASV;     // Assisted Servo Ventilator
+extern QString STR_TR_AVAPS;   // Average Volume Assured Pressure Support
 extern QString STR_TR_STASV;
 
 extern QString STR_TR_Humidifier;

sleepyhead/SleepLib/day.cpp

@@ -1552,6 +1552,8 @@ QString Day::getPressureSettings()
                 arg(settings_max(CPAP_PSMin),0,'f',1).
                 arg(settings_min(CPAP_PSMax),0,'f',1).
                 arg(units);
+    } else if (mode == MODE_AVAPS) {
+        return QObject::tr("EPAP %1 IPAP %2 (%3)").arg(settings_min(CPAP_EPAP),0,'f',1).arg(settings_max(CPAP_IPAP),0,'f',1).arg(units);
     }
 
     return STR_TR_Unknown;

sleepyhead/SleepLib/loader_plugins/prs1_loader.cpp

@@ -1085,6 +1085,7 @@ bool PRS1Import::ParseF3Events()
     EventList *CA = session->AddEventList(CPAP_ClearAirway, EVL_Event);
     EventList *LEAK = session->AddEventList(CPAP_LeakTotal, EVL_Event);
     EventList *MV = session->AddEventList(CPAP_MinuteVent, EVL_Event);
+    //EventList *TMV = session->AddEventList(CPAP_TgMV, EVL_Event);
     EventList *TV = session->AddEventList(CPAP_TidalVolume, EVL_Event,10.0);
     EventList *RR = session->AddEventList(CPAP_RespRate, EVL_Event);
     EventList *PTB = session->AddEventList(CPAP_PTB, EVL_Event);
@@ -1095,9 +1096,6 @@ bool PRS1Import::ParseF3Events()
     int size = event->m_data.size()/0x10;
     unsigned char * h = (unsigned char *)event->m_data.data();
 
-    quint16 tmp;
-    EventDataType epap;
-
     int hy, oa, ca;
     qint64 div = 0;
 
@@ -1111,12 +1109,14 @@ bool PRS1Import::ParseF3Events()
         FLOW->AddEvent(t, h[6]);
         PTB->AddEvent(t, h[7]);
         RR->AddEvent(t, h[8]);
-        MV->AddEvent(t, h[9]);
+        //TMV->AddEvent(t, h[9]); // not sure what this is.. encore doesn't graph it.
+        MV->AddEvent(t, h[11]);
 
-        hy = h[12];
+        hy = h[12];  // count of hypopnea events
-        ca = h[13];
+        ca = h[13];  // count of clear airway events
-        oa = h[14];
+        oa = h[14];  // count of obstructive events
 
+        // divide each event evenly over the 2 minute block
         if (hy > 0) {
             div = block_duration / hy;
 
@@ -1799,8 +1799,14 @@ bool PRS1Import::ParseSummaryF3()
     session->set_first(qint64(summary->timestamp) * 1000L);
     summary_duration = data[0x23] | data[0x24] << 8;
 
-//    EventDataType epap = data[0x04] | (data[0x05] << 8);
+    EventDataType epap = data[0x04] | (data[0x05] << 8);
-//    EventDataType ipap = data[0x06] | (data[0x07] << 8);
+    EventDataType ipap = data[0x06] | (data[0x07] << 8);
+    // why is there another high setting?
+
+    session->settings[CPAP_EPAP] = epap/10.0;
+    session->settings[CPAP_IPAP] = ipap/10.0;
+    session->settings[CPAP_Mode] = (CPAPMode)MODE_AVAPS;
+
 
 //    EventDataType f1 = data[0x08] | (data[0x09] << 8);
 

sleepyhead/SleepLib/machine_common.h

@@ -75,7 +75,7 @@ const quint32 PAP_SplitNight              = 0x8000;  // Split night capabilities
     \brief CPAP Machines mode of operation
   */
 enum CPAPMode { //:short
-    MODE_UNKNOWN = 0, MODE_CPAP, MODE_APAP, MODE_BILEVEL_FIXED, MODE_BILEVEL_AUTO_FIXED_PS, MODE_BILEVEL_AUTO_VARIABLE_PS, MODE_ASV, MODE_ASV_VARIABLE_EPAP
+    MODE_UNKNOWN = 0, MODE_CPAP, MODE_APAP, MODE_BILEVEL_FIXED, MODE_BILEVEL_AUTO_FIXED_PS, MODE_BILEVEL_AUTO_VARIABLE_PS, MODE_ASV, MODE_ASV_VARIABLE_EPAP, MODE_AVAPS
 };
 
 /*! \enum PRTypes

sleepyhead/SleepLib/schema.cpp

@@ -470,6 +470,7 @@ void init()
     ch->addOption(5, QObject::tr("Auto Bi-Level (Variable PS)"));
     ch->addOption(6, QObject::tr("ASV (Fixed EPAP)"));
     ch->addOption(7, QObject::tr("ASV (Variable EPAP)"));
+    ch->addOption(8, QObject::tr("AVAPS"));
 
 
 //    <channel id="0x1200" class="setting" scope="!session" name="PAPMode" details="PAP Mode" label="PAP Mode" type="integer">