rebase micropython, min_time -> peektime

2017-03-30 23:18:13 +02:00 · 2017-03-30 23:18:13 +02:00 · f13c122561
parent dd69929ce1
commit f13c122561
2 changed files with 2 additions and 2 deletions
--- a/src/trezor/loop.py
+++ b/src/trezor/loop.py
@ -92,7 +92,7 @@ def run_forever():
        # compute the maximum amount of time we can wait for a message
        if _scheduled_tasks:
            delay = utime.ticks_diff(
-                _scheduled_tasks.min_time(), utime.ticks_us())
+                _scheduled_tasks.peektime(), utime.ticks_us())
        else:
            delay = _MAX_SELECT_DELAY

--- a/vendor/micropython
+++ b/vendor/micropython
@ -1 +1 @@
-Subproject commit bf2d7b10934242b56833d30a91d0ce1beae097e0
+Subproject commit 6e6c01b97189a95b59a037fa7dabcf8217f199af