rebase

esp-rs · Feb 5, 2025 · b617592 · b617592
1 parent ba39c8d
commit b617592
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/esp-hal/src/spi/master.rs b/esp-hal/src/spi/master.rs
@@ -590,11 +590,11 @@ impl Config {
         // Maximum supported frequency is 80Mhz, minimum is about 70khz.
         cfg_if::cfg_if! {
             if #[cfg(esp32h2)] {
-                if self.frequency < HertzU32::kHz(70) || self.frequency > HertzU32::MHz(48) {
+                if self.frequency < Rate::from_khz(70) || self.frequency > Rate::from_mhz(48) {
                     return Err(ConfigError::UnsupportedFrequency);
                 }
             } else {
-                if self.frequency < HertzU32::kHz(70) || self.frequency > HertzU32::MHz(80) {
+                if self.frequency < Rate::from_khz(70) || self.frequency > Rate::from_mhz(80) {
                     return Err(ConfigError::UnsupportedFrequency);
                 }
             }

diff --git a/esp-hal/src/uart.rs b/esp-hal/src/uart.rs
@@ -2488,7 +2488,7 @@ impl Info {
                     / actual_baud as u64;
                 // We tolerate deviation of 1% from the desired baud value, as it never will be
                 // exactly the same
-                if deviation > 1 as u64 {
+                if deviation > 1_u64 {
                     return Err(ConfigError::UnachievableBaudrate);
                 }
             }
@@ -2580,7 +2580,7 @@ impl Info {
                     / actual_baud as u64;
                 // We tolerate deviation of 1% from the desired baud value, as it never will be
                 // exactly the same
-                if deviation > 1 as u64 {
+                if deviation > 1_u64 {
                     return Err(ConfigError::UnachievableBaudrate);
                 }
             }
@@ -2626,7 +2626,7 @@ impl Info {
                     / actual_baud as u64;
                 // We tolerate deviation of 1% from the desired baud value, as it never will be
                 // exactly the same
-                if deviation > 1 as u64 {
+                if deviation > 1_u64 {
                     return Err(ConfigError::UnachievableBaudrate);
                 }
             }