diff options
| author | Bdale Garbee <bdale@gag.com> | 2018-08-05 11:24:13 +0800 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2018-08-05 11:24:13 +0800 |
| commit | a3b4f0d33e9d13fb5294397304ec0eb44ecaf1fc (patch) | |
| tree | 69c563070ea7ca4a127f2ac925f18a36acb888bb /src/stm-demo | |
| parent | 67da03d1382228a95d0414294703371cf32e666e (diff) | |
| parent | 3a2a5a05bb6372d9003905cee7afdfcd6d38ae7e (diff) | |
Merge branch 'branch-1.8' into debian
Diffstat (limited to 'src/stm-demo')
| -rw-r--r-- | src/stm-demo/Makefile | 2 | ||||
| -rw-r--r-- | src/stm-demo/ao_demo.c | 3 | ||||
| -rw-r--r-- | src/stm-demo/ao_pins.h | 14 |
3 files changed, 16 insertions, 3 deletions
diff --git a/src/stm-demo/Makefile b/src/stm-demo/Makefile index 869fb32f..d4569c1a 100644 --- a/src/stm-demo/Makefile +++ b/src/stm-demo/Makefile @@ -30,6 +30,8 @@ ALTOS_SRC = \ ao_lcd_stm.c \ ao_lcd_font.c \ ao_mutex.c \ + ao_storage.c \ + ao_m25.c \ ao_dma_stm.c \ ao_spi_stm.c \ ao_adc_stm.c \ diff --git a/src/stm-demo/ao_demo.c b/src/stm-demo/ao_demo.c index db432c2a..f6c8e3df 100644 --- a/src/stm-demo/ao_demo.c +++ b/src/stm-demo/ao_demo.c @@ -223,11 +223,12 @@ main(void) ao_cmd_init(); // ao_lcd_stm_init(); // ao_lcd_font_init(); -// ao_spi_init(); + ao_spi_init(); // ao_i2c_init(); // ao_exti_init(); // ao_quadrature_init(); // ao_button_init(); + ao_storage_init(); // ao_timer_set_adc_interval(100); diff --git a/src/stm-demo/ao_pins.h b/src/stm-demo/ao_pins.h index 233537df..2b4c5ab0 100644 --- a/src/stm-demo/ao_pins.h +++ b/src/stm-demo/ao_pins.h @@ -59,11 +59,14 @@ #define SERIAL_3_PC10_PC11 0 #define SERIAL_3_PD8_PD9 1 -#define HAS_SPI_1 1 +#define HAS_SPI_1 0 #define SPI_1_PB3_PB4_PB5 1 #define SPI_1_OSPEEDR STM_OSPEEDR_10MHz -#define HAS_SPI_2 0 +#define HAS_SPI_2 1 +#define SPI_2_PB13_PB14_PB15 1 /* Flash, Companion, Radio */ +#define SPI_2_PD1_PD3_PD4 0 +#define SPI_2_OSPEEDR STM_OSPEEDR_10MHz #define HAS_USB 1 #define HAS_BEEP 0 @@ -200,4 +203,11 @@ struct ao_adc { #define AO_TICK_TYPE uint32_t #define AO_TICK_SIGNED int32_t +#define M25_MAX_CHIPS 1 +#define AO_M25_SPI_CS_PORT (&stm_gpiob) +#define AO_M25_SPI_CS_MASK (1 << 12) +#define AO_M25_SPI_BUS AO_SPI_2_PB13_PB14_PB15 + +#define AO_LOG_FORMAT AO_LOG_FORMAT_TELEMEGA + #endif /* _AO_PINS_H_ */ |