diff --git a/SleepyHead.cbp b/SleepyHead.cbp
index ebabdfcb..389c23f0 100644
--- a/SleepyHead.cbp
+++ b/SleepyHead.cbp
@@ -42,7 +42,6 @@
-
@@ -53,7 +52,6 @@
-
diff --git a/SleepyHead.depend b/SleepyHead.depend
index 0ccdd156..8e621b20 100644
--- a/SleepyHead.depend
+++ b/SleepyHead.depend
@@ -7838,7 +7838,7 @@
"sleeplib/machine.h"
"graphs/graph.h"
-1306991807 /home/mark/projects/git/sleepyhead/libs/sleeplib/machine.h
+1307007107 /home/mark/projects/git/sleepyhead/libs/sleeplib/machine.h
@@ -7876,7 +7876,7 @@
-1306991808 /home/mark/projects/git/sleepyhead/version.h
+1307009363 /home/mark/projects/git/sleepyhead/version.h
1306724655 /home/mark/projects/git/sleepyhead/libs/sleeplib/prs1_loader.h
"machine.h"
@@ -7927,7 +7927,7 @@
-1306991808 source:/home/mark/projects/git/sleepyhead/libs/sleeplib/machine.cpp
+1307007829 source:/home/mark/projects/git/sleepyhead/libs/sleeplib/machine.cpp
@@ -7936,6 +7936,7 @@
"machine.h"
"profiles.h"
+
1306989502 source:/home/mark/projects/git/sleepyhead/libs/sleeplib/machine_loader.cpp
"machine_loader.h"
@@ -7960,7 +7961,7 @@
"machine_loader.h"
"tinyxml/tinyxml.h"
-1306991577 source:/home/mark/projects/git/sleepyhead/libs/sleeplib/prs1_loader.cpp
+1307009357 source:/home/mark/projects/git/sleepyhead/libs/sleeplib/prs1_loader.cpp
diff --git a/SleepyHead.layout b/SleepyHead.layout
index 822b137d..f00417b6 100644
--- a/SleepyHead.layout
+++ b/SleepyHead.layout
@@ -1,19 +1,19 @@
-
+
-
-
+
+
-
+
@@ -29,10 +29,10 @@
-
+
-
-
+
+
@@ -47,13 +47,13 @@
-
+
-
+
diff --git a/libs/sleeplib/machine.cpp b/libs/sleeplib/machine.cpp
index dc3cbbad..47d6d4c5 100644
--- a/libs/sleeplib/machine.cpp
+++ b/libs/sleeplib/machine.cpp
@@ -6,11 +6,23 @@
#include "machine.h"
#include "profiles.h"
#include
-
+#include
extern wxProgressDialog *loader_progress;
-map MachList;
+map MachLastCode;
+
+
+ChannelCode RegisterChannel(MachineType type)
+{
+ if (MachLastCode.find(type)==MachLastCode.end()) {
+ return MachLastCode[type]=0;
+ }
+ return ++(MachLastCode[type]);
+};
+
+const int CPLAP_FLONG=RegisterChannel(MT_CPAP);
+//map MachList;
/*map MachineTypeString= {
{MT_UNKNOWN, wxT("Unknown")},
diff --git a/libs/sleeplib/machine.h b/libs/sleeplib/machine.h
index e4f130ef..2a83b92e 100644
--- a/libs/sleeplib/machine.h
+++ b/libs/sleeplib/machine.h
@@ -36,6 +36,8 @@ enum MachineType//: short
// Could be implimented by MachineLoader's register function requesting a block of integer space,
// and a map to name strings.
+typedef int ChannelCode;
+
// Be cautious when extending these.. add to the end of each groups to preserve file formats.
enum MachineCode//:wxInt16
{
diff --git a/libs/sleeplib/prs1_loader.cpp b/libs/sleeplib/prs1_loader.cpp
index 1fc8ea53..54e20a42 100644
--- a/libs/sleeplib/prs1_loader.cpp
+++ b/libs/sleeplib/prs1_loader.cpp
@@ -488,7 +488,7 @@ bool PRS1Loader::Parse002(Session *session,unsigned char *buffer,int size,time_t
pos+=2;
t+=wxTimeSpan::Seconds(size);
}
- float data0,data1,data2;
+ // float data0,data1,data2;
MachineCode cpapcode=Codes[(int)code];
wxDateTime tt=t;
cnt++;
@@ -521,7 +521,7 @@ bool PRS1Loader::Parse002(Session *session,unsigned char *buffer,int size,time_t
data[0]=buffer[pos++];
data[1]=buffer[pos++];
if (code==0x11) {
- session->AddEvent(new Event(t,cpapcode, data,1));
+ session->AddEvent(new Event(t,cpapcode, data,2));
if (data[1]>0) {
session->AddEvent(new Event(tt,PRS1_VSnore2, &data[1],1));
}
@@ -545,7 +545,7 @@ bool PRS1Loader::Parse002(Session *session,unsigned char *buffer,int size,time_t
data[0]=buffer[pos+1]<<8 | buffer[pos];
pos+=2;
data[1]=buffer[pos++];
- tt-=wxTimeSpan::Seconds(data1);
+ tt-=wxTimeSpan::Seconds(data[1]);
session->AddEvent(new Event(tt,cpapcode, data, 2));
break;
case 0x12: // Summary
diff --git a/version.h b/version.h
index 79a61d8a..610c1829 100644
--- a/version.h
+++ b/version.h
@@ -16,14 +16,14 @@ namespace AutoVersion{
//Standard Version Type
static const long MAJOR = 0;
static const long MINOR = 7;
- static const long BUILD = 2807;
- static const long REVISION = 9954;
+ static const long BUILD = 2821;
+ static const long REVISION = 10042;
//Miscellaneous Version Types
- static const long BUILDS_COUNT = 8303;
- #define RC_FILEVERSION 0,7,2807,9954
- #define RC_FILEVERSION_STRING "0, 7, 2807, 9954\0"
- static const char FULLVERSION_STRING[] = "0.7.2807.9954";
+ static const long BUILDS_COUNT = 8328;
+ #define RC_FILEVERSION 0,7,2821,10042
+ #define RC_FILEVERSION_STRING "0, 7, 2821, 10042\0"
+ static const char FULLVERSION_STRING[] = "0.7.2821.10042";
//These values are to keep track of your versioning state, don't modify them.
static const long BUILD_HISTORY = 62;