projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosui: Show over-ground-distance in Descent tab
[fw/altos]
/
ao-tools
/
lib
/
cc.h
diff --git
a/ao-tools/lib/cc.h
b/ao-tools/lib/cc.h
index b5f1132fcc1e4d6ac28f2b4b1e696780e93b981c..6257ee44ec458d7ddd0261c957d9064c6f6059fa 100644
(file)
--- a/
ao-tools/lib/cc.h
+++ b/
ao-tools/lib/cc.h
@@
-20,6
+20,7
@@
#include <stdio.h>
#include <stdint.h>
#include <stdio.h>
#include <stdint.h>
+#include "cc-telemetry.h"
char *
cc_fullname (char *dir, char *file);
char *
cc_fullname (char *dir, char *file);
@@
-61,7
+62,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
+87,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
+108,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
+154,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
+197,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
+234,6
@@
struct cc_gps {
struct cc_gps_sat {
int svid;
struct cc_gps_sat {
int svid;
- int state;
int c_n0;
};
int c_n0;
};
@@
-238,6
+245,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
+260,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;
};