chore(*): add feature gates for module timing for lara-r6 & toby-r2 (#81

) * Add feature gates for module timing for lara-r6 & toby-r2 * Bump embedded-hal to rc.1
BlackbirdHQ · Aug 29, 2023 · 0fe4634 · 0fe4634
1 parent 68fc2fa
commit 0fe4634
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/ublox-cellular/Cargo.toml b/ublox-cellular/Cargo.toml
@@ -17,7 +17,7 @@ doctest = false
 [dependencies]
 # atat = { version = "0.18", features = ["derive", "bytes"] }
 atat = { git = "https://github.com/BlackbirdHQ/atat", rev = "70283be", features = ["derive", "defmt", "bytes"] }
-embedded-hal = "=1.0.0-alpha.10"
+embedded-hal = "=1.0.0-rc.1"
 embedded-nal = "0.6"
 fugit = { version = "0.3" }
 fugit-timer = { version = "0.1.3" }

diff --git a/ublox-cellular/src/client.rs b/ublox-cellular/src/client.rs
@@ -280,6 +280,7 @@ where
             false,
         )?;
 
+        #[cfg(any(feature = "lara-r6"))]
         self.network.send_internal(
             &SetGpioConfiguration {
                 gpio_id: 42,

diff --git a/ublox-cellular/src/module_timing.rs b/ublox-cellular/src/module_timing.rs
@@ -7,6 +7,8 @@ use fugit::TimerDurationU32;
 pub fn pwr_on_time<const TIMER_HZ: u32>() -> TimerDurationU32<TIMER_HZ> {
     if cfg!(feature = "lara-r6") {
         150.millis()
+    } else if cfg!(feature = "toby-r2") {
+        50.micros()
     } else {
         50.micros()
     }
@@ -16,6 +18,8 @@ pub fn pwr_on_time<const TIMER_HZ: u32>() -> TimerDurationU32<TIMER_HZ> {
 pub fn pwr_off_time<const TIMER_HZ: u32>() -> TimerDurationU32<TIMER_HZ> {
     if cfg!(feature = "lara-r6") {
         1500.millis()
+    } else if cfg!(feature = "toby-r2") {
+        1.secs()
     } else {
         1.secs()
     }
@@ -25,16 +29,20 @@ pub fn pwr_off_time<const TIMER_HZ: u32>() -> TimerDurationU32<TIMER_HZ> {
 pub fn reset_time<const TIMER_HZ: u32>() -> TimerDurationU32<TIMER_HZ> {
     if cfg!(feature = "lara-r6") {
         10.millis()
+    } else if cfg!(feature = "toby-r2") {
+        50.millis()
     } else {
         50.millis()
     }
 }
 
 /// Low time of `RESET_N` pin to trigger module abrupt emergency switch off
-pub fn kill_time<const TIMER_HZ: u32>() -> TimerDurationU32<TIMER_HZ> {
+///
+/// NOTE: Not all modules support this operation from `RESET_N`
+pub fn kill_time<const TIMER_HZ: u32>() -> Option<TimerDurationU32<TIMER_HZ>> {
     if cfg!(feature = "lara-r6") {
-        10.secs()
+        Some(10.secs())
     } else {
-        10.secs()
+        None
     }
 }