Add ao-send-telem to .gitignore

[fw/altos] / src / stm-demo / ao_pins.h

diff --git a/src/stm-demo/ao_pins.h b/src/stm-demo/ao_pins.h
index 9fd1175ddcaaf34a4c6f3daefc427710596bf735..7e22212223033d1c50363a253cf4c245708f2186 100644 (file)
--- a/src/stm-demo/ao_pins.h
+++ b/src/stm-demo/ao_pins.h
@@ -18,6 +18,30 @@
 #ifndef _AO_PINS_H_
 #define _AO_PINS_H_
 
+/* Bridge SB17 on the board and use the MCO from the other chip */
+#define AO_HSE         8000000
+#define AO_HSE_BYPASS          1
+
+/* PLLVCO = 96MHz (so that USB will work) */
+#define AO_PLLMUL              12
+#define AO_RCC_CFGR_PLLMUL     (STM_RCC_CFGR_PLLMUL_12)
+
+/* SYSCLK = 32MHz */
+#define AO_PLLDIV              3
+#define AO_RCC_CFGR_PLLDIV     (STM_RCC_CFGR_PLLDIV_3)
+
+/* HCLK = 32MHZ (CPU clock) */
+#define AO_AHB_PRESCALER       1
+#define AO_RCC_CFGR_HPRE_DIV   STM_RCC_CFGR_HPRE_DIV_1
+
+/* Run APB1 at HCLK/1 */
+#define AO_APB1_PRESCALER      1
+#define AO_RCC_CFGR_PPRE1_DIV  STM_RCC_CFGR_PPRE2_DIV_1
+
+/* Run APB2 at HCLK/1 */
+#define AO_APB2_PRESCALER              1
+#define AO_RCC_CFGR_PPRE2_DIV  STM_RCC_CFGR_PPRE2_DIV_1
+
 #define HAS_SERIAL_1           1
 #define USE_SERIAL_1_STDIN     1
 #define SERIAL_1_PB6_PB7       1
@@ -39,14 +63,14 @@
 
 #define HAS_SPI_2              0
 
-#define HAS_USB                        0
+#define HAS_USB                        1
 #define HAS_BEEP               0
 #define PACKET_HAS_SLAVE       0
 
 #define LOW_LEVEL_DEBUG                1
 
 #define LED_PORT_ENABLE                STM_RCC_AHBENR_GPIOBEN
-#define LED_PORT               stm_gpiob
+#define LED_PORT               (&stm_gpiob)
 #define LED_PIN_GREEN          7
 #define LED_PIN_BLUE           6
 #define AO_LED_GREEN           (1 << LED_PIN_GREEN)
@@ -123,7 +147,7 @@ struct ao_adc {
 };
 
 #define AO_ADC_IDD             4
-#define AO_ADC_PIN0_PORT       stm_gpioa
+#define AO_ADC_PIN0_PORT       (&stm_gpioa)
 #define AO_ADC_PIN0_PIN                4
 
 #define AO_ADC_RCC_AHBENR      ((1 << STM_RCC_AHBENR_GPIOAEN))
@@ -132,6 +156,7 @@ struct ao_adc {
 
 #define HAS_ADC_TEMP           1
 
+#define AO_DATA_RING           32
 #define AO_NUM_ADC             3
 
 #define AO_ADC_SQ1             AO_ADC_IDD