Skip to content

fix(spi): init never called at begin #3049

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fpistm merged 1 commit into from
Aug 20, 2026
+8 −29
Merged

fix(spi): init never called at begin #3049

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 8 additions & 27 deletions libraries/SPI/src/SPI.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,25 +13,6 @@

SPIClass SPI;

void SPIClass::configSpi(const SPISettings &settings)
{
if (_spiSettings != settings) {
_spiSettings = settings;

uint32_t clock = settings.getClockFreq();
SPIMode dataMode = settings.getDataMode();
BitOrder order = settings.getBitOrder();
SPIBusMode busMode = settings.getBusMode();

// Mapping API dataMode → spi_mode_e C
spi_mode_e cspimode = static_cast<spi_mode_e>(dataMode);
// Mapping API busMode → spi_busmode_e C
spi_busmode_e cbusmode = static_cast<spi_busmode_e>(busMode);

spi_init(&_spi, clock, cspimode, order, cbusmode);
}
}

/**
* @brief Default Constructor. Uses pin configuration of default SPI
* defined in the variant*.h.
Expand Down Expand Up @@ -73,13 +54,9 @@ void SPIClass::begin(SPIBusMode busMode)
_spi.handle.State = HAL_SPI_STATE_RESET;
#endif

SPISettings defaultSettings(
SPI_SPEED_CLOCK_DEFAULT, // 4 MHz
MSBFIRST,
SPI_MODE0,
busMode
);
configSpi(defaultSettings);
_spiSettings = SPISettings(4000000, MSBFIRST, SPI_MODE0, busMode);
spi_init(&_spi, _spiSettings.getClockFreq(), (spi_mode_e)_spiSettings.getDataMode(),
_spiSettings.getBitOrder(), (spi_busmode_e)_spiSettings.getBusMode());
}

/**
Expand All @@ -89,7 +66,11 @@ void SPIClass::begin(SPIBusMode busMode)
*/
void SPIClass::beginTransaction(SPISettings settings)
{
configSpi(settings);
if (_spiSettings != settings) {
_spiSettings = settings;
spi_init(&_spi, _spiSettings.getClockFreq(), (spi_mode_e)_spiSettings.getDataMode(),
_spiSettings.getBitOrder(), (spi_busmode_e)_spiSettings.getBusMode());
}
}

/**
Expand Down
2 changes: 0 additions & 2 deletions libraries/SPI/src/SPI.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,6 @@ class SPIClass : public HardwareSPI {
private:
/* Current SPISettings */
SPISettings _spiSettings = SPISettings();

void configSpi(const SPISettings &settings);
};

extern SPIClass SPI;
Expand Down
Loading