Skip to content

Commit 00517b2

Browse files
committed
Move missing pin warning to shared-bindings
1 parent 22d9a94 commit 00517b2

File tree

3 files changed

+4
-18
lines changed
  • ports
    • esp32s2/common-hal/busio
    • stm/common-hal/busio
  • shared-bindings/busio

3 files changed

+4
-18
lines changed

ports/esp32s2/common-hal/busio/SPI.c

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -116,15 +116,6 @@ void common_hal_busio_spi_construct(busio_spi_obj_t *self,
116116
const mcu_pin_obj_t * clock, const mcu_pin_obj_t * mosi,
117117
const mcu_pin_obj_t * miso) {
118118

119-
//SCK is not optional. MOSI and MISO are
120-
if (!clock) {
121-
mp_raise_ValueError(translate("Must provide SCK pin"));
122-
}
123-
124-
if (!miso && !mosi) {
125-
mp_raise_ValueError(translate("Must provide MISO or MOSI pin"));
126-
}
127-
128119
spi_bus_config_t bus_config;
129120
bus_config.mosi_io_num = mosi != NULL ? mosi->number : -1;
130121
bus_config.miso_io_num = miso != NULL ? miso->number : -1;

ports/stm/common-hal/busio/SPI.c

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -127,15 +127,6 @@ STATIC int check_pins(busio_spi_obj_t *self,
127127
uint8_t mosi_len = MP_ARRAY_SIZE(mcu_spi_mosi_list);
128128
uint8_t miso_len = MP_ARRAY_SIZE(mcu_spi_miso_list);
129129

130-
//SCK is not optional. MOSI and MISO are
131-
if (!sck) {
132-
mp_raise_ValueError(translate("Must provide SCK pin"));
133-
}
134-
135-
if (!miso && !mosi) {
136-
mp_raise_ValueError(translate("Must provide MISO or MOSI pin"));
137-
}
138-
139130
// Loop over each possibility for SCK. Check whether MISO and/or MOSI can be used on the same peripheral
140131
for (uint i = 0; i < sck_len; i++) {
141132
const mcu_periph_obj_t *mcu_spi_sck = &mcu_spi_sck_list[i];

shared-bindings/busio/SPI.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,10 @@ STATIC mp_obj_t busio_spi_make_new(const mp_obj_type_t *type, size_t n_args, con
9696
const mcu_pin_obj_t* mosi = validate_obj_is_free_pin_or_none(args[ARG_MOSI].u_obj);
9797
const mcu_pin_obj_t* miso = validate_obj_is_free_pin_or_none(args[ARG_MISO].u_obj);
9898

99+
if (!miso && !mosi) {
100+
mp_raise_ValueError(translate("Must provide MISO or MOSI pin"));
101+
}
102+
99103
common_hal_busio_spi_construct(self, clock, mosi, miso);
100104
return MP_OBJ_FROM_PTR(self);
101105
}

0 commit comments

Comments
 (0)