X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fao.h;h=42c3edda85ec41c1121470a673077b6dc7a2995c;hp=b88bef1f0adc5707de57ab47c2167236b08576c6;hb=c754759a2d503633d527da4ebb20eb859cd506fd;hpb=006de838bbb096b9443863a46b8a125b1e6b5600

diff --git a/src/ao.h b/src/ao.h
index b88bef1f..42c3edda 100644
--- a/src/ao.h
+++ b/src/ao.h
@@ -695,22 +695,10 @@ enum ao_flight_state {
 	ao_flight_invalid = 9
 };
 
-extern __data uint8_t			ao_flight_adc;
 extern __pdata enum ao_flight_state	ao_flight_state;
-extern __pdata uint16_t			ao_flight_tick;
-extern __xdata int16_t			ao_ground_pres;
-extern __pdata int16_t			ao_ground_accel;
+
 extern __pdata uint16_t			ao_launch_time;
 extern __xdata uint8_t			ao_flight_force_idle;
-extern __pdata int16_t			ao_ground_height;
-extern __pdata int16_t			ao_max_height;
-extern __pdata int16_t			ao_height;	/* meters */
-extern __pdata int16_t			ao_speed;	/* m/s * 16 */
-extern __pdata int16_t			ao_accel;	/* m/s² * 16 */
-
-#define AO_M_TO_HEIGHT(m)	((int16_t) (m))
-#define AO_MS_TO_SPEED(ms)	((int16_t) ((ms) * 16))
-#define AO_MSS_TO_ACCEL(mss)	((int16_t) ((mss) * 16))
 
 /* Flight thread */
 void
@@ -720,6 +708,121 @@ ao_flight(void);
 void
 ao_flight_init(void);
 
+/*
+ * ao_sample.c
+ */
+
+/*
+ * Barometer calibration
+ *
+ * We directly sample the barometer. The specs say:
+ *
+ * Pressure range: 15-115 kPa
+ * Voltage at 115kPa: 2.82
+ * Output scale: 27mV/kPa
+ *
+ * If we want to detect launch with the barometer, we need
+ * a large enough bump to not be fooled by noise. At typical
+ * launch elevations (0-2000m), a 200Pa pressure change cooresponds
+ * to about a 20m elevation change. This is 5.4mV, or about 3LSB.
+ * As all of our calculations are done in 16 bits, we'll actually see a change
+ * of 16 times this though
+ *
+ * 27 mV/kPa * 32767 / 3300 counts/mV = 268.1 counts/kPa
+ */
+
+/* Accelerometer calibration
+ *
+ * We're sampling the accelerometer through a resistor divider which
+ * consists of 5k and 10k resistors. This multiplies the values by 2/3.
+ * That goes into the cc1111 A/D converter, which is running at 11 bits
+ * of precision with the bits in the MSB of the 16 bit value. Only positive
+ * values are used, so values should range from 0-32752 for 0-3.3V. The
+ * specs say we should see 40mV/g (uncalibrated), multiply by 2/3 for what
+ * the A/D converter sees (26.67 mV/g). We should see 32752/3300 counts/mV,
+ * for a final computation of:
+ *
+ * 26.67 mV/g * 32767/3300 counts/mV = 264.8 counts/g
+ *
+ * Zero g was measured at 16000 (we would expect 16384).
+ * Note that this value is only require to tell if the
+ * rocket is standing upright. Once that is determined,
+ * the value of the accelerometer is averaged for 100 samples
+ * to find the resting accelerometer value, which is used
+ * for all further flight computations
+ */
+
+#define GRAVITY 9.80665
+
+/*
+ * Above this height, the baro sensor doesn't work
+ */
+#define AO_MAX_BARO_HEIGHT	12000
+
+/*
+ * Above this speed, baro measurements are unreliable
+ */
+#define AO_MAX_BARO_SPEED	200
+
+#define ACCEL_NOSE_UP	(ao_accel_2g >> 2)
+
+/*
+ * Speed and acceleration are scaled by 16 to provide a bit more
+ * resolution while still having reasonable range. Note that this
+ * limits speed to 2047m/s (around mach 6) and acceleration to
+ * 2047m/s² (over 200g)
+ */
+
+#define AO_M_TO_HEIGHT(m)	((int16_t) (m))
+#define AO_MS_TO_SPEED(ms)	((int16_t) ((ms) * 16))
+#define AO_MSS_TO_ACCEL(mss)	((int16_t) ((mss) * 16))
+
+extern __pdata uint16_t	ao_sample_tick;		/* time of last data */
+extern __pdata int16_t	ao_sample_pres;		/* most recent pressure sensor reading */
+extern __pdata int16_t	ao_sample_alt;		/* MSL of ao_sample_pres */
+extern __pdata int16_t	ao_sample_height;	/* AGL of ao_sample_pres */
+extern __data uint8_t	ao_sample_adc;		/* Ring position of last processed sample */
+
+#if HAS_ACCEL
+extern __pdata int16_t	ao_sample_accel;	/* most recent accel sensor reading */
+#endif
+
+extern __xdata int16_t	ao_ground_pres;		/* startup pressure */
+extern __xdata int16_t	ao_ground_height;	/* MSL of ao_ground_pres */
+
+#if HAS_ACCEL
+extern __xdata int16_t	ao_ground_accel;	/* startup acceleration */
+extern __xdata int16_t 	ao_accel_2g;		/* factory accel calibration */
+extern __xdata int32_t	ao_accel_scale;		/* sensor to m/s² conversion */
+#endif
+
+void ao_sample_init(void);
+
+/* returns FALSE in preflight mode, TRUE in flight mode */
+uint8_t ao_sample(void);
+
+/*
+ * ao_kalman.c
+ */
+
+#define to_fix16(x) ((int16_t) ((x) * 65536.0 + 0.5))
+#define to_fix32(x) ((int32_t) ((x) * 65536.0 + 0.5))
+#define from_fix(x)	((x) >> 16)
+
+extern __pdata int16_t			ao_height;	/* meters */
+extern __pdata int16_t			ao_speed;	/* m/s * 16 */
+extern __pdata int16_t			ao_accel;	/* m/s² * 16 */
+extern __pdata int16_t			ao_max_height;	/* max of ao_height */
+
+extern __pdata int16_t			ao_error_h;
+extern __pdata int16_t			ao_error_h_sq_avg;
+
+#if HAS_ACCEL
+extern __pdata int16_t			ao_error_a;
+#endif
+
+void ao_kalman(void);
+
 /*
  * ao_report.c
  */
@@ -1054,7 +1157,7 @@ extern __xdata uint8_t ao_stdin_ready;
 void
 ao_add_stdio(char (*pollchar)(void),
 	     void (*putchar)(char) __reentrant,
-	     void (*flush)(void));
+	     void (*flush)(void)) __reentrant;
 
 /*
  * ao_ignite.c