projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'buttonbox' of git://git.gag.com/fw/altos into buttonbox
[fw/altos]
/
ao-tools
/
lib
/
cc.h
diff --git
a/ao-tools/lib/cc.h
b/ao-tools/lib/cc.h
index b8e3c061140f764699174cda0ba92fd55323d9c7..ede46aa0edd6b76a1948b1fcb8770fe3291cd635 100644
(file)
--- a/
ao-tools/lib/cc.h
+++ b/
ao-tools/lib/cc.h
@@
-61,7
+61,7
@@
char *
cc_get_log_dir(void);
char *
cc_get_log_dir(void);
char *
-cc_make_filename(int serial, char *ext);
+cc_make_filename(int serial,
int flight,
char *ext);
/*
* For sequential data which are not evenly spaced
/*
* For sequential data which are not evenly spaced
@@
-86,6
+86,10
@@
struct cc_timedata {
struct cc_gpselt {
double time;
struct cc_gpselt {
double time;
+ int hour;
+ int minute;
+ int second;
+ int flags;
double lat;
double lon;
double alt;
double lat;
double lon;
double alt;
@@
-103,7
+107,6
@@
struct cc_gpselt {
struct cc_gpssat {
double time;
uint16_t svid;
struct cc_gpssat {
double time;
uint16_t svid;
- uint8_t state;
uint8_t c_n;
};
uint8_t c_n;
};
@@
-150,6
+153,7
@@
struct cc_flightraw {
int serial;
double ground_accel;
double ground_pres;
int serial;
double ground_accel;
double ground_pres;
+ int year, month, day;
struct cc_timedata accel;
struct cc_timedata pres;
struct cc_timedata temp;
struct cc_timedata accel;
struct cc_timedata pres;
struct cc_timedata temp;
@@
-192,6
+196,9
@@
struct cc_flightcooked {
struct cc_gps_time {
struct cc_gps_time {
+ int year;
+ int month;
+ int day;
int hour;
int minute;
int second;
int hour;
int minute;
int second;
@@
-226,7
+233,6
@@
struct cc_gps {
struct cc_gps_sat {
int svid;
struct cc_gps_sat {
int svid;
- int state;
int c_n0;
};
int c_n0;
};