X-Git-Url: https://git.gag.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Fstm-demo%2Fao_pins.h;h=c9c7446e4e21d489aa1ff80fe25a9c2e1fce3779;hb=583458772746317b98fced907ec780edff465888;hp=1daab35165ba0efae56d45e167c4502abfa21cd7;hpb=6d1606895f70c6bca20c25084107f90bd0b613ec;p=fw%2Faltos

diff --git a/src/stm-demo/ao_pins.h b/src/stm-demo/ao_pins.h
index 1daab351..c9c7446e 100644
--- 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))
@@ -156,6 +158,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
@@ -169,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_ */