X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fao_flight_test.c;h=a635803f41b226b2bc988a65b229aaab60520883;hp=2bf7f2b233a4a3b789d5031d60b7adf1482de225;hb=1e56ed44e562f808addfd76bfb352f981db94094;hpb=b529e5e8998702986909111a457f3ce9932e1ccf

diff --git a/src/ao_flight_test.c b/src/ao_flight_test.c
index 2bf7f2b2..a635803f 100644
--- a/src/ao_flight_test.c
+++ b/src/ao_flight_test.c
@@ -72,6 +72,7 @@ uint8_t ao_adc_head;
 #define ao_telemetry_set_interval(x)
 #define ao_rdf_set(rdf)
 #define ao_packet_slave_start()
+#define ao_packet_slave_stop()
 
 enum ao_igniter {
 	ao_igniter_drogue = 0,
@@ -114,35 +115,11 @@ const char const * const ao_state_names[] = {
 };
 
 struct ao_cmds {
-	char		cmd;
 	void		(*func)(void);
 	const char	*help;
 };
 
-
-static int16_t altitude_table[2048] = {
-#include "altitude.h"
-};
-
-int16_t
-ao_pres_to_altitude(int16_t pres) __reentrant
-{
-	pres = pres >> 4;
-	if (pres < 0) pres = 0;
-	if (pres > 2047) pres = 2047;
-	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;
-}
+#include "ao_convert.c"
 
 struct ao_config {
 	uint16_t	main_deploy;
@@ -152,7 +129,18 @@ struct ao_config {
 
 #define ao_config_get()
 
-struct ao_config ao_config = { 250, 15937, 16467 };
+struct ao_config ao_config;
+
+#define DATA_TO_XDATA(x) (x)
+
+#define HAS_FLIGHT 1
+#define HAS_ADC 1
+#define HAS_USB 1
+#define HAS_GPS 1
+#ifndef HAS_ACCEL
+#define HAS_ACCEL 1
+#define HAS_ACCEL_REF 0
+#endif
 
 #include "ao_flight.c"
 
@@ -178,7 +166,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;
@@ -218,6 +206,11 @@ ao_sleep(void *wchan)
 				tick = strtoul(words[1], NULL, 16);
 				a = strtoul(words[2], NULL, 16);
 				b = strtoul(words[3], NULL, 16);
+			} else if (nword >= 6 && strcmp(words[0], "Accel")) {
+				ao_config.accel_plus_g = atoi(words[3]);
+				ao_config.accel_minus_g = atoi(words[5]);
+			} else if (nword >= 4 && strcmp(words[0], "Main")) {
+				ao_config.main_deploy = atoi(words[2]);
 			} else if (nword >= 36 && strcmp(words[0], "CALL") == 0) {
 				tick = atoi(words[10]);
 				if (!ao_flight_started) {
@@ -236,6 +229,12 @@ ao_sleep(void *wchan)
 			switch (type) {
 			case 'F':
 				ao_flight_ground_accel = a;
+				if (ao_config.accel_plus_g == 0) {
+					ao_config.accel_plus_g = a;
+					ao_config.accel_minus_g = a + 530;
+				}
+				if (ao_config.main_deploy == 0)
+					ao_config.main_deploy = 250;
 				ao_flight_started = 1;
 				break;
 			case 'S':
@@ -270,12 +269,19 @@ ao_dump_state(void)
 {
 	if (ao_flight_state == ao_flight_startup)
 		return;
+#if HAS_ACCEL
 	printf ("\t\t\t\t\t%s accel %g vel %g alt %d main %d\n",
 		ao_state_names[ao_flight_state],
 		(ao_ground_accel - ao_flight_accel) / COUNTS_PER_G * GRAVITY,
 		(double) ao_flight_vel / 100 / COUNTS_PER_G * GRAVITY,
 		ao_pres_to_altitude(ao_flight_pres) - ao_pres_to_altitude(ao_ground_pres),
 		ao_pres_to_altitude(ao_main_pres) - ao_pres_to_altitude(ao_ground_pres));
+#else
+	printf ("\t\t\t\t\t%s alt %d main %d\n",
+		ao_state_names[ao_flight_state],
+		ao_pres_to_altitude(ao_flight_pres) - ao_pres_to_altitude(ao_ground_pres),
+		ao_pres_to_altitude(ao_main_pres) - ao_pres_to_altitude(ao_ground_pres));
+#endif
 	if (ao_flight_state == ao_flight_landed)
 		exit(0);
 }