Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
M
micropython
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
card10
micropython
Commits
f0628f54
Commit
f0628f54
authored
Oct 19, 2017
by
Nick Moore
Committed by
Damien George
Dec 13, 2017
Browse files
Options
Downloads
Patches
Plain Diff
esp32/modutime.c: Add localtime and mktime functions.
parent
ba2d9602
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
ports/esp32/modutime.c
+45
-0
45 additions, 0 deletions
ports/esp32/modutime.c
with
45 additions
and
0 deletions
ports/esp32/modutime.c
+
45
−
0
View file @
f0628f54
...
@@ -30,8 +30,51 @@
...
@@ -30,8 +30,51 @@
#include
<string.h>
#include
<string.h>
#include
<sys/time.h>
#include
<sys/time.h>
#include
"py/runtime.h"
#include
"lib/timeutils/timeutils.h"
#include
"extmod/utime_mphal.h"
#include
"extmod/utime_mphal.h"
STATIC
mp_obj_t
time_localtime
(
size_t
n_args
,
const
mp_obj_t
*
args
)
{
timeutils_struct_time_t
tm
;
mp_int_t
seconds
;
if
(
n_args
==
0
||
args
[
0
]
==
mp_const_none
)
{
struct
timeval
tv
;
gettimeofday
(
&
tv
,
NULL
);
seconds
=
tv
.
tv_sec
;
}
else
{
seconds
=
mp_obj_get_int
(
args
[
0
]);
}
timeutils_seconds_since_2000_to_struct_time
(
seconds
,
&
tm
);
mp_obj_t
tuple
[
8
]
=
{
tuple
[
0
]
=
mp_obj_new_int
(
tm
.
tm_year
),
tuple
[
1
]
=
mp_obj_new_int
(
tm
.
tm_mon
),
tuple
[
2
]
=
mp_obj_new_int
(
tm
.
tm_mday
),
tuple
[
3
]
=
mp_obj_new_int
(
tm
.
tm_hour
),
tuple
[
4
]
=
mp_obj_new_int
(
tm
.
tm_min
),
tuple
[
5
]
=
mp_obj_new_int
(
tm
.
tm_sec
),
tuple
[
6
]
=
mp_obj_new_int
(
tm
.
tm_wday
),
tuple
[
7
]
=
mp_obj_new_int
(
tm
.
tm_yday
),
};
return
mp_obj_new_tuple
(
8
,
tuple
);
}
STATIC
MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN
(
time_localtime_obj
,
0
,
1
,
time_localtime
);
STATIC
mp_obj_t
time_mktime
(
mp_obj_t
tuple
)
{
size_t
len
;
mp_obj_t
*
elem
;
mp_obj_get_array
(
tuple
,
&
len
,
&
elem
);
// localtime generates a tuple of len 8. CPython uses 9, so we accept both.
if
(
len
<
8
||
len
>
9
)
{
nlr_raise
(
mp_obj_new_exception_msg_varg
(
&
mp_type_TypeError
,
"mktime needs a tuple of length 8 or 9 (%d given)"
,
len
));
}
return
mp_obj_new_int_from_uint
(
timeutils_mktime
(
mp_obj_get_int
(
elem
[
0
]),
mp_obj_get_int
(
elem
[
1
]),
mp_obj_get_int
(
elem
[
2
]),
mp_obj_get_int
(
elem
[
3
]),
mp_obj_get_int
(
elem
[
4
]),
mp_obj_get_int
(
elem
[
5
])));
}
STATIC
MP_DEFINE_CONST_FUN_OBJ_1
(
time_mktime_obj
,
time_mktime
);
STATIC
mp_obj_t
time_time
(
void
)
{
STATIC
mp_obj_t
time_time
(
void
)
{
struct
timeval
tv
;
struct
timeval
tv
;
gettimeofday
(
&
tv
,
NULL
);
gettimeofday
(
&
tv
,
NULL
);
...
@@ -42,6 +85,8 @@ MP_DEFINE_CONST_FUN_OBJ_0(time_time_obj, time_time);
...
@@ -42,6 +85,8 @@ MP_DEFINE_CONST_FUN_OBJ_0(time_time_obj, time_time);
STATIC
const
mp_rom_map_elem_t
time_module_globals_table
[]
=
{
STATIC
const
mp_rom_map_elem_t
time_module_globals_table
[]
=
{
{
MP_ROM_QSTR
(
MP_QSTR___name__
),
MP_ROM_QSTR
(
MP_QSTR_utime
)
},
{
MP_ROM_QSTR
(
MP_QSTR___name__
),
MP_ROM_QSTR
(
MP_QSTR_utime
)
},
{
MP_ROM_QSTR
(
MP_QSTR_localtime
),
MP_ROM_PTR
(
&
time_localtime_obj
)
},
{
MP_ROM_QSTR
(
MP_QSTR_mktime
),
MP_ROM_PTR
(
&
time_mktime_obj
)
},
{
MP_ROM_QSTR
(
MP_QSTR_time
),
MP_ROM_PTR
(
&
time_time_obj
)
},
{
MP_ROM_QSTR
(
MP_QSTR_time
),
MP_ROM_PTR
(
&
time_time_obj
)
},
{
MP_ROM_QSTR
(
MP_QSTR_sleep
),
MP_ROM_PTR
(
&
mp_utime_sleep_obj
)
},
{
MP_ROM_QSTR
(
MP_QSTR_sleep
),
MP_ROM_PTR
(
&
mp_utime_sleep_obj
)
},
{
MP_ROM_QSTR
(
MP_QSTR_sleep_ms
),
MP_ROM_PTR
(
&
mp_utime_sleep_ms_obj
)
},
{
MP_ROM_QSTR
(
MP_QSTR_sleep_ms
),
MP_ROM_PTR
(
&
mp_utime_sleep_ms_obj
)
},
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment