Skip to content

SPI - Peripheral manager fix #8279

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
merged 2 commits into from
Jun 1, 2023
Merged

SPI - Peripheral manager fix #8279

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a870924
replace bus with spi->num+1
P-R-O-C-H-Y Jun 1, 2023
133614f
Merge branch 'esp-idf-v5.1-libs' into SPI-Periman-fix
P-R-O-C-H-Y Jun 1, 2023
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
8 changes: 4 additions & 4 deletions cores/esp32/esp32-hal-spi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ bool spiAttachSCK(spi_t * spi, int8_t sck)
spi->sck = sck;

if(!perimanSetPinBus(sck, ESP32_BUS_TYPE_SPI_MASTER, (void *)(spi->num+1))){
spiDetachBus(bus);
spiDetachBus((void *)(spi->num+1));
log_e("Failed to set pin bus to SPI for pin %d", sck);
return false;
}
Expand Down Expand Up @@ -291,7 +291,7 @@ bool spiAttachMISO(spi_t * spi, int8_t miso)
SPI_MUTEX_UNLOCK();

if(!perimanSetPinBus(miso, ESP32_BUS_TYPE_SPI_MASTER, (void *)(spi->num+1))){
spiDetachBus(bus);
spiDetachBus((void *)(spi->num+1));
log_e("Failed to set pin bus to SPI for pin %d", miso);
return false;
}
Expand Down Expand Up @@ -341,7 +341,7 @@ bool spiAttachMOSI(spi_t * spi, int8_t mosi)
spi->mosi = mosi;

if(!perimanSetPinBus(mosi, ESP32_BUS_TYPE_SPI_MASTER, (void *)(spi->num+1))){
spiDetachBus(bus);
spiDetachBus((void *)(spi->num+1));
log_e("Failed to set pin bus to SPI for pin %d", mosi);
return false;
}
Expand Down Expand Up @@ -513,7 +513,7 @@ bool spiAttachSS(spi_t * spi, uint8_t cs_num, int8_t ss)
spi->ss = ss;

if(!perimanSetPinBus(ss, ESP32_BUS_TYPE_SPI_MASTER, (void *)(spi->num+1))){
spiDetachBus(bus);
spiDetachBus((void *)(spi->num+1));
log_e("Failed to set pin bus to SPI for pin %d", ss);
return false;
}
Expand Down