diff options
| author | Bdale Garbee <bdale@gag.com> | 2012-05-16 09:13:53 -0600 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2012-05-16 09:13:53 -0600 |
| commit | 6a973f788563ccc66b01cc7557a004dabef18d09 (patch) | |
| tree | ffbc8faad73cde7934c4050deb840092430a311f /ao-tools/lib | |
| parent | d387f246b24502642b76aad04eb3e0f1a5b78a05 (diff) | |
| parent | da2c920b9f3378d5a18551e008c1da5dace1e0ef (diff) | |
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
Diffstat (limited to 'ao-tools/lib')
| -rw-r--r-- | ao-tools/lib/cc-telemetry.c | 2 | ||||
| -rw-r--r-- | ao-tools/lib/cc-telemetry.h | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/ao-tools/lib/cc-telemetry.c b/ao-tools/lib/cc-telemetry.c index 2cdb9cac..99da2680 100644 --- a/ao-tools/lib/cc-telemetry.c +++ b/ao-tools/lib/cc-telemetry.c @@ -57,6 +57,6 @@ cc_telemetry_parse(const char *input_line, union ao_telemetry_all *telemetry) } if (hex[0] != 34) return FALSE; - memcpy(telemetry, hex+1, 32); + memcpy(telemetry, hex+1, 34); return TRUE; } diff --git a/ao-tools/lib/cc-telemetry.h b/ao-tools/lib/cc-telemetry.h index 5a66b971..71f6844d 100644 --- a/ao-tools/lib/cc-telemetry.h +++ b/ao-tools/lib/cc-telemetry.h @@ -29,7 +29,9 @@ struct ao_telemetry_generic { uint16_t tick; /* 2 */ uint8_t type; /* 4 */ uint8_t payload[27]; /* 5 */ - /* 32 */ + uint8_t rssi; /* 32 */ + uint8_t status; /* 33 */ + /* 34 */ }; #define AO_TELEMETRY_SENSOR_TELEMETRUM 0x01 |