djsundog
/
circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into merge-for-5.0.0-rc.1

This commit is contained in:
Dan Halbert 2020-03-01 12:22:18 -05:00
parent 7528814617 29e44721d2
commit 898f67ac2e
6 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitmodules vendored
View File

@ -114,3 +114,9 @@
[submodule "frozen/Adafruit_CircuitPython_Register"] [submodule "frozen/Adafruit_CircuitPython_Register"]
path = frozen/Adafruit_CircuitPython_Register path = frozen/Adafruit_CircuitPython_Register
url = https://github.com/adafruit/Adafruit_CircuitPython_Register.git url = https://github.com/adafruit/Adafruit_CircuitPython_Register.git
[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

1
frozen/Adafruit_CircuitPython_ESP32SPI Submodule

@ -0,0 +1 @@
Subproject commit f523b2316bc3e25220b88c5435868c6a5880dfab

1
frozen/Adafruit_CircuitPython_Requests Submodule

@ -0,0 +1 @@
Subproject commit e8a759719e94c69a01f9e07d418ca6db39114db3

4
ports/mimxrt10xx/boards/feather_m7_1011/mpconfigboard.mk
View File

@ -6,3 +6,7 @@ USB_MANUFACTURER = "Adafruit"
CHIP_VARIANT = MIMXRT1011DAE5A CHIP_VARIANT = MIMXRT1011DAE5A
CHIP_FAMILY = MIMXRT1011 CHIP_FAMILY = MIMXRT1011
FLASH = W25Q32JV 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

4
ports/mimxrt10xx/boards/feather_mimxrt1011/mpconfigboard.mk
View File

@ -6,3 +6,7 @@ USB_MANUFACTURER = "arturo182"
CHIP_VARIANT = MIMXRT1011DAE5A CHIP_VARIANT = MIMXRT1011DAE5A
CHIP_FAMILY = MIMXRT1011 CHIP_FAMILY = MIMXRT1011
FLASH = W25Q64JV 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

4
ports/mimxrt10xx/common-hal/busio/I2C.c
View File

@ -34,10 +34,8 @@
#include "fsl_lpi2c.h" #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) { static void config_periph_pin(const mcu_periph_obj_t *periph) {
IOMUXC_SetPinMux( IOMUXC_SetPinMux(