GitHub-Proxy/ESP3D
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/luc-github/ESP3D.git synced 2025-08-05 18:40:46 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix compilation if TIMESTAMP SD is enabled

Browse Source
This commit is contained in:
Luc 2022-06-19 12:29:25 +08:00
parent 488aea69ea
commit 5b2417af22
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
esp3d/src/modules/filesystem/sd/sd_sdfat2_esp32.cpp
View File

@ -74,15 +74,14 @@ time_t getDateTimeFile(File & filehandle)
struct tm timefile;
uint16_t date;
uint16_t time;
getModifyDateTime(&date, &time)
if(filehandle) {
if (filehandle.getModifyDateTime(&date, &time)) {
timefile.tm_year = FAT_YEAR(date) - 1900;
timefile.tm_mon = FAT_MONTH(date) - 1;
timefile.tm_mday = FAT_DAY(date);
timefile.tm_hour = FAT_HOUR(time);
timefile.tm_min = FAT_MINUTE(time);
timefile.tm_sec = FAT_SECOND(time);
timefile.tm_year = FS_YEAR(date) - 1900;
timefile.tm_mon = FS_MONTH(date) - 1;
timefile.tm_mday = FS_DAY(date);
timefile.tm_hour = FS_HOUR(time);
timefile.tm_min = FS_MINUTE(time);
timefile.tm_sec = FS_SECOND(time);
timefile.tm_isdst = -1;
dt = mktime(&timefile);
if (dt == -1) {

13
esp3d/src/modules/filesystem/sd/sd_sdfat2_esp8266.cpp
View File

@ -59,15 +59,14 @@ time_t getDateTimeFile(sdfat::File & filehandle)
struct tm timefile;
uint16_t date;
uint16_t time;
getModifyDateTime(&date, &time)
if(filehandle) {
if (filehandle.getModifyDateTime(&date, &time)) {
timefile.tm_year = FAT_YEAR(date) - 1900;
timefile.tm_mon = FAT_MONTH(date) - 1;
timefile.tm_mday = FAT_DAY(date);
timefile.tm_hour = FAT_HOUR(time);
timefile.tm_min = FAT_MINUTE(time);
timefile.tm_sec = FAT_SECOND(time);
timefile.tm_year = FS_YEAR(date) - 1900;
timefile.tm_mon = FS_MONTH(date) - 1;
timefile.tm_mday = FS_DAY(date);
timefile.tm_hour = FS_HOUR(time);
timefile.tm_min = FS_MINUTE(time);
timefile.tm_sec = FS_SECOND(time);
timefile.tm_isdst = -1;
dt = mktime(&timefile);
if (dt == -1) {