Skip to content

Commit 3777bad

Browse files
committed
fix: Resolve all changes needed for deny and sort CI
1 parent df574e3 commit 3777bad

File tree

7 files changed

+34
-24
lines changed

7 files changed

+34
-24
lines changed

Cargo.lock

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ version = "1.0.1"
1515
authors = ["UORocketry Avionics Members"]
1616
publish = false
1717
license = "GPL-3.0-or-later"
18+
license-file = "LICENSE"
1819

1920
[workspace.dependencies]
2021
bitflags = { version = "2.10.0", default-features = false }
@@ -42,9 +43,7 @@ embedded-io-async = { version = "0.6.1" }
4243
enum_dispatch = "0.3.11"
4344
heapless = "0.9.1"
4445
high-level-services = { path = "./common/high-level-services" }
45-
uor-utils = { path = "./common/uor-utils" }
46-
uor-proc-macros = { path = "./common/uor-proc-macros" }
47-
46+
libm = "0.2.11"
4847
nb = "1.1.0"
4948
num-traits = { version = "0.2.19", default-features = false }
5049
panic-probe = { version = "0.3", features = ["print-defmt"] }
@@ -54,3 +53,5 @@ serde = { version = "1.0.150", features = ["derive"], default-features = false }
5453
serde-csv-core = { version = "0.3.2", features = ["defmt"] }
5554
smlang = "0.8.0"
5655
static_cell = "2"
56+
uor-proc-macros = { path = "./common/uor-proc-macros" }
57+
uor-utils = { path = "./common/uor-utils" }

boards/argus/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ grounded = "0.2.0"
6969
heapless = { workspace = true }
7070
high-level-services = { workspace = true }
7171
itoa = { version = "1.0.15", features = ["no-panic"] }
72-
libm = { version = "0.2.15", default-features = false }
72+
libm = { workspace = true, default-features = false }
7373
micromath = "2.0.0"
7474
num-traits = { workspace = true, features = ["libm"] }
7575
panic-probe = { workspace = true }

boards/phoenix/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ cortex-m = { workspace = true }
1919
cortex-m-rt = { workspace = true }
2020
defmt = { workspace = true }
2121
defmt-rtt = { workspace = true }
22+
driver-services = { workspace = true }
2223
embassy-executor = { workspace = true, features = [
2324
"nightly",
2425
"task-arena-size-10240",
@@ -40,7 +41,6 @@ embassy-time = { workspace = true, features = ["tick-hz-32_768"] }
4041
embedded-alloc = { workspace = true }
4142
high-level-services = { workspace = true }
4243
panic-probe = { workspace = true }
44+
peripheral-services = { workspace = true }
4345
static_cell = { workspace = true }
4446
uor-utils = { workspace = true }
45-
driver-services = { workspace = true }
46-
peripheral-services = { workspace = true }

common/high-level-services/Cargo.toml

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
[package]
22
name = "high-level-services"
3-
version = "0.1.0"
43
edition = "2024"
4+
authors.workspace = true
5+
publish.workspace = true
6+
license.workspace = true
7+
license-file.workspace = true
58

69
[lib]
710

@@ -38,36 +41,36 @@ std = ["mavlink-core/std"]
3841

3942
[dependencies]
4043
arbitrary = { version = "1.4", optional = true, features = ["derive"] }
41-
bitflags = "2.10.0"
44+
bitflags = { workspace = true }
4245
defmt = { workspace = true }
4346
defmt-rtt = { workspace = true }
4447

4548
driver-services = { workspace = true }
46-
embassy-executor = { version = "0.7.0", features = [
49+
embassy-executor = { workspace = true, features = [
4750
"nightly",
4851
"task-arena-size-10240",
4952
"arch-cortex-m",
5053
"executor-thread",
5154
"executor-interrupt",
5255
"defmt",
5356
] }
54-
embassy-time = { version = "0.4.0", features = [
57+
embassy-time = { workspace = true, features = [
5558
"defmt",
5659
"defmt-timestamp-uptime",
5760
"tick-hz-32_768",
5861
] }
5962
embedded-io = { workspace = true }
60-
embedded-io-async = { version = "0.6.1", features = ["defmt-03"] }
61-
libm = { version = "0.2.15" }
63+
embedded-io-async = { workspace = true, features = ["defmt-03"] }
64+
libm = { workspace = true }
6265
mavlink-core = { version = "0.16.2", default-features = false }
6366
num-derive = "0.4.2"
64-
num-traits = { version = "0.2.19", default-features = false }
67+
num-traits = { workspace = true, default-features = false }
6568
peripheral-services = { workspace = true }
6669
rand = { version = "0.9", optional = true, default-features = false, features = [
6770
"std",
6871
"std_rng",
6972
] }
70-
serde = { version = "1.0.115", optional = true, features = ["derive"] }
73+
serde = { workspace = true, optional = true }
7174
serde_arrays = { version = "0.2.0", optional = true }
7275
ts-rs = { version = "11.0.1", optional = true }
7376
uor-proc-macros = { workspace = true }

common/uor-proc-macros/Cargo.toml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
[package]
22
name = "uor-proc-macros"
3-
version = "0.1.0"
43
edition = "2024"
4+
authors.workspace = true
5+
publish.workspace = true
6+
license.workspace = true
7+
license-file.workspace = true
58

69
[lib]
710
proc-macro = true

common/uor-utils/Cargo.toml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
[package]
22
name = "uor-utils"
3-
version = "0.1.0"
43
edition = "2024"
4+
authors.workspace = true
5+
publish.workspace = true
6+
license.workspace = true
7+
license-file.workspace = true
58

69
[features]
710
# default = ["mavlink/embedded", "mavlink/uorocketry"]
@@ -15,9 +18,9 @@ std = [
1518
messages = ["prost"]
1619

1720
[dependencies]
18-
bitflags = { version = "2.3.1", default-features = false, features = ["serde"] }
21+
bitflags = { workspace = true, default-features = false, features = ["serde"] }
1922
defmt = { workspace = true }
20-
embassy-stm32 = { version = "0.2.0", features = [
23+
embassy-stm32 = { workspace = true, features = [
2124
"defmt",
2225
"stm32h733vg",
2326
"time-driver-tim2",
@@ -30,7 +33,7 @@ embassy-stm32 = { version = "0.2.0", features = [
3033
# glob = "0.3.3"
3134
# prost-build = "0.14.1"
3235
# protoc-bin-vendored = "3"
33-
embassy-sync = { version = "0.6.2", features = ["defmt"] }
36+
embassy-sync = { workspace = true, features = ["defmt"] }
3437
embedded-alloc = { workspace = true }
3538
embedded-io-async = { workspace = true, features = ["defmt-03"] }
3639
heapless = { workspace = true }

0 commit comments

Comments
 (0)