X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Ftelemetrum-v2.0%2Fao_pins.h;h=2ccac628658e848e319cf2a3b305fce7df73f9bc;hb=d0d29cc233b0d444782530fea15d957b2b4c45d7;hp=36cfc7e00c5fe48605d376ac222b79553a90fce8;hpb=7b0f9b25a56fa8b4aa1c2e9d79c43e6a97cab0c0;p=fw%2Faltos

diff --git a/src/telemetrum-v2.0/ao_pins.h b/src/telemetrum-v2.0/ao_pins.h
index 36cfc7e0..2ccac628 100644
--- a/src/telemetrum-v2.0/ao_pins.h
+++ b/src/telemetrum-v2.0/ao_pins.h
@@ -59,15 +59,14 @@
 #define SERIAL_3_PC10_PC11	0
 #define SERIAL_3_PD8_PD9	0
 
-#define ao_gps_getchar		ao_serial3_getchar
-#define ao_gps_putchar		ao_serial3_putchar
-#define ao_gps_set_speed	ao_serial3_set_speed
-#define ao_gps_fifo		(ao_stm_usart3.rx_fifo)
-
+#define AO_CONFIG_DEFAULT_FLIGHT_LOG_MAX	(512 * 1024)
 #define HAS_EEPROM		1
 #define USE_INTERNAL_FLASH	0
+#define USE_EEPROM_CONFIG	1
+#define USE_STORAGE_CONFIG	0
 #define HAS_USB			1
 #define HAS_BEEP		1
+#define HAS_BATTERY_REPORT	1
 #define BEEPER_CHANNEL		4
 #define HAS_RADIO		1
 #define HAS_TELEMETRY		1
@@ -122,8 +121,8 @@
 #define HAS_IGNITE		1
 #define HAS_IGNITE_REPORT	1
 
-#define AO_SENSE_DROGUE(p)	((p)->adc.sense[0])
-#define AO_SENSE_MAIN(p)	((p)->adc.sense[1])
+#define AO_SENSE_DROGUE(p)	((p)->adc.sense_a)
+#define AO_SENSE_MAIN(p)	((p)->adc.sense_m)
 #define AO_IGNITER_CLOSED	400
 #define AO_IGNITER_OPEN		60
 
@@ -145,16 +144,17 @@
 #define AO_ADC_NUM_SENSE	2
 
 struct ao_adc {
-	int16_t			sense[AO_ADC_NUM_SENSE];
+	int16_t			sense_a;
+	int16_t			sense_m;
 	int16_t			v_batt;
 	int16_t			temp;
 };
 
 #define AO_ADC_DUMP(p) \
-	printf("tick: %5u drogue: %5d main: %5d batt: %5d pbatt: %5d temp: %5d\n", \
+	printf("tick: %5u drogue: %5d main: %5d batt: %5d\n", \
 	       (p)->tick, \
-	       (p)->adc.sense[0], (p)->adc.sense[1], \
-	       (p)->adc.v_batt, (p)->adc.temp)
+	       (p)->adc.sense_a, (p)->adc.sense_m, \
+	       (p)->adc.v_batt);
 
 #define AO_ADC_SENSE_DROGUE	0
 #define AO_ADC_SENSE_DROGUE_PORT	(&stm_gpioa)
@@ -190,6 +190,34 @@ struct ao_adc {
 #define AO_ADC_SQ3		AO_ADC_V_BATT
 #define AO_ADC_SQ4		AO_ADC_TEMP
 
+/*
+ * Voltage divider on ADC battery sampler
+ */
+#define AO_BATTERY_DIV_PLUS	56	/* 5.6k */
+#define AO_BATTERY_DIV_MINUS	100	/* 10k */
+
+/*
+ * Voltage divider on ADC igniter samplers
+ */
+#define AO_IGNITE_DIV_PLUS	100	/* 100k */
+#define AO_IGNITE_DIV_MINUS	27	/* 27k */
+
+/*
+ * ADC reference in decivolts
+ */
+#define AO_ADC_REFERENCE_DV	33
+
+/*
+ * GPS
+ */
+
+#define AO_SERIAL_SPEED_UBLOX	AO_SERIAL_SPEED_9600
+
+#define ao_gps_getchar		ao_serial3_getchar
+#define ao_gps_putchar		ao_serial3_putchar
+#define ao_gps_set_speed	ao_serial3_set_speed
+#define ao_gps_fifo		(ao_stm_usart3.rx_fifo)
+
 /*
  * Pressure sensor settings
  */
@@ -247,9 +275,10 @@ struct ao_adc {
  */
 
 #define HAS_MMA655X		1
-#define AO_MMA655X_SPI_INDEX	AO_SPI_1_PE13_PE14_PE15
-#define AO_MMA655X_CS_PORT	(&stm_gpiod)
-#define AO_MMA655X_CS_PIN	4
+#define AO_MMA655X_SPI_INDEX	AO_SPI_1_PB3_PB4_PB5
+#define AO_MMA655X_CS_PORT	(&stm_gpiob)
+#define AO_MMA655X_CS_PIN	9
+#define AO_MMA655X_INVERT	1
 
 #define NUM_CMDS		16