Merge branch 'main' into espressif · mimoccc/circuitpython@554a629 · GitHub
Skip to content

Commit 554a629

Browse files
microdev1microdev1
committed
Merge branch 'main' into espressif
2 parents e5c125d + f6de603 commit 554a629

212 files changed

Lines changed: 9943 additions & 395 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/build.yml‎

Lines changed: 94 additions & 35 deletions

‎.github/workflows/create_website_pr.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,21 @@ jobs:
1818
run: echo "$GITHUB_CONTEXT"
1919
- uses: actions/checkout@v2.2.0
2020
with:
21-
submodules: true
22-
fetch-depth: 0
21+
submodules: false
22+
fetch-depth: 1
2323
- name: Set up Python 3.8
2424
uses: actions/setup-python@v1
2525
with:
2626
python-version: 3.8
27+
- name: Get CP deps
28+
run: python tools/ci_fetch_deps.py website ${{ github.ref }}
2729
- name: Install deps
2830
run: |
2931
pip install -r requirements-dev.txt
3032
- name: Versions
3133
run: |
3234
gcc --version
3335
python3 --version
34-
- run: git fetch --recurse-submodules=no https://github.com/adafruit/circuitpython refs/tags/*:refs/tags/*
3536
- name: CircuitPython version
3637
run: git describe --dirty --tags
3738
- name: Website

‎.github/workflows/ports_windows.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,12 @@ jobs:
6565
which python; python --version; python -c "import cascadetoml"
6666
which python3; python3 --version; python3 -c "import cascadetoml"
6767
68-
- uses: actions/checkout@v2
68+
- uses: actions/checkout@v2.2.0
6969
with:
70-
submodules: true
71-
fetch-depth: 0
72-
73-
- run: git fetch --recurse-submodules=no https://github.com/adafruit/circuitpython refs/tags/*:refs/tags/*
70+
submodules: false
71+
fetch-depth: 1
72+
- name: Get CP deps
73+
run: python tools/ci_fetch_deps.py windows ${{ github.ref }}
7474
- name: CircuitPython version
7575
run: |
7676
git describe --dirty --tags

‎.github/workflows/pre-commit.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
pre-commit:
1313
runs-on: ubuntu-20.04
1414
steps:
15-
- uses: actions/checkout@v1
15+
- uses: actions/checkout@v2.2.0
1616
- uses: actions/setup-python@v1
1717
- name: Install deps
1818
run: |

‎.gitmodules‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,3 +190,11 @@
190190
[submodule "frozen/Adafruit_CircuitPython_APDS9960"]
191191
path = frozen/Adafruit_CircuitPython_APDS9960
192192
url = https://github.com/adafruit/Adafruit_CircuitPython_APDS9960
193+
[submodule "ports/broadcom/peripherals"]
194+
path = ports/broadcom/peripherals
195+
url = https://github.com/adafruit/broadcom-peripherals.git
196+
branch = main-build
197+
[submodule "rpi-firmware"]
198+
path = ports/broadcom/firmware
199+
url = https://github.com/raspberrypi/rpi-firmware.git
200+
branch = master

‎conf.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,8 @@ def autoapi_prepare_jinja_env(jinja_env):
186186
"ports/atmel-samd/peripherals",
187187
"ports/atmel-samd/QTouch",
188188
"ports/atmel-samd/tools",
189+
"ports/broadcom/firmware",
190+
"ports/broadcom/peripherals",
189191
"ports/cxd56/mkspk",
190192
"ports/cxd56/spresense-exported-sdk",
191193
"ports/espressif/certificates",

‎devices/ble_hci/common-hal/_bleio/Adapter.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -938,8 +938,8 @@ uint16_t bleio_adapter_max_attribute_handle(bleio_adapter_obj_t *adapter) {
938938

939939

940940
void bleio_adapter_gc_collect(bleio_adapter_obj_t *adapter) {
941-
gc_collect_root((void **)adapter, sizeof(bleio_adapter_obj_t) / sizeof(size_t));
942-
gc_collect_root((void **)bleio_connections, sizeof(bleio_connections) / sizeof(size_t));
941+
gc_collect_root((void **)adapter, sizeof(bleio_adapter_obj_t) / (sizeof(size_t)));
942+
gc_collect_root((void **)bleio_connections, sizeof(bleio_connections) / (sizeof(size_t)));
943943
}
944944

945945
void bleio_adapter_reset(bleio_adapter_obj_t *adapter) {

‎docs/shared_bindings_matrix.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
from concurrent.futures import ThreadPoolExecutor
3232

33-
SUPPORTED_PORTS = ['atmel-samd', 'cxd56', 'espressif', 'litex', 'mimxrt10xx', 'nrf', 'raspberrypi', 'stm']
33+
SUPPORTED_PORTS = ['atmel-samd', 'broadcom', 'cxd56', 'espressif', 'litex', 'mimxrt10xx', 'nrf', 'raspberrypi', 'stm']
3434

3535
aliases_by_board = {
3636
"circuitplayground_express": [

‎extmod/vfs_fat.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,7 @@ STATIC const mp_obj_property_t fat_vfs_label_obj = {
440440
.base.type = &mp_type_property,
441441
.proxy = {(mp_obj_t)&fat_vfs_getlabel_obj,
442442
(mp_obj_t)&fat_vfs_setlabel_obj,
443-
MP_ROM_NONE},
443+
(mp_obj_t)MP_ROM_NONE},
444444
};
445445
#endif
446446

‎lib/oofatfs/ff.c‎

Lines changed: 1 addition & 1 deletion

0 commit comments

Comments
 (0)