From 6adb95610bedf964a40203cabb81cd3482dddf93 Mon Sep 17 00:00:00 2001 From: chrysn Date: Fri, 18 Oct 2024 10:58:05 +0200 Subject: [PATCH] fixup! feat(device-id): Add to riot-rs and the archs This addresses fallout from rebasing. --- Cargo.lock | 1 + src/riot-rs-nrf/Cargo.toml | 1 + src/riot-rs-nrf/src/identity.rs | 2 ++ 3 files changed, 4 insertions(+) diff --git a/Cargo.lock b/Cargo.lock index 326410b47..d84340167 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3762,6 +3762,7 @@ dependencies = [ "embassy-nrf", "embedded-hal-async", "nrf52832-pac", + "nrf52833-pac", "nrf52840-pac", "nrf5340-app-pac", "paste", diff --git a/src/riot-rs-nrf/Cargo.toml b/src/riot-rs-nrf/Cargo.toml index 11e6996ef..3ea664d61 100644 --- a/src/riot-rs-nrf/Cargo.toml +++ b/src/riot-rs-nrf/Cargo.toml @@ -35,6 +35,7 @@ nrf52832-pac = "0.12.2" [target.'cfg(context = "nrf52833")'.dependencies] # Disable NFC support for now, as we do not support it yet. embassy-nrf = { workspace = true, features = ["nfc-pins-as-gpio", "nrf52833"] } +nrf52833-pac = "0.12.2" [target.'cfg(context = "nrf52840")'.dependencies] embassy-nrf = { workspace = true, features = ["nrf52840"] } diff --git a/src/riot-rs-nrf/src/identity.rs b/src/riot-rs-nrf/src/identity.rs index aa67bfd89..54e92467c 100644 --- a/src/riot-rs-nrf/src/identity.rs +++ b/src/riot-rs-nrf/src/identity.rs @@ -16,6 +16,8 @@ impl riot_rs_embassy_common::identity::DeviceId for DeviceId { let ficr = unsafe { nrf52840_pac::Peripherals::steal().FICR }; #[cfg(context = "nrf52832")] let ficr = unsafe { nrf52832_pac::Peripherals::steal().FICR }; + #[cfg(context = "nrf52833")] + let ficr = unsafe { nrf52833_pac::Peripherals::steal().FICR }; #[cfg(context = "nrf5340")] let ficr = &unsafe { nrf5340_app_pac::Peripherals::steal().FICR_S }.info;