Replace all float calculations with fixed ones

esp-hal-common/src/ledc/channel.rs

@@ -45,7 +45,7 @@ pub mod config {
     #[derive(Copy, Clone)]
     pub struct Config<'a, S: TimerSpeed> {
         pub timer: &'a dyn TimerIFace<S>,
-        pub duty_pct: f32,
+        pub duty_pct: u8,
     }
 }
 
@@ -58,7 +58,7 @@ where
     fn configure(&mut self, config: config::Config<'a, S>) -> Result<(), Error>;
 
     /// Set channel duty HW
-    fn set_duty(&self, duty_pct: f32) -> Result<(), Error>;
+    fn set_duty(&self, duty_pct: u8) -> Result<(), Error>;
 }
 
 /// Channel HW interface
@@ -107,7 +107,7 @@ where
     }
 
     /// Set duty % of channel
-    fn set_duty(&self, duty_pct: f32) -> Result<(), Error> {
+    fn set_duty(&self, duty_pct: u8) -> Result<(), Error> {
         let duty_exp;
         if let Some(timer) = self.timer {
             if let Some(timer_duty) = timer.get_duty() {
@@ -120,9 +120,9 @@ where
         }
 
         let duty_range = 2u32.pow(duty_exp);
-        let duty_value = (duty_range as f32 * duty_pct) as u32;
+        let duty_value = (duty_range * duty_pct as u32) as u32 / 100;
 
-        if duty_value == 0 || duty_pct > 1.0 {
+        if duty_value == 0 || duty_pct > 100u8 {
             // Not enough bits to represent the requested duty % or duty_pct greater than
             // 1.0
             return Err(Error::Duty);

esp-hal-common/src/ledc/mod.rs

@@ -27,7 +27,7 @@
 //! channel0
 //!     .configure(channel::config::Config {
 //!         timer: &lstimer0,
-//!         duty: 0.1,
+//!         duty: 10,
 //!     })
 //!     .unwrap();
 //! ```
@@ -53,7 +53,7 @@
 //! channel0
 //!     .configure(channel::config::Config {
 //!         timer: &hstimer0,
-//!         duty: 0.1,
+//!         duty: 10,
 //!     })
 //!     .unwrap();
 //! ```

esp-hal-common/src/rtc_cntl.rs

@@ -418,10 +418,10 @@ impl RtcClock {
             1024,
         );
 
-        let q_to_float = |val| (val as f32) / ((1 << RtcClock::CAL_FRACT) as f32);
-        let period = q_to_float(period_13q19);
+        // 100_000_000 is used to get rid of `float` calculations
+        let period = (100_000_000 * period_13q19 as u64) / (1 << RtcClock::CAL_FRACT);
 
-        (1000f32 / period) as u16
+        (100_000_000 * 1000 / period) as u16
     }
 
     fn estimate_xtal_frequency() -> u32 {

esp-hal-common/src/timer.rs

@@ -445,10 +445,9 @@ where
 
     let clock: HertzU32 = clock.into();
 
-    // TODO can we get this to not use doubles/floats
-    let period = 1_000_000f64 / (clock.to_Hz() as f64 / divider as f64); // micros
-
-    (micros as f64 / period) as u64
+    // 1_000_000 is used to get rid of `float` calculations
+    let period: u64 = 1_000_000 * 1_000_000 / (clock.to_Hz() as u64 / divider as u64);
+    (1_000_000 * micros / period as u64) as u64
 }
 
 impl<T> CountDown for Timer<T>

esp32-hal/examples/ledc.rs

@@ -1,5 +1,5 @@
 //! Turns on LED with the option to change LED intensity depending on `duty`
-//! value.
+//! value. Possible values (`u32`) are in range 0..100.
 //!
 //! This assumes that a LED is connected to the pin assigned to `led`. (GPIO4)
 
@@ -62,7 +62,7 @@ fn main() -> ! {
     channel0
         .configure(channel::config::Config {
             timer: &hstimer0,
-            duty_pct: 0.1,
+            duty_pct: 10,
         })
         .unwrap();
 

esp32c3-hal/examples/ledc.rs

@@ -1,5 +1,5 @@
 //! Turns on LED with the option to change LED intensity depending on `duty`
-//! value.
+//! value. Possible values (`u32`) are in range 0..100.
 //!
 //! This assumes that a LED is connected to the pin assigned to `led`. (GPIO4)
 
@@ -67,7 +67,7 @@ fn main() -> ! {
     channel0
         .configure(channel::config::Config {
             timer: &lstimer0,
-            duty_pct: 0.1,
+            duty_pct: 10,
         })
         .unwrap();
 

esp32s2-hal/examples/ledc.rs

@@ -1,5 +1,5 @@
 //! Turns on LED with the option to change LED intensity depending on `duty`
-//! value.
+//! value. Possible values (`u32`) are in range 0..100.
 //!
 //! This assumes that a LED is connected to the pin assigned to `led`. (GPIO4)
 
@@ -65,7 +65,7 @@ fn main() -> ! {
     channel0
         .configure(channel::config::Config {
             timer: &lstimer0,
-            duty_pct: 0.1,
+            duty_pct: 10,
         })
         .unwrap();
 

esp32s3-hal/examples/ledc.rs

@@ -1,5 +1,5 @@
 //! Turns on LED with the option to change LED intensity depending on `duty`
-//! value.
+//! value. Possible values (`u32`) are in range 0..100.
 //!
 //! This assumes that a LED is connected to the pin assigned to `led`. (GPIO4)
 
@@ -65,7 +65,7 @@ fn main() -> ! {
     channel0
         .configure(channel::config::Config {
             timer: &lstimer0,
-            duty_pct: 0.1,
+            duty_pct: 10,
         })
         .unwrap();