summaryrefslogtreecommitdiffstatshomepage
path: root/stmhal/main.c
diff options
context:
space:
mode:
authorDamien George <damien.p.george@gmail.com>2014-07-02 14:06:28 +0100
committerDamien George <damien.p.george@gmail.com>2014-07-02 14:06:28 +0100
commit92a47b4dae14189cfd6572ee6eef09b973069d0d (patch)
treecc2b8729380716c83af74bbb65133366772b6576 /stmhal/main.c
parent9cd96cf25d4b044288a923dae63e8e7d8c261c7b (diff)
parent0d81c133b31774058408a5f1d1a058d9734a9def (diff)
downloadmicropython-92a47b4dae14189cfd6572ee6eef09b973069d0d.tar.gz
micropython-92a47b4dae14189cfd6572ee6eef09b973069d0d.zip
Merge branch 'add-timer-deinit' of github.com:dhylands/micropython into dhylands-add-timer-deinit
Diffstat (limited to 'stmhal/main.c')
-rw-r--r--stmhal/main.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/stmhal/main.c b/stmhal/main.c
index 0e260e18cd..c674574575 100644
--- a/stmhal/main.c
+++ b/stmhal/main.c
@@ -548,6 +548,8 @@ soft_reset:
printf("PYB: sync filesystems\n");
storage_flush();
+ timer_deinit();
+
printf("PYB: soft reboot\n");
first_soft_reset = false;