Commit b68d98d6 authored by Damien George's avatar Damien George
Browse files

teensy: Prefix includes with py/; remove need for -I../py.

parent 2cf6dfa2
...@@ -30,8 +30,8 @@ ...@@ -30,8 +30,8 @@
#include "py/nlr.h" #include "py/nlr.h"
#include "py/runtime.h" #include "py/runtime.h"
#include "pin.h"
#include MICROPY_HAL_H #include MICROPY_HAL_H
#include "pin.h"
/// \moduleref pyb /// \moduleref pyb
/// \class Pin - control I/O pins /// \class Pin - control I/O pins
......
...@@ -28,8 +28,8 @@ ...@@ -28,8 +28,8 @@
#include <string.h> #include <string.h>
#include "py/runtime.h" #include "py/runtime.h"
#include "pin.h"
#include MICROPY_HAL_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) { 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) {
pin_named_pins_obj_t *self = self_in; pin_named_pins_obj_t *self = self_in;
......
...@@ -31,7 +31,6 @@ CFLAGS_CORTEX_M4 = -mthumb -mtune=cortex-m4 -mcpu=cortex-m4 -msoft-float -mfloat ...@@ -31,7 +31,6 @@ CFLAGS_CORTEX_M4 = -mthumb -mtune=cortex-m4 -mcpu=cortex-m4 -msoft-float -mfloat
INC = -I. INC = -I.
INC += -I.. INC += -I..
INC += -I$(PY_SRC)
INC += -I../stmhal INC += -I../stmhal
INC += -I$(BUILD) INC += -I$(BUILD)
INC += -Icore INC += -Icore
......
...@@ -26,11 +26,7 @@ ...@@ -26,11 +26,7 @@
#include <stdio.h> #include <stdio.h>
#include "mpconfig.h" #include "py/obj.h"
#include "nlr.h"
#include "misc.h"
#include "qstr.h"
#include "obj.h"
STATIC const char *help_text = STATIC const char *help_text =
"Welcome to Micro Python!\n" "Welcome to Micro Python!\n"
......
#include <stdio.h> #include <stdio.h>
#include <stdint.h>
#include "mpconfig.h"
#include "misc.h"
#include "qstr.h"
#include "lexer.h"
#include "py/lexer.h"
#include "memzip.h" #include "memzip.h"
mp_import_stat_t mp_import_stat(const char *path) { mp_import_stat_t mp_import_stat(const char *path) {
......
#include "mpconfig.h" #include "py/obj.h"
#include "nlr.h"
#include "misc.h"
#include "qstr.h"
#include "parse.h"
#include "obj.h"
#include "../stmhal/lcd.h" #include "../stmhal/lcd.h"
void lcd_init(void) { void lcd_init(void) {
......
...@@ -2,12 +2,8 @@ ...@@ -2,12 +2,8 @@
#include "Arduino.h" #include "Arduino.h"
#include "mpconfig.h" #include "py/nlr.h"
#include "nlr.h" #include "py/runtime.h"
#include "misc.h"
#include "qstr.h"
#include "obj.h"
#include "runtime.h"
#include "led.h" #include "led.h"
#include MICROPY_HAL_H #include MICROPY_HAL_H
#include "pin.h" #include "pin.h"
......
#include <stdint.h>
#include <stdlib.h> #include <stdlib.h>
#include "mpconfig.h" #include "py/lexer.h"
#include "misc.h"
#include "qstr.h"
#include "lexer.h"
#include "memzip.h" #include "memzip.h"
mp_lexer_t *mp_lexer_new_from_file(const char *filename) mp_lexer_t *mp_lexer_new_from_file(const char *filename)
......
...@@ -3,19 +3,15 @@ ...@@ -3,19 +3,15 @@
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include "mpconfig.h" #include "py/nlr.h"
#include "misc.h" #include "py/parse.h"
#include "qstr.h" #include "py/lexer.h"
#include "nlr.h" #include "py/runtime.h"
#include "lexer.h" #include "py/gc.h"
#include "lexermemzip.h"
#include "parse.h"
#include "obj.h"
#include "runtime.h"
#include "gc.h"
#include "gccollect.h" #include "gccollect.h"
#include "pyexec.h" #include "pyexec.h"
#include "readline.h" #include "readline.h"
#include "lexermemzip.h"
#include "Arduino.h" #include "Arduino.h"
#include MICROPY_HAL_H #include MICROPY_HAL_H
......
#include <stdint.h> #include <stdint.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "mpconfigport.h" #include "py/mpconfig.h"
#include "misc.h" #include "py/misc.h"
#include "memzip.h" #include "memzip.h"
extern uint8_t _staticfs[]; extern uint8_t _staticfs[];
......
// stm32fxx-prefix.c becomes the initial portion of the generated pins file. // stm32fxx-prefix.c becomes the initial portion of the generated pins file.
#include <stdio.h> #include <stdio.h>
#include <stdint.h>
#include <mk20dx128.h> #include <mk20dx128.h>
#include "py/obj.h"
#include "teensy_hal.h" #include "teensy_hal.h"
#include "mpconfig.h"
#include "misc.h"
#include "qstr.h"
#include "obj.h"
#include "pin.h" #include "pin.h"
#define AF(af_idx, af_fn, af_unit, af_type, af_ptr) \ #define AF(af_idx, af_fn, af_unit, af_type, af_ptr) \
......
...@@ -29,14 +29,11 @@ ...@@ -29,14 +29,11 @@
#include <mk20dx128.h> #include <mk20dx128.h>
#include "Arduino.h" #include "Arduino.h"
#include "mpconfig.h" #include "py/obj.h"
#include "misc.h" #include "py/gc.h"
#include "teensy_hal.h" #include "teensy_hal.h"
#include "qstr.h"
#include "obj.h"
#include "gc.h"
#include "gccollect.h" #include "gccollect.h"
#include "irq.h" #include "irq.h"
#include "systick.h" #include "systick.h"
......
#include <stdint.h> #include <stdint.h>
#include <mk20dx128.h> #include <mk20dx128.h>
#include "mpconfig.h" #include "py/runtime.h"
#include "nlr.h"
#include "misc.h"
#include "qstr.h"
#include "obj.h"
#include "runtime.h"
#include MICROPY_HAL_H #include MICROPY_HAL_H
#include "pin.h" #include "pin.h"
......
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include "mpconfig.h" #include "py/runtime.h"
#include "nlr.h"
#include "misc.h"
#include "qstr.h"
#include "obj.h"
#include "runtime.h"
#include "reg.h" #include "reg.h"
#if MICROPY_REG #if MICROPY_REG
......
#include <stdio.h> #include <stdio.h>
#include <stdint.h>
#include "mpconfig.h" #include "py/mpconfig.h"
#include "Arduino.h" #include "Arduino.h"
......
...@@ -29,18 +29,13 @@ ...@@ -29,18 +29,13 @@
#include <string.h> #include <string.h>
#include <stddef.h> #include <stddef.h>
#include "mpconfig.h" #include "py/nlr.h"
#include "nlr.h" #include "py/runtime.h"
#include "misc.h" #include "py/pfenv.h"
#include "qstr.h" #include "py/gc.h"
#include "obj.h"
#include "runtime.h"
#include "pfenv.h"
#include MICROPY_HAL_H #include MICROPY_HAL_H
#include "gc.h"
#include "pin.h" #include "pin.h"
#include "reg.h" #include "reg.h"
#include "timer.h" #include "timer.h"
typedef enum { typedef enum {
......
...@@ -27,12 +27,8 @@ ...@@ -27,12 +27,8 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include "mpconfig.h" #include "py/nlr.h"
#include "nlr.h" #include "py/runtime.h"
#include "misc.h"
#include "qstr.h"
#include "obj.h"
#include "runtime.h"
#include MICROPY_HAL_H #include MICROPY_HAL_H
#include "bufhelper.h" #include "bufhelper.h"
#include "uart.h" #include "uart.h"
......
#include <string.h> #include <string.h>
#include <stdint.h>
#include "Arduino.h" #include "py/runtime.h"
#include "mpconfig.h" #include "Arduino.h"
#include "misc.h"
#include "qstr.h"
#include "obj.h"
#include "runtime.h"
#include "usb.h" #include "usb.h"
#include "usb_serial.h" #include "usb_serial.h"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment