pin release flow

dotcypress · dotcypress · commit c1d6b813046e · 2021-07-09T22:06:50.000-07:00
diff --git a/src/analog/comparator.rs b/src/analog/comparator.rs
@@ -521,6 +521,7 @@ impl ComparatorSplit for COMP {
 
 pub trait OutputPin<COMP> {
     fn setup(&self);
+    fn release(self) -> Self;
 }
 
 macro_rules! output_pin {
@@ -529,6 +530,10 @@ macro_rules! output_pin {
             fn setup(&self) {
                 self.set_alt_mode(AltFunction::AF7)
             }
+
+            fn release(self) -> Self {
+                self.into()
+            }
         }
     };
 }
diff --git a/src/i2c.rs b/src/i2c.rs
@@ -82,11 +82,13 @@ pub struct I2c<I2C, SDA, SCL> {
 // I2C SDA pin
 pub trait SDAPin<I2C> {
     fn setup(&self);
+    fn release(self) -> Self;
 }
 
 // I2C SCL pin
 pub trait SCLPin<I2C> {
     fn setup(&self);
+    fn release(self) -> Self;
 }
 
 // I2C error
@@ -155,6 +157,10 @@ macro_rules! i2c {
                 fn setup(&self) {
                     self.set_alt_mode(AltFunction::AF6)
                 }
+
+                fn release(self) -> Self {
+                    self.into()
+                }
             }
         )+
 
@@ -163,6 +169,10 @@ macro_rules! i2c {
                 fn setup(&self) {
                     self.set_alt_mode(AltFunction::AF6)
                 }
+
+                fn release(self) -> Self {
+                    self.into()
+                }
             }
         )+
 
@@ -182,7 +192,10 @@ macro_rules! i2c {
             }
         }
 
-        impl<SDA, SCL> I2c<$I2CX, SDA, SCL> {
+        impl<SDA, SCL> I2c<$I2CX, SDA, SCL> where
+            SDA: SDAPin<$I2CX>,
+            SCL: SCLPin<$I2CX>
+        {
             pub fn $i2cx(i2c: $I2CX, sda: SDA, scl: SCL, config: Config, rcc: &mut Rcc) -> Self
             where
                 SDA: SDAPin<$I2CX>,
@@ -220,7 +233,7 @@ macro_rules! i2c {
             }
 
             pub fn release(self) -> ($I2CX, SDA, SCL) {
-                (self.i2c, self.sda, self.scl)
+                (self.i2c, self.sda.release(), self.scl.release())
             }
         }
 
diff --git a/src/rcc/clockout.rs b/src/rcc/clockout.rs
@@ -20,7 +20,7 @@ impl Lsco {
     }
 
     pub fn release(self) -> LscoPin {
-        self.pin
+        self.pin.into()
     }
 }
 
@@ -52,7 +52,10 @@ pub struct Mco<PIN> {
     src_bits: u8,
 }
 
-impl<PIN> Mco<PIN> {
+impl<PIN> Mco<PIN>
+where
+    PIN: MCOExt<PIN>,
+{
     pub fn enable(&self) {
         let rcc = unsafe { &(*RCC::ptr()) };
         rcc.cfgr
@@ -65,12 +68,13 @@ impl<PIN> Mco<PIN> {
     }
 
     pub fn release(self) -> PIN {
-        self.pin
+        self.pin.release()
     }
 }
 
 pub trait MCOExt<PIN> {
     fn mco(self, src: MCOSrc, psc: Prescaler, rcc: &mut Rcc) -> Mco<PIN>;
+    fn release(self) -> PIN;
 }
 
 macro_rules! mco {
@@ -117,6 +121,10 @@ macro_rules! mco {
                     self.set_alt_mode(AltFunction::AF0);
                     Mco { src_bits, pin: self }
                 }
+
+                fn release(self) -> $PIN {
+                    self.into()
+                }
             }
         )+
     };
diff --git a/src/serial/usart.rs b/src/serial/usart.rs
@@ -95,11 +95,13 @@ pub struct Serial<USART, Config> {
 // Serial TX pin
 pub trait TxPin<USART> {
     fn setup(&self);
+    fn release(self) -> Self;
 }
 
 // Serial RX pin
 pub trait RxPin<USART> {
     fn setup(&self);
+    fn release(self) -> Self;
 }
 
 pub trait SerialExt<USART, Config> {
@@ -140,12 +142,15 @@ macro_rules! uart_shared {
         tx: [ $(($PTX:ident, $TAF:expr),)+ ],
         rx: [ $(($PRX:ident, $RAF:expr),)+ ]) => {
 
-
         $(
             impl<MODE> TxPin<$USARTX> for $PTX<MODE> {
                 fn setup(&self) {
                     self.set_alt_mode($TAF)
                 }
+
+                fn release(self) -> Self {
+                    self.into()
+                }
             }
         )+
 
@@ -154,6 +159,10 @@ macro_rules! uart_shared {
                 fn setup(&self) {
                     self.set_alt_mode($RAF)
                 }
+
+                fn release(self) -> Self {
+                    self.into()
+                }
             }
         )+
 
@@ -640,6 +649,7 @@ rx: [
     (PB7, AltFunction::AF0),
     (PC5, AltFunction::AF1),
 ]);
+
 uart_shared!(USART2, USART2_RX, USART2_TX,
     tx: [
         (PA2, AltFunction::AF1),
diff --git a/src/spi.rs b/src/spi.rs
@@ -25,6 +25,7 @@ pub struct NoMosi;
 
 pub trait Pins<SPI> {
     fn setup(&self);
+    fn release(self) -> Self;
 }
 
 pub trait PinSck<SPI> {
@@ -50,6 +51,10 @@ where
         self.1.setup();
         self.2.setup();
     }
+
+    fn release(self) -> Self {
+        (self.0.into(), self.1.into(), self.2.into())
+    }
 }
 
 #[derive(Debug)]
@@ -105,7 +110,7 @@ macro_rules! spi {
             }
         )*
 
-        impl<PINS> Spi<$SPIX, PINS> {
+        impl<PINS: Pins<$SPIX>> Spi<$SPIX, PINS> {
             pub fn $spiX<T>(
                 spi: $SPIX,
                 pins: PINS,
@@ -114,7 +119,6 @@ macro_rules! spi {
                 rcc: &mut Rcc
             ) -> Self
             where
-            PINS: Pins<$SPIX>,
             T: Into<Hertz>
             {
                 // Enable clock for SPI
@@ -177,7 +181,7 @@ macro_rules! spi {
             }
 
             pub fn release(self) -> ($SPIX, PINS) {
-                (self.spi, self.pins)
+                (self.spi, self.pins.release())
             }
         }
 
diff --git a/src/timer/pins.rs b/src/timer/pins.rs
@@ -11,6 +11,7 @@ pub trait TimerPin<TIM> {
     type Channel;
 
     fn setup(&self);
+    fn release(self) -> Self;
 }
 
 macro_rules! timer_pins {
@@ -22,6 +23,10 @@ macro_rules! timer_pins {
                 fn setup(&self) {
                     self.set_alt_mode($af_mode);
                 }
+
+                fn release(self) -> Self {
+                    self.into()
+                }
             }
         )+
     };
diff --git a/src/timer/qei.rs b/src/timer/qei.rs
@@ -17,6 +17,7 @@ pub struct Qei<TIM, PINS> {
 
 pub trait QeiPins<TIM> {
     fn setup(&self);
+    fn release(self) -> Self;
 }
 
 impl<TIM, P1, P2> QeiPins<TIM> for (P1, P2)
@@ -28,6 +29,10 @@ where
         self.0.setup();
         self.1.setup();
     }
+
+    fn release(self) -> Self {
+        (self.0.release(), self.1.release())
+    }
 }
 
 pub trait QeiExt<TIM, PINS>
@@ -78,7 +83,7 @@ macro_rules! qei {
                 }
 
                 pub fn release(self) -> ($TIMX, PINS) {
-                    (self.tim, self.pins)
+                    (self.tim, self.pins.release())
                 }
             }
 

Original file line number	Diff line number	Diff line change
`@@ -521,6 +521,7 @@ impl ComparatorSplit for COMP {`
`521`	`521`
`522`	`522`	`pub trait OutputPin<COMP> {`
`523`	`523`	`fn setup(&self);`
	`524`	`+ fn release(self) -> Self;`
`524`	`525`	`}`
`525`	`526`
`526`	`527`	`macro_rules! output_pin {`
`@@ -529,6 +530,10 @@ macro_rules! output_pin {`
`529`	`530`	`fn setup(&self) {`
`530`	`531`	`self.set_alt_mode(AltFunction::AF7)`
`531`	`532`	`}`
	`533`	`+`
	`534`	`+ fn release(self) -> Self {`
	`535`	`+ self.into()`
	`536`	`+ }`
`532`	`537`	`}`
`533`	`538`	`};`
`534`	`539`	`}`
Original file line number	Diff line number	Diff line change
`@@ -82,11 +82,13 @@ pub struct I2c<I2C, SDA, SCL> {`
`82`	`82`	`// I2C SDA pin`
`83`	`83`	`pub trait SDAPin<I2C> {`
`84`	`84`	`fn setup(&self);`
	`85`	`+ fn release(self) -> Self;`
`85`	`86`	`}`
`86`	`87`
`87`	`88`	`// I2C SCL pin`
`88`	`89`	`pub trait SCLPin<I2C> {`
`89`	`90`	`fn setup(&self);`
	`91`	`+ fn release(self) -> Self;`
`90`	`92`	`}`
`91`	`93`
`92`	`94`	`// I2C error`
`@@ -155,6 +157,10 @@ macro_rules! i2c {`
`155`	`157`	`fn setup(&self) {`
`156`	`158`	`self.set_alt_mode(AltFunction::AF6)`
`157`	`159`	`}`
	`160`	`+`
	`161`	`+ fn release(self) -> Self {`
	`162`	`+ self.into()`
	`163`	`+ }`
`158`	`164`	`}`
`159`	`165`	`)+`
`160`	`166`
`@@ -163,6 +169,10 @@ macro_rules! i2c {`
`163`	`169`	`fn setup(&self) {`
`164`	`170`	`self.set_alt_mode(AltFunction::AF6)`
`165`	`171`	`}`
	`172`	`+`
	`173`	`+ fn release(self) -> Self {`
	`174`	`+ self.into()`
	`175`	`+ }`
`166`	`176`	`}`
`167`	`177`	`)+`
`168`	`178`
`@@ -182,7 +192,10 @@ macro_rules! i2c {`
`182`	`192`	`}`
`183`	`193`	`}`
`184`	`194`
`185`		`- impl<SDA, SCL> I2c<$I2CX, SDA, SCL> {`
	`195`	`+ impl<SDA, SCL> I2c<$I2CX, SDA, SCL> where`
	`196`	`+ SDA: SDAPin<$I2CX>,`
	`197`	`+ SCL: SCLPin<$I2CX>`
	`198`	`+ {`
`186`	`199`	`pub fn $i2cx(i2c: $I2CX, sda: SDA, scl: SCL, config: Config, rcc: &mut Rcc) -> Self`
`187`	`200`	`where`
`188`	`201`	`SDA: SDAPin<$I2CX>,`
`@@ -220,7 +233,7 @@ macro_rules! i2c {`
`220`	`233`	`}`
`221`	`234`
`222`	`235`	`pub fn release(self) -> ($I2CX, SDA, SCL) {`
`223`		`- (self.i2c, self.sda, self.scl)`
	`236`	`+ (self.i2c, self.sda.release(), self.scl.release())`
`224`	`237`	`}`
`225`	`238`	`}`
`226`	`239`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ impl Lsco {`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`pub fn release(self) -> LscoPin {`
`23`		`- self.pin`
	`23`	`+ self.pin.into()`
`24`	`24`	`}`
`25`	`25`	`}`
`26`	`26`
`@@ -52,7 +52,10 @@ pub struct Mco<PIN> {`
`52`	`52`	`src_bits: u8,`
`53`	`53`	`}`
`54`	`54`
`55`		`-impl<PIN> Mco<PIN> {`
	`55`	`+impl<PIN> Mco<PIN>`
	`56`	`+where`
	`57`	`+ PIN: MCOExt<PIN>,`
	`58`	`+{`
`56`	`59`	`pub fn enable(&self) {`
`57`	`60`	`let rcc = unsafe { &(*RCC::ptr()) };`
`58`	`61`	`rcc.cfgr`
`@@ -65,12 +68,13 @@ impl<PIN> Mco<PIN> {`
`65`	`68`	`}`
`66`	`69`
`67`	`70`	`pub fn release(self) -> PIN {`
`68`		`- self.pin`
	`71`	`+ self.pin.release()`
`69`	`72`	`}`
`70`	`73`	`}`
`71`	`74`
`72`	`75`	`pub trait MCOExt<PIN> {`
`73`	`76`	`fn mco(self, src: MCOSrc, psc: Prescaler, rcc: &mut Rcc) -> Mco<PIN>;`
	`77`	`+ fn release(self) -> PIN;`
`74`	`78`	`}`
`75`	`79`
`76`	`80`	`macro_rules! mco {`
`@@ -117,6 +121,10 @@ macro_rules! mco {`
`117`	`121`	`self.set_alt_mode(AltFunction::AF0);`
`118`	`122`	`Mco { src_bits, pin: self }`
`119`	`123`	`}`
	`124`	`+`
	`125`	`+ fn release(self) -> $PIN {`
	`126`	`+ self.into()`
	`127`	`+ }`
`120`	`128`	`}`
`121`	`129`	`)+`
`122`	`130`	`};`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@ pub struct NoMosi;`
`25`	`25`
`26`	`26`	`pub trait Pins<SPI> {`
`27`	`27`	`fn setup(&self);`
	`28`	`+ fn release(self) -> Self;`
`28`	`29`	`}`
`29`	`30`
`30`	`31`	`pub trait PinSck<SPI> {`
`@@ -50,6 +51,10 @@ where`
`50`	`51`	`self.1.setup();`
`51`	`52`	`self.2.setup();`
`52`	`53`	`}`
	`54`	`+`
	`55`	`+ fn release(self) -> Self {`
	`56`	`+ (self.0.into(), self.1.into(), self.2.into())`
	`57`	`+ }`
`53`	`58`	`}`
`54`	`59`
`55`	`60`	`#[derive(Debug)]`
`@@ -105,7 +110,7 @@ macro_rules! spi {`
`105`	`110`	`}`
`106`	`111`	`)*`
`107`	`112`
`108`		`- impl<PINS> Spi<$SPIX, PINS> {`
	`113`	`+ impl<PINS: Pins<$SPIX>> Spi<$SPIX, PINS> {`
`109`	`114`	`pub fn $spiX<T>(`
`110`	`115`	`spi: $SPIX,`
`111`	`116`	`pins: PINS,`
`@@ -114,7 +119,6 @@ macro_rules! spi {`
`114`	`119`	`rcc: &mut Rcc`
`115`	`120`	`) -> Self`
`116`	`121`	`where`
`117`		`- PINS: Pins<$SPIX>,`
`118`	`122`	`T: Into<Hertz>`
`119`	`123`	`{`
`120`	`124`	`// Enable clock for SPI`
`@@ -177,7 +181,7 @@ macro_rules! spi {`
`177`	`181`	`}`
`178`	`182`
`179`	`183`	`pub fn release(self) -> ($SPIX, PINS) {`
`180`		`- (self.spi, self.pins)`
	`184`	`+ (self.spi, self.pins.release())`
`181`	`185`	`}`
`182`	`186`	`}`
`183`	`187`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ pub trait TimerPin<TIM> {`
`11`	`11`	`type Channel;`
`12`	`12`
`13`	`13`	`fn setup(&self);`
	`14`	`+ fn release(self) -> Self;`
`14`	`15`	`}`
`15`	`16`
`16`	`17`	`macro_rules! timer_pins {`
`@@ -22,6 +23,10 @@ macro_rules! timer_pins {`
`22`	`23`	`fn setup(&self) {`
`23`	`24`	`self.set_alt_mode($af_mode);`
`24`	`25`	`}`
	`26`	`+`
	`27`	`+ fn release(self) -> Self {`
	`28`	`+ self.into()`
	`29`	`+ }`
`25`	`30`	`}`
`26`	`31`	`)+`
`27`	`32`	`};`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@ pub struct Qei<TIM, PINS> {`
`17`	`17`
`18`	`18`	`pub trait QeiPins<TIM> {`
`19`	`19`	`fn setup(&self);`
	`20`	`+ fn release(self) -> Self;`
`20`	`21`	`}`
`21`	`22`
`22`	`23`	`impl<TIM, P1, P2> QeiPins<TIM> for (P1, P2)`
`@@ -28,6 +29,10 @@ where`
`28`	`29`	`self.0.setup();`
`29`	`30`	`self.1.setup();`
`30`	`31`	`}`
	`32`	`+`
	`33`	`+ fn release(self) -> Self {`
	`34`	`+ (self.0.release(), self.1.release())`
	`35`	`+ }`
`31`	`36`	`}`
`32`	`37`
`33`	`38`	`pub trait QeiExt<TIM, PINS>`
`@@ -78,7 +83,7 @@ macro_rules! qei {`
`78`	`83`	`}`
`79`	`84`
`80`	`85`	`pub fn release(self) -> ($TIMX, PINS) {`
`81`		`- (self.tim, self.pins)`
	`86`	`+ (self.tim, self.pins.release())`
`82`	`87`	`}`
`83`	`88`	`}`
`84`	`89`