Skip to content

Commit cc77b30

Browse files
mcauserdpgeorge
authored andcommitted
rp2/machine_spi: Allow boards to configure SPI pins using new macros.
1 parent 79da775 commit cc77b30

File tree

1 file changed

+14
-8
lines changed

1 file changed

+14
-8
lines changed

ports/rp2/machine_spi.c

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,18 @@
3838
#define DEFAULT_SPI_PHASE (0)
3939
#define DEFAULT_SPI_BITS (8)
4040
#define DEFAULT_SPI_FIRSTBIT (SPI_MSB_FIRST)
41-
#define DEFAULT_SPI0_SCK (6)
42-
#define DEFAULT_SPI0_MOSI (7)
43-
#define DEFAULT_SPI0_MISO (4)
44-
#define DEFAULT_SPI1_SCK (10)
45-
#define DEFAULT_SPI1_MOSI (11)
46-
#define DEFAULT_SPI1_MISO (8)
41+
42+
#ifndef MICROPY_HW_SPI0_SCK
43+
#define MICROPY_HW_SPI0_SCK (6)
44+
#define MICROPY_HW_SPI0_MOSI (7)
45+
#define MICROPY_HW_SPI0_MISO (4)
46+
#endif
47+
48+
#ifndef MICROPY_HW_SPI1_SCK
49+
#define MICROPY_HW_SPI1_SCK (10)
50+
#define MICROPY_HW_SPI1_MOSI (11)
51+
#define MICROPY_HW_SPI1_MISO (8)
52+
#endif
4753

4854
#define IS_VALID_PERIPH(spi, pin) ((((pin) & 8) >> 3) == (spi))
4955
#define IS_VALID_SCK(spi, pin) (((pin) & 3) == 2 && IS_VALID_PERIPH(spi, pin))
@@ -68,13 +74,13 @@ STATIC machine_spi_obj_t machine_spi_obj[] = {
6874
{
6975
{&machine_spi_type}, spi0, 0,
7076
DEFAULT_SPI_POLARITY, DEFAULT_SPI_PHASE, DEFAULT_SPI_BITS, DEFAULT_SPI_FIRSTBIT,
71-
DEFAULT_SPI0_SCK, DEFAULT_SPI0_MOSI, DEFAULT_SPI0_MISO,
77+
MICROPY_HW_SPI0_SCK, MICROPY_HW_SPI0_MOSI, MICROPY_HW_SPI0_MISO,
7278
0,
7379
},
7480
{
7581
{&machine_spi_type}, spi1, 1,
7682
DEFAULT_SPI_POLARITY, DEFAULT_SPI_PHASE, DEFAULT_SPI_BITS, DEFAULT_SPI_FIRSTBIT,
77-
DEFAULT_SPI1_SCK, DEFAULT_SPI1_MOSI, DEFAULT_SPI1_MISO,
83+
MICROPY_HW_SPI1_SCK, MICROPY_HW_SPI1_MOSI, MICROPY_HW_SPI1_MISO,
7884
0,
7985
},
8086
};

0 commit comments

Comments
 (0)