Always specify a dummy NSS pin to fix RF-EDU issue

The RF-EDU issue is acutally an issue between all SPIs and UART1. When an SPI is initialized the default value for the NSS pin (GPIO_INVALID) is not handled correctly and sets PA15 to the alternative function AF05. This fucks up the configuration for UART1 where we use PA15 as TX pin.
SpaceTeam · Aug 16, 2023 · a082264 · a082264
1 parent 78fcb24
commit a082264
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 15 deletions.
diff --git a/Sts1CobcSw/Hal/IoNames.hpp b/Sts1CobcSw/Hal/IoNames.hpp
@@ -50,4 +50,8 @@ inline constexpr auto rfSdnPin = pb14;
 inline constexpr auto rfGpio0Pin = pc6;
 inline constexpr auto rfGpio1Pin = pc8;
 inline constexpr auto rfPaEnablePin = pc9;
+
+// We don't need/use NSS pins but due to a bug in Rodos we must specify one so we choose this
+// unconnected pin.
+inline constexpr auto spiNssDummyPin = pa0;
 }
diff --git a/Sts1CobcSw/Periphery/Flash.cpp b/Sts1CobcSw/Periphery/Flash.cpp
@@ -51,8 +51,11 @@ constexpr auto sectorErase4ByteAddress = 0x21_b;
 
 auto csGpioPin = hal::GpioPin(hal::flashCsPin);
 auto writeProtectionGpioPin = hal::GpioPin(hal::flashWriteProtectionPin);
-auto spi = RODOS::HAL_SPI(
-    hal::flashSpiIndex, hal::flashSpiSckPin, hal::flashSpiMisoPin, hal::flashSpiMosiPin);
+auto spi = RODOS::HAL_SPI(hal::flashSpiIndex,
+                          hal::flashSpiSckPin,
+                          hal::flashSpiMisoPin,
+                          hal::flashSpiMosiPin,
+                          hal::spiNssDummyPin);
 
 
 // --- Private function declarations ---

diff --git a/Sts1CobcSw/Periphery/Fram.cpp b/Sts1CobcSw/Periphery/Fram.cpp
@@ -26,8 +26,11 @@ constexpr auto readDeviceId = 0x9F_b;
 }
 
 auto csGpioPin = hal::GpioPin(hal::framCsPin);
-auto spi = RODOS::HAL_SPI(
-    hal::framEpsSpiIndex, hal::framEpsSpiSckPin, hal::framEpsSpiMisoPin, hal::framEpsSpiMosiPin);
+auto spi = RODOS::HAL_SPI(hal::framEpsSpiIndex,
+                          hal::framEpsSpiSckPin,
+                          hal::framEpsSpiMisoPin,
+                          hal::framEpsSpiMosiPin,
+                          hal::spiNssDummyPin);
 
 
 // --- Private function declarations ---

diff --git a/Sts1CobcSw/Periphery/Rf.cpp b/Sts1CobcSw/Periphery/Rf.cpp
@@ -74,7 +74,8 @@ constexpr std::uint8_t morse9 = (5U << maxMorseLetterLength) | 0b00001U;
 constexpr std::uint8_t morse0 = (5U << maxMorseLetterLength) | 0b00000U;
 constexpr std::uint8_t morseSpace = 0;
 
-auto spi = RODOS::HAL_SPI(hal::rfSpiIndex, hal::rfSpiSckPin, hal::rfSpiMisoPin, hal::rfSpiMosiPin);
+auto spi = RODOS::HAL_SPI(
+    hal::rfSpiIndex, hal::rfSpiSckPin, hal::rfSpiMisoPin, hal::rfSpiMosiPin, hal::spiNssDummyPin);
 auto csGpioPin = hal::GpioPin(hal::rfCsPin);
 auto nirqGpioPin = hal::GpioPin(hal::rfNirqPin);
 auto sdnGpioPin = hal::GpioPin(hal::rfSdnPin);

diff --git a/Sts1CobcSw/Periphery/RfDeprecated.cpp b/Sts1CobcSw/Periphery/RfDeprecated.cpp
@@ -19,7 +19,8 @@ using RODOS::NOW;
 
 // --- Globals ---
 
-auto spi = RODOS::HAL_SPI(hal::rfSpiIndex, hal::rfSpiSckPin, hal::rfSpiMisoPin, hal::rfSpiMosiPin);
+auto spi = RODOS::HAL_SPI(
+    hal::rfSpiIndex, hal::rfSpiSckPin, hal::rfSpiMisoPin, hal::rfSpiMosiPin, hal::spiNssDummyPin);
 auto csGpioPin = hal::GpioPin(hal::rfCsPin);
 auto nirqGpioPin = hal::GpioPin(hal::rfNirqPin);
 auto sdnGpioPin = hal::GpioPin(hal::rfSdnPin);

diff --git a/Tests/HardwareTests/RfSimple.test.cpp b/Tests/HardwareTests/RfSimple.test.cpp
@@ -22,8 +22,9 @@
 namespace sts1cobcsw
 {
 
-// auto rfSpi =
-//     RODOS::HAL_SPI(hal::rfSpiIndex, hal::rfSpiSckPin, hal::rfSpiMisoPin, hal::rfSpiMosiPin);
+// auto rfSpi = RODOS::HAL_SPI(
+//     hal::rfSpiIndex, hal::rfSpiSckPin, hal::rfSpiMisoPin, hal::rfSpiMosiPin,
+//     hal::spiNssDummyPin);
 
 
 class RfSimpleTest : public RODOS::StaticThread<>

diff --git a/Tests/HardwareTests/Spi.test.cpp b/Tests/HardwareTests/Spi.test.cpp
@@ -38,13 +38,21 @@ using RODOS::PRINTF;
 
 namespace sts1cobcsw
 {
-auto spis = std::array{
-    HAL_SPI(hal::flashSpiIndex, hal::flashSpiSckPin, hal::flashSpiMisoPin, hal::flashSpiMosiPin),
-    HAL_SPI(hal::rfSpiIndex, hal::rfSpiSckPin, hal::rfSpiMisoPin, hal::rfSpiMosiPin),
-    HAL_SPI(hal::framEpsSpiIndex,
-            hal::framEpsSpiSckPin,
-            hal::framEpsSpiMisoPin,
-            hal::framEpsSpiMosiPin)};
+auto spis = std::array{HAL_SPI(hal::flashSpiIndex,
+                               hal::flashSpiSckPin,
+                               hal::flashSpiMisoPin,
+                               hal::flashSpiMosiPin,
+                               hal::spiNssDummyPin),
+                       HAL_SPI(hal::rfSpiIndex,
+                               hal::rfSpiSckPin,
+                               hal::rfSpiMisoPin,
+                               hal::rfSpiMosiPin,
+                               hal::spiNssDummyPin),
+                       HAL_SPI(hal::framEpsSpiIndex,
+                               hal::framEpsSpiSckPin,
+                               hal::framEpsSpiMisoPin,
+                               hal::framEpsSpiMosiPin,
+                               hal::spiNssDummyPin)};
 
 
 class SpiTest : public RODOS::StaticThread<>