From d8e24607dae027344eab55db4d7f468ce51bbb93 Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Sat, 26 Nov 2011 14:00:31 +1000 Subject: [PATCH] Added PRS1 16bit CRC check algorithm (Thanks Bira) --- Graphs/gGraphView.cpp | 6 ++ Graphs/gGraphView.h | 6 ++ Graphs/gLineChart.cpp | 4 +- Graphs/gSegmentChart.h | 6 ++ SleepLib/day.h | 4 +- SleepLib/loader_plugins/intellipap_loader.h | 7 ++ SleepLib/loader_plugins/prs1_loader.cpp | 83 ++++++++++++++++++++- SleepLib/machine.h | 4 +- SleepLib/schema.cpp | 6 ++ SleepLib/schema.h | 6 ++ SleepLib/session.h | 4 +- common_gui.cpp | 6 ++ common_gui.h | 6 ++ exportcsv.cpp | 6 ++ exportcsv.h | 6 ++ newprofile.cpp | 6 ++ newprofile.h | 6 ++ profileselect.cpp | 6 ++ profileselect.h | 6 ++ report.cpp | 6 ++ report.h | 6 ++ 21 files changed, 186 insertions(+), 10 deletions(-) diff --git a/Graphs/gGraphView.cpp b/Graphs/gGraphView.cpp index 0c8b24c8..8c9b9ed9 100644 --- a/Graphs/gGraphView.cpp +++ b/Graphs/gGraphView.cpp @@ -1,3 +1,9 @@ +/* + gGraphView Implementation + Copyright (c)2011 Mark Watkins + License: GPL +*/ + #include #include #include "gGraphView.h" diff --git a/Graphs/gGraphView.h b/Graphs/gGraphView.h index 6bb9a635..4e65b948 100644 --- a/Graphs/gGraphView.h +++ b/Graphs/gGraphView.h @@ -1,3 +1,9 @@ +/* + gGraphView Header + Copyright (c)2011 Mark Watkins + License: GPL +*/ + #ifndef GGRAPHVIEW_H #define GGRAPHVIEW_H diff --git a/Graphs/gLineChart.cpp b/Graphs/gLineChart.cpp index 947137a4..366a0b7a 100644 --- a/Graphs/gLineChart.cpp +++ b/Graphs/gLineChart.cpp @@ -1,8 +1,8 @@ -/******************************************************************** +/* gLineChart Implementation Copyright (c)2011 Mark Watkins License: GPL -*********************************************************************/ +*/ #include #include diff --git a/Graphs/gSegmentChart.h b/Graphs/gSegmentChart.h index f8d16e45..31e6a1c4 100644 --- a/Graphs/gSegmentChart.h +++ b/Graphs/gSegmentChart.h @@ -1,3 +1,9 @@ +/* + gSegmentChart Header + Copyright (c)2011 Mark Watkins + License: GPL +*/ + #ifndef GSEGMENTCHART_H #define GSEGMENTCHART_H diff --git a/SleepLib/day.h b/SleepLib/day.h index e2349e8b..3093aa10 100644 --- a/SleepLib/day.h +++ b/SleepLib/day.h @@ -1,8 +1,8 @@ -/******************************************************************** +/* SleepLib Day Class Header Copyright (c)2011 Mark Watkins License: GPL -*********************************************************************/ +*/ #ifndef DAY_H #define DAY_H diff --git a/SleepLib/loader_plugins/intellipap_loader.h b/SleepLib/loader_plugins/intellipap_loader.h index 5f6f3dd2..bab5fe89 100644 --- a/SleepLib/loader_plugins/intellipap_loader.h +++ b/SleepLib/loader_plugins/intellipap_loader.h @@ -1,3 +1,10 @@ +/* + Intellipap Loader Header + Copyright (c)2011 Mark Watkins + License: GPL +*/ + + #ifndef INTELLIPAP_LOADER_H #define INTELLIPAP_LOADER_H diff --git a/SleepLib/loader_plugins/prs1_loader.cpp b/SleepLib/loader_plugins/prs1_loader.cpp index 49801ec6..52326791 100644 --- a/SleepLib/loader_plugins/prs1_loader.cpp +++ b/SleepLib/loader_plugins/prs1_loader.cpp @@ -38,6 +38,61 @@ extern QProgressBar *qprogress; QHash ModelMap; +const quint16 CRC16_INIT_VALUE=0xffff; +const quint16 CRC16_XOR_VALUE=0x0000; + +typedef quint16 crc_t; +//quint16 crctable[256]; + +static const crc_t crc_table[256] = { + 0x0000, 0x1189, 0x2312, 0x329b, 0x4624, 0x57ad, 0x6536, 0x74bf, + 0x8c48, 0x9dc1, 0xaf5a, 0xbed3, 0xca6c, 0xdbe5, 0xe97e, 0xf8f7, + 0x1081, 0x0108, 0x3393, 0x221a, 0x56a5, 0x472c, 0x75b7, 0x643e, + 0x9cc9, 0x8d40, 0xbfdb, 0xae52, 0xdaed, 0xcb64, 0xf9ff, 0xe876, + 0x2102, 0x308b, 0x0210, 0x1399, 0x6726, 0x76af, 0x4434, 0x55bd, + 0xad4a, 0xbcc3, 0x8e58, 0x9fd1, 0xeb6e, 0xfae7, 0xc87c, 0xd9f5, + 0x3183, 0x200a, 0x1291, 0x0318, 0x77a7, 0x662e, 0x54b5, 0x453c, + 0xbdcb, 0xac42, 0x9ed9, 0x8f50, 0xfbef, 0xea66, 0xd8fd, 0xc974, + 0x4204, 0x538d, 0x6116, 0x709f, 0x0420, 0x15a9, 0x2732, 0x36bb, + 0xce4c, 0xdfc5, 0xed5e, 0xfcd7, 0x8868, 0x99e1, 0xab7a, 0xbaf3, + 0x5285, 0x430c, 0x7197, 0x601e, 0x14a1, 0x0528, 0x37b3, 0x263a, + 0xdecd, 0xcf44, 0xfddf, 0xec56, 0x98e9, 0x8960, 0xbbfb, 0xaa72, + 0x6306, 0x728f, 0x4014, 0x519d, 0x2522, 0x34ab, 0x0630, 0x17b9, + 0xef4e, 0xfec7, 0xcc5c, 0xddd5, 0xa96a, 0xb8e3, 0x8a78, 0x9bf1, + 0x7387, 0x620e, 0x5095, 0x411c, 0x35a3, 0x242a, 0x16b1, 0x0738, + 0xffcf, 0xee46, 0xdcdd, 0xcd54, 0xb9eb, 0xa862, 0x9af9, 0x8b70, + 0x8408, 0x9581, 0xa71a, 0xb693, 0xc22c, 0xd3a5, 0xe13e, 0xf0b7, + 0x0840, 0x19c9, 0x2b52, 0x3adb, 0x4e64, 0x5fed, 0x6d76, 0x7cff, + 0x9489, 0x8500, 0xb79b, 0xa612, 0xd2ad, 0xc324, 0xf1bf, 0xe036, + 0x18c1, 0x0948, 0x3bd3, 0x2a5a, 0x5ee5, 0x4f6c, 0x7df7, 0x6c7e, + 0xa50a, 0xb483, 0x8618, 0x9791, 0xe32e, 0xf2a7, 0xc03c, 0xd1b5, + 0x2942, 0x38cb, 0x0a50, 0x1bd9, 0x6f66, 0x7eef, 0x4c74, 0x5dfd, + 0xb58b, 0xa402, 0x9699, 0x8710, 0xf3af, 0xe226, 0xd0bd, 0xc134, + 0x39c3, 0x284a, 0x1ad1, 0x0b58, 0x7fe7, 0x6e6e, 0x5cf5, 0x4d7c, + 0xc60c, 0xd785, 0xe51e, 0xf497, 0x8028, 0x91a1, 0xa33a, 0xb2b3, + 0x4a44, 0x5bcd, 0x6956, 0x78df, 0x0c60, 0x1de9, 0x2f72, 0x3efb, + 0xd68d, 0xc704, 0xf59f, 0xe416, 0x90a9, 0x8120, 0xb3bb, 0xa232, + 0x5ac5, 0x4b4c, 0x79d7, 0x685e, 0x1ce1, 0x0d68, 0x3ff3, 0x2e7a, + 0xe70e, 0xf687, 0xc41c, 0xd595, 0xa12a, 0xb0a3, 0x8238, 0x93b1, + 0x6b46, 0x7acf, 0x4854, 0x59dd, 0x2d62, 0x3ceb, 0x0e70, 0x1ff9, + 0xf78f, 0xe606, 0xd49d, 0xc514, 0xb1ab, 0xa022, 0x92b9, 0x8330, + 0x7bc7, 0x6a4e, 0x58d5, 0x495c, 0x3de3, 0x2c6a, 0x1ef1, 0x0f78 +}; + +crc_t CRC16(const unsigned char *data, size_t data_len) +{ + crc_t crc=0; + unsigned int tbl_idx; + + while (data_len--) { + tbl_idx = (crc ^ *data) & 0xff; + crc = (crc_table[tbl_idx] ^ (crc >> 8)) & 0xffff; + + data++; + } + return crc & 0xffff; +} + PRS1::PRS1(Profile *p,MachineID id):CPAP(p,id) { m_class=prs1_class_name; @@ -53,6 +108,7 @@ PRS1::~PRS1() PRS1Loader::PRS1Loader() { + //genCRCTable(); m_buffer=NULL; } @@ -370,7 +426,7 @@ int PRS1Loader::OpenMachine(Machine *m,QString path,Profile *profile) //{ //} -bool PRS1Loader::OpenSummary(Session *session,QString filename) +bool PRS1Loader::OpenSummary(Session *session,QString filename) // Read .001 file { int size,seconds,br,htype,version,sequence; qint64 timestamp; @@ -430,6 +486,17 @@ bool PRS1Loader::OpenSummary(Session *session,QString filename) if (br License: GPL - *********************************************************************/ + */ #ifndef MACHINE_H #define MACHINE_H diff --git a/SleepLib/schema.cpp b/SleepLib/schema.cpp index 700c212a..4ff33c2c 100644 --- a/SleepLib/schema.cpp +++ b/SleepLib/schema.cpp @@ -1,3 +1,9 @@ +/* + Schema Implementation (Parse Channel XML data) + Copyright (c)2011 Mark Watkins + License: GPL +*/ + #include #include #include diff --git a/SleepLib/schema.h b/SleepLib/schema.h index 967fd3fd..acdd33b5 100644 --- a/SleepLib/schema.h +++ b/SleepLib/schema.h @@ -1,3 +1,9 @@ +/* + Schema Header (Parse Channel XML data) + Copyright (c)2011 Mark Watkins + License: GPL +*/ + #ifndef SCHEMA_H #define SCHEMA_H diff --git a/SleepLib/session.h b/SleepLib/session.h index 2492ee9d..40e6de7d 100644 --- a/SleepLib/session.h +++ b/SleepLib/session.h @@ -1,9 +1,9 @@ -/******************************************************************** +/* SleepLib Session Header This stuff contains the base calculation smarts Copyright (c)2011 Mark Watkins License: GPL -*********************************************************************/ +*/ #ifndef SESSION_H #define SESSION_H diff --git a/common_gui.cpp b/common_gui.cpp index 9fbe0378..5cc67c76 100644 --- a/common_gui.cpp +++ b/common_gui.cpp @@ -1,3 +1,9 @@ +/* + Common GUI Functions Implementation + Copyright (c)2011 Mark Watkins + License: GPL +*/ + #include "common_gui.h" #include "qglobal.h" diff --git a/common_gui.h b/common_gui.h index a95c0cba..9c1aa60a 100644 --- a/common_gui.h +++ b/common_gui.h @@ -1,3 +1,9 @@ +/* + Common GUI Functions Header + Copyright (c)2011 Mark Watkins + License: GPL +*/ + #ifndef COMMON_GUI_H #define COMMON_GUI_H diff --git a/exportcsv.cpp b/exportcsv.cpp index b19b27bf..a89a1af8 100644 --- a/exportcsv.cpp +++ b/exportcsv.cpp @@ -1,3 +1,9 @@ +/* + ExportCSV module implementation + Copyright (c)2011 Mark Watkins + License: GPL +*/ + #include #include #include diff --git a/exportcsv.h b/exportcsv.h index 7a2beede..c60edf85 100644 --- a/exportcsv.h +++ b/exportcsv.h @@ -1,3 +1,9 @@ +/* + ExportCSV module header + Copyright (c)2011 Mark Watkins + License: GPL +*/ + #ifndef EXPORTCSV_H #define EXPORTCSV_H diff --git a/newprofile.cpp b/newprofile.cpp index 29e0a373..6f07bc69 100644 --- a/newprofile.cpp +++ b/newprofile.cpp @@ -1,3 +1,9 @@ +/* + Create New Profile Implementation + Copyright (c)2011 Mark Watkins + License: GPL +*/ + #include #include #include "SleepLib/profiles.h" diff --git a/newprofile.h b/newprofile.h index 9862bdd8..87223cbb 100644 --- a/newprofile.h +++ b/newprofile.h @@ -1,3 +1,9 @@ +/* + Create New Profile Header + Copyright (c)2011 Mark Watkins + License: GPL +*/ + #ifndef NEWPROFILE_H #define NEWPROFILE_H diff --git a/profileselect.cpp b/profileselect.cpp index af6e6e1b..4d76762b 100644 --- a/profileselect.cpp +++ b/profileselect.cpp @@ -1,3 +1,9 @@ +/* + Profile Select Implementation(Login Screen) + Copyright (c)2011 Mark Watkins + License: GPL +*/ + #include "profileselect.h" #include #include diff --git a/profileselect.h b/profileselect.h index c95f3845..2ca86abf 100644 --- a/profileselect.h +++ b/profileselect.h @@ -1,3 +1,9 @@ +/* + Profile Select Header (Login Screen) + Copyright (c)2011 Mark Watkins + License: GPL +*/ + #ifndef PROFILESELECT_H #define PROFILESELECT_H diff --git a/report.cpp b/report.cpp index 162734c9..cb1e7b69 100644 --- a/report.cpp +++ b/report.cpp @@ -1,3 +1,9 @@ +/* + Report Module Implementation + Copyright (c)2011 Mark Watkins + License: GPL +*/ + #include "report.h" #include "ui_report.h" #include diff --git a/report.h b/report.h index 596c6730..894eec31 100644 --- a/report.h +++ b/report.h @@ -1,3 +1,9 @@ +/* + Report Module Header + Copyright (c)2011 Mark Watkins + License: GPL +*/ + #ifndef REPORT_H #define REPORT_H