summaryrefslogtreecommitdiffabout
authorMichael Krelin <hacker@klever.net>2008-07-19 14:46:21 (UTC)
committer Michael Krelin <hacker@klever.net>2008-07-19 14:46:21 (UTC)
commit3a827660c11527f6d93008336994fb9431bc34f3 (patch) (unidiff)
tree80997e145a14396252b2f78c434abaf879db9e55
parent04fb190243442e83349f129b523ab747e58100bf (diff)
downloadnapkin-3a827660c11527f6d93008336994fb9431bc34f3.zip
napkin-3a827660c11527f6d93008336994fb9431bc34f3.tar.gz
napkin-3a827660c11527f6d93008336994fb9431bc34f3.tar.bz2
amended sleeptracker structure
Thanks to Lee, the inventor of sleeptracker for disclosing missing piece of information. Signed-off-by: Michael Krelin <hacker@klever.net>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--lib/st-decode.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/st-decode.cc b/lib/st-decode.cc
index f8459ac..0fb41de 100644
--- a/lib/st-decode.cc
+++ b/lib/st-decode.cc
@@ -1,51 +1,51 @@
1#include <stdexcept> 1#include <stdexcept>
2#include <numeric> 2#include <numeric>
3#include <napkin/exception.h> 3#include <napkin/exception.h>
4#include <napkin/st/decode.h> 4#include <napkin/st/decode.h>
5 5
6namespace napkin { 6namespace napkin {
7 namespace sleeptracker { 7 namespace sleeptracker {
8 using std::invalid_argument; 8 using std::invalid_argument;
9 using std::runtime_error; 9 using std::runtime_error;
10 10
11 struct st_time_t { 11 struct st_time_t {
12 uint8_t hour; 12 uint8_t hour;
13 uint8_t min; 13 uint8_t min;
14 }; 14 };
15 struct st_date_t { 15 struct st_date_t {
16 uint8_t month; 16 uint8_t month;
17 uint8_t day; 17 uint8_t day;
18 uint8_t dow;
18 }; 19 };
19 struct st_fulltime_t { 20 struct st_fulltime_t {
20 uint8_t hour; 21 uint8_t hour;
21 uint8_t min; 22 uint8_t min;
22 uint8_t sec; 23 uint8_t sec;
23 }; 24 };
24 struct st_data_header_t { 25 struct st_data_header_t {
25 char magic; 26 char magic;
26 st_date_t today; 27 st_date_t today;
27 uint8_t unknown;
28 uint8_t window; 28 uint8_t window;
29 st_time_t to_bed; 29 st_time_t to_bed;
30 st_time_t alarm; 30 st_time_t alarm;
31 uint8_t nawakes; 31 uint8_t nawakes;
32 }; 32 };
33 struct st_data_footer_t { 33 struct st_data_footer_t {
34 uint16_t data_a; 34 uint16_t data_a;
35 uint8_t checksum; 35 uint8_t checksum;
36 uint8_t eof_mark; 36 uint8_t eof_mark;
37 }; 37 };
38 38
39 static void back_a_day(struct tm& t) { 39 static void back_a_day(struct tm& t) {
40 time_t ts = mktime(&t); 40 time_t ts = mktime(&t);
41 if(ts==(time_t)-1) 41 if(ts==(time_t)-1)
42 throw exception_st_data("failed to make up time to step back a day"); 42 throw exception_st_data("failed to make up time to step back a day");
43 ts -= 60*60*24; 43 ts -= 60*60*24;
44 if(!localtime_r(&ts,&t)) 44 if(!localtime_r(&ts,&t))
45 throw exception_st_data("failed to localtime_r() while stepping back a day"); 45 throw exception_st_data("failed to localtime_r() while stepping back a day");
46 } 46 }
47 47
48 hypnodata_t& decode(hypnodata_t& rv,const void *data,size_t data_length) { 48 hypnodata_t& decode(hypnodata_t& rv,const void *data,size_t data_length) {
49 if(data_length < (sizeof(st_data_header_t)+sizeof(st_data_footer_t))) 49 if(data_length < (sizeof(st_data_header_t)+sizeof(st_data_footer_t)))
50 throw exception_st_data_envelope("not enough sleeptracker data to decode"); 50 throw exception_st_data_envelope("not enough sleeptracker data to decode");
51 st_data_header_t *h = (st_data_header_t*)data; 51 st_data_header_t *h = (st_data_header_t*)data;