diff --git a/Cargo.lock b/Cargo.lock index d9959051..1d1aef87 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -263,6 +263,17 @@ dependencies = [ "syn 2.0.106", ] +[[package]] +name = "bitfield-struct" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8769c4854c5ada2852ddf6fd09d15cf43d4c2aaeccb4de6432f5402f08a6003b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.106", +] + [[package]] name = "bitflags" version = "1.3.2" @@ -680,7 +691,20 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "31e14d288a59ef41f4e05468eae9b1c9fef6866977cea86d3f1a1ced295b6cab" dependencies = [ - "bitfield-struct", + "bitfield-struct 0.10.1", + "bitflags 2.9.4", + "defmt 0.3.100", + "embedded-hal 1.0.0", + "zerocopy", +] + +[[package]] +name = "embedded-batteries" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40f975432b4e146342a1589c563cffab6b7a692024cb511bf87b6bfe78c84125" +dependencies = [ + "bitfield-struct 0.12.1", "bitflags 2.9.4", "defmt 0.3.100", "embedded-hal 1.0.0", @@ -689,13 +713,13 @@ dependencies = [ [[package]] name = "embedded-batteries-async" -version = "0.2.1" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98cb543f4eea7e2c57544f345a5cf40fd90e9d3593b96cb7515f6c1d62c7fc68" +checksum = "a3bf0e4be67770cfc31f1cea8b73baf98c0baf2c57d6bd8c3a4c315acb1d8bd4" dependencies = [ - "bitfield-struct", + "bitfield-struct 0.12.1", "defmt 0.3.100", - "embedded-batteries", + "embedded-batteries 0.3.4", "embedded-hal 1.0.0", ] @@ -1235,7 +1259,7 @@ source = "git+https://github.com/dymk/mctp-rs#4456c65131366acd5e605c7d88a707881f dependencies = [ "bit-register 0.1.0 (git+https://github.com/OpenDevicePartnership/odp-utilities)", "defmt 0.3.100", - "embedded-batteries", + "embedded-batteries 0.2.1", "espi-device", "num_enum", "smbus-pec", diff --git a/Cargo.toml b/Cargo.toml index 02638389..424221b9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -58,7 +58,7 @@ embassy-imxrt = { git = "https://github.com/OpenDevicePartnership/embassy-imxrt" embassy-sync = "0.7.2" embassy-time = "0.5.0" embassy-time-driver = "0.2.1" -embedded-batteries-async = "0.2.0" +embedded-batteries-async = "0.3" embedded-cfu-protocol = { git = "https://github.com/OpenDevicePartnership/embedded-cfu" } embedded-hal = "1.0" embedded-hal-async = "1.0" diff --git a/embedded-service/Cargo.toml b/embedded-service/Cargo.toml index 503feb6e..e630c664 100644 --- a/embedded-service/Cargo.toml +++ b/embedded-service/Cargo.toml @@ -58,6 +58,7 @@ defmt = [ "embassy-time/defmt", "embedded-usb-pd/defmt", "embedded-cfu-protocol/defmt", + "embedded-batteries-async/defmt", "mctp-rs/defmt", ] log = [ diff --git a/examples/rt633/Cargo.lock b/examples/rt633/Cargo.lock index 24dd8728..ba119a8a 100644 --- a/examples/rt633/Cargo.lock +++ b/examples/rt633/Cargo.lock @@ -2,24 +2,6 @@ # It is not intended for manual editing. version = 4 -[[package]] -name = "ahash" -version = "0.8.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75" -dependencies = [ - "cfg-if", - "once_cell", - "version_check", - "zerocopy", -] - -[[package]] -name = "anyhow" -version = "1.0.98" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487" - [[package]] name = "aquamarine" version = "0.6.0" @@ -34,49 +16,6 @@ dependencies = [ "syn 2.0.104", ] -[[package]] -name = "arraydeque" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d902e3d592a523def97af8f317b08ce16b7ab854c1985a0c671e6f15cebc236" - -[[package]] -name = "askama" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f75363874b771be265f4ffe307ca705ef6f3baa19011c149da8674a87f1b75c4" -dependencies = [ - "askama_derive", - "itoa", - "percent-encoding", - "serde", - "serde_json", -] - -[[package]] -name = "askama_derive" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "129397200fe83088e8a68407a8e2b1f826cf0086b21ccdb866a722c8bcd3a94f" -dependencies = [ - "askama_parser", - "memchr", - "proc-macro2", - "quote", - "rustc-hash", - "syn 2.0.104", -] - -[[package]] -name = "askama_parser" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6ab5630b3d5eaf232620167977f95eb51f3432fc76852328774afbd242d4358" -dependencies = [ - "memchr", - "winnow 0.7.12", -] - [[package]] name = "autocfg" version = "1.5.0" @@ -184,6 +123,17 @@ dependencies = [ "syn 2.0.104", ] +[[package]] +name = "bitfield-struct" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8769c4854c5ada2852ddf6fd09d15cf43d4c2aaeccb4de6432f5402f08a6003b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.104", +] + [[package]] name = "bitflags" version = "1.3.2" @@ -210,14 +160,15 @@ dependencies = [ [[package]] name = "bq40z50-rx" -version = "0.1.1" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6490641e82ed3770614a0f2a301fc26422ee83b52eb7d2802805e41f471be318" +checksum = "09b6faf600295f12c3fb99b45266bc9140af5c344b08f2705bc06bfa0e8b549e" dependencies = [ "device-driver", "embedded-batteries-async", "embedded-hal 1.0.0", "embedded-hal-async", + "smbus-pec", ] [[package]] @@ -238,15 +189,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268" -[[package]] -name = "convert_case" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca" -dependencies = [ - "unicode-segmentation", -] - [[package]] name = "cortex-m" version = "0.7.7" @@ -327,15 +269,6 @@ dependencies = [ "syn 2.0.104", ] -[[package]] -name = "dd-manifest-tree" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5793572036e0a6638977c7370c6afc423eac848ee8495f079b8fd3964de7b9f9" -dependencies = [ - "yaml-rust2", -] - [[package]] name = "defmt" version = "0.3.100" @@ -374,7 +307,7 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "10d60334b3b2e7c9d91ef8150abfb6fa4c1c39ebbcf4a81c2e346aad939fee3e" dependencies = [ - "thiserror 2.0.16", + "thiserror", ] [[package]] @@ -393,40 +326,10 @@ version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1298272ea07037196af2fe8d1eb50792206f45476d79eefa435432b9323cf488" dependencies = [ - "device-driver-macros", "embedded-io", "embedded-io-async", ] -[[package]] -name = "device-driver-generation" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f86a17ed060a6119daeb05ad5596ac3bd945f7ab2213cc6260bf6a7623e73da1" -dependencies = [ - "anyhow", - "askama", - "bitvec", - "convert_case", - "dd-manifest-tree", - "itertools 0.14.0", - "kdl", - "proc-macro2", - "quote", - "syn 2.0.104", -] - -[[package]] -name = "device-driver-macros" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1c29238099c66bf44098efaa772cae6f47d632aebb7ade8d3087bd565e8fae0" -dependencies = [ - "device-driver-generation", - "proc-macro2", - "syn 2.0.104", -] - [[package]] name = "document-features" version = "0.2.11" @@ -604,7 +507,20 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "31e14d288a59ef41f4e05468eae9b1c9fef6866977cea86d3f1a1ced295b6cab" dependencies = [ - "bitfield-struct", + "bitfield-struct 0.10.1", + "bitflags 2.9.1", + "defmt 0.3.100", + "embedded-hal 1.0.0", + "zerocopy", +] + +[[package]] +name = "embedded-batteries" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40f975432b4e146342a1589c563cffab6b7a692024cb511bf87b6bfe78c84125" +dependencies = [ + "bitfield-struct 0.12.1", "bitflags 2.9.1", "defmt 0.3.100", "embedded-hal 1.0.0", @@ -613,13 +529,13 @@ dependencies = [ [[package]] name = "embedded-batteries-async" -version = "0.2.1" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98cb543f4eea7e2c57544f345a5cf40fd90e9d3593b96cb7515f6c1d62c7fc68" +checksum = "a3bf0e4be67770cfc31f1cea8b73baf98c0baf2c57d6bd8c3a4c315acb1d8bd4" dependencies = [ - "bitfield-struct", + "bitfield-struct 0.12.1", "defmt 0.3.100", - "embedded-batteries", + "embedded-batteries 0.3.4", "embedded-hal 1.0.0", ] @@ -746,15 +662,6 @@ dependencies = [ "embedded-hal-async", ] -[[package]] -name = "encoding_rs" -version = "0.8.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3" -dependencies = [ - "cfg-if", -] - [[package]] name = "espi-device" version = "0.1.0" @@ -837,24 +744,6 @@ dependencies = [ "byteorder", ] -[[package]] -name = "hashbrown" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" -dependencies = [ - "ahash", -] - -[[package]] -name = "hashlink" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ba4ff7128dee98c7dc9794b6a411377e1404dba1c97deb8d1a55297bd25d8af" -dependencies = [ - "hashbrown", -] - [[package]] name = "heapless" version = "0.8.0" @@ -914,33 +803,6 @@ dependencies = [ "either", ] -[[package]] -name = "itertools" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285" -dependencies = [ - "either", -] - -[[package]] -name = "itoa" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" - -[[package]] -name = "kdl" -version = "6.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12661358400b02cbbf1fbd05f0a483335490e8a6bd1867620f2eeb78f304a22f" -dependencies = [ - "miette", - "num", - "thiserror 1.0.69", - "winnow 0.6.24", -] - [[package]] name = "litrs" version = "0.4.1" @@ -954,39 +816,11 @@ source = "git+https://github.com/dymk/mctp-rs#4456c65131366acd5e605c7d88a707881f dependencies = [ "bit-register 0.1.0 (git+https://github.com/OpenDevicePartnership/odp-utilities)", "defmt 0.3.100", - "embedded-batteries", + "embedded-batteries 0.2.1", "espi-device", "num_enum", "smbus-pec", - "thiserror 2.0.16", -] - -[[package]] -name = "memchr" -version = "2.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0" - -[[package]] -name = "miette" -version = "7.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f98efec8807c63c752b5bd61f862c165c115b0a35685bdcfd9238c7aeb592b7" -dependencies = [ - "cfg-if", - "miette-derive", - "unicode-width", -] - -[[package]] -name = "miette-derive" -version = "7.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db5b29714e950dbb20d5e6f74f9dcec4edbcc1067bb7f8ed198c097b8c1a818b" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.104", + "thiserror", ] [[package]] @@ -1039,70 +873,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d5439c4ad607c3c23abf66de8c8bf57ba8adcd1f129e699851a6e43935d339d" -[[package]] -name = "num" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23" -dependencies = [ - "num-bigint", - "num-complex", - "num-integer", - "num-iter", - "num-rational", - "num-traits", -] - -[[package]] -name = "num-bigint" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" -dependencies = [ - "num-integer", - "num-traits", -] - -[[package]] -name = "num-complex" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495" -dependencies = [ - "num-traits", -] - -[[package]] -name = "num-integer" -version = "0.1.46" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" -dependencies = [ - "num-traits", -] - -[[package]] -name = "num-iter" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-rational" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" -dependencies = [ - "num-bigint", - "num-integer", - "num-traits", -] - [[package]] name = "num-traits" version = "0.2.19" @@ -1133,12 +903,6 @@ dependencies = [ "syn 2.0.104", ] -[[package]] -name = "once_cell" -version = "1.21.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" - [[package]] name = "panic-probe" version = "0.3.2" @@ -1155,12 +919,6 @@ version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" -[[package]] -name = "percent-encoding" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" - [[package]] name = "portable-atomic" version = "1.11.1" @@ -1242,12 +1000,6 @@ dependencies = [ "static_cell", ] -[[package]] -name = "rustc-hash" -version = "2.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d" - [[package]] name = "rustc_version" version = "0.2.3" @@ -1263,12 +1015,6 @@ version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" -[[package]] -name = "ryu" -version = "1.0.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" - [[package]] name = "semver" version = "0.9.0" @@ -1304,18 +1050,6 @@ dependencies = [ "syn 2.0.104", ] -[[package]] -name = "serde_json" -version = "1.0.141" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30b9eff21ebe718216c6ec64e1d9ac57087aad11efc64e32002bce4a0d4c03d3" -dependencies = [ - "itoa", - "memchr", - "ryu", - "serde", -] - [[package]] name = "smbus-pec" version = "1.0.1" @@ -1397,33 +1131,13 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" -[[package]] -name = "thiserror" -version = "1.0.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" -dependencies = [ - "thiserror-impl 1.0.69", -] - [[package]] name = "thiserror" version = "2.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3467d614147380f2e4e374161426ff399c91084acd2363eaf549172b3d5e60c0" dependencies = [ - "thiserror-impl 2.0.16", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.104", + "thiserror-impl", ] [[package]] @@ -1449,18 +1163,6 @@ version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" -[[package]] -name = "unicode-segmentation" -version = "1.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" - -[[package]] -name = "unicode-width" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" - [[package]] name = "unty" version = "0.0.4" @@ -1479,12 +1181,6 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77439c1b53d2303b20d9459b1ade71a83c716e3f9c34f3228c00e6f185d6c002" -[[package]] -name = "version_check" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" - [[package]] name = "void" version = "1.0.2" @@ -1500,24 +1196,6 @@ dependencies = [ "vcell", ] -[[package]] -name = "winnow" -version = "0.6.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8d71a593cc5c42ad7876e2c1fda56f314f3754c084128833e64f1345ff8a03a" -dependencies = [ - "memchr", -] - -[[package]] -name = "winnow" -version = "0.7.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3edebf492c8125044983378ecb5766203ad3b4c2f7a922bd7dd207f6d443e95" -dependencies = [ - "memchr", -] - [[package]] name = "wyz" version = "0.5.1" @@ -1527,17 +1205,6 @@ dependencies = [ "tap", ] -[[package]] -name = "yaml-rust2" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a1a1c0bc9823338a3bdf8c61f994f23ac004c6fa32c08cd152984499b445e8d" -dependencies = [ - "arraydeque", - "encoding_rs", - "hashlink", -] - [[package]] name = "zerocopy" version = "0.8.26" diff --git a/examples/rt633/Cargo.toml b/examples/rt633/Cargo.toml index 573ba002..9da4f452 100644 --- a/examples/rt633/Cargo.toml +++ b/examples/rt633/Cargo.toml @@ -32,9 +32,7 @@ embassy-imxrt = { git = "https://github.com/OpenDevicePartnership/embassy-imxrt" "unstable-pac", ] } -embassy-sync = { version = "0.7.2", features = [ - "defmt", -] } +embassy-sync = { version = "0.7.2", features = ["defmt"] } embassy-executor = { version = "0.9.1", features = [ "arch-cortex-m", "executor-thread", @@ -49,9 +47,9 @@ mimxrt600-fcb = "0.2.0" espi-service = { path = "../../espi-service", features = ["defmt"] } embedded-services = { path = "../../embedded-service", features = ["defmt"] } -embedded-batteries-async = { version = "0.2.0", features = ["defmt"] } +embedded-batteries-async = { version = "0.3", features = ["defmt"] } battery-service = { path = "../../battery-service", features = ["defmt"] } -bq40z50-rx = { version = "0.1", features = ["r5"] } +bq40z50-rx = { version = "0.8", features = ["r5"] } static_cell = "2.1.0" embassy-embedded-hal = { version = "0.5.0", default-features = false } diff --git a/examples/rt633/src/bin/espi_battery.rs b/examples/rt633/src/bin/espi_battery.rs index 165b5244..c7aeb983 100644 --- a/examples/rt633/src/bin/espi_battery.rs +++ b/examples/rt633/src/bin/espi_battery.rs @@ -17,7 +17,7 @@ use embedded_services::{error, info}; use battery_service::controller::{Controller, ControllerEvent}; use battery_service::device::{Device, DeviceId, DynamicBatteryMsgs, StaticBatteryMsgs}; use battery_service::wrapper::Wrapper; -use bq40z50_rx::Bq40z50; +use bq40z50_rx::Bq40z50R5 as Bq40z50; use embassy_embedded_hal::shared_bus::asynch::i2c::I2cDevice; use embassy_executor::Spawner; use embassy_imxrt::bind_interrupts; @@ -44,11 +44,12 @@ static FG_DEVICE: StaticCell = StaticCell::new(); struct Bq40z50Controller { driver: Bq40z50< I2cDevice<'static, NoopRawMutex, embassy_imxrt::i2c::master::I2cMaster<'static, embassy_imxrt::i2c::Async>>, + embassy_time::Delay, >, } impl embedded_batteries_async::smart_battery::ErrorType for Bq40z50Controller { - type Error = >> as embedded_batteries_async::smart_battery::ErrorType>::Error; + type Error = >, embassy_time::Delay,> as embedded_batteries_async::smart_battery::ErrorType>::Error; } impl embedded_batteries_async::smart_battery::SmartBattery for Bq40z50Controller { @@ -160,7 +161,7 @@ impl embedded_batteries_async::smart_battery::SmartBattery for Bq40z50Controller } impl Controller for Bq40z50Controller { - type ControllerError = >> as embedded_batteries_async::smart_battery::ErrorType>::Error; + type ControllerError = >, embassy_time::Delay,> as embedded_batteries_async::smart_battery::ErrorType>::Error; async fn initialize(&mut self) -> Result<(), Self::ControllerError> { info!("Fuel gauge inited!"); @@ -327,7 +328,7 @@ async fn main(spawner: Spawner) { let wrap = Wrapper::new( fg, Bq40z50Controller { - driver: Bq40z50::new(fg_bus), + driver: Bq40z50::new(fg_bus, embassy_time::Delay), }, ); diff --git a/examples/rt685s-evk/Cargo.lock b/examples/rt685s-evk/Cargo.lock index eab39806..89a9d0af 100644 --- a/examples/rt685s-evk/Cargo.lock +++ b/examples/rt685s-evk/Cargo.lock @@ -182,6 +182,17 @@ dependencies = [ "syn 2.0.106", ] +[[package]] +name = "bitfield-struct" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8769c4854c5ada2852ddf6fd09d15cf43d4c2aaeccb4de6432f5402f08a6003b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.106", +] + [[package]] name = "bitflags" version = "1.3.2" @@ -607,7 +618,20 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "31e14d288a59ef41f4e05468eae9b1c9fef6866977cea86d3f1a1ced295b6cab" dependencies = [ - "bitfield-struct", + "bitfield-struct 0.10.1", + "bitflags 2.9.4", + "defmt 0.3.100", + "embedded-hal 1.0.0", + "zerocopy", +] + +[[package]] +name = "embedded-batteries" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40f975432b4e146342a1589c563cffab6b7a692024cb511bf87b6bfe78c84125" +dependencies = [ + "bitfield-struct 0.12.1", "bitflags 2.9.4", "defmt 0.3.100", "embedded-hal 1.0.0", @@ -616,12 +640,13 @@ dependencies = [ [[package]] name = "embedded-batteries-async" -version = "0.2.1" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98cb543f4eea7e2c57544f345a5cf40fd90e9d3593b96cb7515f6c1d62c7fc68" +checksum = "a3bf0e4be67770cfc31f1cea8b73baf98c0baf2c57d6bd8c3a4c315acb1d8bd4" dependencies = [ - "bitfield-struct", - "embedded-batteries", + "bitfield-struct 0.12.1", + "defmt 0.3.100", + "embedded-batteries 0.3.4", "embedded-hal 1.0.0", ] @@ -945,7 +970,7 @@ source = "git+https://github.com/dymk/mctp-rs#4456c65131366acd5e605c7d88a707881f dependencies = [ "bit-register 0.1.0 (git+https://github.com/OpenDevicePartnership/odp-utilities)", "defmt 0.3.100", - "embedded-batteries", + "embedded-batteries 0.2.1", "espi-device", "num_enum", "smbus-pec", diff --git a/examples/std/Cargo.lock b/examples/std/Cargo.lock index 6843a6e0..29b48551 100644 --- a/examples/std/Cargo.lock +++ b/examples/std/Cargo.lock @@ -204,9 +204,9 @@ dependencies = [ [[package]] name = "bitfield-struct" -version = "0.10.1" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2be5a46ba01b60005ae2c51a36a29cfe134bcacae2dd5cedcd4615fbaad1494b" +checksum = "8769c4854c5ada2852ddf6fd09d15cf43d4c2aaeccb4de6432f5402f08a6003b" dependencies = [ "proc-macro2", "quote", @@ -579,9 +579,9 @@ dependencies = [ [[package]] name = "embedded-batteries" -version = "0.2.1" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e14d288a59ef41f4e05468eae9b1c9fef6866977cea86d3f1a1ced295b6cab" +checksum = "40f975432b4e146342a1589c563cffab6b7a692024cb511bf87b6bfe78c84125" dependencies = [ "bitfield-struct", "bitflags 2.9.4", @@ -591,9 +591,9 @@ dependencies = [ [[package]] name = "embedded-batteries-async" -version = "0.2.1" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98cb543f4eea7e2c57544f345a5cf40fd90e9d3593b96cb7515f6c1d62c7fc68" +checksum = "a3bf0e4be67770cfc31f1cea8b73baf98c0baf2c57d6bd8c3a4c315acb1d8bd4" dependencies = [ "bitfield-struct", "embedded-batteries", diff --git a/examples/std/Cargo.toml b/examples/std/Cargo.toml index 1bcc30b1..9867a606 100644 --- a/examples/std/Cargo.toml +++ b/examples/std/Cargo.toml @@ -33,7 +33,7 @@ power-policy-service = { path = "../../power-policy-service", features = [ cfu-service = { path = "../../cfu-service", features = ["log"] } embedded-cfu-protocol = { git = "https://github.com/OpenDevicePartnership/embedded-cfu" } -embedded-batteries-async = "0.2.0" +embedded-batteries-async = "0.3" battery-service = { path = "../../battery-service", features = ["log"] } type-c-service = { path = "../../type-c-service", features = ["log"] } diff --git a/supply-chain/audits.toml b/supply-chain/audits.toml index 1f4a713f..2630ad3f 100644 --- a/supply-chain/audits.toml +++ b/supply-chain/audits.toml @@ -11,6 +11,26 @@ who = "jerrysxie " criteria = "safe-to-deploy" version = "0.4.2" +[[audits.anstream]] +who = "Robert Zieba " +criteria = "safe-to-run" +version = "0.6.21" + +[[audits.anstyle-parse]] +who = "Robert Zieba " +criteria = "safe-to-run" +version = "0.2.7" + +[[audits.anstyle-query]] +who = "Robert Zieba " +criteria = "safe-to-run" +version = "1.1.5" + +[[audits.anstyle-wincon]] +who = "Robert Zieba " +criteria = "safe-to-run" +version = "3.0.11" + [[audits.aquamarine]] who = "Robert Zieba " criteria = "safe-to-deploy" @@ -31,11 +51,22 @@ who = "Robert Zieba " criteria = "safe-to-run" version = "0.3.75" +[[audits.bitfield-struct]] +who = "matteotullo " +criteria = "safe-to-deploy" +delta = "0.10.1 -> 0.12.1" +notes = "Adds hash and bitenum derives, mostly parsing and refactoring changes. No code execution nor writing to the filesystem." + [[audits.block-device-driver]] who = "jerrysxie " criteria = "safe-to-deploy" version = "0.2.0" +[[audits.colorchoice]] +who = "Robert Zieba " +criteria = "safe-to-run" +version = "1.0.3" + [[audits.const-init]] who = "Jerry Xie " criteria = "safe-to-deploy" @@ -59,6 +90,24 @@ criteria = "safe-to-deploy" version = "0.2.1" notes = "ODP crates are always trusted." +[[audits.embedded-batteries]] +who = "matteotullo " +criteria = "safe-to-deploy" +version = "0.2.1" +notes = "ODP crates are always trusted." + +[[audits.embedded-batteries]] +who = "matteotullo " +criteria = "safe-to-deploy" +version = "0.3.1" +notes = "ODP crates are always trusted." + +[[audits.embedded-batteries]] +who = "matteotullo " +criteria = "safe-to-deploy" +version = "0.3.4" +notes = "ODP crates are always trusted." + [[audits.embedded-batteries-async]] who = "Felipe Balbi " criteria = "safe-to-deploy" @@ -76,6 +125,29 @@ who = "Matteo Tullo " criteria = "safe-to-deploy" version = "0.2.1" +[[audits.embedded-batteries-async]] +who = "Matteo Tullo " +criteria = "safe-to-deploy" +version = "0.3.0" + +[[audits.embedded-batteries-async]] +who = "matteotullo " +criteria = "safe-to-deploy" +version = "0.3.0" +notes = "ODP crates are always trusted." + +[[audits.embedded-batteries-async]] +who = "matteotullo " +criteria = "safe-to-deploy" +version = "0.3.1" +notes = "ODP crates are always trusted." + +[[audits.embedded-batteries-async]] +who = "matteotullo " +criteria = "safe-to-deploy" +version = "0.3.4" +notes = "ODP crates are always trusted." + [[audits.embedded-crc-macros]] who = "Matteo Tullo " criteria = "safe-to-deploy" @@ -105,6 +177,16 @@ criteria = "safe-to-deploy" version = "0.3.0" notes = "ODP crates are always trusted." +[[audits.env_filter]] +who = "Robert Zieba " +criteria = "safe-to-run" +version = "0.1.4" + +[[audits.env_logger]] +who = "Robert Zieba " +criteria = "safe-to-run" +version = "0.11.8" + [[audits.futures-task]] who = "Jerry Xie " criteria = "safe-to-deploy" @@ -151,6 +233,11 @@ who = "jerrysxie " criteria = "safe-to-deploy" version = "2.9.0" +[[audits.is_terminal_polyfill]] +who = "Robert Zieba " +criteria = "safe-to-run" +version = "1.70.2" + [[audits.itertools]] who = "Robert Zieba " criteria = "safe-to-deploy" @@ -162,6 +249,16 @@ criteria = "safe-to-deploy" version = "0.11.0" notes = "Used as a dependency for embassy-imxrt." +[[audits.jiff]] +who = "Robert Zieba " +criteria = "safe-to-run" +version = "0.2.18" + +[[audits.jiff-static]] +who = "Robert Zieba " +criteria = "safe-to-run" +version = "0.2.18" + [[audits.libc]] who = "Robert Zieba " criteria = "safe-to-run" @@ -222,16 +319,33 @@ who = "Matteo Tullo " criteria = "safe-to-deploy" version = "0.7.4" +[[audits.num_enum]] +who = "Billy Price " +criteria = "safe-to-deploy" +delta = "0.7.4 -> 0.7.5" +notes = "Looks like this is just uptaking a new version of num_enum_derive" + [[audits.num_enum_derive]] who = "Matteo Tullo " criteria = "safe-to-deploy" version = "0.7.4" +[[audits.num_enum_derive]] +who = "Billy Price " +criteria = "safe-to-deploy" +delta = "0.7.4 -> 0.7.5" +notes = "Looks like mostly improvements to error messaging" + [[audits.object]] who = "Robert Zieba " criteria = "safe-to-run" version = "0.36.7" +[[audits.once_cell_polyfill]] +who = "Robert Zieba " +criteria = "safe-to-run" +version = "1.70.2" + [[audits.portable-atomic]] who = "Robert Zieba " criteria = "safe-to-deploy" @@ -242,11 +356,21 @@ who = "Robert Zieba " criteria = "safe-to-run" version = "1.11.1" +[[audits.portable-atomic-util]] +who = "Robert Zieba " +criteria = "safe-to-run" +version = "0.2.4" + [[audits.proc-macro-error]] who = "Jerry Xie " criteria = "safe-to-deploy" version = "1.0.4" +[[audits.rand_core]] +who = "Billy Price " +criteria = "safe-to-deploy" +delta = "0.6.4 -> 0.9.5" + [[audits.regex]] who = "Billy Price " criteria = "safe-to-run" @@ -272,6 +396,23 @@ who = "Billy Price " criteria = "safe-to-run" delta = "1.0.26 -> 1.0.27" +[[audits.serde]] +who = "Robert Zieba " +criteria = "safe-to-deploy" +version = "1.0.228" +notes = "Changes are mostly a reorganization of the internal module structure" + +[[audits.serde_core]] +who = "Robert Zieba " +criteria = "safe-to-deploy" +version = "1.0.226" + +[[audits.serde_derive]] +who = "Robert Zieba " +criteria = "safe-to-deploy" +version = "1.0.228" +notes = "Diff is clean-up in proc macros" + [[audits.serde_spanned]] who = "jerrysxie " criteria = "safe-to-deploy"