diff options
| author | Damien George | 2014-07-02 13:42:37 +0100 |
|---|---|---|
| committer | Damien George | 2014-07-02 13:42:37 +0100 |
| commit | 7a37f647a5d953a47a6147cf8302e08f27537771 (patch) | |
| tree | 5f6bdb76cac3f59334431f62a3920f39ceca8b8b /stmhal/pin_named_pins.c | |
| parent | 5fc580475f5eba8248de86a4148090e63f777372 (diff) | |
| parent | 4f1b7fec9f103c92de40875e9a06b7decc4923f4 (diff) | |
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/pin_named_pins.c')
| -rw-r--r-- | stmhal/pin_named_pins.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/stmhal/pin_named_pins.c b/stmhal/pin_named_pins.c index d59ba8d11..dbf03d1a0 100644 --- a/stmhal/pin_named_pins.c +++ b/stmhal/pin_named_pins.c @@ -28,13 +28,12 @@ #include <stdint.h> #include <string.h> -#include "stm32f4xx_hal.h" - #include "mpconfig.h" #include "misc.h" #include "qstr.h" #include "obj.h" #include "runtime.h" +#include MICROPY_HAL_H #include "pin.h" STATIC void pin_named_pins_obj_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t self_in, mp_print_kind_t kind) { |