Skip to content

Commit da035fe

Browse files
authored
Merge pull request #5990 from sgauche/stm_spi_3wire
Add support for half-duplex SPI to CPy
2 parents 7270d46 + 72317c3 commit da035fe

File tree

45 files changed

+102
-62
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+102
-62
lines changed

locale/circuitpython.pot

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -579,7 +579,7 @@ msgstr ""
579579

580580
#: shared-bindings/displayio/Display.c
581581
#: shared-bindings/framebufferio/FramebufferDisplay.c
582-
#: shared-bindings/is31fl3741/IS31FL3741.c
582+
#: shared-bindings/is31fl3741/FrameBuffer.c
583583
#: shared-bindings/rgbmatrix/RGBMatrix.c
584584
msgid "Brightness must be 0-1.0"
585585
msgstr ""
@@ -1129,6 +1129,13 @@ msgstr ""
11291129
msgid "Group already used"
11301130
msgstr ""
11311131

1132+
#: ports/atmel-samd/common-hal/busio/SPI.c ports/cxd56/common-hal/busio/SPI.c
1133+
#: ports/espressif/common-hal/busio/SPI.c
1134+
#: ports/mimxrt10xx/common-hal/busio/SPI.c ports/nrf/common-hal/busio/SPI.c
1135+
#: ports/raspberrypi/common-hal/busio/SPI.c
1136+
msgid "Half duplex SPI is not implemented"
1137+
msgstr ""
1138+
11321139
#: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/I2C.c
11331140
#: ports/stm/common-hal/busio/SPI.c ports/stm/common-hal/canio/CAN.c
11341141
#: ports/stm/common-hal/sdioio/SDCard.c
@@ -1480,7 +1487,7 @@ msgstr ""
14801487
msgid "Key must be 16, 24, or 32 bytes long"
14811488
msgstr ""
14821489

1483-
#: shared-module/is31fl3741/IS31FL3741.c
1490+
#: shared-module/is31fl3741/FrameBuffer.c
14841491
msgid "LED mappings must match display size"
14851492
msgstr ""
14861493

@@ -1508,7 +1515,7 @@ msgstr ""
15081515
msgid "MOSI pin init failed."
15091516
msgstr ""
15101517

1511-
#: shared-bindings/is31fl3741/__init__.c
1518+
#: shared-bindings/is31fl3741/IS31FL3741.c
15121519
msgid "Mapping must be a tuple"
15131520
msgstr ""
15141521

@@ -2121,7 +2128,7 @@ msgstr ""
21212128
msgid "Sample rate too high. It must be less than %d"
21222129
msgstr ""
21232130

2124-
#: shared-bindings/is31fl3741/IS31FL3741.c
2131+
#: shared-bindings/is31fl3741/FrameBuffer.c
21252132
msgid "Scale dimensions must divide by 3"
21262133
msgstr ""
21272134

@@ -4557,7 +4564,7 @@ msgstr ""
45574564
msgid "width must be from 2 to 8 (inclusive), not %d"
45584565
msgstr ""
45594566

4560-
#: shared-bindings/is31fl3741/IS31FL3741.c
4567+
#: shared-bindings/is31fl3741/FrameBuffer.c
45614568
#: shared-bindings/rgbmatrix/RGBMatrix.c
45624569
msgid "width must be greater than zero"
45634570
msgstr ""

ports/atmel-samd/boards/arduino_mkr1300/mpconfigboard.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,3 @@ CHIP_FAMILY = samd21
99
INTERNAL_FLASH_FILESYSTEM = 1
1010
LONGINT_IMPL = NONE
1111
CIRCUITPY_FULL_BUILD = 0
12-
13-
CIRCUITPY_ONEWIREIO = 0

ports/atmel-samd/boards/arduino_mkrzero/mpconfigboard.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,3 @@ CHIP_FAMILY = samd21
99
INTERNAL_FLASH_FILESYSTEM = 1
1010
LONGINT_IMPL = NONE
1111
CIRCUITPY_FULL_BUILD = 0
12-
13-
CIRCUITPY_ONEWIREIO = 0

ports/atmel-samd/boards/arduino_nano_33_iot/mpconfigboard.mk

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,5 @@ INTERNAL_FLASH_FILESYSTEM = 1
1010
LONGINT_IMPL = NONE
1111
CIRCUITPY_FULL_BUILD = 0
1212

13-
CIRCUITPY_ONEWIREIO = 0
13+
# This board has many pins, and we have to remove something else to make room.
14+
CIRCUITPY_RAINBOWIO = 0

ports/atmel-samd/boards/arduino_zero/mpconfigboard.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,3 @@ CHIP_FAMILY = samd21
99
INTERNAL_FLASH_FILESYSTEM = 1
1010
LONGINT_IMPL = NONE
1111
CIRCUITPY_FULL_BUILD = 0
12-
13-
CIRCUITPY_ONEWIREIO = 0

ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.mk

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ LONGINT_IMPL = NONE
1515
CIRCUITPY_BUSDEVICE = 1
1616
CIRCUITPY_DISPLAYIO = 0
1717
CIRCUITPY_KEYPAD = 0
18-
CIRCUITPY_ONEWIREIO = 0
1918

2019
# Include these Python libraries in firmware.
2120
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_CircuitPlayground

ports/atmel-samd/boards/datum_imu/mpconfigboard.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,3 @@ CHIP_FAMILY = samd21
99
INTERNAL_FLASH_FILESYSTEM = 1
1010
LONGINT_IMPL = NONE
1111
CIRCUITPY_FULL_BUILD = 0
12-
13-
CIRCUITPY_ONEWIREIO = 0

ports/atmel-samd/boards/feather_m0_adalogger/mpconfigboard.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,3 @@ CHIP_FAMILY = samd21
99
INTERNAL_FLASH_FILESYSTEM = 1
1010
LONGINT_IMPL = NONE
1111
CIRCUITPY_FULL_BUILD = 0
12-
13-
CIRCUITPY_ONEWIREIO = 0

ports/atmel-samd/boards/hallowing_m4_express/board.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ uint8_t display_init_sequence[] = {
4848

4949
void board_init(void) {
5050
busio_spi_obj_t *spi = &displays[0].fourwire_bus.inline_bus;
51-
common_hal_busio_spi_construct(spi, &pin_PA01, &pin_PA00, NULL);
51+
common_hal_busio_spi_construct(spi, &pin_PA01, &pin_PA00, NULL, false);
5252
common_hal_busio_spi_never_reset(spi);
5353

5454
displayio_fourwire_obj_t *bus = &displays[0].fourwire_bus;

ports/atmel-samd/boards/monster_m4sk/board.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ uint8_t display_init_sequence[] = {
4949

5050
void board_init(void) {
5151
busio_spi_obj_t *spi = &displays[0].fourwire_bus.inline_bus;
52-
common_hal_busio_spi_construct(spi, &pin_PA13, &pin_PA12, NULL);
52+
common_hal_busio_spi_construct(spi, &pin_PA13, &pin_PA12, NULL, false);
5353
common_hal_busio_spi_never_reset(spi);
5454

5555
displayio_fourwire_obj_t *bus = &displays[0].fourwire_bus;

0 commit comments

Comments
 (0)