projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
[fw/altos]
/
src
/
ao_flight_test.c
diff --git
a/src/ao_flight_test.c
b/src/ao_flight_test.c
index 2bf7f2b233a4a3b789d5031d60b7adf1482de225..5c61951853d63c84ddc6905be651b002a1e9a2d0 100644
(file)
--- a/
src/ao_flight_test.c
+++ b/
src/ao_flight_test.c
@@
-154,6
+154,8
@@
struct ao_config {
struct ao_config ao_config = { 250, 15937, 16467 };
struct ao_config ao_config = { 250, 15937, 16467 };
+#define DATA_TO_XDATA(x) (x)
+
#include "ao_flight.c"
void
#include "ao_flight.c"
void
@@
-178,7
+180,7
@@
void
ao_sleep(void *wchan)
{
ao_dump_state();
ao_sleep(void *wchan)
{
ao_dump_state();
- if (wchan == &ao_adc_
ring
) {
+ if (wchan == &ao_adc_
head
) {
char type;
uint16_t tick;
uint16_t a, b;
char type;
uint16_t tick;
uint16_t a, b;
@@
-236,6
+238,8
@@
ao_sleep(void *wchan)
switch (type) {
case 'F':
ao_flight_ground_accel = a;
switch (type) {
case 'F':
ao_flight_ground_accel = a;
+ ao_config.accel_plus_g = a;
+ ao_config.accel_minus_g = a + 530;
ao_flight_started = 1;
break;
case 'S':
ao_flight_started = 1;
break;
case 'S':