Skip to content
Snippets Groups Projects
Commit 1631a288 authored by dx's avatar dx
Browse files

Merge branch 'add-utime-unix_time-expansion' into 'master'

pycardium/utime: add unix_time and unix_time_ms

See merge request card10/firmware!290
parents 95e9c024 f736c0b3
No related branches found
No related tags found
No related merge requests found
......@@ -52,6 +52,8 @@ Q(monotonic)
Q(monotonic_ms)
Q(time)
Q(time_ms)
Q(unix_time)
Q(unix_time_ms)
Q(set_time)
Q(set_unix_time)
......
......@@ -51,6 +51,20 @@ static mp_obj_t time_time_ms(void)
}
MP_DEFINE_CONST_FUN_OBJ_0(time_time_ms_obj, time_time_ms);
static mp_obj_t time_unix_time(void)
{
mp_int_t seconds = epic_rtc_get_seconds();
return mp_obj_new_int(seconds);
}
MP_DEFINE_CONST_FUN_OBJ_0(time_unix_time_obj, time_unix_time);
static mp_obj_t time_unix_time_ms(void)
{
uint64_t milliseconds = epic_rtc_get_milliseconds();
return mp_obj_new_int_from_ull(milliseconds);
}
MP_DEFINE_CONST_FUN_OBJ_0(time_unix_time_ms_obj, time_unix_time_ms);
static mp_obj_t time_monotonic(void)
{
mp_int_t seconds;
......@@ -146,6 +160,9 @@ 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_time), MP_ROM_PTR(&time_time_obj) },
{ MP_ROM_QSTR(MP_QSTR_time_ms), MP_ROM_PTR(&time_time_ms_obj) },
{ MP_ROM_QSTR(MP_QSTR_unix_time), MP_ROM_PTR(&time_unix_time_obj) },
{ MP_ROM_QSTR(MP_QSTR_unix_time_ms),
MP_ROM_PTR(&time_unix_time_ms_obj) },
{ MP_ROM_QSTR(MP_QSTR_monotonic), MP_ROM_PTR(&time_monotonic_obj) },
{ MP_ROM_QSTR(MP_QSTR_monotonic_ms),
MP_ROM_PTR(&time_monotonic_ms_obj) },
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment