X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fao.h;h=bc9afcc32ca38430986dce42caefb85c64813f31;hb=036400a2db303f3db3be7cc0426f88359c6bd2b1;hp=4cceefe101a0306a57ae53c804ec5efe245b5e09;hpb=b219801fb0e5eaff7778d21701da977104522da3;p=fw%2Faltos

diff --git a/src/ao.h b/src/ao.h
index 4cceefe1..bc9afcc3 100644
--- a/src/ao.h
+++ b/src/ao.h
@@ -117,8 +117,9 @@ ao_panic(uint8_t reason);
  */
 
 /* Our timer runs at 100Hz */
-#define AO_MS_TO_TICKS(ms)	((ms) / 10)
-#define AO_SEC_TO_TICKS(s)	((s) * 100)
+#define AO_HERTZ		100
+#define AO_MS_TO_TICKS(ms)	((ms) / (1000 / AO_HERTZ))
+#define AO_SEC_TO_TICKS(s)	((s) * AO_HERTZ)
 
 /* Returns the current time in ticks */
 uint16_t
@@ -783,6 +784,7 @@ ao_gps_report_init(void);
  */
 
 #define AO_MAX_CALLSIGN		8
+#define AO_TELEMETRY_VERSION	1
 
 struct ao_telemetry {
 	uint8_t			addr;
@@ -792,6 +794,8 @@ struct ao_telemetry {
 	int32_t			flight_vel;
 	int16_t			flight_pres;
 	int16_t			ground_pres;
+	int16_t			accel_plus_g;
+	int16_t			accel_minus_g;
 	struct ao_adc		adc;
 	struct ao_gps_data	gps;
 	char			callsign[AO_MAX_CALLSIGN];
@@ -928,16 +932,17 @@ ao_igniter_init(void);
  */
 
 #define AO_CONFIG_MAJOR	1
-#define AO_CONFIG_MINOR	1
+#define AO_CONFIG_MINOR	2
 
 struct ao_config {
 	uint8_t		major;
 	uint8_t		minor;
 	uint16_t	main_deploy;
-	int16_t		accel_zero_g;
+	int16_t		accel_plus_g;
 	uint8_t		radio_channel;
 	char		callsign[AO_MAX_CALLSIGN + 1];
 	uint8_t		apogee_delay;
+	int16_t		accel_minus_g;
 };
 
 extern __xdata struct ao_config ao_config;