Commit fd1ffbc2 authored by Rahix's avatar Rahix
Browse files

Merge 'fix-utime' into 'master'

fix(utime.c): make set_time correctly subtract TZONE_OFFSET

See merge request card10/firmware!184
parents 08d8d9a1 db1f8d07
......@@ -20,7 +20,7 @@
static mp_obj_t time_set_time(mp_obj_t secs)
{
uint64_t timestamp = mp_obj_get_int(secs) * 1000ULL +
EPOCH_OFFSET * 1000ULL + TZONE_OFFSET;
EPOCH_OFFSET * 1000ULL - TZONE_OFFSET * 1000ULL;
epic_rtc_set_milliseconds(timestamp);
return mp_const_none;
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment