Fixed to be compatibility with esp8266 earlier than 2.5.0

pull/83/head
Hieromon Ikasamo 6 years ago
parent c7a839d9cd
commit 46c4fbc943
  1. 12
      src/AutoConnectDefs.h
  2. 20
      src/AutoConnectUploadImpl.h

@ -132,18 +132,6 @@
#define AUTOCONNECT_SSIDPAGEUNIT_LINES 5 #define AUTOCONNECT_SSIDPAGEUNIT_LINES 5
#endif // !AUTOCONNECT_SSIDPAGEUNIT_LINES #endif // !AUTOCONNECT_SSIDPAGEUNIT_LINES
// SD pin assignment for AutoConnectFile
#ifndef AUTOCONNECT_SD_CS
#if defined(ARDUINO_ARCH_ESP8266)
#ifndef SD_CHIP_SELECT_PIN
#define SD_CHIP_SELECT_PIN SS
#endif
#define AUTOCONNECT_SD_CS SD_CHIP_SELECT_PIN
#elif defined(ARDUINO_ARCH_ESP32)
#define AUTOCONNECT_SD_CS SS
#endif
#endif // !AUTOCONNECT_SD_CS
// SPI transfer speed for SD // SPI transfer speed for SD
#ifndef AUTOCONNECT_SD_SPEED #ifndef AUTOCONNECT_SD_SPEED
#define AUTOCONNECT_SD_SPEED 4000000 #define AUTOCONNECT_SD_SPEED 4000000

@ -104,11 +104,23 @@ class AutoConnectUploadFS : public AutoConnectUploadHandler {
}; };
// Fix to be compatibility with backward for ESP8266 core 2.5.1 or later // Fix to be compatibility with backward for ESP8266 core 2.5.1 or later
// SD pin assignment for AutoConnectFile
#ifndef AUTOCONNECT_SD_CS
#if defined(ARDUINO_ARCH_ESP8266)
#ifndef SD_CHIP_SELECT_PIN
#define SD_CHIP_SELECT_PIN SS
#endif
#define AUTOCONNECT_SD_CS SD_CHIP_SELECT_PIN
#elif defined(ARDUINO_ARCH_ESP32)
#define AUTOCONNECT_SD_CS SS
#endif
#endif // !AUTOCONNECT_SD_CS
// Derivation of SCK frequency and ensuring SD.begin compatibility
#ifdef ARDUINO_ARCH_ESP8266 #ifdef ARDUINO_ARCH_ESP8266
#if defined(SD_SCK_HZ) #if defined(SD_SCK_HZ)
#define AC_SD_SPEED(s) SD_SCK_HZ(s) #define AC_SD_SPEED(s) SD_SCK_HZ(s)
#else #else
#define AC_SD_SPPED(s) s #define AC_SD_SPEED(s) s
#endif #endif
#endif #endif
@ -126,13 +138,13 @@ class AutoConnectUploadSD : public AutoConnectUploadHandler {
uint8_t oflag = *mode == 'w' ? FILE_WRITE : FILE_READ; uint8_t oflag = *mode == 'w' ? FILE_WRITE : FILE_READ;
uint8_t sdType = _media->type(); uint8_t sdType = _media->type();
switch (sdType) { switch (sdType) {
case sdfat::SD_CARD_TYPE_SD1: case 1: // SD_CARD_TYPE_SD1
sdVerify = (const char*)"MMC"; sdVerify = (const char*)"MMC";
break; break;
case sdfat::SD_CARD_TYPE_SD2: case 2: // SD_CARD_TYPE_SD2
sdVerify = (const char*)"SDSC"; sdVerify = (const char*)"SDSC";
break; break;
case sdfat::SD_CARD_TYPE_SDHC: case 3: // SD_CARD_TYPE_SDHC
sdVerify = (const char*)"SDHC"; sdVerify = (const char*)"SDHC";
break; break;
default: default:

Loading…
Cancel
Save