Skip to content

Pull latest changes #7

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.

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 231 commits into from
Dec 30, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
231 commits
Select commit Hold shift + click to select a range
472a5a9
Add API reset to reset_pin_number
hierophect Nov 3, 2020
6a6e998
Added BastBLE
sabas1080 Nov 8, 2020
78dffd8
add board on build.yml
Soulkrown Nov 9, 2020
ee57bc4
fix name
Soulkrown Nov 9, 2020
7253b2e
fix name board
Soulkrown Nov 13, 2020
089fa82
Fix pre-commit
sabas1080 Nov 17, 2020
33ca357
fix VID and PID
sabas1080 Nov 17, 2020
8669426
Merge remote-tracking branch 'upstream/main' into esp32-pin-reset
hierophect Nov 23, 2020
1c9f33a
Replace reset with mux change
hierophect Nov 24, 2020
1553a64
build: Update to gcc10 preview
jepler Nov 24, 2020
bde1c41
Revert "Prevent exceptions from accumulating in REPL"
cwalther Nov 28, 2020
57fa6be
allow radio.enabled to be settable
dhalbert Dec 4, 2020
2f0e676
update doc per review
dhalbert Dec 4, 2020
db04582
Translated using Weblate (Portuguese (Brazil))
wtuemura Dec 3, 2020
a7ec4a0
Merge pull request #3791 from dhalbert/radio-set-enabled
tannewt Dec 4, 2020
11d829e
Translated using Weblate (Czech)
vkuthan Dec 4, 2020
e58c385
Merge branch 'origin/main' into Weblate.
weblate Dec 4, 2020
bb1b2bd
Translated using Weblate (Swedish)
bergdahl Dec 4, 2020
9391c8f
Make ResetReason and RunReason available
dhalbert Dec 6, 2020
70827ac
debug log for wifi scan, start stop
BennyE Dec 6, 2020
169b487
Include wifi.radio singleton in gc
dhalbert Dec 7, 2020
40a5369
Merge remote-tracking branch 'upstream/main' into esp32-pin-reset
hierophect Dec 7, 2020
c7b5928
Fix submodule desync
hierophect Dec 7, 2020
c1a2ea2
Change to config-based resets
hierophect Dec 7, 2020
7ac2000
Merge pull request #3799 from dhalbert/wifi-radio-gc-collect
tannewt Dec 7, 2020
ac8a962
Translated using Weblate (Swedish)
bergdahl Dec 6, 2020
4e7668d
Merge branch 'origin/main' into Weblate.
weblate Dec 7, 2020
22ad76b
Merge pull request #3800 from BennyE/wifi-better-logs
tannewt Dec 7, 2020
458f557
Merge branch 'origin/main' into Weblate.
weblate Dec 7, 2020
054eafd
Merge pull request #3797 from dhalbert/reset-reason-run-reason-available
dhalbert Dec 7, 2020
3b5be92
Merge branch 'origin/main' into Weblate.
weblate Dec 7, 2020
44b56f7
Store safe mode state in the RTC.
tannewt Dec 8, 2020
571c063
Working, tested with two i2c busses
skieast Dec 8, 2020
7250925
Merge pull request #3802 from tannewt/fix_s2_safe_mode
dhalbert Dec 8, 2020
a31fc3b
Merge branch 'origin/main' into Weblate.
weblate Dec 8, 2020
fc23a0c
implement ota module
microdev1 Dec 8, 2020
6022437
add ota support for esp32s2
microdev1 Dec 8, 2020
2f95c94
esp32s2 - update common_hal_mcu_reset
microdev1 Dec 8, 2020
2c546ab
Remove warning about lack of support on M0 from rotaryio
deshipu Dec 8, 2020
1df0334
Merge pull request #3806 from pewpew-game/rotarydoc
dhalbert Dec 8, 2020
f261004
Merge branch 'origin/main' into Weblate.
weblate Dec 8, 2020
40118bc
Add `board_deinit` for use with sleep
tannewt Dec 3, 2020
d0a806d
Enter safe mode after panic or brownout
tannewt Dec 8, 2020
93fade2
Merge pull request #3804 from microDev1/s2-reset
tannewt Dec 8, 2020
0ff0bb9
Translated using Weblate (French)
Anton-2 Dec 8, 2020
a3fc20d
Merge branch 'origin/main' into Weblate.
weblate Dec 8, 2020
0b4bcd9
Fix build and more comments
tannewt Dec 8, 2020
9a5006e
Remove problematic calloc
hierophect Dec 8, 2020
f7c7324
Translations
hierophect Dec 8, 2020
57101d7
Merge pull request #3807 from tannewt/sleep_tweaks
tannewt Dec 9, 2020
1330130
Merge pull request #3808 from tannewt/panic_safe_mode
tannewt Dec 9, 2020
fea25c1
Merge branch 'origin/main' into Weblate.
weblate Dec 9, 2020
cea6c3d
Update translation files
weblate Dec 9, 2020
eedcc98
Fix some spelling mistakes
mcauser Dec 9, 2020
e14b148
Merge pull request #3803 from skieast/fix_i2c_hang_with_wifi
tannewt Dec 9, 2020
6af532f
Merge branch 'origin/main' into Weblate.
weblate Dec 9, 2020
e9fd689
Merge pull request #3814 from mcauser2/main
tannewt Dec 9, 2020
8b98867
Merge branch 'origin/main' into Weblate.
weblate Dec 9, 2020
20c3184
re-organize and clean-up
microdev1 Dec 10, 2020
dee86a0
factor out esp_ota_end
microdev1 Dec 10, 2020
ed5add3
add ability to flash in continuous chunks
microdev1 Dec 10, 2020
bfa2c60
add ability to flash in discontinuous chunks
microdev1 Dec 10, 2020
07015ad
add ability to switch boot partition
microdev1 Dec 10, 2020
6a4f749
reset ota module on every vm run
microdev1 Dec 10, 2020
5964163
Initial SleepMemory code
dhalbert Dec 10, 2020
55f4110
fix typo
dhalbert Dec 10, 2020
d83d46a
Invoke scripts with
dhalbert Dec 10, 2020
cb35abf
add docs, update translation & fix ota.flash()
microdev1 Dec 10, 2020
cf93898
SleepMemory + set alarm.wake_alarm
dhalbert Dec 11, 2020
1daad63
add apt-get update
dhalbert Dec 11, 2020
39124b8
doc fixes
dhalbert Dec 11, 2020
08e94e6
add more docs
microdev1 Dec 11, 2020
d920750
Merge pull request #3815 from dhalbert/python3-mkenv-mk
tannewt Dec 11, 2020
8d9d53a
Translated using Weblate (Portuguese (Brazil))
wtuemura Dec 11, 2020
4becc00
Merge branch 'origin/main' into Weblate.
weblate Dec 11, 2020
e3194ad
Reserve UART pins only if DEBUG=1 is set to address issue 3811
BennyE Dec 11, 2020
2de5eba
add apt-get update
BennyE Dec 11, 2020
37c9f76
add apt-get update
dhalbert Dec 11, 2020
81c4871
Set DEBUG CFLAG if set in make
BennyE Dec 11, 2020
eda3392
Merge pull request #3818 from dhalbert/apt-update
dhalbert Dec 11, 2020
54fcf12
Merge branch 'origin/main' into Weblate.
weblate Dec 11, 2020
92098ca
update docs, implement suggested changes
microdev1 Dec 11, 2020
c5c1362
Fix for issue 3663 by returning early if no scan was started before s…
BennyE Dec 11, 2020
37ee5e6
Merge branch 'main' into ota-s2
microdev1 Dec 11, 2020
fe32dd0
Update Big Honking Button configuration to support its newest board r…
theacodes Dec 13, 2020
6cced49
Merge pull request #3820 from theacodes/bhb-v6
dhalbert Dec 13, 2020
9acdd91
Merge branch 'origin/main' into Weblate.
weblate Dec 13, 2020
210c0ec
add country(code) to wifi network objects)
BennyE Dec 13, 2020
e0afa32
use RTC_DATA_ATTR; address review comments
dhalbert Dec 14, 2020
e0bb4a8
make translate
dhalbert Dec 14, 2020
f15e2d8
Reduce samples from 64 to 2
hierophect Dec 14, 2020
dc560f0
translations
hierophect Dec 14, 2020
cac755b
Merge remote-tracking branch 'upstream/main' into esp-analog-hang
hierophect Dec 14, 2020
d793ec2
Change pinfunc to default of 0 at reset
hierophect Dec 14, 2020
eea8bc4
Use Dec 11 gcc 10.2 release
dhalbert Dec 14, 2020
d2cb58a
suod apt-get update
dhalbert Dec 14, 2020
845cf03
typo
dhalbert Dec 14, 2020
731cdef
this should be it.
Dec 14, 2020
6d8642b
fixing line comment issue with CI build tests
Dec 14, 2020
c16b8f1
odd thing with a tests/pyboard\ 2.py file showing up
Dec 14, 2020
6abe3cd
-Os for SAMD51; fix CSUPEROPT typo
dhalbert Dec 14, 2020
dc473b2
Merge pull request #3643 from hierophect/esp32-pin-reset
tannewt Dec 15, 2020
b98da3d
Merge branch 'origin/main' into Weblate.
weblate Dec 15, 2020
a1f773d
Merge pull request #3819 from BennyE/issue3663
tannewt Dec 15, 2020
1bacfac
Merge branch 'origin/main' into Weblate.
weblate Dec 15, 2020
d6ee17c
Merge pull request #3817 from BennyE/reserve-pins-only-for-debug
tannewt Dec 15, 2020
2c4b1f2
Merge branch 'origin/main' into Weblate.
weblate Dec 15, 2020
d076296
Merge pull request #3816 from dhalbert/sleepmemory
tannewt Dec 15, 2020
f267c32
Merge branch 'origin/main' into Weblate.
weblate Dec 15, 2020
9fd6521
Update translation files
weblate Dec 15, 2020
97947b4
shrink bast_pro_mini_m0; use proper flex-array syntax
dhalbert Dec 15, 2020
b810b38
Merge pull request #3792 from weblate/weblate-circuitpython-main
jepler Dec 15, 2020
afcc00f
Merge pull request #3771 from cwalther/exceptionprint
jepler Dec 15, 2020
9f9ab44
Avoid "error: flexible array member in a struct with no named members"
dhalbert Dec 15, 2020
dc9bc8f
Fix flexible array declaration
jepler Dec 15, 2020
3c4562c
camera: Provide correct forward-declaration of camera_imageformat_type
jepler Dec 15, 2020
bbbd621
nrf: simmel: remove some unneeded modules to make it fit
jepler Dec 15, 2020
fb33c4e
-ftree-vrp better diagnostics on -Os builds; -fno-inline-functions fo…
dhalbert Dec 15, 2020
4521dfb
squeeze some smaller boards
dhalbert Dec 15, 2020
3ad4b12
Merge branch 'main' into esp-analog-hang
hierophect Dec 15, 2020
a2d2d69
Merge pull request #3810 from hierophect/esp-analog-hang
dhalbert Dec 15, 2020
2de9f18
Update translation files
weblate Dec 15, 2020
f2204d7
Merge pull request #3828 from weblate/weblate-circuitpython-main
jepler Dec 16, 2020
1ad49d9
Add alarm.pin that wakes on pin level
tannewt Dec 9, 2020
0dcc659
Swap to IDF release/4.2 branch for stability
tannewt Dec 12, 2020
ca757f2
removed comments on 64MiB SPI flash causing build test issues
Dec 16, 2020
2f47673
removing pesky directories
Dec 16, 2020
8fcb28e
hopefully this gets rid of all the funny files
Dec 16, 2020
1f58795
still removing doubles. should be the last
Dec 16, 2020
7480552
Delete board.h
skerr92 Dec 16, 2020
109b6ba
Translated using Weblate (Portuguese (Brazil))
wtuemura Dec 16, 2020
28bd29e
displayio: ColorConverter: fix logic errors about transparent pixels
jepler Dec 16, 2020
68dd4b2
Merge pull request #3832 from weblate/weblate-circuitpython-main
tannewt Dec 16, 2020
fac0bf1
Add files via upload
StackRduino Dec 17, 2020
70a9c60
Update devices.h
StackRduino Dec 17, 2020
70739ff
Update pins.c
StackRduino Dec 17, 2020
f3b7cd6
Delete pins.c
StackRduino Dec 17, 2020
3d9e495
Add files via upload
StackRduino Dec 17, 2020
23ad9c7
Update mpconfigboard.h
StackRduino Dec 17, 2020
109e147
Update board.c
StackRduino Dec 17, 2020
0a7c742
Update mpconfigboard.mk
StackRduino Dec 17, 2020
736c0d4
Delete pins.c
StackRduino Dec 17, 2020
1284418
Delete mpconfigboard.mk
StackRduino Dec 17, 2020
f3fb014
Delete mpconfigboard.h
StackRduino Dec 17, 2020
bc95c7f
Delete board.c
StackRduino Dec 17, 2020
c6de41b
Update build.yml
StackRduino Dec 17, 2020
81ff95a
Add files via upload
StackRduino Dec 17, 2020
06022a5
Update mpconfigboard.mk
StackRduino Dec 17, 2020
7afa1a1
Update mpconfigboard.mk
StackRduino Dec 17, 2020
8f9cd70
Merge pull request #3752 from jepler/gcc10
dhalbert Dec 17, 2020
f224ed1
OnDiskBitmap: Correct handling of "0 color palette" images
jepler Dec 17, 2020
4863413
rename ota to dualbank
microdev1 Dec 17, 2020
4512290
Merge branch 'main' into ota-s2
microdev1 Dec 17, 2020
6c4df5a
adafruit_bus_device: Don't transmit STOP condition in write_then_read…
jepler Dec 18, 2020
79658ad
Merge pull request #3838 from StackRduino/patch-1
dhalbert Dec 18, 2020
f202eb7
Merge pull request #3842 from StackRduino/main
dhalbert Dec 18, 2020
fd21ff5
Merge pull request #3847 from jepler/issue-3795
jepler Dec 18, 2020
88b1e2f
remove Internal flash unnecessary
sabas1080 Dec 20, 2020
bd3c5c3
define QSPI pinout
sabas1080 Dec 20, 2020
2e393ed
adding debug infos
BennyE Dec 20, 2020
d24a5d6
update path board.h
sabas1080 Dec 20, 2020
233ccaa
Merge pull request #3824 from skerr92/add_more_spi_flash
dhalbert Dec 21, 2020
ae3b440
more fixes and still with debug
BennyE Dec 21, 2020
fb0c74c
Merge pull request #3662 from ElectronicCats/bastble
tannewt Dec 22, 2020
3b4c14f
unmounted filesystems start as ejected
dhalbert Dec 22, 2020
df8cba1
Merge pull request #3834 from jepler/pr3723
tannewt Dec 22, 2020
6347a3f
Merge pull request #3812 from microDev1/ota-s2
tannewt Dec 22, 2020
aa1f0e9
Update translation files
weblate Dec 22, 2020
39ca406
Add Adafruit to MICROPY_HW_BOARD_NAME for various boards
dhalbert Dec 22, 2020
17e7973
Add support for Winbond W25Q64FV
djix123 Dec 21, 2020
d6df43b
Merge pull request #3863 from dhalbert/adafruit-prefix
dhalbert Dec 22, 2020
9e725df
Merge branch 'origin/main' into Weblate.
weblate Dec 22, 2020
aaa3c61
Add default I2C pins for STM32F411CE
djix123 Dec 22, 2020
f226f4a
Merge pull request #3864 from djix123/w25q64fv
dhalbert Dec 22, 2020
d3ae03b
Merge branch 'origin/main' into Weblate.
weblate Dec 22, 2020
d4e9eea
mark alarm.wake_alarm during gc sweep
dhalbert Dec 22, 2020
da8f023
esp32s2: make flash: use the stub
jepler Dec 22, 2020
65b295c
Merge pull request #3865 from djix123/stm32f411ce_i2c
dhalbert Dec 22, 2020
4db2d69
Translated using Weblate (Portuguese (Brazil))
wtuemura Dec 22, 2020
3fbd45d
Merge branch 'origin/main' into Weblate.
weblate Dec 22, 2020
8b5b602
Merge pull request #3862 from dhalbert/storage-remount
tannewt Dec 22, 2020
e31ecd6
Merge branch 'origin/main' into Weblate.
weblate Dec 22, 2020
8b03951
Merge pull request #3866 from jepler/use-stub
tannewt Dec 22, 2020
cda6de8
Merge branch 'origin/main' into Weblate.
weblate Dec 22, 2020
8907903
FrequencyIn: do not raise in interrupt handler
dhalbert Dec 22, 2020
1fca297
A couple sleep fixes
tannewt Dec 23, 2020
e9c9fce
Remove debug log messages
BennyE Dec 23, 2020
42a229c
circuitpy_mpconfig.mk: Unconditionally disable CIRCUITPY_BUSDEVICE
jepler Dec 23, 2020
eb65765
Merge pull request #3867 from dhalbert/frequencyin-fix-6.0.x
tannewt Dec 23, 2020
ad4939e
Translated using Weblate (Dutch)
ryevertigo Dec 23, 2020
414d216
Merge branch 'origin/main' into Weblate.
weblate Dec 23, 2020
1a80334
Stub out mp_hal_is_interrupted for UNIX
tannewt Dec 23, 2020
a11ad25
BLE fixes
dhalbert Dec 22, 2020
153a686
make translate for main
dhalbert Dec 23, 2020
966f4de
Merge pull request #3869 from jepler/disable-busdevice-in-core
dhalbert Dec 23, 2020
98afc9a
Merge branch 'origin/main' into Weblate.
weblate Dec 23, 2020
c371119
Make translate
tannewt Dec 23, 2020
1a6b1b1
implementing suggested changes
BennyE Dec 23, 2020
a1e3ab1
Merge pull request #3874 from dhalbert/ble-fixes-6.0.x-to-main
dhalbert Dec 24, 2020
34c90b6
Merge branch 'origin/main' into Weblate.
weblate Dec 24, 2020
ce01aed
Update translation files
weblate Dec 24, 2020
8061a25
Merge branch 'main' into pin_alarm
dhalbert Dec 24, 2020
cf4862e
make translate again
dhalbert Dec 24, 2020
578abae
make translate yet again; forgot to fetch submodules to fresh clone
dhalbert Dec 24, 2020
f3e5441
litex: ensure we don't re-enable interrups during ISR
xobs Dec 24, 2020
2f95cc9
litex: move more critical code to RAM
xobs Dec 24, 2020
64bb055
Updating comment to reflect feedback of espressif from IDFGH-4486 -> …
BennyE Dec 24, 2020
2729666
SAMD51: change of DAC power setting
digixx Dec 25, 2020
5c4cb43
Merge pull request #3880 from digixx/patch-1
jepler Dec 25, 2020
ffedfdd
Merge branch 'origin/main' into Weblate.
weblate Dec 25, 2020
f7cafbf
re-arrange ci actions
microdev1 Dec 26, 2020
1b7fbaf
Merge pull request #3881 from microDev1/update-ci
dhalbert Dec 26, 2020
18047d0
Merge branch 'origin/main' into Weblate.
weblate Dec 26, 2020
938a0fa
Add include to tick.c for mp_hal_is_interrupted()
dhalbert Dec 26, 2020
6c7e6ab
Downgrade OTA API for IDF 4.2
tannewt Dec 28, 2020
dc332ba
update common_hal_reset_pin()
microdev1 Dec 28, 2020
171efd5
Merge pull request #3830 from tannewt/pin_alarm
dhalbert Dec 28, 2020
dc8593d
Translated using Weblate (Swedish)
bergdahl Dec 28, 2020
759321a
Merge branch 'origin/main' into Weblate.
weblate Dec 28, 2020
860c4d5
Update translation files
weblate Dec 28, 2020
c3396e4
Merge pull request #3868 from BennyE/wifi-enhancement-countrycode
tannewt Dec 28, 2020
3332206
Merge branch 'origin/main' into Weblate.
weblate Dec 28, 2020
f9d9c03
Merge pull request #3878 from xobs/fomu-fixes-6.0.0
tannewt Dec 28, 2020
b6f6af2
Merge branch 'origin/main' into Weblate.
weblate Dec 28, 2020
7401aa8
Merge pull request #3888 from microDev1/fix-reset-pin
jepler Dec 29, 2020
62eb65e
Translated using Weblate (Portuguese (Brazil))
wtuemura Dec 29, 2020
6348e2f
Merge branch 'origin/main' into Weblate.
weblate Dec 29, 2020
9993814
Merge pull request #3860 from weblate/weblate-circuitpython-main
jepler Dec 29, 2020
8666083
Translated using Weblate (French)
hugodahl Dec 29, 2020
ffbe37b
Translated using Weblate (French)
hugodahl Dec 29, 2020
48de52c
Merge pull request #3893 from weblate/weblate-circuitpython-main
jepler Dec 30, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
59 changes: 31 additions & 28 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,40 @@ jobs:
python-version: 3.8
- name: Install deps
run: |
sudo apt-get update
sudo apt-get install -y eatmydata
sudo eatmydata apt-get install -y gettext librsvg2-bin mingw-w64 latexmk texlive-fonts-recommended texlive-latex-recommended texlive-latex-extra
pip install requests sh click setuptools cpp-coveralls "Sphinx<4" sphinx-rtd-theme recommonmark sphinx-autoapi sphinxcontrib-svg2pdfconverter polib pyyaml astroid isort black awscli mypy
- name: Versions
run: |
gcc --version
python3 --version
- name: Translations
run: make check-translate
- name: New boards check
run: python3 -u ci_new_boards_check.py
working-directory: tools
- name: Duplicate USB VID/PID Check
run: python3 -u -m tools.ci_check_duplicate_usb_vid_pid
- name: Build and Validate Stubs
run: make check-stubs -j2
- uses: actions/upload-artifact@v2
with:
name: stubs
path: circuitpython-stubs*
- name: Test Documentation Build (HTML)
run: sphinx-build -E -W -b html -D version=${{ env.CP_VERSION }} -D release=${{ env.CP_VERSION }} . _build/html
- uses: actions/upload-artifact@v2
with:
name: docs
path: _build/html
- name: Test Documentation Build (LaTeX/PDF)
run: |
make latexpdf
- uses: actions/upload-artifact@v2
with:
name: docs
path: _build/latex
- name: Build mpy-cross
run: make -C mpy-cross -j2
- name: Build unix port
Expand All @@ -67,32 +94,6 @@ jobs:
- name: mpy Tests
run: MICROPY_CPYTHON3=python3.8 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -j1 --via-mpy -d basics float
working-directory: tests
- name: Build and Validate Stubs
run: make check-stubs -j2
- uses: actions/upload-artifact@v2
with:
name: stubs
path: circuitpython-stubs*
- name: Test Documentation Build (HTML)
run: sphinx-build -E -W -b html -D version=${{ env.CP_VERSION }} -D release=${{ env.CP_VERSION }} . _build/html
- uses: actions/upload-artifact@v2
with:
name: docs
path: _build/html
- name: Test Documentation Build (LaTeX/PDF)
run: |
make latexpdf
- uses: actions/upload-artifact@v2
with:
name: docs
path: _build/latex
- name: Translations
run: make check-translate
- name: New boards check
run: python3 -u ci_new_boards_check.py
working-directory: tools
- name: Duplicate USB VID/PID Check
run: python3 -u -m tools.ci_check_duplicate_usb_vid_pid
- name: Build mpy-cross.static-raspbian
run: make -C mpy-cross -j2 -f Makefile.static-raspbian
- uses: actions/upload-artifact@v2
Expand Down Expand Up @@ -184,6 +185,7 @@ jobs:
- "arduino_nano_33_iot"
- "arduino_zero"
- "bast_pro_mini_m0"
- "bastble"
- "bdmicro_vina_d21"
- "bdmicro_vina_d51"
- "bless_dev_board_multi_sensor"
Expand Down Expand Up @@ -310,6 +312,7 @@ jobs:
- "sparkfun_samd21_mini"
- "sparkfun_samd51_thing_plus"
- "spresense"
- "stackrduino_m0_pro"
- "stm32f411ce_blackpill"
- "stm32f411ve_discovery"
- "stm32f412zg_discovery"
Expand Down Expand Up @@ -342,8 +345,8 @@ jobs:
run: |
sudo apt-get install -y gettext
pip install requests sh click setuptools awscli
wget https://adafruit-circuit-python.s3.amazonaws.com/gcc-arm-none-eabi-9-2019-q4-major-x86_64-linux.tar.bz2
sudo tar -C /usr --strip-components=1 -xaf gcc-arm-none-eabi-9-2019-q4-major-x86_64-linux.tar.bz2
wget --no-verbose https://adafruit-circuit-python.s3.amazonaws.com/gcc-arm-none-eabi-10-2020-q4-major-x86_64-linux.tar.bz2
sudo tar -C /usr --strip-components=1 -xaf gcc-arm-none-eabi-10-2020-q4-major-x86_64-linux.tar.bz2
- name: Versions
run: |
gcc --version
Expand Down
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@
url = https://github.com/adafruit/Adafruit_CircuitPython_RFM69.git
[submodule "ports/esp32s2/esp-idf"]
path = ports/esp32s2/esp-idf
url = https://github.com/jepler/esp-idf.git
url = https://github.com/adafruit/esp-idf.git
[submodule "ports/esp32s2/certificates/nina-fw"]
path = ports/esp32s2/certificates/nina-fw
url = https://github.com/adafruit/nina-fw.git
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ update-frozen-libraries:
@echo "Updating all frozen libraries to latest tagged version."
cd frozen; for library in *; do cd $$library; ../../tools/git-checkout-latest-tag.sh; cd ..; done

one-of-each: samd21 samd51 esp32s2 litex mimxrt10xx nrf stm
one-of-each: samd21 litex mimxrt10xx nrf stm

samd21:
$(MAKE) -C ports/atmel-samd BOARD=trinket_m0
Expand Down
48 changes: 25 additions & 23 deletions devices/ble_hci/common-hal/_bleio/att.c
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ STATIC struct {
typedef struct __packed {
uint8_t properties;
uint16_t value_handle;
uint8_t uuid[0]; // 2 or 16 bytes
uint8_t uuid[]; // 2 or 16 bytes
} characteristic_declaration_t;

STATIC uint8_t bleio_properties_to_ble_spec_properties(uint8_t bleio_properties) {
Expand Down Expand Up @@ -1010,21 +1010,22 @@ void process_read_group_req(uint16_t conn_handle, uint16_t mtu, uint8_t dlen, ui
}

int att_read_group_req(uint16_t conn_handle, uint16_t start_handle, uint16_t end_handle, uint16_t uuid, uint8_t response_buffer[]) {
struct __packed {

typedef struct __packed {
struct bt_att_hdr h;
struct bt_att_read_group_req r;
} req = { {
.code = BT_ATT_OP_READ_GROUP_REQ,
}, {
.start_handle = start_handle,
.end_handle = end_handle,
}
};
req.r.uuid[0] = uuid & 0xff;
req.r.uuid[1] = uuid >> 8;
} req_t;

uint8_t req_bytes[sizeof(req_t) + sizeof(uuid)];
req_t *req = (req_t *) req_bytes;

return send_req_wait_for_rsp(conn_handle, sizeof(req), (uint8_t *) &req, response_buffer);
req->h.code = BT_ATT_OP_READ_GROUP_REQ;
req->r.start_handle = start_handle;
req->r.end_handle = end_handle;
req->r.uuid[0] = uuid & 0xff;
req->r.uuid[1] = uuid >> 8;

return send_req_wait_for_rsp(conn_handle, sizeof(req_bytes), req_bytes, response_buffer);
}

STATIC void process_read_group_rsp(uint16_t conn_handle, uint8_t dlen, uint8_t data[]) {
Expand Down Expand Up @@ -1305,20 +1306,21 @@ STATIC void process_read_type_req(uint16_t conn_handle, uint16_t mtu, uint8_t dl
}

int att_read_type_req(uint16_t conn_handle, uint16_t start_handle, uint16_t end_handle, uint16_t type, uint8_t response_buffer[]) {
struct __packed {
typedef struct __packed {
struct bt_att_hdr h;
struct bt_att_read_type_req r;
} req = { {
.code = BT_ATT_OP_READ_TYPE_REQ,
}, {
.start_handle = start_handle,
.end_handle = end_handle,
}
};
req.r.uuid[0] = type & 0xff;
req.r.uuid[1] = type >> 8;
} req_t;

return send_req_wait_for_rsp(conn_handle, sizeof(req), (uint8_t *) &req, response_buffer);
uint8_t req_bytes[sizeof(req_t) + sizeof(type)];
req_t *req = (req_t *) req_bytes;

req->h.code = BT_ATT_OP_READ_TYPE_REQ;
req->r.start_handle = start_handle;
req->r.end_handle = end_handle;
req->r.uuid[0] = type & 0xff;
req->r.uuid[1] = type >> 8;

return send_req_wait_for_rsp(conn_handle, sizeof(req_bytes), req_bytes, response_buffer);
}

STATIC void process_read_type_rsp(uint16_t conn_handle, uint8_t dlen, uint8_t data[]) {
Expand Down
52 changes: 29 additions & 23 deletions devices/ble_hci/common-hal/_bleio/hci_include/att_internal.h
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ struct bt_att_info_128 {
#define BT_ATT_OP_FIND_INFO_RSP 0x05
struct bt_att_find_info_rsp {
uint8_t format;
uint8_t info[0];
uint8_t info[];
} __packed;

/* Find By Type Value Request */
Expand All @@ -78,7 +78,7 @@ struct bt_att_find_type_req {
uint16_t start_handle;
uint16_t end_handle;
uint16_t type;
uint8_t value[0];
uint8_t value[];
} __packed;

struct bt_att_handle_group {
Expand All @@ -89,27 +89,28 @@ struct bt_att_handle_group {
/* Find By Type Value Response */
#define BT_ATT_OP_FIND_TYPE_RSP 0x07
struct bt_att_find_type_rsp {
struct bt_att_handle_group list[0];
uint8_t _dummy[0];
struct bt_att_handle_group list[];
} __packed;

/* Read By Type Request */
#define BT_ATT_OP_READ_TYPE_REQ 0x08
struct bt_att_read_type_req {
uint16_t start_handle;
uint16_t end_handle;
uint8_t uuid[0];
uint8_t uuid[];
} __packed;

struct bt_att_data {
uint16_t handle;
uint8_t value[0];
uint8_t value[];
} __packed;

/* Read By Type Response */
#define BT_ATT_OP_READ_TYPE_RSP 0x09
struct bt_att_read_type_rsp {
uint8_t len;
struct bt_att_data data[0];
struct bt_att_data data[];
} __packed;

/* Read Request */
Expand All @@ -121,7 +122,8 @@ struct bt_att_read_req {
/* Read Response */
#define BT_ATT_OP_READ_RSP 0x0b
struct bt_att_read_rsp {
uint8_t value[0];
uint8_t _dummy[0];
uint8_t value[];
} __packed;

/* Read Blob Request */
Expand All @@ -134,49 +136,52 @@ struct bt_att_read_blob_req {
/* Read Blob Response */
#define BT_ATT_OP_READ_BLOB_RSP 0x0d
struct bt_att_read_blob_rsp {
uint8_t value[0];
uint8_t _dummy[0];
uint8_t value[];
} __packed;

/* Read Multiple Request */
#define BT_ATT_READ_MULT_MIN_LEN_REQ 0x04

#define BT_ATT_OP_READ_MULT_REQ 0x0e
struct bt_att_read_mult_req {
uint16_t handles[0];
uint8_t _dummy[0];
uint16_t handles[];
} __packed;

/* Read Multiple Respose */
#define BT_ATT_OP_READ_MULT_RSP 0x0f
struct bt_att_read_mult_rsp {
uint8_t value[0];
uint8_t _dummy[0];
uint8_t value[];
} __packed;

/* Read by Group Type Request */
#define BT_ATT_OP_READ_GROUP_REQ 0x10
struct bt_att_read_group_req {
uint16_t start_handle;
uint16_t end_handle;
uint8_t uuid[0];
uint8_t uuid[];
} __packed;

struct bt_att_group_data {
uint16_t start_handle;
uint16_t end_handle;
uint8_t value[0];
uint8_t value[];
} __packed;

/* Read by Group Type Response */
#define BT_ATT_OP_READ_GROUP_RSP 0x11
struct bt_att_read_group_rsp {
uint8_t len;
struct bt_att_group_data data[0];
struct bt_att_group_data data[];
} __packed;

/* Write Request */
#define BT_ATT_OP_WRITE_REQ 0x12
struct bt_att_write_req {
uint16_t handle;
uint8_t value[0];
uint8_t value[];
} __packed;

/* Write Response */
Expand All @@ -187,15 +192,15 @@ struct bt_att_write_req {
struct bt_att_prepare_write_req {
uint16_t handle;
uint16_t offset;
uint8_t value[0];
uint8_t value[];
} __packed;

/* Prepare Write Respond */
#define BT_ATT_OP_PREPARE_WRITE_RSP 0x17
struct bt_att_prepare_write_rsp {
uint16_t handle;
uint16_t offset;
uint8_t value[0];
uint8_t value[];
} __packed;

/* Execute Write Request */
Expand All @@ -214,14 +219,14 @@ struct bt_att_exec_write_req {
#define BT_ATT_OP_NOTIFY 0x1b
struct bt_att_notify {
uint16_t handle;
uint8_t value[0];
uint8_t value[];
} __packed;

/* Handle Value Indication */
#define BT_ATT_OP_INDICATE 0x1d
struct bt_att_indicate {
uint16_t handle;
uint8_t value[0];
uint8_t value[];
} __packed;

/* Handle Value Confirm */
Expand All @@ -233,34 +238,35 @@ struct bt_att_signature {

#define BT_ATT_OP_READ_MULT_VL_REQ 0x20
struct bt_att_read_mult_vl_req {
uint16_t handles[0];
uint8_t _dummy[0];
uint16_t handles[];
} __packed;

/* Read Multiple Respose */
#define BT_ATT_OP_READ_MULT_VL_RSP 0x21
struct bt_att_read_mult_vl_rsp {
uint16_t len;
uint8_t value[0];
uint8_t value[];
} __packed;

/* Handle Multiple Value Notification */
#define BT_ATT_OP_NOTIFY_MULT 0x23
struct bt_att_notify_mult {
uint16_t handle;
uint16_t len;
uint8_t value[0];
uint8_t value[];
} __packed;

/* Write Command */
#define BT_ATT_OP_WRITE_CMD 0x52
struct bt_att_write_cmd {
uint16_t handle;
uint8_t value[0];
uint8_t value[];
} __packed;

/* Signed Write Command */
#define BT_ATT_OP_SIGNED_WRITE_CMD 0xd2
struct bt_att_signed_write_cmd {
uint16_t handle;
uint8_t value[0];
uint8_t value[];
} __packed;
Loading