Attempt to merge

This commit is contained in:
Thomas Göttgens
2025-01-05 21:34:38 +01:00
parent 7c08ff35f3
commit f7feea63f7
7 changed files with 47 additions and 12 deletions

View File

@@ -613,6 +613,9 @@ void setup()
i2cScanner.reset();
#endif
// Init our SPI controller (must be before screen and lora)
initSPI();
#ifdef HAS_SDCARD
setupSDCard();
#endif
@@ -704,7 +707,6 @@ void setup()
drv.setMode(DRV2605_MODE_INTTRIG);
#endif
// Init our SPI controller (must be before screen and lora)
#ifdef ARCH_RP2040
#ifdef HW_SPI1_DEVICE
SPI1.setSCK(LORA_SCK);