X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Ftelemini-v3.0%2Fao_pins.h;h=242e30d71b208db436576256d4b350ebaa72554e;hb=HEAD;hp=17cff2aeb0e53497316fcc34e718888f9484d791;hpb=178d7c0aa32267ea71be2ccff146ea6ff990d7dc;p=fw%2Faltos

diff --git a/src/telemini-v3.0/ao_pins.h b/src/telemini-v3.0/ao_pins.h
index 17cff2ae..242e30d7 100644
--- a/src/telemini-v3.0/ao_pins.h
+++ b/src/telemini-v3.0/ao_pins.h
@@ -20,7 +20,7 @@
 #define HAS_SERIAL_1		0
 #define HAS_BATTERY_REPORT	1
 
-#define AO_STACK_SIZE	448
+#define AO_STACK_SIZE	428
 
 #define IS_FLASH_LOADER	0
 
@@ -74,7 +74,7 @@
 #define AO_RECOVERY_VALUE	0
 #define AO_RECOVERY_MODE	AO_EXTI_MODE_PULL_UP
 
-/* Beeper is on Tim1 CH3 */
+/* Beeper is on Tim2 CH4 */
 #define BEEPER_CHANNEL		4
 #define BEEPER_TIMER		2
 #define BEEPER_PORT		(&stm_gpioa)
@@ -106,7 +106,6 @@
 #define AO_MS5607_MISO_PIN	4
 #define AO_MS5607_MISO_MASK	(1 << AO_MS5607_MISO_PIN)
 #define AO_MS5607_SPI_INDEX	AO_SPI_1_PB3_PB4_PB5
-#define AO_MS5607_SPI_SPEED	AO_SPI_SPEED_12MHz
 
 /* CC1200 */
 
@@ -119,7 +118,6 @@
 #define AO_CC1200_SPI_CS_PIN	0
 #define AO_CC1200_SPI_BUS	AO_SPI_1_PA5_PA6_PA7
 #define AO_CC1200_SPI		stm_spi1
-#define AO_CC1200_SPI_SPEED	AO_SPI_SPEED_12MHz
 
 #define AO_CC1200_INT_PORT		(&stm_gpiob)
 #define AO_CC1200_INT_PIN		1
@@ -165,17 +163,15 @@ struct ao_adc {
 
 #define AO_IGNITER_DROGUE_PORT	(&stm_gpiob)
 #define AO_IGNITER_DROGUE_PIN	7
-#define AO_IGNITER_SET_DROGUE(v)	ao_gpio_set(AO_IGNITER_DROGUE_PORT, AO_IGNITER_DROGUE_PIN, AO_IGNITER_DROGUE, v)
 
 #define AO_IGNITER_MAIN_PORT	(&stm_gpiob)
 #define AO_IGNITER_MAIN_PIN	6
-#define AO_IGNITER_SET_MAIN(v)		ao_gpio_set(AO_IGNITER_MAIN_PORT, AO_IGNITER_MAIN_PIN, AO_IGNITER_MAIN, v)
 
 #define AO_SENSE_DROGUE(p)	((p)->adc.sense_a)
 #define AO_SENSE_MAIN(p)	((p)->adc.sense_m)
 
 #define AO_ADC_DUMP(p) \
-	printf("tick: %5u apogee: %5d main: %5d batt: %5d\n", \
+	printf("tick: %5lu apogee: %5d main: %5d batt: %5d\n", \
 	       (p)->tick, (p)->adc.sense_a, (p)->adc.sense_m, (p)->adc.v_batt)
 
 /*