10000 Merge branch 'master' into ulab · gregdavill/circuitpython@dc64857 · GitHub
[go: up one dir, main page]
Skip to content

Commit dc64857

Browse files
jeplerjepler
authored
Merge branch 'master' into ulab
2 parents 39cfe32 + 29e4472 commit dc64857

File tree

6 files changed

+17
-3
lines changed

6 files changed

+17
-3
lines changed

‎.gitmodules

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,3 +117,9 @@
117117
[submodule "extmod/ulab"]
118118
path = extmod/ulab
119119
url = https://github.com/adafruit/circuitpython-ulab
120+
[submodule "frozen/Adafruit_CircuitPython_ESP32SPI"]
121+
path = frozen/Adafruit_CircuitPython_ESP32SPI
122+
url = https://github.com/adafruit/Adafruit_CircuitPython_ESP32SPI
123+
[submodule "frozen/Adafruit_CircuitPython_Requests"]
124+
path = frozen/Adafruit_CircuitPython_Requests
125+
url = https://github.com/adafruit/Adafruit_CircuitPython_Requests

‎frozen/Adafruit_CircuitPython_ESP32SPI

‎frozen/Adafruit_CircuitPython_Requests

‎ports/mimxrt10xx/boards/feather_m7_1011/mpconfigboard.mk

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,7 @@ USB_MANUFACTURER = "Adafruit"
66
CHIP_VARIANT = MIMXRT1011DAE5A
77
CHIP_FAMILY = MIMXRT1011
88
FLASH = W25Q32JV
9+
10+
# Include these Python libraries in the firmware
11+
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_ESP32SPI
12+
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Requests

‎ports/mimxrt10xx/boards/feather_mimxrt1011/mpconfigboard.mk

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,7 @@ USB_MANUFACTURER = "arturo182"
66
CHIP_VARIANT = MIMXRT1011DAE5A
77
CHIP_FAMILY = MIMXRT1011
88
FLASH = W25Q64JV
9+
10+
# Include these Python libraries in the firmware
11+
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_ESP32SPI
12+
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Requests

‎ports/mimxrt10xx/common-hal/busio/I2C.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,8 @@
3434

3535
#include "fsl_lpi2c.h"
3636

37-
//TODO
37+
#define I2C_CLOCK_FREQ (CLOCK_GetFreq(kCLOCK_Usb1PllClk) / 8 / (1+CLOCK_GetDiv(kCLOCK_Lpi2cDiv)))
3838

39-
#define I2C_CLOCK_SOURCE_DIVIDER (5U)
40-
#define I2C_CLOCK_FREQ (CLOCK_GetFreq(kCLOCK_Usb1PllClk) / 8 / (I2C_CLOCK_SOURCE_DIVIDER + 1U))
4139

4240
static void config_periph_pin(const mcu_periph_obj_t *periph) {
4341
IOMUXC_SetPinMux(

0 commit comments

Comments
 (0)
0