Skip to content
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

V6 hardware support #154

Merged
merged 32 commits into from
Dec 9, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
ac1e065
Add v6 features and c6 dependencies
bugadani Nov 16, 2023
e5f5c9d
Follow esp-hal changes
bugadani Nov 16, 2023
51071f4
Separate ADC SPI and frontend initialization
bugadani Nov 16, 2023
109baca
Rework xtask to support multiple SoCs
bugadani Nov 17, 2023
07f8167
Add v6 hardware configs
bugadani Nov 17, 2023
7f43dea
Add compiler flags
bugadani Nov 20, 2023
ddc8572
Single-core stack symbols
bugadani Nov 20, 2023
51c3e73
Provide fmaxf, fminf
bugadani Nov 20, 2023
39396c0
Depend on the published executor PR branch
bugadani Nov 20, 2023
1b71c6b
Patch S3, too
bugadani Nov 20, 2023
262adc0
Handle swapped top/bottom
bugadani Nov 20, 2023
a931c69
Fix embassy alert allocation on c6
bugadani Nov 20, 2023
558ed41
New hardware changes, clean up
bugadani Nov 22, 2023
6a77e73
Restore jtag_serial
bugadani Nov 22, 2023
c439745
Increase wifi heap size
bugadani Nov 22, 2023
a747759
Allow different wifi configuration for the different devices
bugadani Nov 22, 2023
25d9c3c
Don't let the C6 sleep for now
bugadani Nov 22, 2023
bb19cdb
Enable/disable display in each init-shutdown pair
bugadani Nov 22, 2023
421de91
Update SVD
bugadani Nov 23, 2023
bbe4f58
Add C6 launch config
bugadani Nov 23, 2023
61dba13
Let the MCU sleep
bugadani Nov 23, 2023
ae0add0
Allow setup fn to determine wakeup type
bugadani Nov 24, 2023
b94e9c3
Use Ext1 for v6
bugadani Nov 24, 2023
578e3b4
Activate v6 hardware feature
bugadani Nov 25, 2023
421ff31
Update local paths
bugadani Dec 4, 2023
ca7b4c6
Update esp-wifi
bugadani Dec 5, 2023
146c6d8
Include mcu in v6+ hw version
bugadani Dec 5, 2023
5fdfaef
Test/build all active configurations
bugadani Dec 5, 2023
b9ade08
Fix v6s3 pin assignment
bugadani Dec 5, 2023
7c1f324
Split up v6 configs
bugadani Dec 5, 2023
1929ebc
Update esp-println
bugadani Dec 7, 2023
bee85c5
Use git deps
bugadani Dec 8, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 6 additions & 12 deletions .cargo/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,13 @@ rustflags = [
"-C", "link-arg=-nostartfiles",
"-C", "link-arg=-Wl,-Tlinkall.x",
"-C", "link-arg=-Trom_functions.x",
]

# tell the core library have atomics even though it's not specified in the target definition
"--cfg", "target_has_atomic_load_store",
"--cfg", 'target_has_atomic_load_store="8"',
"--cfg", 'target_has_atomic_load_store="16"',
"--cfg", 'target_has_atomic_load_store="32"',
"--cfg", 'target_has_atomic_load_store="ptr"',
# enable cas
"--cfg", "target_has_atomic",
"--cfg", 'target_has_atomic="8"',
"--cfg", 'target_has_atomic="16"',
"--cfg", 'target_has_atomic="32"',
"--cfg", 'target_has_atomic="ptr"',
[target.riscv32imac-unknown-none-elf]
rustflags = [
"-C", "force-frame-pointers",
"-C", "link-arg=-Tlinkall.x",
"-C", "link-arg=-Trom_functions.x",
]

[alias]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
build-fw:
strategy:
matrix:
version: ["v4"]
version: ["v4", "v6c6", "v6s3"]

runs-on: ubuntu-latest

Expand Down
19 changes: 17 additions & 2 deletions .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,11 @@ concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}

jobs:
test:
check:
strategy:
matrix:
version: ["v4", "v6c6", "v6s3"]

runs-on: ubuntu-latest

steps:
Expand All @@ -31,7 +35,18 @@ jobs:
run: cargo fmt --check

- name: check
run: cargo xcheck
run: cargo xcheck ${{ matrix.version }}

test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: esp-rs/[email protected]
with:
default: true
buildtargets: esp32s3
ldproxy: false
- uses: Swatinem/rust-cache@v2

- name: test
run: cargo xtask test
25 changes: 19 additions & 6 deletions .github/workflows/merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,11 @@ env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

jobs:
test:
build:
strategy:
matrix:
version: ["v4", "v6c6", "v6s3"]

runs-on: ubuntu-latest

steps:
Expand All @@ -24,11 +28,20 @@ jobs:
- name: setup espflash
run: cargo binstall --no-confirm --force cargo-espflash

- name: check
run: cargo xcheck
- name: build
run: cargo xbuild ${{ matrix.version }}

test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: esp-rs/[email protected]
with:
default: true
buildtargets: esp32s3
ldproxy: false
- uses: Swatinem/rust-cache@v2

- name: test
run: cargo xtask test

- name: build
run: cargo xbuild

1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ Cargo.lock
.vscode/esp32s3.base.svd
.vscode/launch.json
.vscode/.cortex-debug.peripherals.state.json
cfg.toml
Loading