aboutsummaryrefslogtreecommitdiff
path: root/ports/stm32/machine_i2c.c
diff options
context:
space:
mode:
authorDamien George2020-09-16 14:09:49 +1000
committerDamien George2020-10-01 12:57:10 +1000
commit39d50d129ce428858332523548f0594503d0f45b (patch)
treeb00ef4832fdd15a5e6215f31fba6af44760e7c13 /ports/stm32/machine_i2c.c
parent9e0533b9e158a455be9284b70011d0515096a5f6 (diff)
ports: Add SoftI2C and SoftSPI to machine module where appropriate.
Previous commits removed the ability for one I2C/SPI constructor to construct both software- or hardware-based peripheral instances. Such construction is now split to explicit soft and non-soft types. This commit makes both types available in all ports that previously could create both software and hardware peripherals: machine.I2C and machine.SPI construct hardware instances, while machine.SoftI2C and machine.SoftSPI create software instances. This is a breaking change for use of software-based I2C and SPI. Code that constructed I2C/SPI peripherals in the following way will need to be changed: machine.I2C(-1, ...) -> machine.SoftI2C(...) machine.I2C(scl=scl, sda=sda) -> machine.SoftI2C(scl=scl, sda=sda) machine.SPI(-1, ...) -> machine.SoftSPI(...) machine.SPI(sck=sck, mosi=mosi, miso=miso) -> machine.SoftSPI(sck=sck, mosi=mosi, miso=miso) Code which uses machine.I2C and machine.SPI classes to access hardware peripherals does not need to change. Signed-off-by: Damien George <damien@micropython.org>
Diffstat (limited to 'ports/stm32/machine_i2c.c')
-rw-r--r--ports/stm32/machine_i2c.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/ports/stm32/machine_i2c.c b/ports/stm32/machine_i2c.c
index 14dd88b78..31defcb17 100644
--- a/ports/stm32/machine_i2c.c
+++ b/ports/stm32/machine_i2c.c
@@ -32,11 +32,10 @@
#include "py/mperrno.h"
#include "extmod/machine_i2c.h"
#include "i2c.h"
+#include "modmachine.h"
#if MICROPY_HW_ENABLE_HW_I2C
-STATIC const mp_obj_type_t machine_hard_i2c_type;
-
#define I2C_POLL_DEFAULT_TIMEOUT_US (50000) // 50ms
#if defined(STM32F0) || defined(STM32F4) || defined(STM32F7)
@@ -266,7 +265,7 @@ STATIC const mp_machine_i2c_p_t machine_hard_i2c_p = {
.transfer = machine_hard_i2c_transfer,
};
-STATIC const mp_obj_type_t machine_hard_i2c_type = {
+const mp_obj_type_t machine_hard_i2c_type = {
{ &mp_type_type },
.name = MP_QSTR_I2C,
.print = machine_hard_i2c_print,