Skip to content

Commit 8de6ca3

Browse files
committed
Fixed bug in utime.mktime()
not enough precission in returned float value
1 parent 978b699 commit 8de6ca3

21 files changed

+12
-12
lines changed

MicroPython_BUILD/components/micropython/docs/zones.csv

+7-7
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
"Africa/Nouakchott","GMT0"
4747
"Africa/Ouagadougou","GMT0"
4848
"Africa/Porto-Novo","WAT-1"
49-
"Africa/Sao_Tome","GMT0"
49+
"Africa/Sao_Tome","WAT-1"
5050
"Africa/Tripoli","EET-2"
5151
"Africa/Tunis","CET-1"
5252
"Africa/Windhoek","CAT-2"
@@ -80,7 +80,7 @@
8080
"America/Bogota","<-05>5"
8181
"America/Boise","MST7MDT,M3.2.0,M11.1.0"
8282
"America/Cambridge_Bay","MST7MDT,M3.2.0,M11.1.0"
83-
"America/Campo_Grande","<-04>4<-03>,M10.3.0/0,M2.3.0/0"
83+
"America/Campo_Grande","<-04>4<-03>,M11.1.0/0,M2.3.0/0"
8484
"America/Cancun","EST5"
8585
"America/Caracas","<-04>4"
8686
"America/Cayenne","<-03>3"
@@ -89,7 +89,7 @@
8989
"America/Chihuahua","MST7MDT,M4.1.0,M10.5.0"
9090
"America/Costa_Rica","CST6"
9191
"America/Creston","MST7"
92-
"America/Cuiaba","<-04>4<-03>,M10.3.0/0,M2.3.0/0"
92+
"America/Cuiaba","<-04>4<-03>,M11.1.0/0,M2.3.0/0"
9393
"America/Curacao","AST4"
9494
"America/Danmarkshavn","GMT0"
9595
"America/Dawson","PST8PDT,M3.2.0,M11.1.0"
@@ -177,7 +177,7 @@
177177
"America/Santarem","<-03>3"
178178
"America/Santiago","<-04>4<-03>,M8.2.6/24,M5.2.6/24"
179179
"America/Santo_Domingo","AST4"
180-
"America/Sao_Paulo","<-03>3<-02>,M10.3.0/0,M2.3.0/0"
180+
"America/Sao_Paulo","<-03>3<-02>,M11.1.0/0,M2.3.0/0"
181181
"America/Scoresbysund","<-01>1<+00>,M3.5.0/0,M10.5.0/1"
182182
"America/Sitka","AKST9AKDT,M3.2.0,M11.1.0"
183183
"America/St_Barthelemy","AST4"
@@ -198,7 +198,7 @@
198198
"America/Winnipeg","CST6CDT,M3.2.0,M11.1.0"
199199
"America/Yakutat","AKST9AKDT,M3.2.0,M11.1.0"
200200
"America/Yellowknife","MST7MDT,M3.2.0,M11.1.0"
201-
"Antarctica/Casey","<+11>-11"
201+
"Antarctica/Casey","<+08>-8"
202202
"Antarctica/Davis","<+07>-7"
203203
"Antarctica/DumontDUrville","<+10>-10"
204204
"Antarctica/Macquarie","<+11>-11"
@@ -235,8 +235,8 @@
235235
"Asia/Dubai","<+04>-4"
236236
"Asia/Dushanbe","<+05>-5"
237237
"Asia/Famagusta","EET-2EEST,M3.5.0/3,M10.5.0/4"
238-
"Asia/Gaza","EET-2EEST,M3.5.6/1,M10.5.6/1"
239-
"Asia/Hebron","EET-2EEST,M3.5.6/1,M10.5.6/1"
238+
"Asia/Gaza","EET-2EEST,M3.4.6/1,M10.5.6/1"
239+
"Asia/Hebron","EET-2EEST,M3.4.6/1,M10.5.6/1"
240240
"Asia/Ho_Chi_Minh","<+07>-7"
241241
"Asia/Hong_Kong","HKT-8"
242242
"Asia/Hovd","<+07>-7"

MicroPython_BUILD/components/micropython/esp32/modutime.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ STATIC mp_obj_t time_mktime(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t
171171

172172
time_t seconds = mktime(&tm_inf);
173173

174-
return mp_obj_new_float((float)seconds);
174+
return mp_obj_new_float((double)seconds);
175175
}
176176
STATIC MP_DEFINE_CONST_FUN_OBJ_KW(time_mktime_obj, 1, time_mktime);
177177

MicroPython_BUILD/components/micropython/esp32/mpversion.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@
2424
* THE SOFTWARE.
2525
*/
2626

27-
#define MICROPY_GIT_TAG "ESP32_LoBo_v3.1.28"
27+
#define MICROPY_GIT_TAG "ESP32_LoBo_v3.1.29"
2828
#define MICROPY_GIT_HASH "g84788230"
29-
#define MICROPY_BUILD_DATE "2018-03-29"
29+
#define MICROPY_BUILD_DATE "2018-03-31"
3030
#define MICROPY_VERSION_MAJOR (3)
3131
#define MICROPY_VERSION_MINOR (1)
32-
#define MICROPY_VERSION_MICRO (28)
33-
#define MICROPY_VERSION_STRING "3.1.28"
32+
#define MICROPY_VERSION_MICRO (29)
33+
#define MICROPY_VERSION_STRING "3.1.29"
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
0 Bytes
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)