Skip to content
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

Jump to bottom

BF 4.4.1 rollup 1 #12306

Merged
merged 2 commits into from Feb 7, 2023
Merged

BF 4.4.1 rollup 1 #12306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
81fca3e
NVIC - Update ELRS and SPI atomic_block usage to use appropriate
hydra Mar 7, 2022
0125bb3
SD - Use SDIO by default if target uses USE_SDCARD_SDIO.
hydra Jun 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/drivers/bus_spi.c
View file
Open in desktop
Expand Up @@ -717,7 +717,7 @@ void spiSequence(const extDevice_t *dev, busSegment_t *segments)
{
busDevice_t *bus = dev->bus;

ATOMIC_BLOCK(NVIC_PRIO_MAX) {
ATOMIC_BLOCK(NVIC_PRIO_SPI_DMA) {
if (spiIsBusy(dev)) {
busSegment_t *endSegment;

Expand Down
2 changes: 1 addition & 1 deletion src/main/drivers/rx/rx_sx1280.c
View file
Open in desktop
Expand Up @@ -572,7 +572,7 @@ static void sx1280StartTransmittingDMA(extiCallbackRec_t *cb);
FAST_IRQ_HANDLER void sx1280ISR(void)
{
// Only attempt to access the SX1280 if it is currently idle to avoid any race condition
ATOMIC_BLOCK(NVIC_PRIO_MAX) {
ATOMIC_BLOCK(NVIC_PRIO_RX_INT_EXTI) {
if (sx1280EnableBusy()) {
pendingISR = false;
sx1280SetBusyFn(sx1280IrqGetStatus);
Expand Down
7 changes: 7 additions & 0 deletions src/main/pg/sdcard.c
View file
Open in desktop
Expand Up @@ -30,6 +30,7 @@

#include "sdcard.h"
#include "drivers/bus_spi.h"
#include "drivers/sdio.h"
#include "drivers/io.h"
#include "drivers/dma.h"
#include "drivers/dma_reqmap.h"
Expand Down Expand Up @@ -71,5 +72,11 @@ void pgResetFn_sdcardConfig(sdcardConfig_t *config)
config->mode = SDCARD_MODE_SPI;
}
#endif

#if defined(USE_SDCARD_SDIO)
if (SDIO_DEVICE != SDIOINVALID) {
config->mode = SDCARD_MODE_SDIO;
}
#endif
}
#endif