diff options
| author | Lucian Copeland <hierophect@gmail.com> | 2021-02-11 16:19:12 -0500 |
|---|---|---|
| committer | Lucian Copeland <hierophect@gmail.com> | 2021-02-11 16:19:12 -0500 |
| commit | a061768ceb784f475b6a776df64432ed705c8d20 (patch) | |
| tree | b73ae66f9ff6488ae7d857793198c17104fdcfce /shared-module | |
| parent | d00bee2149825ee1e187a8a5bfc8c6e75874cc0b (diff) | |
| parent | aae10fb37fa402f9bc51f3edec0d2f7772036a25 (diff) | |
Merge remote-tracking branch 'upstream/main' into stm32-i2cstart
Diffstat (limited to 'shared-module')
| -rw-r--r-- | shared-module/adafruit_bus_device/I2CDevice.c | 2 | ||||
| -rw-r--r-- | shared-module/adafruit_bus_device/SPIDevice.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/shared-module/adafruit_bus_device/I2CDevice.c b/shared-module/adafruit_bus_device/I2CDevice.c index 792ab7183..6d80cf599 100644 --- a/shared-module/adafruit_bus_device/I2CDevice.c +++ b/shared-module/adafruit_bus_device/I2CDevice.c @@ -71,7 +71,7 @@ void common_hal_adafruit_bus_device_i2cdevice_probe_for_device(adafruit_bus_devi nlr_buf_t nlr; if (nlr_push(&nlr) == 0) { mp_load_method(self->i2c, MP_QSTR_writeto, dest); - dest[2] = mp_obj_new_int_from_ull(self->device_address); + dest[2] = MP_OBJ_NEW_SMALL_INT(self->device_address); dest[3] = write_buffer; mp_call_method_n_kw(2, 0, dest); nlr_pop(); diff --git a/shared-module/adafruit_bus_device/SPIDevice.c b/shared-module/adafruit_bus_device/SPIDevice.c index e489fc7c0..65649026a 100644 --- a/shared-module/adafruit_bus_device/SPIDevice.c +++ b/shared-module/adafruit_bus_device/SPIDevice.c @@ -41,7 +41,7 @@ void common_hal_adafruit_bus_device_spidevice_construct(adafruit_bus_device_spid self->chip_select = cs; } -void common_hal_adafruit_bus_device_spidevice_enter(adafruit_bus_device_spidevice_obj_t *self) { +mp_obj_t common_hal_adafruit_bus_device_spidevice_enter(adafruit_bus_device_spidevice_obj_t *self) { bool success = false; while (!success) { success = common_hal_busio_spi_try_lock(self->spi); @@ -54,6 +54,7 @@ void common_hal_adafruit_bus_device_spidevice_enter(adafruit_bus_device_spidevic if (self->chip_select != MP_OBJ_NULL) { common_hal_digitalio_digitalinout_set_value(MP_OBJ_TO_PTR(self->chip_select), false); } + return self->spi; } void common_hal_adafruit_bus_device_spidevice_exit(adafruit_bus_device_spidevice_obj_t *self) { |