Skip to content

Commit 23067a1

Browse files
robert-hhpfalcon
authored andcommitted
esp8266: Use RTC to set date & time stamps for files.
The time stamp is taken from the RTC for all newly generated or changed files. RTC must be maintained separately. The dummy time stamp of Jan 1, 2000 is set in vfs.stat() for the root directory, avoiding invalid time values.
1 parent d0416ff commit 23067a1

2 files changed

Lines changed: 41 additions & 4 deletions

File tree

esp8266/fatfs_port.c

Lines changed: 39 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,43 @@
1+
/*
2+
* This file is part of the Micro Python project, http://micropython.org/
3+
*
4+
* The MIT License (MIT)
5+
*
6+
* Copyright (c) 2013, 2014, 2016 Damien P. George
7+
*
8+
* Permission is hereby granted, free of charge, to any person obtaining a copy
9+
* of this software and associated documentation files (the "Software"), to deal
10+
* in the Software without restriction, including without limitation the rights
11+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
12+
* copies of the Software, and to permit persons to whom the Software is
13+
* furnished to do so, subject to the following conditions:
14+
*
15+
* The above copyright notice and this permission notice shall be included in
16+
* all copies or substantial portions of the Software.
17+
*
18+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
19+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
20+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
21+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
22+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
23+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
24+
* THE SOFTWARE.
25+
*/
26+
27+
#include "py/obj.h"
128
#include "lib/fatfs/ff.h"
2-
#include "lib/fatfs/diskio.h"
29+
#include "timeutils.h"
30+
#include "modpybrtc.h"
331

432
DWORD get_fattime(void) {
5-
return 0;
33+
34+
// TODO: Optimize division (there's no HW division support on ESP8266,
35+
// so it's expensive).
36+
uint32_t secs = (uint32_t)(pyb_rtc_get_us_since_2000() / 1000000);
37+
38+
timeutils_struct_time_t tm;
39+
timeutils_seconds_since_2000_to_struct_time(secs, &tm);
40+
41+
return (((DWORD)(tm.tm_year - 1980) << 25) | ((DWORD)tm.tm_mon << 21) | ((DWORD)tm.tm_mday << 16) |
42+
((DWORD)tm.tm_hour << 11) | ((DWORD)tm.tm_min << 5) | ((DWORD)tm.tm_sec >> 1));
643
}

extmod/vfs_fat.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ STATIC mp_obj_t fat_vfs_stat(mp_obj_t vfs_in, mp_obj_t path_in) {
186186
if (path_equal(path, "/")) {
187187
// stat root directory
188188
fno.fsize = 0;
189-
fno.fdate = 0;
189+
fno.fdate = 0x2821; // Jan 1, 2000
190190
fno.ftime = 0;
191191
fno.fattrib = AM_DIR;
192192
} else {
@@ -196,7 +196,7 @@ STATIC mp_obj_t fat_vfs_stat(mp_obj_t vfs_in, mp_obj_t path_in) {
196196
if (vfs != NULL && path_equal(path, vfs->str)) {
197197
// stat mounted device directory
198198
fno.fsize = 0;
199-
fno.fdate = 0;
199+
fno.fdate = 0x2821; // Jan 1, 2000
200200
fno.ftime = 0;
201201
fno.fattrib = AM_DIR;
202202
res = FR_OK;

0 commit comments

Comments
 (0)