From 75e3f6eed77a817b752b20255a787156aebd2cfb Mon Sep 17 00:00:00 2001
From: Mark Watkins <mark@jedimark.net>
Date: Thu, 17 Mar 2016 09:28:18 +1000
Subject: [PATCH] Clean up some more channels.xml stuff

---
 .../SleepLib/loader_plugins/resmed_loader.cpp |  2 --
 sleepyhead/SleepLib/schema.cpp                | 23 +++++++++++++++++--
 sleepyhead/docs/channels.xml                  | 17 --------------
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp b/sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp
index 8666c584..c8332177 100644
--- a/sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp
+++ b/sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp
@@ -3340,8 +3340,6 @@ void ResmedLoader::initChannels()
     chan->addOption(10, QObject::tr("???"));
     chan->addOption(11, QObject::tr("Auto for Her"));
 
-
-
     channel.add(GRP_CPAP, chan = new Channel(RMS9_EPR = 0xe201, SETTING, MT_CPAP,   SESSION,
         "EPR", QObject::tr("EPR"),
         QObject::tr("ResMed Exhale Pressure Relief"),
diff --git a/sleepyhead/SleepLib/schema.cpp b/sleepyhead/SleepLib/schema.cpp
index f72d29ce..b8d49df0 100644
--- a/sleepyhead/SleepLib/schema.cpp
+++ b/sleepyhead/SleepLib/schema.cpp
@@ -540,7 +540,6 @@ void init()
                         QObject::tr("Journal"),  QString(),
                         RICHTEXT,  Qt::black));
 
-
 //    <channel id="0x2000" class="data" name="SleepStage" details="Sleep Stage" label="Sleep Stage" unit="1=Awake 2=REM 3=Light Sleep 4=Deep Sleep" color="dark grey"/>
     schema::channel.add(GRP_SLEEP, ch = new Channel(ZEO_SleepStage = 0x2000, WAVEFORM,   MT_SLEEPSTAGE,  SESSION,
                         "SleepStage",      QObject::tr("Sleep Stage"),
@@ -600,10 +599,11 @@ void init()
     schema::channel.add(GRP_SLEEP, ch = new Channel(ZEO_ZQ=0x2009, DATA,   MT_SLEEPSTAGE,  SESSION,
                         "ZeoZQ",      QObject::tr("Zeo ZQ"),
                         QObject::tr("Zeo sleep quality measurement"),
-                        QObject::tr("ZEO Zq"),  QString(),
+                        QObject::tr("ZEO ZQ"),  QString(),
                         INTEGER,  Qt::black));
 
 
+
 //    <channel id="0x1200" class="setting" scope="!session" name="PAPMode" details="PAP Mode" label="PAP Mode" type="integer">
 //     <option id="0" value="CPAP"/>
 //     <option id="1" value="Auto"/>
@@ -613,6 +613,25 @@ void init()
 //     <option id="5" value="ASV Auto EPAP"/>
 //    </channel>
 
+    //    <channel id="0x1201" class="setting" scope="!session" name="PresRelType" details="Pressure Relief" label="Pres. Relief" type="integer">
+    //      <Option id="0" value=""/>
+    //      <Option id="1" value="None"/>
+    //      <Option id="2" value="C-Flex"/>
+    //      <Option id="3" value="C-Flex+"/>
+    //      <Option id="4" value="A-Flex"/>
+    //      <Option id="5" value="Bi-Flex"/>
+    //      <Option id="6" value="EPR"/>
+    //      <Option id="7" value="SmartFlex"/>
+    //      <Option id="8" value="Easy-Breathe"/>
+    //    </channel>
+    //    <channel id="0x1202" class="setting" scope="!session" name="PresRelMode" details="Pressure Relief Mode" label="Pres. Rel. Mode" type="integer">
+    //      <Option id="0" value=""/>
+    //      <Option id="1" value="Ramp"/>
+    //      <Option id="2" value="Full Time"/>
+    //    </channel>
+    //    <channel id="0x1203" class="setting" scope="!session" name="PresRelSet" details="Pressure Relief Setting" label="Pressure Relief" type="integer"/>
+
+
 
     NoChannel = 0;
     //    CPAP_IPAP=schema::channel["IPAP"].id();
diff --git a/sleepyhead/docs/channels.xml b/sleepyhead/docs/channels.xml
index 8fa89186..47ff3615 100644
--- a/sleepyhead/docs/channels.xml
+++ b/sleepyhead/docs/channels.xml
@@ -24,23 +24,6 @@ Important: One id code per item, DO NOT CHANGE ID NUMBERS!!!
   <channel id="0x1167" class="data" name="IntUnk1" details="Unknown 1" label="Unknown 1" unit="?" color="dark green"/>
   <channel id="0x1168" class="data" name="IntUnk2" details="Unknown 2" label="Unknown 2" unit="?" color="dark green"/>
 
-  <channel id="0x1201" class="setting" scope="!session" name="PresRelType" details="Pressure Relief" label="Pres. Relief" type="integer">
-    <Option id="0" value=""/>
-    <Option id="1" value="None"/>
-    <Option id="2" value="C-Flex"/>
-    <Option id="3" value="C-Flex+"/>
-    <Option id="4" value="A-Flex"/>
-    <Option id="5" value="Bi-Flex"/>
-    <Option id="6" value="EPR"/>
-    <Option id="7" value="SmartFlex"/>
-    <Option id="8" value="Easy-Breathe"/>
-  </channel>
-  <channel id="0x1202" class="setting" scope="!session" name="PresRelMode" details="Pressure Relief Mode" label="Pres. Rel. Mode" type="integer">
-    <Option id="0" value=""/>
-    <Option id="1" value="Ramp"/>
-    <Option id="2" value="Full Time"/>
-  </channel>
-  <channel id="0x1203" class="setting" scope="!session" name="PresRelSet" details="Pressure Relief Setting" label="Pressure Relief" type="integer"/>
 
  </group>
  <group name="OXI">