X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Feasymega-v3.0%2Fao_pins.h;h=79a2a59a35764bfebda67d7453e757bd825abe7c;hb=cea0f40fff14b9d2085e0026a68b742a4b114cb9;hp=fa810fdae4efde8be69f5768d4e2cf21b73670b7;hpb=260dd06107c8f8f5c7e606a283d388cb3ba46465;p=fw%2Faltos

diff --git a/src/easymega-v3.0/ao_pins.h b/src/easymega-v3.0/ao_pins.h
index fa810fda..79a2a59a 100644
--- a/src/easymega-v3.0/ao_pins.h
+++ b/src/easymega-v3.0/ao_pins.h
@@ -19,7 +19,6 @@
 #ifndef _AO_PINS_H_
 #define _AO_PINS_H_
 
-#define HAS_TASK_QUEUE		1
 
 /* 16MHz High speed external crystal */
 #define AO_HSE			16000000
@@ -178,7 +177,7 @@ struct ao_adc {
 };
 
 #define AO_ADC_DUMP(p) \
-	printf("tick: %5u A: %5d B: %5d C: %5d D: %5d drogue: %5d main: %5d batt: %5d pbatt: %5d temp: %5d\n", \
+	printf("tick: %5lu A: %5d B: %5d C: %5d D: %5d drogue: %5d main: %5d batt: %5d pbatt: %5d temp: %5d\n", \
 	       (p)->tick, \
 	       (p)->adc.sense[0], (p)->adc.sense[1], (p)->adc.sense[2], \
 	       (p)->adc.sense[3], (p)->adc.sense[4], (p)->adc.sense[5], \
@@ -259,6 +258,12 @@ struct ao_adc {
 #define AO_BATTERY_DIV_PLUS	56	/* 5.6k */
 #define AO_BATTERY_DIV_MINUS	100	/* 10k */
 
+/*
+ * Voltage divider on ADC pyro battery sampler
+ */
+#define AO_PYRO_BATTERY_DIV_PLUS	100	/* 100k */
+#define AO_PYRO_BATTERY_DIV_MINUS	27	/* 27k */
+
 /*
  * Voltage divider on ADC igniter samplers
  */
@@ -324,7 +329,6 @@ struct ao_adc {
 #define AO_ADXL375_SPI_INDEX	(AO_SPI_1_PB3_PB4_PB5 | AO_SPI_MODE_3)
 #define AO_ADXL375_CS_PORT	(&stm_gpioc)
 #define AO_ADXL375_CS_PIN	12
-#define AO_ADXL375_SPI_SPEED	AO_SPI_SPEED_4MHz
 
 #define AO_ADXL375_INT1_PORT	(&stm_gpiob)
 #define AO_ADXL375_INT1_PIN	8