Skip to content

Merge for 5.0.0 rc.1 #2671

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Mar 1, 2020
Merged

Merge for 5.0.0 rc.1 #2671

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
09a3153
Fix I2C clock divider
mubes Feb 27, 2020
0c2894c
Merge pull request #2659 from mubes/i2cfixes
dhalbert Feb 28, 2020
3f26a0b
Freeze adafruit_requests and adafruit_esp32spi into feather_mimxrt1011
arturo182 Feb 28, 2020
0af00cf
Freeze adafruit_requests and adafruit_esp32spi into feather_m7_1011
arturo182 Feb 28, 2020
29e4472
Merge pull request #2665 from arturo182/esp32_freeze
dhalbert Feb 29, 2020
898f67a
Merge branch 'master' into merge-for-5.0.0-rc.1
dhalbert Mar 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,3 +114,9 @@
[submodule "frozen/Adafruit_CircuitPython_Register"]
path = frozen/Adafruit_CircuitPython_Register
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 change: 1 addition & 0 deletions frozen/Adafruit_CircuitPython_ESP32SPI
Open in desktop
Submodule Adafruit_CircuitPython_ESP32SPI added at f523b2
1 change: 1 addition & 0 deletions frozen/Adafruit_CircuitPython_Requests
Open in desktop
Submodule Adafruit_CircuitPython_Requests added at e8a759
4 changes: 4 additions & 0 deletions ports/mimxrt10xx/boards/feather_m7_1011/mpconfigboard.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 4 additions & 0 deletions ports/mimxrt10xx/boards/feather_mimxrt1011/mpconfigboard.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 1 addition & 3 deletions ports/mimxrt10xx/common-hal/busio/I2C.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down