diff options
| author | Damien George <damien.p.george@gmail.com> | 2014-07-02 13:42:37 +0100 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2014-07-02 13:42:37 +0100 |
| commit | 7a37f647a5d953a47a6147cf8302e08f27537771 (patch) | |
| tree | 5f6bdb76cac3f59334431f62a3920f39ceca8b8b /stmhal/pyexec.c | |
| parent | 5fc580475f5eba8248de86a4148090e63f777372 (diff) | |
| parent | 4f1b7fec9f103c92de40875e9a06b7decc4923f4 (diff) | |
| download | micropython-7a37f647a5d953a47a6147cf8302e08f27537771.tar.gz micropython-7a37f647a5d953a47a6147cf8302e08f27537771.zip | |
Merge branch 'teensy-new' of github.com:dhylands/micropython into dhylands-teensy-new
Conflicts:
stmhal/pin_named_pins.c
stmhal/readline.c
Renamed HAL_H to MICROPY_HAL_H. Made stmhal/mphal.h which intends to
define the generic Micro Python HAL, which in stmhal sits above the ST
HAL.
Diffstat (limited to 'stmhal/pyexec.c')
| -rw-r--r-- | stmhal/pyexec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/stmhal/pyexec.c b/stmhal/pyexec.c index baf6ddfb34..93f4d62a96 100644 --- a/stmhal/pyexec.c +++ b/stmhal/pyexec.c @@ -26,8 +26,7 @@ #include <stdlib.h> #include <stdio.h> - -#include <stm32f4xx_hal.h> +#include <stdint.h> #include "mpconfig.h" #include "nlr.h" @@ -43,6 +42,7 @@ #include "repl.h" #include "gc.h" #include "gccollect.h" +#include MICROPY_HAL_H #include "systick.h" #include "pybstdio.h" #include "readline.h" |