Skip to content

Commit 102a33a

Browse files
committed
add missing Nss
1 parent 42a078d commit 102a33a

File tree

2 files changed

+23
-37
lines changed

2 files changed

+23
-37
lines changed

CHANGELOG.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
1111
- Split SPI master and slave implementations [#609]
1212
- Split USART and UART implementations [#608]
1313
- Add `lapce` editor settings [#601]
14-
- Use `enum`s for alternate peripheral pins [#594] [#610]
15-
- Use `enum`s for alternate peripheral pins [#594]
16-
- Use `enum`s for alternate peripheral pins (generic over otype) [#594] [#596] [#600]
14+
- Use `enum`s for alternate peripheral pins (generic over otype) [#594] [#596] [#600] [#610]
1715
- Added missing U(S)ART DMA traits for HAL serial types [#593]
1816
- Improve SPI::new* docs [#587]
1917
- Add advanced timer dead time insertion example [#585]

src/gpio/alt.rs

Lines changed: 22 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -429,7 +429,6 @@ pub mod spi1 {
429429
<Mosi> for PushPull: no:NoPin, [
430430
PA7<5>, PB5<5>,
431431
],
432-
433432
<Nss> for PushPull: [
434433
PA4<5>,
435434
PA15<5>,
@@ -580,7 +579,10 @@ pub mod spi3 {
580579
PD0<6>,
581580
],
582581

583-
<Nss> for PushPull: [PA4<6>, PA15<6>,],
582+
<Nss> for PushPull: [
583+
PA4<6>,
584+
PA15<6>,
585+
],
584586
}
585587
}
586588

@@ -637,27 +639,15 @@ pub mod spi4 {
637639
PG13<6>,
638640
],
639641

640-
<Nss> for PushPull: no:NoPin, [
641-
#[cfg(any(
642-
feature = "gpio-f411",
643-
feature = "gpio-f412",
644-
feature = "gpio-f413",
645-
))]
646-
PB12<6>,
647-
648-
#[cfg(any(
649-
feature = "gpio-f411",
650-
feature = "gpio-f412",
651-
feature = "gpio-f413",
652-
))]
642+
<Nss> for PushPull: [
653643
PE4<5>,
654-
655-
#[cfg(any(
656-
feature = "gpio-f411",
657-
feature = "gpio-f412",
658-
feature = "gpio-f413",
659-
))]
660644
PE11<5>,
645+
646+
#[cfg(any(feature = "gpio-f411", feature = "gpio-f412", feature = "gpio-f413"))]
647+
PB12<6>,
648+
649+
#[cfg(feature = "gpio-f446")]
650+
PG14<6>,
661651
],
662652
}
663653
}
@@ -782,28 +772,26 @@ pub mod spi5 {
782772
PF11<5>,
783773
],
784774

785-
<Nss> for PushPull: no:NoPin, [
775+
<Nss> for PushPull: [
786776
#[cfg(any(
787777
feature = "gpio-f410",
788778
feature = "gpio-f411",
789779
feature = "gpio-f412",
790-
feature = "gpio-f413",
780+
feature = "gpio-f413"
791781
))]
792782
PB1<6>,
793783

794-
#[cfg(any(
795-
feature = "gpio-f411",
796-
feature = "gpio-f412",
797-
feature = "gpio-f413",
798-
))]
784+
#[cfg(any(feature = "gpio-f411", feature = "gpio-f412", feature = "gpio-f413"))]
799785
PE4<6>,
800786

801-
#[cfg(any(
802-
feature = "gpio-f411",
803-
feature = "gpio-f412",
804-
feature = "gpio-f413",
805-
))]
787+
#[cfg(any(feature = "gpio-f411", feature = "gpio-f412", feature = "gpio-f413"))]
806788
PE11<6>,
789+
790+
#[cfg(any(feature = "gpio-f427", feature = "gpio-f469"))]
791+
PF6<5>,
792+
793+
#[cfg(any(feature = "gpio-f427", feature = "gpio-f469"))]
794+
PH5<5>,
807795
],
808796
}
809797
}
@@ -816,7 +804,7 @@ pub mod spi6 {
816804
<Sck> for PushPull: no:NoPin, [PG13<5>,],
817805
<Miso> for PushPull: no:NoPin, [PG12<5>,],
818806
<Mosi> for PushPull: no:NoPin, [PG14<5>,],
819-
<Nss> for PushPull: [],
807+
<Nss> for PushPull: no:NoPin, [PG8<5>,],
820808
}
821809
}
822810

0 commit comments

Comments
 (0)