diff options
| author | Jeff Epler <jeff@adafruit.com> | 2020-02-29 21:54:39 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-29 21:54:39 -0600 |
| commit | dc64857a7daa68086fb5eaba17d21078d07a5e9e (patch) | |
| tree | cbfa97af8e1ccf4199e7bac95e0c377139918b69 | |
| parent | 39cfe32c345781b32d235353c2e59acacbc32dc6 (diff) | |
| parent | 29e44721d2d4712de865aa3a3b8fdd5de90c029b (diff) | |
Merge branch 'master' into ulab
| -rw-r--r-- | .gitmodules | 6 | ||||
| m--------- | frozen/Adafruit_CircuitPython_ESP32SPI | 0 | ||||
| m--------- | frozen/Adafruit_CircuitPython_Requests | 0 | ||||
| -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 |
6 files changed, 15 insertions, 3 deletions
diff --git a/.gitmodules b/.gitmodules index a8748efbe..9130593f2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -117,3 +117,9 @@ [submodule "extmod/ulab"] path = extmod/ulab url = https://github.com/adafruit/circuitpython-ulab +[submodule "frozen/Adafruit_CircuitPython_ESP32SPI"] + path = frozen/Adafruit_CircuitPython_ESP32SPI + url = https://github.com/adafruit/Adafruit_CircuitPython_ESP32SPI +[submodule "frozen/Adafruit_CircuitPython_Requests"] + path = frozen/Adafruit_CircuitPython_Requests + url = https://github.com/adafruit/Adafruit_CircuitPython_Requests
\ No newline at end of file diff --git a/frozen/Adafruit_CircuitPython_ESP32SPI b/frozen/Adafruit_CircuitPython_ESP32SPI new file mode 160000 +Subproject f523b2316bc3e25220b88c5435868c6a5880dfa diff --git a/frozen/Adafruit_CircuitPython_Requests b/frozen/Adafruit_CircuitPython_Requests new file mode 160000 +Subproject e8a759719e94c69a01f9e07d418ca6db39114db 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( |