Skip to content

Add tombi ci form toml file #35

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add tombi ci form toml file #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 14 additions & 0 deletions .github/workflows/lint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,3 +73,17 @@ jobs:
run: |
cd bluepill-prog && cargo clippy -- -D warnings
cd ../picoprog && cargo clippy -- -D warnings
tombi:
name: TOML Validation
needs: generate-matrix
strategy:
matrix:
commit: ${{ fromJson(needs.generate-matrix.outputs.commits) }}
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
ref: ${{ matrix.commit }}
- uses: tombi-toml/setup-tombi@v1
- name: Validate TOML files
run: tombi lint
46 changes: 32 additions & 14 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,49 @@
[workspace]
members = [
"bluepill-prog",
"picoprog",
"serprog"
]
resolver = "2"
members = ["bluepill-prog", "picoprog", "serprog"]

[workspace.dependencies]
assign-resources = "0.4.1"
cortex-m = { version = "0.7.7", features = ["inline-asm", "critical-section"] }
cortex-m = { version = "0.7.7", features = ["critical-section", "inline-asm"] }
cortex-m-rt = "0.7.5"
critical-section = "1.2.0"
defmt = "0.3.10"
defmt-rtt = "0.4.1"
embassy-executor = { version = "0.7.0", features = ["arch-cortex-m", "executor-thread", "executor-interrupt", "nightly"] }
embassy-executor = { version = "0.7.0", features = [
"arch-cortex-m",
"executor-interrupt",
"executor-thread",
"nightly",
] }
embassy-futures = "0.1.1"
embassy-rp = { version = "0.3.0", features = ["unstable-pac", "time-driver", "critical-section-impl", "rom-func-cache", "rom-v2-intrinsics", "rp2040"] }
embassy-rp = { version = "0.3.0", features = [
"critical-section-impl",
"rom-func-cache",
"rom-v2-intrinsics",
"rp2040",
"time-driver",
"unstable-pac",
] }
embassy-stm32 = { version = "0.2.0" }
embassy-sync = "0.6.2"
embassy-time = "0.4.0"
embassy-usb = { version = "0.4.0", features = ["max-handler-count-6", "max-interface-count-6"] }
embassy-usb = { version = "0.4.0", features = [
"max-handler-count-6",
"max-interface-count-6",
] }
embedded-hal = "1.0.0"
embedded-hal-async = "1.0.0"
futures = { version = "0.3.31", default-features = false, features = ["async-await", "cfg-target-has-atomic", "unstable"] }
heapless = { version = "0.8.0", features = ["portable-atomic-critical-section", "ufmt"] }
futures = { version = "0.3.31", default-features = false, features = [
"async-await",
"cfg-target-has-atomic",
"unstable",
] }
heapless = { version = "0.8.0", features = [
"portable-atomic-critical-section",
"ufmt",
] }
log = "0.4.26"
num_enum = { version = "0.7.3", default-features = false }
panic-probe = { version = "0.3.2", features = ["print-defmt"] }
portable-atomic = { version = "1.11.0", features = ["critical-section"] }
serprog = { path = "./serprog" }
Expand All @@ -33,7 +52,6 @@ stm32-fmc = { version = "0.4.0" }
tock-registers = "0.9.0"
ufmt = "0.2.0"
zerocopy = { version = "0.8", features = ["derive"] }
num_enum = { version = "0.7.3", default-features = false }

[patch.crates-io]
embassy-executor = { git = "https://github.com/embassy-rs/embassy", rev = "17301c00e986c5b8536435ea31ebf5aaf13aed17" }
Expand All @@ -45,8 +63,8 @@ embassy-time = { git = "https://github.com/embassy-rs/embassy", rev = "17301c00e
embassy-usb = { git = "https://github.com/embassy-rs/embassy", rev = "17301c00e986c5b8536435ea31ebf5aaf13aed17" }

[profile.release]
opt-level = "s"
debug = true
lto = "fat"
incremental = false
codegen-units = 1
opt-level = "s"
lto = "fat"
37 changes: 30 additions & 7 deletions bluepill-prog/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,48 @@
[package]
name = "bluepill-prog"
version = "0.1.0"
authors = ["Arthur Heymans <[email protected]>"]
edition = "2021"
license = "Apache-2.0"
authors = [ "Arthur Heymans <[email protected]>" ]

[dependencies]
assign-resources.workspace = true
cortex-m = { workspace = true, features = ["inline-asm", "critical-section-single-core"] }
cortex-m = { workspace = true, features = [
"critical-section-single-core",
"inline-asm",
] }
cortex-m-rt.workspace = true
critical-section.workspace = true
defmt-rtt.workspace = true
defmt.workspace = true
embassy-executor = { workspace = true, features = ["defmt", "arch-cortex-m", "executor-thread", "nightly"] }
defmt-rtt.workspace = true
embassy-executor = { workspace = true, features = [
"arch-cortex-m",
"defmt",
"executor-thread",
"nightly",
] }
embassy-futures = { workspace = true, features = ["defmt"] }
embassy-stm32 = { workspace = true, features = ["defmt", "stm32f103c8", "memory-x", "rt", "time-driver-any"] }
embassy-stm32 = { workspace = true, features = [
"defmt",
"memory-x",
"rt",
"stm32f103c8",
"time-driver-any",
] }
embassy-sync = { workspace = true, features = ["defmt"] }
embassy-time = { workspace = true, features = ["defmt", "defmt-timestamp-uptime", "tick-hz-32_768"] }
embassy-time = { workspace = true, features = [
"defmt",
"defmt-timestamp-uptime",
"tick-hz-32_768",
] }
embassy-usb = { workspace = true, features = ["defmt"] }
futures.workspace = true
heapless = { workspace = true, features = ["defmt-03", "portable-atomic", "portable-atomic-critical-section", "ufmt"] }
heapless = { workspace = true, features = [
"defmt-03",
"portable-atomic",
"portable-atomic-critical-section",
"ufmt",
] }
panic-probe.workspace = true
portable-atomic.workspace = true
serprog.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion picoprog/.cargo/config.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[target.'cfg(all(target_arch = "arm", target_os = "none"))']
linker = "flip-link"
runner = "elf2uf2-rs"
#runner = "probe-rs run --chip RP2040"
# runner = "probe-rs run --chip RP2040"

[build]
target = "thumbv6m-none-eabi"
Expand Down
42 changes: 31 additions & 11 deletions picoprog/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,46 @@
[package]
name = "picoprog"
version = "0.1.0"
authors = ["Marvin Drees <[email protected]>"]
edition = "2021"
license = "Apache-2.0"
authors = ["Marvin Drees <[email protected]>"]

[dependencies]
assign-resources.workspace = true
cortex-m = { workspace = true, features = ["inline-asm", "critical-section"] }
cortex-m = { workspace = true, features = ["critical-section", "inline-asm"] }
cortex-m-rt.workspace = true
embassy-executor = { workspace = true, features = ["arch-cortex-m", "executor-thread", "executor-interrupt", "nightly", "defmt"] }
defmt.workspace = true
defmt-rtt.workspace = true
embassy-executor = { workspace = true, features = [
"arch-cortex-m",
"defmt",
"executor-interrupt",
"executor-thread",
"nightly",
] }
embassy-futures.workspace = true
embedded-hal.workspace = true
embedded-hal-async.workspace = true
serprog.workspace = true
embassy-rp = { workspace = true, features = ["unstable-pac", "time-driver", "critical-section-impl", "rom-func-cache", "rom-v2-intrinsics", "rp2040"] }
embassy-rp = { workspace = true, features = [
"critical-section-impl",
"rom-func-cache",
"rom-v2-intrinsics",
"rp2040",
"time-driver",
"unstable-pac",
] }
embassy-sync = { workspace = true, features = ["defmt"] }
embassy-time.workspace = true
embassy-usb = { workspace = true, features = ["max-handler-count-6", "max-interface-count-6", "defmt"] }
heapless = { workspace = true, features = ["portable-atomic-critical-section", "ufmt"] }
embassy-usb = { workspace = true, features = [
"defmt",
"max-handler-count-6",
"max-interface-count-6",
] }
embedded-hal.workspace = true
embedded-hal-async.workspace = true
heapless = { workspace = true, features = [
"portable-atomic-critical-section",
"ufmt",
] }
log.workspace = true
serprog.workspace = true
static_cell.workspace = true
ufmt.workspace = true
defmt.workspace = true
defmt-rtt.workspace = true
6 changes: 3 additions & 3 deletions rust-toolchain.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[toolchain]
channel = "nightly-2025-02-01"
components = [ "rust-src", "rustfmt", "llvm-tools", "miri" ]
components = ["rust-src", "rustfmt", "llvm-tools", "miri"]
targets = [
"thumbv6m-none-eabi",
"thumbv7m-none-eabi",
"thumbv6m-none-eabi",
"thumbv7m-none-eabi",
]
9 changes: 6 additions & 3 deletions serprog/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,16 @@ edition = "2021"
license = "Apache-2.0"

[dependencies]
embassy-usb.workspace = true
# log.workspace = true
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suppose we can drop this line altogether

defmt.workspace = true
embassy-futures.workspace = true
embassy-sync.workspace = true
embassy-usb.workspace = true
embedded-hal.workspace = true
embedded-hal-async.workspace = true
#log.workspace = true
defmt.workspace = true
num_enum.workspace = true
tock-registers.workspace = true
zerocopy.workspace = true

[features]
usb2 = []
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where does this suddenly come from?

Copy link
Contributor Author

@ArthurHeymans ArthurHeymans Jun 10, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh I'm working on that but it shouldn't be in here

Loading