[Pkg-running-devel] [openambit] 112/131: Parse cadence parameters in header correctly

[Christian Perrier]

This is an automated email from the git hooks/post-receive script.

bubulle pushed a commit to branch master
in repository openambit.

commit 02d1cc776ba0f6bb80990812c3713780ca534f82
Author: Emil Ljungdahl <emil at kratern.se>
Date:   Tue May 27 21:54:57 2014 +0200

    Parse cadence parameters in header correctly
---
 src/libambit/libambit.h |  7 +++++--
 src/libambit/pmem20.c   | 12 ++++++++----
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/libambit/libambit.h b/src/libambit/libambit.h
index f667f98..d5dc139 100644
--- a/src/libambit/libambit.h
+++ b/src/libambit/libambit.h
@@ -325,8 +325,11 @@ typedef struct ambit_log_header_s {
 
     uint8_t  unknown1[5];
     uint8_t  unknown2;
-    uint8_t  unknown3[6];
-    uint8_t  unknown4[8];
+    uint8_t  cadence_max;           /* rpm */
+    uint8_t  cadence_avg;           /* rpm */
+    uint8_t  unknown3[4];
+    uint32_t cadence_max_time;      /* ms */
+    uint8_t  unknown4[4];
     uint8_t  unknown5[4];
     uint8_t  unknown6[24];
 } ambit_log_header_t;
diff --git a/src/libambit/pmem20.c b/src/libambit/pmem20.c
index 7e83a17..929b071 100644
--- a/src/libambit/pmem20.c
+++ b/src/libambit/pmem20.c
@@ -391,8 +391,11 @@ int libambit_pmem20_log_parse_header(uint8_t *data, size_t datalen, ambit_log_he
     log_header->samples_count = read32inc(data, &offset);
     log_header->energy_consumption = read16inc(data, &offset);
 
-    memcpy(log_header->unknown3, data+offset, 6);
-    offset += 6;
+    log_header->cadence_max = read8inc(data, &offset);
+    log_header->cadence_avg = read8inc(data, &offset);
+
+    memcpy(log_header->unknown3, data+offset, 4);
+    offset += 4;
 
     log_header->speed_max_time = read32inc(data, &offset);
     log_header->altitude_max_time = read32inc(data, &offset);
@@ -401,9 +404,10 @@ int libambit_pmem20_log_parse_header(uint8_t *data, size_t datalen, ambit_log_he
     log_header->heartrate_min_time = read32inc(data, &offset);
     log_header->temperature_max_time = read32inc(data, &offset);
     log_header->temperature_min_time = read32inc(data, &offset);
+    log_header->cadence_max_time = read32inc(data, &offset);
 
-    memcpy(log_header->unknown4, data+offset, 8);
-    offset += 8;
+    memcpy(log_header->unknown4, data+offset, 4);
+    offset += 4;
 
     log_header->first_fix_time = read16inc(data, &offset)*1000;
     log_header->battery_start = read8inc(data, &offset);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-running/openambit.git