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) (side-by-side diff)
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 @@
#include <stdexcept>
#include <numeric>
#include <napkin/exception.h>
#include <napkin/st/decode.h>
namespace napkin {
namespace sleeptracker {
using std::invalid_argument;
using std::runtime_error;
struct st_time_t {
uint8_t hour;
uint8_t min;
};
struct st_date_t {
uint8_t month;
uint8_t day;
+ uint8_t dow;
};
struct st_fulltime_t {
uint8_t hour;
uint8_t min;
uint8_t sec;
};
struct st_data_header_t {
char magic;
st_date_t today;
- uint8_t unknown;
uint8_t window;
st_time_t to_bed;
st_time_t alarm;
uint8_t nawakes;
};
struct st_data_footer_t {
uint16_t data_a;
uint8_t checksum;
uint8_t eof_mark;
};
static void back_a_day(struct tm& t) {
time_t ts = mktime(&t);
if(ts==(time_t)-1)
throw exception_st_data("failed to make up time to step back a day");
ts -= 60*60*24;
if(!localtime_r(&ts,&t))
throw exception_st_data("failed to localtime_r() while stepping back a day");
}
hypnodata_t& decode(hypnodata_t& rv,const void *data,size_t data_length) {
if(data_length < (sizeof(st_data_header_t)+sizeof(st_data_footer_t)))
throw exception_st_data_envelope("not enough sleeptracker data to decode");
st_data_header_t *h = (st_data_header_t*)data;