diff options
| author | Damien George <damien.p.george@gmail.com> | 2016-11-22 17:40:50 +1100 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2016-11-22 17:40:50 +1100 |
| commit | a3320e781142ef5d4f5252e05479280e66ce3ffd (patch) | |
| tree | 42821b2632703ed5bab2875fc69dd8e226cb7668 | |
| parent | 2eff9c29a11a9549121c63a702315cfe6c4a711f (diff) | |
| download | micropython-a3320e781142ef5d4f5252e05479280e66ce3ffd.tar.gz micropython-a3320e781142ef5d4f5252e05479280e66ce3ffd.zip | |
stmhal/i2c: Remove use of legacy I2C_NOSTRETCH_DISABLED option.
In the new HAL this is renamed to I2C_NOSTRETCH_DISABLE.
| -rw-r--r-- | stmhal/accel.c | 2 | ||||
| -rw-r--r-- | stmhal/i2c.c | 9 |
2 files changed, 1 insertions, 10 deletions
diff --git a/stmhal/accel.c b/stmhal/accel.c index 827aa46e7c..ec517fe436 100644 --- a/stmhal/accel.c +++ b/stmhal/accel.c @@ -69,7 +69,7 @@ STATIC void accel_start(void) { I2CHandle1.Init.DualAddressMode = I2C_DUALADDRESS_DISABLED; I2CHandle1.Init.DutyCycle = I2C_DUTYCYCLE_16_9; I2CHandle1.Init.GeneralCallMode = I2C_GENERALCALL_DISABLED; - I2CHandle1.Init.NoStretchMode = I2C_NOSTRETCH_DISABLED; + I2CHandle1.Init.NoStretchMode = I2C_NOSTRETCH_DISABLE; I2CHandle1.Init.OwnAddress1 = PYB_I2C_MASTER_ADDRESS; I2CHandle1.Init.OwnAddress2 = 0xfe; // unused i2c_init(&I2CHandle1); diff --git a/stmhal/i2c.c b/stmhal/i2c.c index 6146419a91..8f5f8c2d93 100644 --- a/stmhal/i2c.c +++ b/stmhal/i2c.c @@ -45,14 +45,6 @@ #define MICROPY_HW_I2C_BAUDRATE_MAX 400000 #endif -#if !defined(I2C_NOSTRETCH_DISABLE) -// Assumes that the F7 firmware is newer, so the F4 firmware will eventually -// catchup. I2C_NOSTRETCH_DISABLED was renamed to I2C_NOSTRETCH_DISABLE -// in the F7 so we use the F7 constant and provide a backwards compatabilty -// #define here. -#define I2C_NOSTRETCH_DISABLE I2C_NOSTRETCH_DISABLED -#endif - /// \moduleref pyb /// \class I2C - a two-wire serial protocol /// @@ -503,7 +495,6 @@ STATIC mp_obj_t pyb_i2c_init_helper(const pyb_i2c_obj_t *self, mp_uint_t n_args, init->AddressingMode = I2C_ADDRESSINGMODE_7BIT; init->DualAddressMode = I2C_DUALADDRESS_DISABLED; init->GeneralCallMode = args[3].u_bool ? I2C_GENERALCALL_ENABLED : I2C_GENERALCALL_DISABLED; - init->NoStretchMode = I2C_NOSTRETCH_DISABLED; init->OwnAddress2 = 0; // unused init->NoStretchMode = I2C_NOSTRETCH_DISABLE; |