Added timer implmentations for tim15/16. Added stm32 capacitance notes to stop of tsc mod

Author: MabezDev

src/serial.rs

@@ -103,8 +103,8 @@ macro_rules! hal {
                     // TODO implement pin remaping
 
                     // disable hardware flow control
-                    // TODO enable DMA
                     // usart.cr3.write(|w| w.rtse().clear_bit().ctse().clear_bit());
+                    
                     usart.cr3.write(|w| w.dmat().set_bit().dmar().set_bit()); // enable DMA transfers
 
                     let brr = clocks.$pclkX().0 / baud_rate.0;

src/timer.rs

@@ -3,10 +3,10 @@
 use cast::{u16, u32};
 use hal::timer::{CountDown, Periodic};
 use nb;
-use stm32l4::stm32l4x2::{TIM2, /* TODO TIM3 ,*/ TIM6, TIM7};
+use stm32l4::stm32l4x2::{TIM2, TIM6, TIM7, TIM15, TIM16};
 use void::Void;
 
-use rcc::{APB1R1, Clocks};
+use rcc::{APB1R1, Clocks, APB2};
 use time::Hertz;
 
 /// Hardware timers
@@ -23,7 +23,7 @@ pub enum Event {
 }
 
 macro_rules! hal {
-    ($($TIM:ident: ($tim:ident, $timXen:ident, $timXrst:ident),)+) => {
+    ($($TIM:ident: ($tim:ident, $timXen:ident, $timXrst:ident, $apb:ident),)+) => {
         $(
             impl Periodic for Timer<$TIM> {}
 
@@ -73,14 +73,14 @@ macro_rules! hal {
                 // even if the `$TIM` are non overlapping (compare to the `free` function below
                 // which just works)
                 /// Configures a TIM peripheral as a periodic count down timer
-                pub fn $tim<T>(tim: $TIM, timeout: T, clocks: Clocks, apb1: &mut APB1R1) -> Self
+                pub fn $tim<T>(tim: $TIM, timeout: T, clocks: Clocks, apb: &mut $apb) -> Self
                 where
                     T: Into<Hertz>,
                 {
                     // enable and reset peripheral to a clean slate state
-                    apb1.enr().modify(|_, w| w.$timXen().set_bit());
-                    apb1.rstr().modify(|_, w| w.$timXrst().set_bit());
-                    apb1.rstr().modify(|_, w| w.$timXrst().clear_bit());
+                    apb.enr().modify(|_, w| w.$timXen().set_bit());
+                    apb.rstr().modify(|_, w| w.$timXrst().set_bit());
+                    apb.rstr().modify(|_, w| w.$timXrst().clear_bit());
 
                     let mut timer = Timer {
                         clocks,
@@ -123,14 +123,10 @@ macro_rules! hal {
     }
 }
 
-/* 
-TODO Untested
- */
-
 hal! {
-    TIM2: (tim2, tim2en, tim2rst),
-    // TODO fix TIM3
-    // TIM3: (tim3, tim3en, tim3rst),
-    TIM6: (tim6, tim6en, tim6rst),
-    TIM7: (tim7, tim7en, tim7rst),
+    TIM2: (tim2, tim2en, tim2rst, APB1R1),
+    TIM6: (tim6, tim6en, tim6rst, APB1R1),
+    TIM7: (tim7, tim7en, tim7rst, APB1R1),
+    TIM15: (tim15, tim15en, tim15rst, APB2),
+    TIM16: (tim16, tim16en, tim16rst, APB2),
 }

src/tsc.rs

@@ -1,4 +1,11 @@
 //! Touch sense controller
+//! 
+//! From STM32 (https://www.st.com/content/ccc/resource/technical/document/application_note/9d/be/03/8c/5d/8c/49/50/DM00088471.pdf/files/DM00088471.pdf/jcr:content/translations/en.DM00088471.pdf): 
+//! 
+//! The Cs capacitance is a key parameter for sensitivity. For touchkey sensors, the Cs value is
+//! usually comprised between 8.7nF to 22nF. For linear and rotary touch sensors, the value is
+//! usually comprised between 47nF and 100nF. These values are given as reference for an
+//! electrode fitting a human finger tip size across a few millimeters dielectric panel.
 
 use rcc::AHB1;
 use stm32l4::stm32l4x2::{TSC};
@@ -21,7 +28,6 @@ pub enum Error {
     InvalidPin
 }
 
-// TODO macro to impl all possible channel/sample pin combinations
 pub trait SamplePin<TSC> {
     const GROUP: u32;
     const OFFSET: u32;
@@ -65,10 +71,8 @@ impl ChannelPin<TSC> for PB7<Alternate<AF9, Output<PushPull>>> {
 }
 
 
-// TODO currently requires all the pins even if a user wants one channel, fix
 pub struct Tsc<SPIN> {
     sample_pin: SPIN,
-    // pins: PINS,
     tsc: TSC
 }
 
@@ -102,8 +106,6 @@ impl<SPIN> Tsc<SPIN> {
                 .tsce()
                 .set_bit()
         });
-
-        // TODO allow configuration
 
         let bit_pos = SPIN::OFFSET + (4 * (SPIN::GROUP - 1));