Adds simple_pwm support for the attiny85

Author: dalpil

arduino-hal/src/lib.rs

@@ -113,7 +113,7 @@ pub use delay::{delay_ms, delay_us, Delay};
 #[cfg(feature = "board-selected")]
 pub mod port;
 
-#[cfg(feature = "mcu-atmega")]
+#[cfg(feature = "board-selected")]
 pub mod simple_pwm;
 
 #[doc(no_inline)]

arduino-hal/src/simple_pwm.rs

@@ -7,4 +7,9 @@
 
 pub use avr_hal_generic::simple_pwm::IntoPwmPin;
 pub use avr_hal_generic::simple_pwm::Prescaler;
-pub use atmega_hal::simple_pwm::*;
+
+#[cfg(feature = "mcu-atmega")]
+pub use atmega_hal::simple_pwm::*;
+
+#[cfg(feature = "mcu-attiny")]
+pub use attiny_hal::simple_pwm::*;

mcu/attiny-hal/src/lib.rs

@@ -54,6 +54,9 @@ pub mod port;
 #[cfg(feature = "device-selected")]
 pub use port::Pins;
 
+#[cfg(feature = "device-selected")]
+pub mod simple_pwm;
+
 pub struct Attiny;
 
 #[cfg(feature = "attiny84")]

mcu/attiny-hal/src/simple_pwm.rs

@@ -0,0 +1,90 @@
+use avr_hal_generic::simple_pwm::Prescaler;
+
+use crate::port::*;
+
+#[cfg(feature = "attiny85")]
+avr_hal_generic::impl_simple_pwm! {
+    /// Use `TC0` for PWM (pins `PB0`, `PB1`)
+    ///
+    /// # Example
+    /// ```
+    /// let mut timer0 = Timer0Pwm::new(dp.TC0, Prescaler::Prescale64);
+    ///
+    /// let mut d0 = portd.d0.into_output().into_pwm(&mut timer0);
+    /// let mut d1 = portd.d1.into_output().into_pwm(&mut timer0);
+    ///
+    /// d0.set_duty(128);
+    /// d0.enable();
+    /// ```
+    pub struct Timer0Pwm {
+        timer: crate::pac::TC0,
+        init: |tim, prescaler| {
+            tim.tccr0a.modify(|_r, w| w.wgm0().pwm_fast());
+            tim.tccr0b.modify(|_r, w| match prescaler {
+                Prescaler::Direct => w.cs0().direct(),
+                Prescaler::Prescale8 => w.cs0().prescale_8(),
+                Prescaler::Prescale64 => w.cs0().prescale_64(),
+                Prescaler::Prescale256 => w.cs0().prescale_256(),
+                Prescaler::Prescale1024 => w.cs0().prescale_1024(),
+            });
+        },
+        pins: {
+            PB0: {
+                ocr: ocr0a,
+                into_pwm: |tim| if enable {
+                    tim.tccr0a.modify(|_r, w| w.com0a().match_clear());
+                } else {
+                    tim.tccr0a.modify(|_r, w| w.com0a().disconnected());
+                },
+            },
+
+            PB1: {
+                ocr: ocr0b,
+                into_pwm: |tim| if enable {
+                    tim.tccr0a.modify(|_r, w| w.com0b().match_clear());
+                } else {
+                    tim.tccr0a.modify(|_r, w| w.com0b().disconnected());
+                },
+            },
+        },
+    }
+}
+
+#[cfg(feature = "attiny85")]
+avr_hal_generic::impl_simple_pwm! {
+    /// Use `TC1` for PWM (pins `PB4`)
+    ///
+    /// # Example
+    /// ```
+    /// let mut timer1 = Timer1Pwm::new(dp.TC1, Prescaler::Prescale64);
+    ///
+    /// let mut d4 = portd.d4.into_output().into_pwm(&mut timer1);
+    ///
+    /// d4.set_duty(128);
+    /// d4.enable();
+    /// ```
+    pub struct Timer1Pwm {
+        timer: crate::pac::TC1,
+        init: |tim, prescaler| {
+            tim.gtccr.modify(|_, w| w.pwm1b().bit(true));
+
+            tim.tccr1.modify(|_r, w| match prescaler {
+                Prescaler::Direct => w.cs1().direct(),
+                Prescaler::Prescale8 => w.cs1().prescale_8(),
+                Prescaler::Prescale64 => w.cs1().prescale_64(),
+                Prescaler::Prescale256 => w.cs1().prescale_256(),
+                Prescaler::Prescale1024 => w.cs1().prescale_1024(),
+            });
+        },
+        pins: {
+            PB4: {
+                ocr: ocr1b,
+                into_pwm: |tim| if enable {
+                    tim.gtccr.modify(|_, w| w.com1b().bits(0b10));
+                } else {
+                    tim.gtccr.modify(|_, w| w.com1b().disconnected());
+                },
+            },
+        },
+    }
+}