Use the same simple_pwm implementation for 1280 as for 2560

dalpil · Rahix · commit d32864afad53 · 2022-07-04T21:38:55.000+02:00
The only difference seems to be the amount of flash memory available
diff --git a/mcu/atmega-hal/src/simple_pwm.rs b/mcu/atmega-hal/src/simple_pwm.rs
@@ -233,7 +233,7 @@ avr_hal_generic::impl_simple_pwm! {
 }
 
 
-#[cfg(feature = "atmega2560")]
+#[cfg(any(feature = "atmega1280", feature="atmega2560"))]
 avr_hal_generic::impl_simple_pwm! {
     /// Use `TC0` for PWM (pins `PB7`, `PG5`)
     ///
@@ -281,7 +281,7 @@ avr_hal_generic::impl_simple_pwm! {
     }
 }
 
-#[cfg(feature = "atmega2560")]
+#[cfg(any(feature = "atmega1280", feature="atmega2560"))]
 avr_hal_generic::impl_simple_pwm! {
     /// Use `TC1` for PWM (pins `PB5`, `PB6`, `PB7`)
     ///
@@ -339,7 +339,7 @@ avr_hal_generic::impl_simple_pwm! {
     }
 }
 
-#[cfg(feature = "atmega2560")]
+#[cfg(any(feature = "atmega1280", feature="atmega2560"))]
 avr_hal_generic::impl_simple_pwm! {
     /// Use `TC2` for PWM (pins `PB4`, `PH6`)
     ///
@@ -392,7 +392,7 @@ avr_hal_generic::impl_simple_pwm! {
     }
 }
 
-#[cfg(feature = "atmega2560")]
+#[cfg(any(feature = "atmega1280", feature="atmega2560"))]
 avr_hal_generic::impl_simple_pwm! {
     /// Use `TC3` for PWM (pins `PE3`, `PE4`, `PE5`)
     ///
@@ -455,7 +455,7 @@ avr_hal_generic::impl_simple_pwm! {
     }
 }
 
-#[cfg(feature = "atmega2560")]
+#[cfg(any(feature = "atmega1280", feature="atmega2560"))]
 avr_hal_generic::impl_simple_pwm! {
     /// Use `TC4` for PWM (pins `PH3`, `PH4`, `PH5`)
     ///
@@ -518,7 +518,7 @@ avr_hal_generic::impl_simple_pwm! {
     }
 }
 
-#[cfg(feature = "atmega2560")]
+#[cfg(any(feature = "atmega1280", feature="atmega2560"))]
 avr_hal_generic::impl_simple_pwm! {
     /// Use `TC5` for PWM (pins `PL3`, `PL4`, `PL5`)
     ///

Original file line number	Diff line number	Diff line change
`@@ -233,7 +233,7 @@ avr_hal_generic::impl_simple_pwm! {`
`233`	`233`	`}`
`234`	`234`
`235`	`235`
`236`		`-#[cfg(feature = "atmega2560")]`
	`236`	`+#[cfg(any(feature = "atmega1280", feature="atmega2560"))]`
`237`	`237`	`avr_hal_generic::impl_simple_pwm! {`
`238`	`238`	/// Use `TC0` for PWM (pins `PB7`, `PG5`)
`239`	`239`	`///`
`@@ -281,7 +281,7 @@ avr_hal_generic::impl_simple_pwm! {`
`281`	`281`	`}`
`282`	`282`	`}`
`283`	`283`
`284`		`-#[cfg(feature = "atmega2560")]`
	`284`	`+#[cfg(any(feature = "atmega1280", feature="atmega2560"))]`
`285`	`285`	`avr_hal_generic::impl_simple_pwm! {`
`286`	`286`	/// Use `TC1` for PWM (pins `PB5`, `PB6`, `PB7`)
`287`	`287`	`///`
`@@ -339,7 +339,7 @@ avr_hal_generic::impl_simple_pwm! {`
`339`	`339`	`}`
`340`	`340`	`}`
`341`	`341`
`342`		`-#[cfg(feature = "atmega2560")]`
	`342`	`+#[cfg(any(feature = "atmega1280", feature="atmega2560"))]`
`343`	`343`	`avr_hal_generic::impl_simple_pwm! {`
`344`	`344`	/// Use `TC2` for PWM (pins `PB4`, `PH6`)
`345`	`345`	`///`
`@@ -392,7 +392,7 @@ avr_hal_generic::impl_simple_pwm! {`
`392`	`392`	`}`
`393`	`393`	`}`
`394`	`394`
`395`		`-#[cfg(feature = "atmega2560")]`
	`395`	`+#[cfg(any(feature = "atmega1280", feature="atmega2560"))]`
`396`	`396`	`avr_hal_generic::impl_simple_pwm! {`
`397`	`397`	/// Use `TC3` for PWM (pins `PE3`, `PE4`, `PE5`)
`398`	`398`	`///`
`@@ -455,7 +455,7 @@ avr_hal_generic::impl_simple_pwm! {`
`455`	`455`	`}`
`456`	`456`	`}`
`457`	`457`
`458`		`-#[cfg(feature = "atmega2560")]`
	`458`	`+#[cfg(any(feature = "atmega1280", feature="atmega2560"))]`
`459`	`459`	`avr_hal_generic::impl_simple_pwm! {`
`460`	`460`	/// Use `TC4` for PWM (pins `PH3`, `PH4`, `PH5`)
`461`	`461`	`///`
`@@ -518,7 +518,7 @@ avr_hal_generic::impl_simple_pwm! {`
`518`	`518`	`}`
`519`	`519`	`}`
`520`	`520`
`521`		`-#[cfg(feature = "atmega2560")]`
	`521`	`+#[cfg(any(feature = "atmega1280", feature="atmega2560"))]`
`522`	`522`	`avr_hal_generic::impl_simple_pwm! {`
`523`	`523`	/// Use `TC5` for PWM (pins `PL3`, `PL4`, `PL5`)
`524`	`524`	`///`