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.h
diff --git
a/ao-tools/lib/cc.h
b/ao-tools/lib/cc.h
index b5f1132fcc1e4d6ac28f2b4b1e696780e93b981c..0e8ced8a63c6c93d3897d23647fa8cde17064b41 100644
(file)
--- a/
ao-tools/lib/cc.h
+++ b/
ao-tools/lib/cc.h
@@
-103,7
+103,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;
};
@@
-192,6
+191,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;
@@
-238,6
+240,7
@@
struct cc_gps_tracking {
struct cc_telem {
char callsign[16];
int serial;
struct cc_telem {
char callsign[16];
int serial;
+ int flight;
int rssi;
char state[16];
int tick;
int rssi;
char state[16];
int tick;
@@
-252,6
+255,8
@@
struct cc_telem {
int flight_vel;
int flight_pres;
int ground_pres;
int flight_vel;
int flight_pres;
int ground_pres;
+ int accel_plus_g;
+ int accel_minus_g;
struct cc_gps gps;
struct cc_gps_tracking gps_tracking;
};
struct cc_gps gps;
struct cc_gps_tracking gps_tracking;
};