Skip to content

Commit

Permalink
Merge branch 'embassy-rs:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
@klownfish
klownfish authored Dec 18, 2024
2 parents 657f98d + 583744a commit 0a1abec
Show file tree
Hide file tree
Showing 21 changed files with 1,788 additions and 349 deletions.
1 change: 1 addition & 0 deletions .github/ci/build.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ set -e
mv /ci/cache/sources ./sources || true

./d ci
./d check

# move the sources directory into the cache
mv ./sources /ci/cache/sources
Expand Down
103 changes: 99 additions & 4 deletions d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,105 @@ case "$CMD" in
cargo run --release --bin stm32-data-gen
cargo run --release --bin stm32-metapac-gen
cd build/stm32-metapac
#find . -name '*.rs' -not -path '*target*' | xargs rustfmt --skip-children --unstable-features --edition 2021
cargo check --features stm32h755zi-cm7,pac,metadata
cargo check --features stm32f777zi,pac
cargo check --features stm32u585zi,metadata
find . -name '*.rs' -not -path '*target*' | xargs rustfmt --skip-children --unstable-features --edition 2021
;;
check)
cargo batch \
--- build --release --manifest-path build/stm32-metapac/Cargo.toml --target thumbv7em-none-eabi --features stm32c031c6 \
--- build --release --manifest-path build/stm32-metapac/Cargo.toml --target thumbv7em-none-eabi --features stm32f030c6 \
--- build --release --manifest-path build/stm32-metapac/Cargo.toml --target thumbv7em-none-eabi --features stm32f030r8 \
--- build --release --manifest-path build/stm32-metapac/Cargo.toml --target thumbv7em-none-eabi --features stm32f030rc \
--- build --release --manifest-path build/stm32-metapac/Cargo.toml --target thumbv7em-none-eabi --features stm32f031k6 \
--- build --release --manifest-path build/stm32-metapac/Cargo.toml --target thumbv7em-none-eabi --features stm32f038f6 \
--- build --release --manifest-path build/stm32-metapac/Cargo.toml --target thumbv7em-none-eabi --features stm32f042g4 \
--- build --release --manifest-path build/stm32-metapac/Cargo.toml --target thumbv7em-none-eabi --features stm32f058t8 \
--- build --release --manifest-path build/stm32-metapac/Cargo.toml --target thumbv7em-none-eabi --features stm32f070f6 \
--- build --release --manifest-path build/stm32-metapac/Cargo.toml --target thumbv7em-none-eabi --features stm32f072c8 \
--- build --release --manifest-path build/stm32-metapac/Cargo.toml --target thumbv7em-none-eabi --features stm32f078vb \
--- build --release --manifest-path build/stm32-metapac/Cargo.toml --target thumbv7em-none-eabi --features stm32f091rc \
--- build --release --manifest-path build/stm32-metapac/Cargo.toml --target thumbv7em-none-eabi --features stm32f100c4 \
--- build --release --manifest-path build/stm32-metapac/Cargo.toml --target thumbv7em-none-eabi --features stm32f103c8 \
--- build --release --manifest-path build/stm32-metapac/Cargo.toml --target thumbv7em-none-eabi --features stm32f103re \
--- build --release --manifest-path build/stm32-metapac/Cargo.toml --target thumbv7em-none-eabi --features stm32f107vc \
--- build --release --manifest-path build/stm32-metapac/Cargo.toml --target thumbv7em-none-eabi --features stm32f207zg \
--- build --release --manifest-path build/stm32-metapac/Cargo.toml --target thumbv7em-none-eabi --features stm32f217zg \
--- build --release --manifest-path build/stm32-metapac/Cargo.toml --target thumbv7em-none-eabi --features stm32f303c8 \
--- build --release --manifest-path build/stm32-metapac/Cargo.toml --target thumbv7em-none-eabi --features stm32f303ze \
--- build --release --manifest-path build/stm32-metapac/Cargo.toml --target thumbv7em-none-eabi --features stm32f378cc \
--- build --release --manifest-path build/stm32-metapac/Cargo.toml --target thumbv7em-none-eabi --features stm32f398ve \
--- build --release --manifest-path build/stm32-metapac/Cargo.toml --target thumbv7em-none-eabi --features stm32f401ve \
--- build --release --manifest-path build/stm32-metapac/Cargo.toml --target thumbv7em-none-eabi --features stm32f405zg \
--- build --release --manifest-path build/stm32-metapac/Cargo.toml --target thumbv7em-none-eabi --features stm32f407zg \
--- build --release --manifest-path build/stm32-metapac/Cargo.toml --target thumbv7em-none-eabi --features stm32f410tb \
--- build --release --manifest-path build/stm32-metapac/Cargo.toml --target thumbv7em-none-eabi --features stm32f411ce \
--- build --release --manifest-path build/stm32-metapac/Cargo.toml --target thumbv7em-none-eabi --features stm32f412zg \
--- build --release --manifest-path build/stm32-metapac/Cargo.toml --target thumbv7em-none-eabi --features stm32f413vh \
--- build --release --manifest-path build/stm32-metapac/Cargo.toml --target thumbv7em-none-eabi --features stm32f415zg \
--- build --release --manifest-path build/stm32-metapac/Cargo.toml --target thumbv7em-none-eabi --features stm32f417zg \
--- build --release --manifest-path build/stm32-metapac/Cargo.toml --target thumbv7em-none-eabi --features stm32f423zh \
--- build --release --manifest-path build/stm32-metapac/Cargo.toml --target thumbv7em-none-eabi --features stm32f427zi \
--- build --release --manifest-path build/stm32-metapac/Cargo.toml --target thumbv7em-none-eabi --features stm32f429zi \
--- build --release --manifest-path build/stm32-metapac/Cargo.toml --target thumbv7em-none-eabi --features stm32f437zi \
--- build --release --manifest-path build/stm32-metapac/Cargo.toml --target thumbv7em-none-eabi --features stm32f439zi \
--- build --release --manifest-path build/stm32-metapac/Cargo.toml --target thumbv7em-none-eabi --features stm32f446re \
--- build --release --manifest-path build/stm32-metapac/Cargo.toml --target thumbv7em-none-eabi --features stm32f446ze \
--- build --release --manifest-path build/stm32-metapac/Cargo.toml --target thumbv7em-none-eabi --features stm32f469zi \
--- build --release --manifest-path build/stm32-metapac/Cargo.toml --target thumbv7em-none-eabi --features stm32f479zi \
--- build --release --manifest-path build/stm32-metapac/Cargo.toml --target thumbv7em-none-eabi --features stm32f730i8 \
--- build --release --manifest-path build/stm32-metapac/Cargo.toml --target thumbv7em-none-eabi --features stm32f767zi \
--- build --release --manifest-path build/stm32-metapac/Cargo.toml --target thumbv7em-none-eabi --features stm32g071rb \
--- build --release --manifest-path build/stm32-metapac/Cargo.toml --target thumbv7em-none-eabi --features stm32g0c1ve \
--- build --release --manifest-path build/stm32-metapac/Cargo.toml --target thumbv7em-none-eabi --features stm32g474pe \
--- build --release --manifest-path build/stm32-metapac/Cargo.toml --target thumbv7em-none-eabi --features stm32g491re \
--- build --release --manifest-path build/stm32-metapac/Cargo.toml --target thumbv7em-none-eabi --features stm32h503rb \
--- build --release --manifest-path build/stm32-metapac/Cargo.toml --target thumbv7em-none-eabi --features stm32h523cc \
--- build --release --manifest-path build/stm32-metapac/Cargo.toml --target thumbv7em-none-eabi --features stm32h562ag \
--- build --release --manifest-path build/stm32-metapac/Cargo.toml --target thumbv7em-none-eabi --features stm32h563zi \
--- build --release --manifest-path build/stm32-metapac/Cargo.toml --target thumbv7em-none-eabi --features stm32h725re \
--- build --release --manifest-path build/stm32-metapac/Cargo.toml --target thumbv7em-none-eabi --features stm32h735zg \
--- build --release --manifest-path build/stm32-metapac/Cargo.toml --target thumbv7em-none-eabi --features stm32h753zi \
--- build --release --manifest-path build/stm32-metapac/Cargo.toml --target thumbv7em-none-eabi --features stm32h755zi-cm7 \
--- build --release --manifest-path build/stm32-metapac/Cargo.toml --target thumbv7em-none-eabi --features stm32h755zi-cm4 \
--- build --release --manifest-path build/stm32-metapac/Cargo.toml --target thumbv7em-none-eabi --features stm32h7a3zi \
--- build --release --manifest-path build/stm32-metapac/Cargo.toml --target thumbv7em-none-eabi --features stm32h7b3ai \
--- build --release --manifest-path build/stm32-metapac/Cargo.toml --target thumbv7em-none-eabi --features stm32h7r3z8 \
--- build --release --manifest-path build/stm32-metapac/Cargo.toml --target thumbv7em-none-eabi --features stm32h7r7a8 \
--- build --release --manifest-path build/stm32-metapac/Cargo.toml --target thumbv7em-none-eabi --features stm32h7s3a8 \
--- build --release --manifest-path build/stm32-metapac/Cargo.toml --target thumbv7em-none-eabi --features stm32h7s3l8 \
--- build --release --manifest-path build/stm32-metapac/Cargo.toml --target thumbv7em-none-eabi --features stm32h7s7z8 \
--- build --release --manifest-path build/stm32-metapac/Cargo.toml --target thumbv7em-none-eabi --features stm32l041f6 \
--- build --release --manifest-path build/stm32-metapac/Cargo.toml --target thumbv7em-none-eabi --features stm32l051k8 \
--- build --release --manifest-path build/stm32-metapac/Cargo.toml --target thumbv7em-none-eabi --features stm32l072cz \
--- build --release --manifest-path build/stm32-metapac/Cargo.toml --target thumbv7em-none-eabi --features stm32l073cz \
--- build --release --manifest-path build/stm32-metapac/Cargo.toml --target thumbv7em-none-eabi --features stm32l073rz \
--- build --release --manifest-path build/stm32-metapac/Cargo.toml --target thumbv7em-none-eabi --features stm32l151cb \
--- build --release --manifest-path build/stm32-metapac/Cargo.toml --target thumbv7em-none-eabi --features stm32l152re \
--- build --release --manifest-path build/stm32-metapac/Cargo.toml --target thumbv7em-none-eabi --features stm32l422cb \
--- build --release --manifest-path build/stm32-metapac/Cargo.toml --target thumbv7em-none-eabi --features stm32l431cb \
--- build --release --manifest-path build/stm32-metapac/Cargo.toml --target thumbv7em-none-eabi --features stm32l476vg \
--- build --release --manifest-path build/stm32-metapac/Cargo.toml --target thumbv7em-none-eabi --features stm32l496zg \
--- build --release --manifest-path build/stm32-metapac/Cargo.toml --target thumbv7em-none-eabi --features stm32l4a6zg \
--- build --release --manifest-path build/stm32-metapac/Cargo.toml --target thumbv7em-none-eabi --features stm32l4r5zi \
--- build --release --manifest-path build/stm32-metapac/Cargo.toml --target thumbv7em-none-eabi --features stm32l552ze \
--- build --release --manifest-path build/stm32-metapac/Cargo.toml --target thumbv7em-none-eabi --features stm32u031r8 \
--- build --release --manifest-path build/stm32-metapac/Cargo.toml --target thumbv7em-none-eabi --features stm32u073mb \
--- build --release --manifest-path build/stm32-metapac/Cargo.toml --target thumbv7em-none-eabi --features stm32u083rc \
--- build --release --manifest-path build/stm32-metapac/Cargo.toml --target thumbv7em-none-eabi --features stm32u585ai \
--- build --release --manifest-path build/stm32-metapac/Cargo.toml --target thumbv7em-none-eabi --features stm32u5a5zj \
--- build --release --manifest-path build/stm32-metapac/Cargo.toml --target thumbv7em-none-eabi --features stm32u5f9zj \
--- build --release --manifest-path build/stm32-metapac/Cargo.toml --target thumbv7em-none-eabi --features stm32u5g9nj \
--- build --release --manifest-path build/stm32-metapac/Cargo.toml --target thumbv7em-none-eabi --features stm32wb15cc \
--- build --release --manifest-path build/stm32-metapac/Cargo.toml --target thumbv7em-none-eabi --features stm32wb35ce \
--- build --release --manifest-path build/stm32-metapac/Cargo.toml --target thumbv7em-none-eabi --features stm32wb55rg \
--- build --release --manifest-path build/stm32-metapac/Cargo.toml --target thumbv7em-none-eabi --features stm32wba50ke \
--- build --release --manifest-path build/stm32-metapac/Cargo.toml --target thumbv7em-none-eabi --features stm32wba52cg \
--- build --release --manifest-path build/stm32-metapac/Cargo.toml --target thumbv7em-none-eabi --features stm32wba55ug \
--- build --release --manifest-path build/stm32-metapac/Cargo.toml --target thumbv7em-none-eabi --features stm32wl54jc-cm4 \
--- build --release --manifest-path build/stm32-metapac/Cargo.toml --target thumbv7em-none-eabi --features stm32wl54jc-cm0p \
--- build --release --manifest-path build/stm32-metapac/Cargo.toml --target thumbv7em-none-eabi --features stm32wl55jc-cm4 \
--- build --release --manifest-path build/stm32-metapac/Cargo.toml --target thumbv7em-none-eabi --features stm32wl55jc-cm0p \
--- build --release --manifest-path build/stm32-metapac/Cargo.toml --target thumbv7em-none-eabi --features stm32wle5jb \

;;
*)
echo "unknown command"
Expand Down
2 changes: 1 addition & 1 deletion d.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ param (
[string]$peri
)

$REV="74b97817d4c4ed0db9d19a8eac46720b3c5b0d57"
$REV="709c1060ac2ec57f6042f2b4eb9cf8c1821a6c57"

Switch ($CMD)
{
Expand Down
10 changes: 5 additions & 5 deletions data/registers/adc_g4.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,16 +129,16 @@ fieldset/CALFACT:
fieldset/CFGR:
description: configuration register 1
fields:
- name: DMACFG
description: Direct memory access configuration
bit_offset: 0
bit_size: 1
enum: DMACFG
- name: DMAEN
description: Direct memory access enable
bit_offset: 0
bit_size: 1
enum: DMAEN
- name: DMACFG
description: Direct memory access configuration
bit_offset: 1
bit_size: 1
enum: DMACFG
- name: RES
description: data resolution
bit_offset: 3
Expand Down
Loading

0 comments on commit 0a1abec

Please sign in to comment.