Skip to content

Commit 3563771

Browse files
committed
Modernize EC to embedded-services main
Bump the embedded-services git pin off the stale 62d4ea9 onto current main (6d7dbbf, which carries the new default_mctp_serial constructor), porting the shared mock to the new battery Registration model and the new spawn_service! init-closure form. platform-common/src/mock: - battery.rs: rewrite to the fuel-gauge Registration model. The OEM owns a Mutex<GlobalRawMutex, MockFuelGauge> and drives it directly; the service is bs::Service::new(ArrayRegistration{..}). Replaces the removed Device / MockBattery / execute_event API. - thermal.rs: wrap the sensor and fan spawn_service! args in the new |resources| Service::new(resources, InitParams{..}) closures. - time_alarm.rs: switch to the positional tas::Service::new closure. - mod.rs: update the relay-handler battery type argument. Bump all five platform locks (dev-mec was at 5cc395f1) and add crc / crc-catalog / embedded-mcu-hal 0.3.0 cargo-vet exemptions to the four CI platforms (dev-mec has no supply-chain store). No per-platform code changes: every platform consumes platform_common::mock only. dev-qemu unifies embedded-mcu-hal on crates.io: time-alarm-service (from embedded-services main), embassy-qemu-riscv, and dev-qemu's own HID dep all use the crates.io 0.3.0 rather than mixing crates.io and git sources of the identical crate, which collide on defmt's derive symbols under LTO (surfaces only in the release build, not cargo check). Unblocks dropping the F1.1 fork [patch] override. Assisted-by: GitHub Copilot:claude-opus-4.8
1 parent 41ef81a commit 3563771

14 files changed

Lines changed: 347 additions & 193 deletions

File tree

platform/dev-imxrt/Cargo.lock

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

platform/dev-imxrt/supply-chain/config.toml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,14 @@ criteria = "safe-to-deploy"
4343
version = "1.0.4"
4444
criteria = "safe-to-deploy"
4545

46+
[[exemptions.crc]]
47+
version = "3.4.0"
48+
criteria = "safe-to-deploy"
49+
50+
[[exemptions.crc-catalog]]
51+
version = "2.5.0"
52+
criteria = "safe-to-deploy"
53+
4654
[[exemptions.darling]]
4755
version = "0.20.11"
4856
criteria = "safe-to-deploy"
@@ -87,6 +95,10 @@ criteria = "safe-to-deploy"
8795
version = "0.1.0@git:6524cbabcc12016f1aea4c0ffa2f1354c3f8c6d1"
8896
criteria = "safe-to-deploy"
8997

98+
[[exemptions.embedded-mcu-hal]]
99+
version = "0.3.0"
100+
criteria = "safe-to-deploy"
101+
90102
[[exemptions.embedded-sensors-hal]]
91103
version = "0.1.1"
92104
criteria = "safe-to-deploy"

0 commit comments

Comments
 (0)