pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-04-25 01:42:15 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

redid the reorganisation of the SPI definitions

Browse Source
This commit is contained in:
Woutvstk 2025-02-23 17:23:35 +01:00
parent 4ec0134606
commit b19d358dcc
8 changed files with 21 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/FSCommon.cpp
View File

@ -16,25 +16,20 @@
#include "SPILock.h" #include "SPILock.h"
#include <SD.h> #include <SD.h>
#include <SPI.h> #include <SPI.h>
#ifndef SDCARD_USE_HSPI // old ESP32 #if defined(ARCH_ESP32)
#ifdef SDCARD_USE_SPI1 #if defined(SDCARD_USE_HSPI)
#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 // SDCARD_USE_SPI1
#else
SPIClass SDHandler = SPIClass(HSPI); SPIClass SDHandler = SPIClass(HSPI);
#elif defined(SDCARD_USE_VSPI)
SPIClass SDHandler = SPIClass(VSPI);
#endif #endif
#endif // HAS_SDCARD #elif defined(ARCH_NRF52)
#if defined(SDCARD_USE_SPI1)
#define SDHandler SPI1 // only used for esp32, SPI selection for NRF52 happens in variant.h (for now)
#elif defined(SDCARD_USE_SPI)
#define SDHandler SPI // only used for esp32
#endif //NRF52 SPI or SPI1
#endif // ESP32/NRF52
#endif // HAS_SDCARD
#if defined(ARCH_STM32WL) #if defined(ARCH_STM32WL)
@ -404,3 +399,4 @@ void setupSDCard()
#endif #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 // SD card - TODO: test, currently untested, copied from T3S3 variant
#define HAS_SDCARD #define HAS_SDCARD
#define SDCARD_USE_SPI1 #define SDCARD_USE_HSPI
// TODO: rename this to make this SD-card specific // TODO: rename this to make this SD-card specific
#define SPI_CS 13 #define SPI_CS 13
#define SPI_SCK 14 #define SPI_SCK 14

2
variants/bpi_picow_esp32_s3/variant.h
View File

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

2
variants/dreamcatcher/variant.h
View File

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

2
variants/my_esp32s3_diy_eink/variant.h
View File

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

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

@ -58,7 +58,7 @@
#define GPS_1PPS_PIN 6 #define GPS_1PPS_PIN 6
#define HAS_SDCARD // Have SPI interface SD card slot #define HAS_SDCARD // Have SPI interface SD card slot
#define SDCARD_USE_SPI1 #define SDCARD_USE_HSPI
// PCF8563 RTC Module // PCF8563 RTC Module
// #define PCF8563_RTC 0x51 //Putting definitions in variant. h does not compile correctly // #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 HAS_SDCARD
#define SDCARD_USE_SPI1 #define SDCARD_USE_HSPI
// Display (E-Ink) // Display (E-Ink)
#define USE_EINK #define USE_EINK

4
variants/tlora_t3s3_v1/variant.h
View File

@ -1,5 +1,5 @@
#define HAS_SDCARD #define HAS_SDCARD
#define SDCARD_USE_SPI1 #define SDCARD_USE_HSPI
#define USE_SSD1306 #define USE_SSD1306
@ -76,4 +76,4 @@
#endif #endif
#define HAS_SDCARD // Have SPI interface SD card slot #define HAS_SDCARD // Have SPI interface SD card slot
#define SDCARD_USE_SPI1 #define SDCARD_USE_HSPI