X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fao_flight_test.c;h=5c61951853d63c84ddc6905be651b002a1e9a2d0;hb=da42f406e88ccc821cd45d5a94d5afec65ec50e9;hp=61f48cb6e14d8236bd111368c24cf44856cfcd27;hpb=144db05f6b286a0450d486f69ce192632a2c0656;p=fw%2Faltos

diff --git a/src/ao_flight_test.c b/src/ao_flight_test.c
index 61f48cb6..5c619518 100644
--- 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 };
 
+#define DATA_TO_XDATA(x) (x)
+
 #include "ao_flight.c"
 
 void
@@ -178,7 +180,7 @@ void
 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;
@@ -217,7 +219,7 @@ ao_sleep(void *wchan)
 				type = words[0][0];
 				tick = strtoul(words[1], NULL, 16);
 				a = strtoul(words[2], NULL, 16);
-				b = strtoul(words[2], NULL, 16);
+				b = strtoul(words[3], NULL, 16);
 			} else if (nword >= 36 && strcmp(words[0], "CALL") == 0) {
 				tick = atoi(words[10]);
 				if (!ao_flight_started) {
@@ -236,6 +238,8 @@ ao_sleep(void *wchan)
 			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':