diff options
| author | Damien George <damien.p.george@gmail.com> | 2014-07-02 14:10:18 +0100 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2014-07-02 14:10:18 +0100 |
| commit | 5e6419cb11b2897e29ab6dd5b74245d5b42742cf (patch) | |
| tree | 7c9519100291697b52c3e08231bd3b39cc67f93c /stmhal/main.c | |
| parent | 9cd96cf25d4b044288a923dae63e8e7d8c261c7b (diff) | |
| parent | e70b5dbe589ea1c085247ca21c7b4d0efd972c27 (diff) | |
| download | micropython-5e6419cb11b2897e29ab6dd5b74245d5b42742cf.tar.gz micropython-5e6419cb11b2897e29ab6dd5b74245d5b42742cf.zip | |
Merge branch 'dhylands-add-timer-deinit'
Diffstat (limited to 'stmhal/main.c')
| -rw-r--r-- | stmhal/main.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/stmhal/main.c b/stmhal/main.c index 0e260e18cd..ae4ff5141c 100644 --- a/stmhal/main.c +++ b/stmhal/main.c @@ -549,6 +549,7 @@ soft_reset: storage_flush(); printf("PYB: soft reboot\n"); + timer_deinit(); first_soft_reset = false; goto soft_reset; |