Skip to content

Commit 5e38b48

Browse files
author
Daniel Campora
committed
cc3200: Fix time.localtime() so that it returns the correct fields.
1 parent 56053c3 commit 5e38b48

1 file changed

Lines changed: 2 additions & 4 deletions

File tree

cc3200/mods/modutime.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,11 +73,11 @@ STATIC mp_obj_t time_localtime(mp_uint_t n_args, const mp_obj_t *args) {
7373
mp_obj_new_int(tm.tm_year),
7474
mp_obj_new_int(tm.tm_mon),
7575
mp_obj_new_int(tm.tm_mday),
76-
mp_obj_new_int(tm.tm_wday),
7776
mp_obj_new_int(tm.tm_hour),
7877
mp_obj_new_int(tm.tm_min),
7978
mp_obj_new_int(tm.tm_sec),
80-
mp_obj_new_int(mseconds)
79+
mp_obj_new_int(tm.tm_wday),
80+
mp_obj_new_int(tm.tm_yday)
8181
};
8282
return mp_obj_new_tuple(8, tuple);
8383
} else {
@@ -105,7 +105,6 @@ MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(time_localtime_obj, 0, 1, time_localtime);
105105
/// which expresses a time as per localtime. It returns an integer which is
106106
/// the number of seconds since Jan 1, 2000.
107107
STATIC mp_obj_t time_mktime(mp_obj_t tuple) {
108-
109108
mp_uint_t len;
110109
mp_obj_t *elem;
111110

@@ -119,7 +118,6 @@ STATIC mp_obj_t time_mktime(mp_obj_t tuple) {
119118
return mp_obj_new_int_from_uint(timeutils_mktime(mp_obj_get_int(elem[0]),
120119
mp_obj_get_int(elem[1]), mp_obj_get_int(elem[2]), mp_obj_get_int(elem[3]),
121120
mp_obj_get_int(elem[4]), mp_obj_get_int(elem[5])));
122-
123121
}
124122
MP_DEFINE_CONST_FUN_OBJ_1(time_mktime_obj, time_mktime);
125123

0 commit comments

Comments
 (0)