Skip to content

Commit d3ba97e

Browse files
Merge branch 'master' into temp
2 parents 07aa952 + 23acde3 commit d3ba97e

File tree

9 files changed

+367
-18
lines changed

9 files changed

+367
-18
lines changed

.github/workflows/compile-examples.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858

5959
steps:
6060
- name: Checkout repository
61-
uses: actions/checkout@v4
61+
uses: actions/checkout@v5
6262

6363
- name: Compile examples
6464
uses: arduino/compile-sketches@v1
@@ -83,20 +83,20 @@ jobs:
8383

8484
build-for-esp32:
8585
runs-on: ubuntu-latest
86-
86+
8787
strategy:
8888
matrix:
8989
fqbn:
9090
- esp32:esp32:esp32
9191
- esp32:esp32:esp32s3
9292
- esp32:esp32:esp32c3
93-
# future bluetooth chips
93+
- esp32:esp32:esp32c6
94+
- esp32:esp32:esp32h2
95+
# Not supported out of the box by ESP32 Arduino core
9496
#- esp32:esp32:esp32c2
95-
#- esp32:esp32:esp32c6
96-
#- esp32:esp32:esp32h2
9797

9898
steps:
99-
- uses: actions/checkout@v4
99+
- uses: actions/checkout@v5
100100
- uses: arduino/compile-sketches@v1
101101
with:
102102
github-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/spell-check.yml

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,25 @@
1+
# Source: https://github.com/per1234/.github/blob/main/workflow-templates/spell-check.md
12
name: Spell Check
23

3-
on: [push, pull_request]
4+
# See: https://docs.github.com/en/actions/reference/events-that-trigger-workflows
5+
on:
6+
push:
7+
pull_request:
8+
schedule:
9+
# Run every Tuesday at 8 AM UTC to catch new misspelling detections resulting from dictionary updates.
10+
- cron: "0 8 * * TUE"
11+
workflow_dispatch:
12+
repository_dispatch:
413

514
jobs:
6-
build:
15+
spellcheck:
716
runs-on: ubuntu-latest
17+
permissions:
18+
contents: read
819

920
steps:
10-
- name: Checkout
11-
uses: actions/checkout@v4
21+
- name: Checkout repository
22+
uses: actions/checkout@v5
1223

1324
- name: Spell check
14-
uses: arduino/actions/libraries/spell-check@master
15-
with:
16-
skip-paths: ./extras/test
25+
uses: codespell-project/actions-codespell@v2

.github/workflows/sync-labels.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727

2828
steps:
2929
- name: Checkout repository
30-
uses: actions/checkout@v4
30+
uses: actions/checkout@v5
3131

3232
- name: Download JSON schema for labels configuration file
3333
id: download-schema
@@ -105,10 +105,10 @@ jobs:
105105
echo "::set-output name=flag::--dry-run"
106106
107107
- name: Checkout repository
108-
uses: actions/checkout@v4
108+
uses: actions/checkout@v5
109109

110110
- name: Download configuration files artifact
111-
uses: actions/download-artifact@v4
111+
uses: actions/download-artifact@v5
112112
with:
113113
name: ${{ env.CONFIGURATIONS_ARTIFACT }}
114114
path: ${{ env.CONFIGURATIONS_FOLDER }}

.github/workflows/unit-tests.yml

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
name: Unit Tests
2+
3+
on:
4+
pull_request:
5+
paths:
6+
- ".github/workflows/unit-tests.yml"
7+
- 'extras/test/**'
8+
- 'src/**'
9+
10+
push:
11+
paths:
12+
- ".github/workflows/unit-tests.yml"
13+
- 'extras/test/**'
14+
- 'src/**'
15+
16+
jobs:
17+
test:
18+
name: Run unit tests
19+
runs-on: ubuntu-latest
20+
21+
env:
22+
COVERAGE_DATA_PATH: extras/coverage-data/coverage.info
23+
24+
steps:
25+
- name: Checkout
26+
uses: actions/checkout@v5
27+
28+
- uses: arduino/cpp-test-action@main
29+
with:
30+
runtime-paths: |
31+
- extras/test/build/bin/TEST_TARGET_UUID
32+
- extras/test/build/bin/TEST_TARGET_DISC_DEVICE
33+
- extras/test/build/bin/TEST_TARGET_ADVERTISING_DATA
34+
coverage-exclude-paths: |
35+
- '*/extras/test/*'
36+
- '/usr/*'
37+
coverage-data-path: ${{ env.COVERAGE_DATA_PATH }}
38+
39+
# A token is used to avoid intermittent spurious job failures caused by rate limiting.
40+
- name: Set up Codecov upload token
41+
run: |
42+
if [[ "${{ github.repository }}" == "arduino-libraries/ArduinoBLE" ]]; then
43+
# In order to avoid uploads of data from forks, only use the token for runs in the parent repo.
44+
# Token is intentionally exposed.
45+
# See: https://community.codecov.com/t/upload-issues-unable-to-locate-build-via-github-actions-api/3954
46+
CODECOV_TOKEN="8118de48-b2af-48b4-a66a-26026847bfc5"
47+
else
48+
# codecov/codecov-action does unauthenticated upload if empty string is passed via the `token` input.
49+
CODECOV_TOKEN=""
50+
fi
51+
echo "CODECOV_TOKEN=$CODECOV_TOKEN" >> "$GITHUB_ENV"
52+
53+
- name: Upload coverage report to Codecov
54+
uses: codecov/codecov-action@v3
55+
with:
56+
file: "${{ env.COVERAGE_DATA_PATH }}"
57+
fail_ci_if_error: true
58+
token: ${{ env.CODECOV_TOKEN }}

library.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ sentence=Enables Bluetooth® Low Energy connectivity on the Arduino MKR WiFi 101
66
paragraph=This library supports creating a Bluetooth® Low Energy peripheral & central mode.
77
category=Communication
88
url=https://www.arduino.cc/en/Reference/ArduinoBLE
9-
architectures=samd,megaavr,mbed,apollo3,mbed_nano,mbed_portenta,mbed_nicla,esp32,mbed_giga,renesas,renesas_portenta,mbed_opta,renesas_uno,silabs
9+
architectures=*
1010
includes=ArduinoBLE.h

src/local/BLELocalDevice.cpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,14 @@
2525

2626
#include "BLELocalDevice.h"
2727

28+
#ifdef __ZEPHYR__
29+
#undef ARDUINO_PORTENTA_H7_M7
30+
#undef ARDUINO_OPTA
31+
#undef ARDUINO_GIGA
32+
#undef ARDUINO_NICLA_VISION
33+
#undef ARDUINO_PORTENTA_C33
34+
#endif
35+
2836
#if defined(PORTENTA_H7_PINS) || defined(ARDUINO_PORTENTA_H7_M7) || defined(ARDUINO_OPTA)
2937
#ifndef BT_REG_ON
3038
#define BT_REG_ON PJ_12

src/utility/HCIUartTransport.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1818
*/
1919

20-
#if !defined(ARDUINO_ARCH_MBED) && !defined(ESP32) && !defined(ARDUINO_SILABS) && !defined(ARDUINO_UNOR4_WIFI) || defined(TARGET_NANO_RP2040_CONNECT) //|| defined(CORE_CM4)
20+
#if !defined(ARDUINO_ARCH_MBED) && !defined(__ZEPHYR__) && !defined(ESP32) && !defined(ARDUINO_SILABS) && !defined(ARDUINO_UNOR4_WIFI) && !defined(__ZEPHYR__) || defined(TARGET_NANO_RP2040_CONNECT) //|| defined(CORE_CM4)
2121

2222
#include "HCIUartTransport.h"
2323

0 commit comments

Comments
 (0)