X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao_flight_test.c;h=aefe3da748ad2e0da07f6877d52b439eec2b4471;hp=2cd7c81e67ed948cb726a3b7fcf3a71fb24d1e97;hb=75ca1751b7cac2f8074d0713ee96d6ab45b54f19;hpb=f94ab879ff6f97708827c74facd11003a2d8b590

diff --git a/ao_flight_test.c b/ao_flight_test.c
index 2cd7c81e..aefe3da7 100644
--- a/ao_flight_test.c
+++ b/ao_flight_test.c
@@ -63,6 +63,9 @@ uint8_t ao_adc_head;
 #define ao_timer_set_adc_interval(i)
 #define ao_wakeup(wchan) ao_dump_state()
 #define ao_cmd_register(c)
+#define ao_usb_disable()
+#define ao_telemetry_set_interval(x)
+#define ao_rdf_set(rdf)
 
 enum ao_igniter {
 	ao_igniter_drogue = 0,
@@ -124,6 +127,26 @@ ao_pres_to_altitude(int16_t pres) __reentrant
 	return altitude_table[pres];
 }
 
+int16_t
+ao_altitude_to_pres(int16_t alt) __reentrant
+{
+	int16_t pres;
+
+	for (pres = 0; pres < 2047; pres++)
+		if (altitude_table[pres] <= alt)
+			break;
+	return pres << 4;
+}
+
+struct ao_config {
+	uint16_t	main_deploy;
+	int16_t		accel_zero_g;
+};
+
+#define ao_config_get()
+
+struct ao_config ao_config = { 250, 16000 };
+
 #include "ao_flight.c"
 
 void
@@ -201,11 +224,12 @@ ao_dump_state(void)
 {
 	if (ao_flight_state == ao_flight_startup)
 		return;
-	printf ("\t%s accel %g vel %g alt %d\n",
+	printf ("\t\t\t\t\t%s accel %g vel %g alt %d main %d\n",
 		ao_state_names[ao_flight_state],
 		(ao_flight_accel - ao_ground_accel) / COUNTS_PER_G * GRAVITY,
 		(double) ao_flight_vel / 100 / COUNTS_PER_G * GRAVITY,
-		altitude_table[ao_flight_pres >> 4]);
+		ao_pres_to_altitude(ao_flight_pres),
+		ao_pres_to_altitude(ao_main_pres));
 	if (ao_flight_state == ao_flight_landed)
 		exit(0);
 }