Skip to content

Commit d2df064

Browse files
Merge pull request #2 from HalfSweet/main
feat: uart
2 parents 9c45699 + ca3851d commit d2df064

72 files changed

Lines changed: 1908 additions & 406 deletions

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: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,7 @@ jobs:
3939
run: |
4040
sudo apt-get update
4141
sudo apt-get install -y gettext gcc-multilib
42-
pip install -r requirements-linux.txt
43-
pip install -e \
44-
python_libs/pblprog \
45-
python_libs/pebble-commander \
46-
python_libs/pulse2 \
47-
python_libs/pebble-loghash
42+
pip install -r requirements.txt
4843
wget --no-verbose "https://developer.arm.com/-/media/Files/downloads/gnu/${ARM_GNU_TOOLCHAIN_VERSION}/binrel/arm-gnu-toolchain-${ARM_GNU_TOOLCHAIN_VERSION}-x86_64-arm-none-eabi.tar.xz"
4944
sudo tar xf arm-gnu-toolchain-${ARM_GNU_TOOLCHAIN_VERSION}-x86_64-arm-none-eabi.tar.xz -C /opt
5045
echo "/opt/arm-gnu-toolchain-${ARM_GNU_TOOLCHAIN_VERSION}-x86_64-arm-none-eabi/bin" >> $GITHUB_PATH

.github/workflows/test.yml

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
name: Test
2+
3+
on:
4+
push:
5+
branches: [main]
6+
pull_request:
7+
branches: [main]
8+
9+
env:
10+
ARM_GNU_TOOLCHAIN_VERSION: 14.2.rel1
11+
EM_VERSION: 4.0.1
12+
EM_CACHE_FOLDER: 'emsdk-cache'
13+
TEST_BOARD: 'snowy_bb2'
14+
15+
jobs:
16+
build:
17+
runs-on: ubuntu-24.04
18+
steps:
19+
- name: Checkout
20+
uses: actions/checkout@v4
21+
with:
22+
fetch-depth: 0
23+
submodules: true
24+
25+
- name: Setup emsdk cache
26+
id: cache-emsdk
27+
uses: actions/cache@v4
28+
with:
29+
path: ${{env.EM_CACHE_FOLDER}}
30+
key: emsdk-${{env.EM_VERSION}}-${{ runner.os }}
31+
32+
- uses: actions/setup-python@v5
33+
with:
34+
python-version: "3.13"
35+
36+
- name: Set up environment
37+
run: |
38+
sudo apt-get update
39+
sudo apt-get install -y gettext gcc-multilib
40+
pip install -r requirements.txt
41+
wget --no-verbose "https://developer.arm.com/-/media/Files/downloads/gnu/${ARM_GNU_TOOLCHAIN_VERSION}/binrel/arm-gnu-toolchain-${ARM_GNU_TOOLCHAIN_VERSION}-x86_64-arm-none-eabi.tar.xz"
42+
sudo tar xf arm-gnu-toolchain-${ARM_GNU_TOOLCHAIN_VERSION}-x86_64-arm-none-eabi.tar.xz -C /opt
43+
echo "/opt/arm-gnu-toolchain-${ARM_GNU_TOOLCHAIN_VERSION}-x86_64-arm-none-eabi/bin" >> $GITHUB_PATH
44+
45+
- uses: mymindstorm/setup-emsdk@v14
46+
with:
47+
version: ${{env.EM_VERSION}}
48+
actions-cache-folder: ${{env.EM_CACHE_FOLDER}}
49+
50+
- name: Configure
51+
run: ./waf configure --board ${{env.TEST_BOARD}}
52+
53+
- name: Run tests
54+
run: ./waf test
55+
continue-on-error: true
56+
57+
- name: Publish Test Report
58+
uses: mikepenz/action-junit-report@v5
59+
if: success() || failure()
60+
with:
61+
report_paths: build/test/junit.xml
62+
annotate_only: true
63+
64+
- name: Store failed test images
65+
uses: actions/upload-artifact@v4
66+
with:
67+
name: failed_diff_images
68+
path: build/test/tests/failed/*-diff.png

README.md

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -51,15 +51,7 @@ may work right now.
5151
```
5252
- Install dependencies:
5353
```shell
54-
pip install -r requirements-linux.txt
55-
```
56-
- Install local dependencies:
57-
```shell
58-
pip install -e \
59-
python_libs/pblprog \
60-
python_libs/pebble-commander \
61-
python_libs/pulse2 \
62-
python_libs/pebble-loghash
54+
pip install -r requirements.txt
6355
```
6456
- Install emscripten
6557
- If you're on Mac and using [Homebrew](https://brew.sh), you can run `brew install emscripten`.

docs/porting-bluetooth.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,6 @@ These apply only to Bluetooth Classic and are no-ops on BLE.
142142
* bt_driver_classic_update_connectability
143143
* bt_driver_reconnect_pause
144144
* bt_driver_reconnect_resume
145-
* reconnect_set_interval
146145
* bt_driver_reconnect_try_now
147146
* bt_driver_reconnect_reset_interval
148147
* bt_driver_reconnect_notify_platform_bitfield

requirements-brew.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
nanopb-generator
21
freetype
32
gettext
43
llvm
54
cmake
65
lcov
76
node
8-
arm-none-eabi-gcc
97
emscripten

requirements-linux.txt

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

requirements-osx.txt

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

requirements.txt

Lines changed: 23 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,37 @@
1-
#--extra-index-url https://pebble:W9Ngyc3ohHFvLKfUUxmVruCmBaHQxNBCpfDCXyoAwLJgncZmAw@pypi.pbl.io/
2-
Pillow==2.0.0
3-
freetype-py==1.0
1+
pillow
2+
freetype-py
43
ply==3.4
5-
pyusb==1.0.0b2
6-
pyserial==2.7
4+
pyusb==1.3.1
5+
pyserial
76
sh==1.04
8-
pypng==0.0.16
7+
pypng
98
pexpect
10-
cobs<1.2.0
11-
svg.path<5
9+
cobs==1.0.0
10+
svg.path
1211
requests
1312
GitPython==1.0.1
14-
pyelftools==0.23
15-
pycrypto==2.6.1
13+
pyelftools
14+
pycryptodome
1615
mock
1716
nose
1817
boto
19-
prompt-toolkit>=0.55
18+
prompt_toolkit>=0.55
2019
enum34
2120
bitarray
2221
pep8
2322
polib
2423
intelhex>=2.1,<3
25-
26-
# pypi.getpebble.com provided modules
27-
#pebble.loghash>=2.6
28-
#pebble.programmer>=0.0.4
29-
#pebble.commander==0.0.11
24+
protobuf
25+
grpcio-tools
26+
nanopb
27+
certifi
28+
libclang
29+
packaging
3030
libpebble2>=0.0.16
31-
#pyftdi==0.10.5
31+
pyftdi==0.56.0
32+
pathlib
33+
34+
-e python_libs/pblprog
35+
-e python_libs/pebble-commander
36+
-e python_libs/pulse2
37+
-e python_libs/pebble-loghash

src/bluetooth-fw/nimble/adv_reconnect.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616

1717
#include <bluetooth/adv_reconnect.h>
1818

19-
#include "comm/ble/gap_le_advert.h"
20-
2119
const GAPLEAdvertisingJobTerm *bt_driver_adv_reconnect_get_job_terms(size_t *num_terms_out) {
2220
*num_terms_out = 0;
2321
return NULL;

0 commit comments

Comments
 (0)