pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-08-03 04:15:53 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Revert "Reorganize spi definitions for use with sd cards ESP32/NRF52 (#6080)"

Browse Source 
This reverts commit 443922b947.
This commit is contained in:
Woutvstk 2025-02-23 16:56:22 +01:00
parent e67b84ee06
commit 5aa4946e6f
13 changed files with 38 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/FSCommon.cpp
View File

@ -16,16 +16,25 @@
#include "SPILock.h"
#include <SD.h>
#include <SPI.h>
#if defined(ARCH_ESP32)
#if defined(SDCARD_USE_HSPI)
SPIClass SDHandler = SPIClass(HSPI);
#elif defined(SDCARD_USE_VSPI)
SPIClass SDHandler = SPIClass(VSPI);
#endif
#elif defined(ARCH_NRF52)
#ifndef SDCARD_USE_HSPI // old ESP32
#ifdef SDCARD_USE_SPI1
#ifdef ARCH_ESP32
SPIClass SPI1(HSPI);
#endif // ARCH_ESP32
#ifdef ARCH_NRF52
#define SDCARD_SPI SPI1
#endif // NRF52
#define SDHandler SPI1 // only used for esp32
#else
#ifdef ARCH_NRF52
#define SDCARD_SPI SPI
#endif // NRF52
#define SDHandler SPI // only used for esp32
#endif // ESP32/NRF52
#endif // HAS_SDCARD
#endif // SDCARD_USE_SPI1
#else
SPIClass SDHandler = SPIClass(HSPI);
#endif
#endif // HAS_SDCARD
#if defined(ARCH_STM32WL)
@ -394,4 +403,4 @@ void setupSDCard()
#endif
#endif
#endif
}

2
variants/CDEBYTE_EoRa-S3/variant.h
View File

@ -6,7 +6,7 @@
// SD card - TODO: test, currently untested, copied from T3S3 variant
#define HAS_SDCARD
#define SDCARD_USE_HSPI
#define SDCARD_USE_SPI1
// TODO: rename this to make this SD-card specific
#define SPI_CS 13
#define SPI_SCK 14

2
variants/bpi_picow_esp32_s3/variant.h
View File

@ -5,7 +5,7 @@
// #define HAS_SCREEN 0
// #define HAS_SDCARD
// #define SDCARD_USE_HSPI
// #define SDCARD_USE_SPI1
#define USE_SSD1306
#define I2C_SDA 12

2
variants/dreamcatcher/variant.h
View File

@ -70,7 +70,7 @@
#endif
#define HAS_SDCARD // Have SPI interface SD card slot
#define SDCARD_USE_HSPI
#define SDCARD_USE_SPI1
#define LORA_RESET 3
#define LORA_SCK 12

1
variants/mesh-tab/variant.h
View File

@ -25,7 +25,6 @@
#define GPS_TX_PIN 17
// #define HAS_SDCARD 1
// #define SDCARD_USE_HSPI
#define SPI_MOSI 13
#define SPI_SCK 12
#define SPI_MISO 11

2
variants/my_esp32s3_diy_eink/variant.h
View File

@ -4,7 +4,7 @@
// #define HAS_SCREEN 0
// #define HAS_SDCARD
// #define SDCARD_USE_HSPI
// #define SDCARD_USE_SPI1
// #define USE_SSD1306

2
variants/my_esp32s3_diy_oled/variant.h
View File

@ -4,7 +4,7 @@
// #define HAS_SCREEN 0
// #define HAS_SDCARD
// #define SDCARD_USE_HSPI
// #define SDCARD_USE_SPI1
#define USE_SSD1306

11
variants/rak4631/variant.h
View File

@ -121,9 +121,14 @@ static const uint8_t SCK = PIN_SPI_SCK;
// SD card SPI pin definitions
#define HAS_SDCARD 1
#define SPI_MOSI PIN_SPI_MOSI
#define SPI_SCK PIN_SPI_SCK
#define SPI_MISO PIN_SPI_MISO
#define SDCARD_USE_SPI1 1
#ifdef SDCARD_USE_SPI1
#define SDCARD_SPI SPI1
#endif
#define SPI_MOSI PIN_SPI1_MOSI
#define SPI_SCK PIN_SPI1_SCK
#define SPI_MISO PIN_SPI1_MISO
#define SDCARD_CS (26)
/*

1
variants/t-deck/variant.h
View File

@ -37,7 +37,6 @@
// Have SPI interface SD card slot
#define HAS_SDCARD 1
#define SDCARD_USE_HSPI
#define SPI_MOSI (41)
#define SPI_SCK (40)
#define SPI_MISO (38)

2
variants/tbeam-s3-core/variant.h
View File

@ -58,7 +58,7 @@
#define GPS_1PPS_PIN 6
#define HAS_SDCARD // Have SPI interface SD card slot
#define SDCARD_USE_HSPI
#define SDCARD_USE_SPI1
// PCF8563 RTC Module
// #define PCF8563_RTC 0x51 //Putting definitions in variant. h does not compile correctly

2
variants/tlora_t3s3_epaper/variant.h
View File

@ -1,5 +1,5 @@
#define HAS_SDCARD
#define SDCARD_USE_HSPI
#define SDCARD_USE_SPI1
// Display (E-Ink)
#define USE_EINK

5
variants/tlora_t3s3_v1/variant.h
View File

@ -1,5 +1,5 @@
#define HAS_SDCARD
#define SDCARD_USE_HSPI
#define SDCARD_USE_SPI1
#define USE_SSD1306
@ -74,3 +74,6 @@
#define LR11X0_DIO3_TCXO_VOLTAGE 3.0
#define LR11X0_DIO_AS_RF_SWITCH
#endif
#define HAS_SDCARD // Have SPI interface SD card slot
#define SDCARD_USE_SPI1

1
variants/unphone/variant.h
View File

@ -49,7 +49,6 @@
#undef GPS_TX_PIN
// #define HAS_SDCARD 1 // causes hang if defined
#define SDCARD_USE_HSPI
#define SDCARD_CS 43
#define LED_PIN 13 // the red part of the RGB LED