Merge remote-tracking branch 'mjb/master'

[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 d02c071c4d2f2312039eeca1227d044f6c0b6d63..c9c7446e4e21d489aa1ff80fe25a9c2e1fce3779 100644 (file)
--- a/src/stm-demo/ao_pins.h
+++ b/src/stm-demo/ao_pins.h
@@ -70,7 +70,7 @@
 #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)
@@ -135,6 +135,8 @@
 
 #define AO_LCD_28_ON_C 1
 
+#define AO_LCD_DUTY    STM_LCD_CR_DUTY_STATIC
+
 #define HAS_ADC                        1
 
 #define AO_ADC_RING            32
@@ -147,7 +149,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))
@@ -170,4 +172,29 @@ struct ao_adc {
 #define HAS_I2C_2              0
 #define I2C_2_PB10_PB11                0
 
+#define AO_EVENT               1
+
+#define AO_QUADRATURE_COUNT    2
+#define AO_QUADRATURE_MODE     AO_EXTI_MODE_PULL_UP
+
+#define AO_QUADRATURE_0_PORT   &stm_gpioc
+#define AO_QUADRATURE_0_A      1
+#define AO_QUADRATURE_0_B      0
+
+#define AO_QUADRATURE_1_PORT   &stm_gpioc
+#define AO_QUADRATURE_1_A      3
+#define AO_QUADRATURE_1_B      2
+
+#define AO_BUTTON_COUNT                2
+#define AO_BUTTON_MODE         AO_EXTI_MODE_PULL_UP
+
+#define AO_BUTTON_0_PORT       &stm_gpioc
+#define AO_BUTTON_0            6
+
+#define AO_BUTTON_1_PORT       &stm_gpioc
+#define AO_BUTTON_1            7
+
+#define AO_TICK_TYPE           uint32_t
+#define AO_TICK_SIGNED         int32_t
+
 #endif /* _AO_PINS_H_ */