diff options
| author | Dan Halbert <halbert@adafruit.com> | 2020-03-01 15:39:26 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-01 15:39:26 -0500 |
| commit | ba0c14f9ddf01f6cf98d278cbc4769a476342db0 (patch) | |
| tree | 240d15fad46d2d811074705dce2233c831211a31 /ports | |
| parent | 752881461733263cae77db8c33a2da142a046f7e (diff) | |
| parent | 898f67ac2eb5fa895cb93bb81ec86999593e524a (diff) | |
Merge pull request #2671 from dhalbert/merge-for-5.0.0-rc.15.0.0-rc.15.0.0
Merge for 5.0.0 rc.1
Diffstat (limited to 'ports')
| -rw-r--r-- | ports/mimxrt10xx/boards/feather_m7_1011/mpconfigboard.mk | 4 | ||||
| -rw-r--r-- | ports/mimxrt10xx/boards/feather_mimxrt1011/mpconfigboard.mk | 4 | ||||
| -rw-r--r-- | ports/mimxrt10xx/common-hal/busio/I2C.c | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/ports/mimxrt10xx/boards/feather_m7_1011/mpconfigboard.mk b/ports/mimxrt10xx/boards/feather_m7_1011/mpconfigboard.mk index 670b48b60..fbaf5d399 100644 --- a/ports/mimxrt10xx/boards/feather_m7_1011/mpconfigboard.mk +++ b/ports/mimxrt10xx/boards/feather_m7_1011/mpconfigboard.mk @@ -6,3 +6,7 @@ USB_MANUFACTURER = "Adafruit" CHIP_VARIANT = MIMXRT1011DAE5A CHIP_FAMILY = MIMXRT1011 FLASH = W25Q32JV + +# Include these Python libraries in the firmware +FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_ESP32SPI +FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Requests diff --git a/ports/mimxrt10xx/boards/feather_mimxrt1011/mpconfigboard.mk b/ports/mimxrt10xx/boards/feather_mimxrt1011/mpconfigboard.mk index 08164b140..60eed8a80 100644 --- a/ports/mimxrt10xx/boards/feather_mimxrt1011/mpconfigboard.mk +++ b/ports/mimxrt10xx/boards/feather_mimxrt1011/mpconfigboard.mk @@ -6,3 +6,7 @@ USB_MANUFACTURER = "arturo182" CHIP_VARIANT = MIMXRT1011DAE5A CHIP_FAMILY = MIMXRT1011 FLASH = W25Q64JV + +# Include these Python libraries in the firmware +FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_ESP32SPI +FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Requests diff --git a/ports/mimxrt10xx/common-hal/busio/I2C.c b/ports/mimxrt10xx/common-hal/busio/I2C.c index 2de996f9a..0bb7dcc6c 100644 --- a/ports/mimxrt10xx/common-hal/busio/I2C.c +++ b/ports/mimxrt10xx/common-hal/busio/I2C.c @@ -34,10 +34,8 @@ #include "fsl_lpi2c.h" -//TODO +#define I2C_CLOCK_FREQ (CLOCK_GetFreq(kCLOCK_Usb1PllClk) / 8 / (1+CLOCK_GetDiv(kCLOCK_Lpi2cDiv))) -#define I2C_CLOCK_SOURCE_DIVIDER (5U) -#define I2C_CLOCK_FREQ (CLOCK_GetFreq(kCLOCK_Usb1PllClk) / 8 / (I2C_CLOCK_SOURCE_DIVIDER + 1U)) static void config_periph_pin(const mcu_periph_obj_t *periph) { IOMUXC_SetPinMux( |