mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add SDCard SDIO support

This commit is contained in:
Stephan Hadinger 2022-04-19 19:17:04 +02:00
parent 5193050fa8
commit 43c53838ad
29 changed files with 234 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tasmota/language/af_AF.h
View File

@ -651,6 +651,12 @@
#define D_SENSOR_SPI_MISO "SPI MISO"
#define D_SENSOR_SPI_MOSI "SPI MOSI"
#define D_SENSOR_SPI_CLK "SPI CLK"
#define D_SENSOR_SDIO_CMD "SDIO CMD"
#define D_SENSOR_SDIO_CLK "SDIO CLK"
#define D_SENSOR_SDIO_D0 "SDIO D0"
#define D_SENSOR_SDIO_D1 "SDIO D1"
#define D_SENSOR_SDIO_D2 "SDIO D2"
#define D_SENSOR_SDIO_D3 "SDIO D3"
#define D_SENSOR_BACKLIGHT "Backlight"
#define D_SENSOR_PMS5003_TX "PMS5003 Tx"
#define D_SENSOR_PMS5003_RX "PMS5003 Rx"

6
tasmota/language/bg_BG.h
View File

@ -651,6 +651,12 @@
#define D_SENSOR_SPI_MISO "SPI MISO"
#define D_SENSOR_SPI_MOSI "SPI MOSI"
#define D_SENSOR_SPI_CLK "SPI CLK"
#define D_SENSOR_SDIO_CMD "SDIO CMD"
#define D_SENSOR_SDIO_CLK "SDIO CLK"
#define D_SENSOR_SDIO_D0 "SDIO D0"
#define D_SENSOR_SDIO_D1 "SDIO D1"
#define D_SENSOR_SDIO_D2 "SDIO D2"
#define D_SENSOR_SDIO_D3 "SDIO D3"
#define D_SENSOR_BACKLIGHT "Подсветка"
#define D_SENSOR_PMS5003_TX "PMS5003 Tx"
#define D_SENSOR_PMS5003_RX "PMS5003 Rx"

6
tasmota/language/cs_CZ.h
View File

@ -651,6 +651,12 @@
#define D_SENSOR_SPI_MISO "SPI MISO"
#define D_SENSOR_SPI_MOSI "SPI MOSI"
#define D_SENSOR_SPI_CLK "SPI CLK"
#define D_SENSOR_SDIO_CMD "SDIO CMD"
#define D_SENSOR_SDIO_CLK "SDIO CLK"
#define D_SENSOR_SDIO_D0 "SDIO D0"
#define D_SENSOR_SDIO_D1 "SDIO D1"
#define D_SENSOR_SDIO_D2 "SDIO D2"
#define D_SENSOR_SDIO_D3 "SDIO D3"
#define D_SENSOR_BACKLIGHT "Backlight"
#define D_SENSOR_PMS5003_TX "PMS5003 Tx"
#define D_SENSOR_PMS5003_RX "PMS5003 Rx"

6
tasmota/language/de_DE.h
View File

@ -651,6 +651,12 @@
#define D_SENSOR_SPI_MISO "SPI MISO"
#define D_SENSOR_SPI_MOSI "SPI MOSI"
#define D_SENSOR_SPI_CLK "SPI CLK"
#define D_SENSOR_SDIO_CMD "SDIO CMD"
#define D_SENSOR_SDIO_CLK "SDIO CLK"
#define D_SENSOR_SDIO_D0 "SDIO D0"
#define D_SENSOR_SDIO_D1 "SDIO D1"
#define D_SENSOR_SDIO_D2 "SDIO D2"
#define D_SENSOR_SDIO_D3 "SDIO D3"
#define D_SENSOR_BACKLIGHT "Backlight"
#define D_SENSOR_PMS5003_TX "PMS5003 Tx"
#define D_SENSOR_PMS5003_RX "PMS5003 Rx"

6
tasmota/language/el_GR.h
View File

@ -651,6 +651,12 @@
#define D_SENSOR_SPI_MISO "SPI MISO"
#define D_SENSOR_SPI_MOSI "SPI MOSI"
#define D_SENSOR_SPI_CLK "SPI CLK"
#define D_SENSOR_SDIO_CMD "SDIO CMD"
#define D_SENSOR_SDIO_CLK "SDIO CLK"
#define D_SENSOR_SDIO_D0 "SDIO D0"
#define D_SENSOR_SDIO_D1 "SDIO D1"
#define D_SENSOR_SDIO_D2 "SDIO D2"
#define D_SENSOR_SDIO_D3 "SDIO D3"
#define D_SENSOR_BACKLIGHT "Backlight"
#define D_SENSOR_PMS5003_TX "PMS5003 Tx"
#define D_SENSOR_PMS5003_RX "PMS5003 Rx"

6
tasmota/language/en_GB.h
View File

@ -651,6 +651,12 @@
#define D_SENSOR_SPI_MISO "SPI MISO"
#define D_SENSOR_SPI_MOSI "SPI MOSI"
#define D_SENSOR_SPI_CLK "SPI CLK"
#define D_SENSOR_SDIO_CMD "SDIO CMD"
#define D_SENSOR_SDIO_CLK "SDIO CLK"
#define D_SENSOR_SDIO_D0 "SDIO D0"
#define D_SENSOR_SDIO_D1 "SDIO D1"
#define D_SENSOR_SDIO_D2 "SDIO D2"
#define D_SENSOR_SDIO_D3 "SDIO D3"
#define D_SENSOR_BACKLIGHT "Backlight"
#define D_SENSOR_PMS5003_TX "PMS5003 Tx"
#define D_SENSOR_PMS5003_RX "PMS5003 Rx"

6
tasmota/language/es_ES.h
View File

@ -651,6 +651,12 @@
#define D_SENSOR_SPI_MISO "SPI MISO"
#define D_SENSOR_SPI_MOSI "SPI MOSI"
#define D_SENSOR_SPI_CLK "SPI CLK"
#define D_SENSOR_SDIO_CMD "SDIO CMD"
#define D_SENSOR_SDIO_CLK "SDIO CLK"
#define D_SENSOR_SDIO_D0 "SDIO D0"
#define D_SENSOR_SDIO_D1 "SDIO D1"
#define D_SENSOR_SDIO_D2 "SDIO D2"
#define D_SENSOR_SDIO_D3 "SDIO D3"
#define D_SENSOR_BACKLIGHT "Backlight"
#define D_SENSOR_PMS5003_TX "PMS5003 Tx"
#define D_SENSOR_PMS5003_RX "PMS5003 Rx"

6
tasmota/language/fr_FR.h
View File

@ -651,6 +651,12 @@
#define D_SENSOR_SPI_MISO "SPI MISO"
#define D_SENSOR_SPI_MOSI "SPI MOSI"
#define D_SENSOR_SPI_CLK "SPI CLK"
#define D_SENSOR_SDIO_CMD "SDIO CMD"
#define D_SENSOR_SDIO_CLK "SDIO CLK"
#define D_SENSOR_SDIO_D0 "SDIO D0"
#define D_SENSOR_SDIO_D1 "SDIO D1"
#define D_SENSOR_SDIO_D2 "SDIO D2"
#define D_SENSOR_SDIO_D3 "SDIO D3"
#define D_SENSOR_BACKLIGHT "RétroÉcl"
#define D_SENSOR_PMS5003_TX "PMS5003 TX"
#define D_SENSOR_PMS5003_RX "PMS5003 RX"

6
tasmota/language/fy_NL.h
View File

@ -651,6 +651,12 @@
#define D_SENSOR_SPI_MISO "SPI MISO"
#define D_SENSOR_SPI_MOSI "SPI MOSI"
#define D_SENSOR_SPI_CLK "SPI CLK"
#define D_SENSOR_SDIO_CMD "SDIO CMD"
#define D_SENSOR_SDIO_CLK "SDIO CLK"
#define D_SENSOR_SDIO_D0 "SDIO D0"
#define D_SENSOR_SDIO_D1 "SDIO D1"
#define D_SENSOR_SDIO_D2 "SDIO D2"
#define D_SENSOR_SDIO_D3 "SDIO D3"
#define D_SENSOR_BACKLIGHT "Backlight"
#define D_SENSOR_PMS5003_TX "PMS5003 Tx"
#define D_SENSOR_PMS5003_RX "PMS5003 Rx"

6
tasmota/language/he_HE.h
View File

@ -651,6 +651,12 @@
#define D_SENSOR_SPI_MISO "SPI MISO"
#define D_SENSOR_SPI_MOSI "SPI MOSI"
#define D_SENSOR_SPI_CLK "SPI CLK"
#define D_SENSOR_SDIO_CMD "SDIO CMD"
#define D_SENSOR_SDIO_CLK "SDIO CLK"
#define D_SENSOR_SDIO_D0 "SDIO D0"
#define D_SENSOR_SDIO_D1 "SDIO D1"
#define D_SENSOR_SDIO_D2 "SDIO D2"
#define D_SENSOR_SDIO_D3 "SDIO D3"
#define D_SENSOR_BACKLIGHT "Backlight"
#define D_SENSOR_PMS5003_TX "PMS5003 Tx"
#define D_SENSOR_PMS5003_RX "PMS5003 Rx"

6
tasmota/language/hu_HU.h
View File

@ -651,6 +651,12 @@
#define D_SENSOR_SPI_MISO "SPI MISO"
#define D_SENSOR_SPI_MOSI "SPI MOSI"
#define D_SENSOR_SPI_CLK "SPI CLK"
#define D_SENSOR_SDIO_CMD "SDIO CMD"
#define D_SENSOR_SDIO_CLK "SDIO CLK"
#define D_SENSOR_SDIO_D0 "SDIO D0"
#define D_SENSOR_SDIO_D1 "SDIO D1"
#define D_SENSOR_SDIO_D2 "SDIO D2"
#define D_SENSOR_SDIO_D3 "SDIO D3"
#define D_SENSOR_BACKLIGHT "Háttérfény"
#define D_SENSOR_PMS5003_TX "PMS5003 Tx"
#define D_SENSOR_PMS5003_RX "PMS5003 Rx"

6
tasmota/language/it_IT.h
View File

@ -651,6 +651,12 @@
#define D_SENSOR_SPI_MISO "SPI - MISO"
#define D_SENSOR_SPI_MOSI "SPI - MOSI"
#define D_SENSOR_SPI_CLK "SPI - CLK"
#define D_SENSOR_SDIO_CMD "SDIO CMD"
#define D_SENSOR_SDIO_CLK "SDIO CLK"
#define D_SENSOR_SDIO_D0 "SDIO D0"
#define D_SENSOR_SDIO_D1 "SDIO D1"
#define D_SENSOR_SDIO_D2 "SDIO D2"
#define D_SENSOR_SDIO_D3 "SDIO D3"
#define D_SENSOR_BACKLIGHT "Retroilluminazione"
#define D_SENSOR_PMS5003_TX "PMS5003 - TX"
#define D_SENSOR_PMS5003_RX "PMS5003 - RX"

6
tasmota/language/ko_KO.h
View File

@ -651,6 +651,12 @@
#define D_SENSOR_SPI_MISO "SPI MISO"
#define D_SENSOR_SPI_MOSI "SPI MOSI"
#define D_SENSOR_SPI_CLK "SPI CLK"
#define D_SENSOR_SDIO_CMD "SDIO CMD"
#define D_SENSOR_SDIO_CLK "SDIO CLK"
#define D_SENSOR_SDIO_D0 "SDIO D0"
#define D_SENSOR_SDIO_D1 "SDIO D1"
#define D_SENSOR_SDIO_D2 "SDIO D2"
#define D_SENSOR_SDIO_D3 "SDIO D3"
#define D_SENSOR_BACKLIGHT "Backlight"
#define D_SENSOR_PMS5003_TX "PMS5003 Tx"
#define D_SENSOR_PMS5003_RX "PMS5003 Rx"

6
tasmota/language/nl_NL.h
View File

@ -651,6 +651,12 @@
#define D_SENSOR_SPI_MISO "SPI MISO"
#define D_SENSOR_SPI_MOSI "SPI MOSI"
#define D_SENSOR_SPI_CLK "SPI CLK"
#define D_SENSOR_SDIO_CMD "SDIO CMD"
#define D_SENSOR_SDIO_CLK "SDIO CLK"
#define D_SENSOR_SDIO_D0 "SDIO D0"
#define D_SENSOR_SDIO_D1 "SDIO D1"
#define D_SENSOR_SDIO_D2 "SDIO D2"
#define D_SENSOR_SDIO_D3 "SDIO D3"
#define D_SENSOR_BACKLIGHT "Backlight"
#define D_SENSOR_PMS5003_TX "PMS5003 Tx"
#define D_SENSOR_PMS5003_RX "PMS5003 Rx"

6
tasmota/language/pl_PL.h
View File

@ -651,6 +651,12 @@
#define D_SENSOR_SPI_MISO "SPI MISO"
#define D_SENSOR_SPI_MOSI "SPI MOSI"
#define D_SENSOR_SPI_CLK "SPI CLK"
#define D_SENSOR_SDIO_CMD "SDIO CMD"
#define D_SENSOR_SDIO_CLK "SDIO CLK"
#define D_SENSOR_SDIO_D0 "SDIO D0"
#define D_SENSOR_SDIO_D1 "SDIO D1"
#define D_SENSOR_SDIO_D2 "SDIO D2"
#define D_SENSOR_SDIO_D3 "SDIO D3"
#define D_SENSOR_BACKLIGHT "Podświetlanie"
#define D_SENSOR_PMS5003_TX "PMS5003 Tx"
#define D_SENSOR_PMS5003_RX "PMS5003 Rx"

6
tasmota/language/pt_BR.h
View File

@ -651,6 +651,12 @@
#define D_SENSOR_SPI_MISO "SPI MISO"
#define D_SENSOR_SPI_MOSI "SPI MOSI"
#define D_SENSOR_SPI_CLK "SPI CLK"
#define D_SENSOR_SDIO_CMD "SDIO CMD"
#define D_SENSOR_SDIO_CLK "SDIO CLK"
#define D_SENSOR_SDIO_D0 "SDIO D0"
#define D_SENSOR_SDIO_D1 "SDIO D1"
#define D_SENSOR_SDIO_D2 "SDIO D2"
#define D_SENSOR_SDIO_D3 "SDIO D3"
#define D_SENSOR_BACKLIGHT "Luz de fundo"
#define D_SENSOR_PMS5003_TX "PMS5003 Tx"
#define D_SENSOR_PMS5003_RX "PMS5003 Rx"

6
tasmota/language/pt_PT.h
View File

@ -651,6 +651,12 @@
#define D_SENSOR_SPI_MISO "SPI MISO"
#define D_SENSOR_SPI_MOSI "SPI MOSI"
#define D_SENSOR_SPI_CLK "SPI CLK"
#define D_SENSOR_SDIO_CMD "SDIO CMD"
#define D_SENSOR_SDIO_CLK "SDIO CLK"
#define D_SENSOR_SDIO_D0 "SDIO D0"
#define D_SENSOR_SDIO_D1 "SDIO D1"
#define D_SENSOR_SDIO_D2 "SDIO D2"
#define D_SENSOR_SDIO_D3 "SDIO D3"
#define D_SENSOR_BACKLIGHT "Luz fundo"
#define D_SENSOR_PMS5003_TX "PMS5003 Tx"
#define D_SENSOR_PMS5003_RX "PMS5003 Rx"

6
tasmota/language/ro_RO.h
View File

@ -651,6 +651,12 @@
#define D_SENSOR_SPI_MISO "SPI MISO"
#define D_SENSOR_SPI_MOSI "SPI MOSI"
#define D_SENSOR_SPI_CLK "SPI CLK"
#define D_SENSOR_SDIO_CMD "SDIO CMD"
#define D_SENSOR_SDIO_CLK "SDIO CLK"
#define D_SENSOR_SDIO_D0 "SDIO D0"
#define D_SENSOR_SDIO_D1 "SDIO D1"
#define D_SENSOR_SDIO_D2 "SDIO D2"
#define D_SENSOR_SDIO_D3 "SDIO D3"
#define D_SENSOR_BACKLIGHT "Backlight"
#define D_SENSOR_PMS5003_TX "PMS5003 Tx"
#define D_SENSOR_PMS5003_RX "PMS5003 Rx"

6
tasmota/language/ru_RU.h
View File

@ -651,6 +651,12 @@
#define D_SENSOR_SPI_MISO "SPI MISO"
#define D_SENSOR_SPI_MOSI "SPI MOSI"
#define D_SENSOR_SPI_CLK "SPI CLK"
#define D_SENSOR_SDIO_CMD "SDIO CMD"
#define D_SENSOR_SDIO_CLK "SDIO CLK"
#define D_SENSOR_SDIO_D0 "SDIO D0"
#define D_SENSOR_SDIO_D1 "SDIO D1"
#define D_SENSOR_SDIO_D2 "SDIO D2"
#define D_SENSOR_SDIO_D3 "SDIO D3"
#define D_SENSOR_BACKLIGHT "Backlight"
#define D_SENSOR_PMS5003_TX "PMS5003 Tx"
#define D_SENSOR_PMS5003_RX "PMS5003 Rx"

6
tasmota/language/sk_SK.h
View File

@ -651,6 +651,12 @@
#define D_SENSOR_SPI_MISO "SPI MISO"
#define D_SENSOR_SPI_MOSI "SPI MOSI"
#define D_SENSOR_SPI_CLK "SPI CLK"
#define D_SENSOR_SDIO_CMD "SDIO CMD"
#define D_SENSOR_SDIO_CLK "SDIO CLK"
#define D_SENSOR_SDIO_D0 "SDIO D0"
#define D_SENSOR_SDIO_D1 "SDIO D1"
#define D_SENSOR_SDIO_D2 "SDIO D2"
#define D_SENSOR_SDIO_D3 "SDIO D3"
#define D_SENSOR_BACKLIGHT "Backlight"
#define D_SENSOR_PMS5003_TX "PMS5003 Tx"
#define D_SENSOR_PMS5003_RX "PMS5003 Rx"

6
tasmota/language/sv_SE.h
View File

@ -651,6 +651,12 @@
#define D_SENSOR_SPI_MISO "SPI MISO"
#define D_SENSOR_SPI_MOSI "SPI MOSI"
#define D_SENSOR_SPI_CLK "SPI CLK"
#define D_SENSOR_SDIO_CMD "SDIO CMD"
#define D_SENSOR_SDIO_CLK "SDIO CLK"
#define D_SENSOR_SDIO_D0 "SDIO D0"
#define D_SENSOR_SDIO_D1 "SDIO D1"
#define D_SENSOR_SDIO_D2 "SDIO D2"
#define D_SENSOR_SDIO_D3 "SDIO D3"
#define D_SENSOR_BACKLIGHT "Backlight"
#define D_SENSOR_PMS5003_TX "PMS5003 Tx"
#define D_SENSOR_PMS5003_RX "PMS5003 Rx"

6
tasmota/language/tr_TR.h
View File

@ -651,6 +651,12 @@
#define D_SENSOR_SPI_MISO "SPI MISO"
#define D_SENSOR_SPI_MOSI "SPI MOSI"
#define D_SENSOR_SPI_CLK "SPI CLK"
#define D_SENSOR_SDIO_CMD "SDIO CMD"
#define D_SENSOR_SDIO_CLK "SDIO CLK"
#define D_SENSOR_SDIO_D0 "SDIO D0"
#define D_SENSOR_SDIO_D1 "SDIO D1"
#define D_SENSOR_SDIO_D2 "SDIO D2"
#define D_SENSOR_SDIO_D3 "SDIO D3"
#define D_SENSOR_BACKLIGHT "Backlight"
#define D_SENSOR_PMS5003_TX "PMS5003 Tx"
#define D_SENSOR_PMS5003_RX "PMS5003 Rx"

6
tasmota/language/uk_UA.h
View File

@ -651,6 +651,12 @@
#define D_SENSOR_SPI_MISO "SPI MISO"
#define D_SENSOR_SPI_MOSI "SPI MOSI"
#define D_SENSOR_SPI_CLK "SPI CLK"
#define D_SENSOR_SDIO_CMD "SDIO CMD"
#define D_SENSOR_SDIO_CLK "SDIO CLK"
#define D_SENSOR_SDIO_D0 "SDIO D0"
#define D_SENSOR_SDIO_D1 "SDIO D1"
#define D_SENSOR_SDIO_D2 "SDIO D2"
#define D_SENSOR_SDIO_D3 "SDIO D3"
#define D_SENSOR_BACKLIGHT "OLED Light"
#define D_SENSOR_PMS5003_TX "PMS5003 Tx"
#define D_SENSOR_PMS5003_RX "PMS5003 Rx"

6
tasmota/language/vi_VN.h
View File

@ -651,6 +651,12 @@
#define D_SENSOR_SPI_MISO "SPI MISO"
#define D_SENSOR_SPI_MOSI "SPI MOSI"
#define D_SENSOR_SPI_CLK "SPI CLK"
#define D_SENSOR_SDIO_CMD "SDIO CMD"
#define D_SENSOR_SDIO_CLK "SDIO CLK"
#define D_SENSOR_SDIO_D0 "SDIO D0"
#define D_SENSOR_SDIO_D1 "SDIO D1"
#define D_SENSOR_SDIO_D2 "SDIO D2"
#define D_SENSOR_SDIO_D3 "SDIO D3"
#define D_SENSOR_BACKLIGHT "Backlight"
#define D_SENSOR_PMS5003_TX "PMS5003 Tx"
#define D_SENSOR_PMS5003_RX "PMS5003 Rx"

6
tasmota/language/zh_CN.h
View File

@ -651,6 +651,12 @@
#define D_SENSOR_SPI_MISO "SPI MISO"
#define D_SENSOR_SPI_MOSI "SPI MOSI"
#define D_SENSOR_SPI_CLK "SPI CLK"
#define D_SENSOR_SDIO_CMD "SDIO CMD"
#define D_SENSOR_SDIO_CLK "SDIO CLK"
#define D_SENSOR_SDIO_D0 "SDIO D0"
#define D_SENSOR_SDIO_D1 "SDIO D1"
#define D_SENSOR_SDIO_D2 "SDIO D2"
#define D_SENSOR_SDIO_D3 "SDIO D3"
#define D_SENSOR_BACKLIGHT "Backlight"
#define D_SENSOR_PMS5003_TX "PMS5003 Tx"
#define D_SENSOR_PMS5003_RX "PMS5003 Rx"

6
tasmota/language/zh_TW.h
View File

@ -651,6 +651,12 @@
#define D_SENSOR_SPI_MISO "SPI MISO"
#define D_SENSOR_SPI_MOSI "SPI MOSI"
#define D_SENSOR_SPI_CLK "SPI CLK"
#define D_SENSOR_SDIO_CMD "SDIO CMD"
#define D_SENSOR_SDIO_CLK "SDIO CLK"
#define D_SENSOR_SDIO_D0 "SDIO D0"
#define D_SENSOR_SDIO_D1 "SDIO D1"
#define D_SENSOR_SDIO_D2 "SDIO D2"
#define D_SENSOR_SDIO_D3 "SDIO D3"
#define D_SENSOR_BACKLIGHT "Backlight"
#define D_SENSOR_PMS5003_TX "PMS5003 Tx"
#define D_SENSOR_PMS5003_RX "PMS5003 Rx"

1
tasmota/tasmota.ino
View File

@ -75,6 +75,7 @@
#include <LittleFS.h>
#ifdef USE_SDCARD
#include <SD.h>
#include <SD_MMC.h>
#endif // USE_SDCARD
#include "FFat.h"
#include "FS.h"

18
tasmota/tasmota_template.h
View File

@ -186,6 +186,7 @@ enum UserSelectablePins {
GPIO_ADE7880_IRQ, // ADE7880 IRQ
GPIO_RESET, // Generic reset
GPIO_MS01, // Sonoff MS01 Moisture Sensor 1wire interface
GPIO_SDIO_CMD, GPIO_SDIO_CLK, GPIO_SDIO_D0, GPIO_SDIO_D1, GPIO_SDIO_D2, GPIO_SDIO_D3, // SD Card SDIO interface, including 1-bit and 4-bit modes
GPIO_SENSOR_END };
enum ProgramSelectablePins {
@ -411,6 +412,12 @@ const char kSensorNames[] PROGMEM =
D_SENSOR_ADE7880_IRQ "|"
D_SENSOR_RESET "|"
D_SENSOR_MS01 "|"
D_SENSOR_SDIO_CMD "|"
D_SENSOR_SDIO_CLK "|"
D_SENSOR_SDIO_D0 "|"
D_SENSOR_SDIO_D1 "|"
D_SENSOR_SDIO_D2 "|"
D_SENSOR_SDIO_D3 "|"
;
const char kSensorNamesFixed[] PROGMEM =
@ -516,13 +523,22 @@ const uint16_t kGpioNiceList[] PROGMEM = {
AGPIO(GPIO_RC522_RST), // RC522 Rfid Reset
#endif
#ifdef USE_SDCARD
AGPIO(GPIO_SDCARD_CS),
AGPIO(GPIO_SDCARD_CS), // SDCard in SPI mode
#endif // USE_SDCARD
#ifdef USE_MCP2515
AGPIO(GPIO_MCP2515_CS),
#endif // USE_MCP2515
#endif // USE_SPI
#if defined(USE_SDCARD) && defined(ESP32)
AGPIO(GPIO_SDIO_CMD), // SDCard in SDIO mode
AGPIO(GPIO_SDIO_CLK),
AGPIO(GPIO_SDIO_D0),
AGPIO(GPIO_SDIO_D1), // (opt) if in 4-bit mode, DAT1-3 are needed
AGPIO(GPIO_SDIO_D2),
AGPIO(GPIO_SDIO_D3),
#endif // USE_SDCARD
AGPIO(GPIO_SSPI_MISO), // Software SPI Master Input Client Output
AGPIO(GPIO_SSPI_MOSI), // Software SPI Master Output Client Input
AGPIO(GPIO_SSPI_SCLK), // Software SPI Serial Clock

47
tasmota/xdrv_50_filesystem.ino
View File

@ -41,10 +41,6 @@ ufsfree free size in kB
#define XDRV_50 50
#ifndef SDCARD_CS_PIN
#define SDCARD_CS_PIN 4
#endif
#define UFS_TNONE 0
#define UFS_TSDC 1
#define UFS_TFAT 2
@ -141,17 +137,14 @@ void UfsInit(void) {
#ifdef USE_SDCARD
void UfsCheckSDCardInit(void) {
if (TasmotaGlobal.spi_enabled) {
int8_t cs = SDCARD_CS_PIN;
if (PinUsed(GPIO_SDCARD_CS)) {
cs = Pin(GPIO_SDCARD_CS);
}
// Try SPI mode first
// SPI mode requires SDCARD_CS to be configured
if (TasmotaGlobal.spi_enabled && PinUsed(GPIO_SDCARD_CS)) {
int8_t cs = Pin(GPIO_SDCARD_CS);
#ifdef EPS8266
SPI.begin();
#endif // EPS8266
#ifdef ESP32
SPI.begin(Pin(GPIO_SPI_CLK), Pin(GPIO_SPI_MISO), Pin(GPIO_SPI_MOSI), -1);
#endif // ESP32
@ -160,10 +153,10 @@ void UfsCheckSDCardInit(void) {
#ifdef ESP8266
ufsp = &SDFS;
#endif // ESP8266
#ifdef ESP32
ufsp = &SD;
#endif // ESP32
ufs_type = UFS_TSDC;
dfsp = ufsp;
if (ffsp) {ufs_dir = 1;}
@ -173,10 +166,38 @@ void UfsCheckSDCardInit(void) {
AddLog(LOG_LEVEL_INFO, PSTR("UFS: SDCard mounted"));
#endif // ESP8266
#ifdef ESP32
AddLog(LOG_LEVEL_INFO, PSTR("UFS: SDCard mounted with %d kB free"), UfsInfo(1, 0));
AddLog(LOG_LEVEL_INFO, PSTR("UFS: SDCard mounted (SPI mode) with %d kB free"), UfsInfo(1, 0));
#endif // ESP32
}
}
#ifdef ESP32
// check if SDIO is configured
else if (PinUsed(GPIO_SDIO_CLK) && PinUsed(GPIO_SDIO_CMD) && PinUsed(GPIO_SDIO_D0)) {
int32_t sdio_cmd = Pin(GPIO_SDIO_CMD);
int32_t sdio_clk = Pin(GPIO_SDIO_CLK);
int32_t sdio_d0 = Pin(GPIO_SDIO_D0);
int32_t sdio_d1 = Pin(GPIO_SDIO_D1);
int32_t sdio_d2 = Pin(GPIO_SDIO_D2);
int32_t sdio_d3 = Pin(GPIO_SDIO_D3);
bool bit_4_mode = (sdio_d1 >= 0) && (sdio_d2 >= 0) && (sdio_d3 >= 0); // enable 4-bit mode if possible
if (bit_4_mode) {
// AddLog(LOG_LEVEL_DEBUG, "UFS: trying SDIO 4-bit clk=%i cmd=%i d0=%i d1=%i d2=%i d3=%i", sdio_clk, sdio_cmd, sdio_d0, sdio_d1, sdio_d2, sdio_d3);
SD_MMC.setPins(sdio_clk, sdio_cmd, sdio_d0, sdio_d1, sdio_d2, sdio_d3);
} else {
// AddLog(LOG_LEVEL_DEBUG, "UFS: trying SDIO 1-bit clk=%i cmd=%i d0=%i", sdio_clk, sdio_cmd, sdio_d0);
SD_MMC.setPins(sdio_clk, sdio_cmd, sdio_d0);
}
if (SD_MMC.begin("/sd", !bit_4_mode /*mode 1 bit*/, false /*format_if_failed*/)) { // mount under "/sd" to be consistent with SD SPI
ufsp = &SD_MMC;
ufs_type = UFS_TSDC;
dfsp = ufsp;
if (ffsp) {ufs_dir = 1;}
// make sd card the global filesystem
AddLog(LOG_LEVEL_INFO, PSTR("UFS: SDCard mounted (SDIO %i-bit) with %d kB free"), bit_4_mode ? 4 : 1, UfsInfo(1, 0));
}
}
#endif
}
#endif // USE_SDCARD