Skip to content

Commit 03dfd28

Browse files
committed
trying to pull 5.0.x
2 parents 527eb24 + ba0c14f commit 03dfd28

File tree

9 files changed

+33
-51
lines changed

9 files changed

+33
-51
lines changed

.github/workflows/build.yml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -273,13 +273,3 @@ jobs:
273273
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
274274
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
275275
if: github.event_name == 'push' || (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
276-
- name: Install upload deps
277-
run: |
278-
pip install uritemplate
279-
- name: Upload to Release
280-
run: "[ -z \"$ADABOT_GITHUB_ACCESS_TOKEN\" ] || python3 -u upload_release_files.py"
281-
working-directory: tools
282-
env:
283-
UPLOAD_URL: ${{ github.event.release.upload_url }}
284-
ADABOT_GITHUB_ACCESS_TOKEN: ${{ secrets.BLINKA_GITHUB_ACCESS_TOKEN }}
285-
if: github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested')

.gitmodules

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,3 +114,9 @@
114114
[submodule "frozen/Adafruit_CircuitPython_Register"]
115115
path = frozen/Adafruit_CircuitPython_Register
116116
url = https://github.com/adafruit/Adafruit_CircuitPython_Register.git
117+
[submodule "frozen/Adafruit_CircuitPython_ESP32SPI"]
118+
path = frozen/Adafruit_CircuitPython_ESP32SPI
119+
url = https://github.com/adafruit/Adafruit_CircuitPython_ESP32SPI
120+
[submodule "frozen/Adafruit_CircuitPython_Requests"]
121+
path = frozen/Adafruit_CircuitPython_Requests
122+
url = https://github.com/adafruit/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(

tools/build_board_info.py

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@
2121
HEX_UF2 = ('hex', 'uf2')
2222
SPK = ('spk',)
2323

24+
# Example:
25+
# https://downloads.circuitpython.org/bin/trinket_m0/en_US/adafruit-circuitpython-trinket_m0-en_US-5.0.0-rc.0.uf2
26+
DOWNLOAD_BASE_URL = "https://downloads.circuitpython.org/bin"
27+
2428
# Default extensions
2529
extension_by_port = {
2630
"nrf": UF2,
@@ -33,8 +37,10 @@
3337
# Per board overrides
3438
extension_by_board = {
3539
# samd
36-
"arduino_mkr1300": BIN,
37-
"arduino_zero": BIN,
40+
"arduino_mkr1300": BIN_UF2,
41+
"arduino_mkrzero": BIN_UF2,
42+
"arduino_nano_33_iot": BIN_UF2,
43+
"arduino_zero": BIN_UF2,
3844
"feather_m0_adalogger": BIN_UF2,
3945
"feather_m0_basic": BIN_UF2,
4046
"feather_m0_rfm69": BIN_UF2,
@@ -275,7 +281,14 @@ def generate_download_info():
275281
files = []
276282
new_version["files"][language] = files
277283
for extension in board_info["extensions"]:
278-
files.append("https://github.com/adafruit/circuitpython/releases/download/{tag}/adafruit-circuitpython-{alias}-{language}-{tag}.{extension}".format(tag=new_tag, alias=alias, language=language, extension=extension))
284+
files.append(
285+
"{base_url}/{alias}/{language}/adafruit-circuitpython-{alias}-{language}-{tag}.{extension}"
286+
.format(
287+
base_url=DOWNLOAD_BASE_URL,
288+
tag=new_tag,
289+
alias=alias,
290+
language=language,
291+
extension=extension))
279292
current_info[alias]["downloads"] = alias_info["download_count"]
280293
current_info[alias]["versions"].append(new_version)
281294

tools/upload_release_files.py

Lines changed: 0 additions & 35 deletions
This file was deleted.

0 commit comments

Comments
 (0)