projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Leave serial number writing to aoload
[fw/altos]
/
ao_telemetry.c
diff --git
a/ao_telemetry.c
b/ao_telemetry.c
index db2cfda0e3103e2717debe588c64f63ee2d2e731..5cf9ca6134c3bfcc4de4e4cb3f9a7180f1a36a18 100644
(file)
--- a/
ao_telemetry.c
+++ b/
ao_telemetry.c
@@
-17,9
+17,6
@@
#include "ao.h"
#include "ao.h"
-/* XXX make serial numbers real */
-__xdata uint8_t ao_serial_number = 2;
-
__xdata uint16_t ao_telemetry_interval = 0;
__xdata uint8_t ao_rdf = 0;
__xdata uint16_t ao_rdf_time;
__xdata uint16_t ao_telemetry_interval = 0;
__xdata uint8_t ao_rdf = 0;
__xdata uint16_t ao_rdf_time;
@@
-39,6
+36,11
@@
ao_telemetry(void)
while (ao_telemetry_interval == 0)
ao_sleep(&ao_telemetry_interval);
telemetry.flight_state = ao_flight_state;
while (ao_telemetry_interval == 0)
ao_sleep(&ao_telemetry_interval);
telemetry.flight_state = ao_flight_state;
+ telemetry.flight_accel = ao_flight_accel;
+ telemetry.ground_accel = ao_ground_accel;
+ telemetry.flight_vel = ao_flight_vel;
+ telemetry.flight_pres = ao_flight_pres;
+ telemetry.ground_pres = ao_ground_pres;
ao_adc_get(&telemetry.adc);
ao_mutex_get(&ao_gps_mutex);
memcpy(&telemetry.gps, &ao_gps_data, sizeof (struct ao_gps_data));
ao_adc_get(&telemetry.adc);
ao_mutex_get(&ao_gps_mutex);
memcpy(&telemetry.gps, &ao_gps_data, sizeof (struct ao_gps_data));