projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ao-tools: Update ao-eeprom for TeleMega v6
[fw/altos]
/
ao-tools
/
ao-eeprom
/
ao-eeprom.c
diff --git
a/ao-tools/ao-eeprom/ao-eeprom.c
b/ao-tools/ao-eeprom/ao-eeprom.c
index ec5f9c4da932c91785ad7d20d995993bb45efc3e..8650f38d7f35e0a947447c065d2abc6f93ca32b3 100644
(file)
--- a/
ao-tools/ao-eeprom/ao-eeprom.c
+++ b/
ao-tools/ao-eeprom/ao-eeprom.c
@@
-354,6
+354,8
@@
main (int argc, char **argv)
len = 2;
break;
case AO_LOG_FORMAT_TELEMEGA_4:
len = 2;
break;
case AO_LOG_FORMAT_TELEMEGA_4:
+ case AO_LOG_FORMAT_TELEMEGA_5:
+ case AO_LOG_FORMAT_TELEMEGA_6:
len = 32;
max_adc= 4095;
adc_ref = 3.3;
len = 32;
max_adc= 4095;
adc_ref = 3.3;
@@
-375,6
+377,11
@@
main (int argc, char **argv)
}
if (arg_len)
len = arg_len;
}
if (arg_len)
len = arg_len;
+ if (len == 0) {
+ fprintf(stderr, "Unknown eeprom format %d and no specified length\n",
+ eeprom->log_format);
+ exit(1);
+ }
if (verbose)
printf("config major %d minor %d log format %d total %u len %d\n",
eeprom->config.major,
if (verbose)
printf("config major %d minor %d log format %d total %u len %d\n",
eeprom->config.major,
@@
-421,6
+428,8
@@
main (int argc, char **argv)
case AO_LOG_FORMAT_TELEMEGA_3:
case AO_LOG_FORMAT_EASYMEGA_2:
case AO_LOG_FORMAT_TELEMEGA_4:
case AO_LOG_FORMAT_TELEMEGA_3:
case AO_LOG_FORMAT_EASYMEGA_2:
case AO_LOG_FORMAT_TELEMEGA_4:
+ case AO_LOG_FORMAT_TELEMEGA_5:
+ case AO_LOG_FORMAT_TELEMEGA_6:
log_mega = (struct ao_log_mega *) &eeprom->data[pos];
switch (log_mega->type) {
case AO_LOG_FLIGHT:
log_mega = (struct ao_log_mega *) &eeprom->data[pos];
switch (log_mega->type) {
case AO_LOG_FLIGHT: