|
23 | 23 | #include <time.h> |
24 | 24 |
|
25 | 25 | #include "esp_sd.h" |
26 | | -/* |
27 | | -#define ESP_MAX_SD_OPENHANDLE 4 |
28 | | -#if (SD_DEVICE == ESP_SD_NATIVE) && defined(ARDUINO_ARCH_ESP8266) |
29 | | -#define FS_NO_GLOBALS |
30 | | -#include <SD.h> |
31 | | -File tSDFile_handle[ESP_MAX_SD_OPENHANDLE]; |
32 | | -#elif ((SD_DEVICE == ESP_SDFAT) || (SD_DEVICE == ESP_SDFAT2)) && \ |
33 | | - defined(ARDUINO_ARCH_ESP8266) |
34 | | -#define FS_NO_GLOBALS |
35 | | -#define NO_GLOBAL_SD |
36 | | -#include <SdFat.h> |
37 | | -#if SDFAT_FILE_TYPE == 1 |
38 | | -typedef File32 File; |
39 | | -#elif SDFAT_FILE_TYPE == 2 |
40 | | -typedef ExFile File; |
41 | | -#elif SDFAT_FILE_TYPE == 3 |
42 | | -typedef FsFile File; |
43 | | -#else // SDFAT_FILE_TYPE |
44 | | -#error Invalid SDFAT_FILE_TYPE |
45 | | -#endif // SDFAT_FILE_TYPE |
46 | | -File tSDFile_handle[ESP_MAX_SD_OPENHANDLE]; |
47 | | -#elif ((SD_DEVICE == ESP_SDFAT) || (SD_DEVICE == ESP_SDFAT2)) && \ |
48 | | - defined(ARDUINO_ARCH_ESP32) |
49 | | -#include <SdFat.h> |
50 | | -#if (SD_DEVICE == ESP_SDFAT2) |
51 | | -#if SDFAT_FILE_TYPE == 1 |
52 | | -typedef File32 File; |
53 | | -#elif SDFAT_FILE_TYPE == 2 |
54 | | -typedef ExFile File; |
55 | | -#elif SDFAT_FILE_TYPE == 3 |
56 | | -typedef FsFile File; |
57 | | -#else // SDFAT_FILE_TYPE |
58 | | -#error Invalid SDFAT_FILE_TYPE |
59 | | -#endif // SDFAT_FILE_TYPE |
60 | | -#endif |
61 | | -File tSDFile_handle[ESP_MAX_SD_OPENHANDLE]; |
62 | | -#else |
63 | | -#include <FS.h> |
64 | | -File tSDFile_handle[ESP_MAX_SD_OPENHANDLE]; |
65 | | -#endif*/ |
| 26 | + |
66 | 27 |
|
67 | 28 | #if defined(ESP3DLIB_ENV) |
68 | 29 | #include "../../include/Marlin/cardreader.h" |
@@ -138,8 +99,6 @@ bool ESP_SD::disableSharedSD() { |
138 | 99 | bool ESP_SD::_started = false; |
139 | 100 | uint8_t ESP_SD::_state = ESP_SDCARD_NOT_PRESENT; |
140 | 101 | uint8_t ESP_SD::_spi_speed_divider = 1; |
141 | | - |
142 | | - |
143 | 102 | bool ESP_SD::_sizechanged = true; |
144 | 103 | uint8_t ESP_SD::setState(uint8_t flag) { |
145 | 104 | _state = flag; |
|
0 commit comments