projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Stop using SiRF state info.
[fw/altos]
/
ao-tools
/
lib
/
cc-logfile.c
diff --git
a/ao-tools/lib/cc-logfile.c
b/ao-tools/lib/cc-logfile.c
index 2136eec4d428cde3d077cb9a0c407259111af63d..9d086c8231cdb78ba8a80fb14b6b587699b8d4be 100644
(file)
--- a/
ao-tools/lib/cc-logfile.c
+++ b/
ao-tools/lib/cc-logfile.c
@@
-101,11
+101,12
@@
gpssat_add(struct cc_gpsdata *data, struct cc_gpssat *sat)
if (data->sizesats == 0)
newsats = malloc((newsizesats = 256) * sizeof (struct cc_gpssats));
else
if (data->sizesats == 0)
newsats = malloc((newsizesats = 256) * sizeof (struct cc_gpssats));
else
- newsats = realloc (data->
data
, (newsizesats = data->sizesats * 2)
+ newsats = realloc (data->
sats
, (newsizesats = data->sizesats * 2)
* sizeof (struct cc_gpssats));
if (!newsats)
return 0;
data->sats = newsats;
* sizeof (struct cc_gpssats));
if (!newsats)
return 0;
data->sats = newsats;
+ data->sizesats = newsizesats;
}
i = data->numsats++;
data->sats[i].nsat = 0;
}
i = data->numsats++;
data->sats[i].nsat = 0;
@@
-211,7
+212,6
@@
read_eeprom(const char *line, struct cc_flightraw *f, double *ground_pres, int *
case AO_LOG_GPS_SAT:
sat.time = tick;
sat.svid = a;
case AO_LOG_GPS_SAT:
sat.time = tick;
sat.svid = a;
- sat.state = (b & 0xff);
sat.c_n = (b >> 8) & 0xff;
gpssat_add(&f->gps, &sat);
break;
sat.c_n = (b >> 8) & 0xff;
gpssat_add(&f->gps, &sat);
break;