From 6865b696161d32cd47e1ccbfac942c38385d6dfd Mon Sep 17 00:00:00 2001
From: Foo <34515228+fooooooooooooooo@users.noreply.github.com>
Date: Mon, 27 May 2024 04:26:09 -0700
Subject: [PATCH] add support for nrf52805 (#941)

---
 rtic-monotonics/Cargo.toml       | 2 ++
 rtic-monotonics/src/lib.rs       | 2 ++
 rtic-monotonics/src/nrf/rtc.rs   | 3 +++
 rtic-monotonics/src/nrf/timer.rs | 3 +++
 xtask/src/argument_parsing.rs    | 1 +
 5 files changed, 11 insertions(+)

diff --git a/rtic-monotonics/Cargo.toml b/rtic-monotonics/Cargo.toml
index c9756dc2d2..d5be4b86ea 100644
--- a/rtic-monotonics/Cargo.toml
+++ b/rtic-monotonics/Cargo.toml
@@ -45,6 +45,7 @@ critical-section = { version = "1", optional = true }
 rp2040-pac = { version = "0.6", optional = true }
 
 # nRF52
+nrf52805-pac = { version = "0.12.2", optional = true }
 nrf52810-pac = { version = "0.12.2", optional = true }
 nrf52811-pac = { version = "0.12.2", optional = true }
 nrf52832-pac = { version = "0.12.2", optional = true }
@@ -80,6 +81,7 @@ systick-64bit = []
 rp2040 = ["dep:cortex-m", "dep:rp2040-pac"]
 
 # nRF Timers and RTC
+nrf52805 = ["dep:cortex-m", "dep:nrf52805-pac", "dep:critical-section"]
 nrf52810 = ["dep:cortex-m", "dep:nrf52810-pac", "dep:critical-section"]
 nrf52811 = ["dep:cortex-m", "dep:nrf52811-pac", "dep:critical-section"]
 nrf52832 = ["dep:cortex-m", "dep:nrf52832-pac", "dep:critical-section"]
diff --git a/rtic-monotonics/src/lib.rs b/rtic-monotonics/src/lib.rs
index 65180b1b8f..70a89fc90d 100644
--- a/rtic-monotonics/src/lib.rs
+++ b/rtic-monotonics/src/lib.rs
@@ -44,6 +44,7 @@ pub mod rp2040;
 pub mod imxrt;
 
 #[cfg(any(
+    feature = "nrf52805",
     feature = "nrf52810",
     feature = "nrf52811",
     feature = "nrf52832",
@@ -66,6 +67,7 @@ pub(crate) const fn cortex_logical2hw(logical: u8, nvic_prio_bits: u8) -> u8 {
 
 #[cfg(any(
     feature = "rp2040",
+    feature = "nrf52805",
     feature = "nrf52810",
     feature = "nrf52811",
     feature = "nrf52832",
diff --git a/rtic-monotonics/src/nrf/rtc.rs b/rtic-monotonics/src/nrf/rtc.rs
index 39b26c4d75..5b9a90b572 100644
--- a/rtic-monotonics/src/nrf/rtc.rs
+++ b/rtic-monotonics/src/nrf/rtc.rs
@@ -33,6 +33,9 @@ pub mod prelude {
     pub use fugit::{self, ExtU64, ExtU64Ceil};
 }
 
+#[cfg(feature = "nrf52805")]
+#[doc(hidden)]
+pub use nrf52805_pac::{self as pac, RTC0, RTC1};
 #[cfg(feature = "nrf52810")]
 #[doc(hidden)]
 pub use nrf52810_pac::{self as pac, RTC0, RTC1};
diff --git a/rtic-monotonics/src/nrf/timer.rs b/rtic-monotonics/src/nrf/timer.rs
index 60ee7dc603..3ec1dfe822 100644
--- a/rtic-monotonics/src/nrf/timer.rs
+++ b/rtic-monotonics/src/nrf/timer.rs
@@ -39,6 +39,9 @@ pub mod prelude {
     pub use fugit::{self, ExtU64, ExtU64Ceil};
 }
 
+#[cfg(feature = "nrf52805")]
+#[doc(hidden)]
+pub use nrf52805_pac::{self as pac, TIMER0, TIMER1, TIMER2};
 #[cfg(feature = "nrf52810")]
 #[doc(hidden)]
 pub use nrf52810_pac::{self as pac, TIMER0, TIMER1, TIMER2};
diff --git a/xtask/src/argument_parsing.rs b/xtask/src/argument_parsing.rs
index c327af804a..d7301f4a22 100644
--- a/xtask/src/argument_parsing.rs
+++ b/xtask/src/argument_parsing.rs
@@ -76,6 +76,7 @@ impl Package {
                         "cortex-m-systick",
                         "cortex-m-systick,systick-64bit",
                         "rp2040",
+                        "nrf52805",
                         "nrf52810",
                         "nrf52811",
                         "nrf52832",