diff options
55 files changed, 127 insertions, 328 deletions
diff --git a/drivers/cc3000/src/ccspi.c b/drivers/cc3000/src/ccspi.c index 68d2da7c19..0e1ba7ad0c 100644 --- a/drivers/cc3000/src/ccspi.c +++ b/drivers/cc3000/src/ccspi.c @@ -34,13 +34,9 @@ #include <string.h> -#include "stm32f4xx_hal.h" -#include "mpconfig.h" -#include "nlr.h" -#include "misc.h" -#include "qstr.h" -#include "obj.h" -#include "runtime.h" +#include "py/nlr.h" +#include "py/obj.h" +#include "py/runtime.h" #include "pin.h" #include "led.h" #include "extint.h" diff --git a/stmhal/Makefile b/stmhal/Makefile index 422b31dfa3..fe9e57a447 100644 --- a/stmhal/Makefile +++ b/stmhal/Makefile @@ -33,7 +33,6 @@ CROSS_COMPILE = arm-none-eabi- INC = -I. INC += -I.. -INC += -I$(PY_SRC) INC += -I$(BUILD) INC += -I$(CMSIS_DIR)/inc INC += -I$(CMSIS_DIR)/devinc diff --git a/stmhal/accel.c b/stmhal/accel.c index 0af8c8fd40..a61e8ef3ee 100644 --- a/stmhal/accel.c +++ b/stmhal/accel.c @@ -29,12 +29,8 @@ #include "stm32f4xx_hal.h" -#include "mpconfig.h" -#include "nlr.h" -#include "misc.h" -#include "qstr.h" -#include "obj.h" -#include "runtime.h" +#include "py/nlr.h" +#include "py/runtime.h" #include "i2c.h" #include "accel.h" diff --git a/stmhal/adc.c b/stmhal/adc.c index 6044931ec9..cacfed7a8a 100644 --- a/stmhal/adc.c +++ b/stmhal/adc.c @@ -28,13 +28,9 @@ #include <stm32f4xx_hal.h> #include <string.h> -#include "mpconfig.h" -#include "misc.h" -#include "nlr.h" -#include "qstr.h" -#include "obj.h" -#include "runtime.h" -#include "binary.h" +#include "py/nlr.h" +#include "py/runtime.h" +#include "py/binary.h" #include "adc.h" #include "pin.h" #include "genhdr/pins.h" diff --git a/stmhal/boards/stm32f4xx_prefix.c b/stmhal/boards/stm32f4xx_prefix.c index c200301726..d22bfacadf 100644 --- a/stmhal/boards/stm32f4xx_prefix.c +++ b/stmhal/boards/stm32f4xx_prefix.c @@ -1,15 +1,10 @@ // stm32f4xx_prefix.c becomes the initial portion of the generated pins file. #include <stdio.h> -#include <stdint.h> -#include "stm32f4xx_hal.h" - -#include "mpconfig.h" -#include "misc.h" -#include "qstr.h" -#include "obj.h" +#include "py/obj.h" #include "pin.h" +#include MICROPY_HAL_H #define AF(af_idx, af_fn, af_unit, af_type, af_ptr) \ { \ diff --git a/stmhal/bufhelper.c b/stmhal/bufhelper.c index 1f823ea963..57aef5a91e 100644 --- a/stmhal/bufhelper.c +++ b/stmhal/bufhelper.c @@ -24,10 +24,7 @@ * THE SOFTWARE. */ -#include "mpconfig.h" -#include "misc.h" -#include "qstr.h" -#include "obj.h" +#include "py/obj.h" #include "bufhelper.h" void pyb_buf_get_for_send(mp_obj_t o, mp_buffer_info_t *bufinfo, byte *tmp_data) { diff --git a/stmhal/can.c b/stmhal/can.c index 118c4d8d90..28f00c9940 100644 --- a/stmhal/can.c +++ b/stmhal/can.c @@ -29,13 +29,9 @@ #include <stdarg.h> #include <errno.h> -#include "mpconfig.h" -#include "nlr.h" -#include "misc.h" -#include "qstr.h" -#include "obj.h" -#include "objtuple.h" -#include "runtime.h" +#include "py/nlr.h" +#include "py/objtuple.h" +#include "py/runtime.h" #include "bufhelper.h" #include "can.h" #include "pybioctl.h" diff --git a/stmhal/dac.c b/stmhal/dac.c index d6b6668860..e8ed752c06 100644 --- a/stmhal/dac.c +++ b/stmhal/dac.c @@ -30,13 +30,8 @@ #include "stm32f4xx_hal.h" -#include "mpconfig.h" -#include "nlr.h" -#include "misc.h" -#include "qstr.h" -#include "parse.h" -#include "obj.h" -#include "runtime.h" +#include "py/nlr.h" +#include "py/runtime.h" #include "timer.h" #include "dac.h" #include "pin.h" diff --git a/stmhal/diskio.c b/stmhal/diskio.c index baebd27929..948297aa48 100644 --- a/stmhal/diskio.c +++ b/stmhal/diskio.c @@ -32,11 +32,7 @@ #include "stm32f4xx_hal.h" -#include "mpconfig.h" -#include "misc.h" -#include "qstr.h" -#include "obj.h" -#include "runtime.h" +#include "py/runtime.h" #include "systick.h" #include "rtc.h" #include "storage.h" diff --git a/stmhal/extint.c b/stmhal/extint.c index a67af65b05..78bc17be0f 100644 --- a/stmhal/extint.c +++ b/stmhal/extint.c @@ -30,15 +30,10 @@ #include <stm32f4xx_hal.h> -#include "mpconfig.h" -#include "nlr.h" -#include "misc.h" -#include "qstr.h" -#include "gc.h" -#include "obj.h" -#include "runtime.h" -#include "pfenv.h" - +#include "py/nlr.h" +#include "py/runtime.h" +#include "py/gc.h" +#include "py/pfenv.h" #include "pin.h" #include "extint.h" diff --git a/stmhal/ffconf.c b/stmhal/ffconf.c index 8ed7543433..0a4745462e 100644 --- a/stmhal/ffconf.c +++ b/stmhal/ffconf.c @@ -26,10 +26,7 @@ #include <string.h> -#include "mpconfig.h" -#include "misc.h" -#include "qstr.h" -#include "obj.h" +#include "py/obj.h" #include "ff.h" #include "ffconf.h" #include "fsusermount.h" diff --git a/stmhal/file.c b/stmhal/file.c index c4f4dace0d..66bb51f49c 100644 --- a/stmhal/file.c +++ b/stmhal/file.c @@ -27,13 +27,9 @@ #include <stdio.h> #include <errno.h> -#include "mpconfig.h" -#include "nlr.h" -#include "misc.h" -#include "qstr.h" -#include "obj.h" -#include "runtime.h" -#include "stream.h" +#include "py/nlr.h" +#include "py/runtime.h" +#include "py/stream.h" #include "file.h" #include "ff.h" diff --git a/stmhal/fsusermount.c b/stmhal/fsusermount.c index e6b915382a..0cd36480e6 100644 --- a/stmhal/fsusermount.c +++ b/stmhal/fsusermount.c @@ -24,12 +24,8 @@ * THE SOFTWARE. */ -#include "mpconfig.h" -#include "misc.h" -#include "nlr.h" -#include "qstr.h" -#include "obj.h" -#include "runtime.h" +#include "py/nlr.h" +#include "py/runtime.h" #include "ff.h" #include "fsusermount.h" diff --git a/stmhal/gccollect.c b/stmhal/gccollect.c index e79dc38494..fcbe10fec1 100644 --- a/stmhal/gccollect.c +++ b/stmhal/gccollect.c @@ -27,11 +27,8 @@ #include <stdio.h> #include <stdint.h> -#include "mpconfig.h" -#include "misc.h" -#include "qstr.h" -#include "obj.h" -#include "gc.h" +#include "py/obj.h" +#include "py/gc.h" #include "gccollect.h" #include MICROPY_HAL_H diff --git a/stmhal/help.c b/stmhal/help.c index 525f5b0f4b..3d9656c63c 100644 --- a/stmhal/help.c +++ b/stmhal/help.c @@ -26,11 +26,8 @@ #include <stdio.h> -#include "mpconfig.h" -#include "nlr.h" -#include "misc.h" -#include "qstr.h" -#include "obj.h" +#include "py/nlr.h" +#include "py/obj.h" STATIC const char *help_text = "Welcome to Micro Python!\n" diff --git a/stmhal/i2c.c b/stmhal/i2c.c index 7678e9a234..e4d406b4ab 100644 --- a/stmhal/i2c.c +++ b/stmhal/i2c.c @@ -27,12 +27,8 @@ #include <stdio.h> #include <string.h> -#include "mpconfig.h" -#include "nlr.h" -#include "misc.h" -#include "qstr.h" -#include "obj.h" -#include "runtime.h" +#include "py/nlr.h" +#include "py/runtime.h" #include "pin.h" #include "genhdr/pins.h" #include "bufhelper.h" diff --git a/stmhal/import.c b/stmhal/import.c index 88ddaefacf..e94cf620e0 100644 --- a/stmhal/import.c +++ b/stmhal/import.c @@ -25,12 +25,8 @@ */ #include <stdio.h> -#include <stdint.h> -#include "mpconfig.h" -#include "misc.h" -#include "qstr.h" -#include "lexer.h" +#include "py/lexer.h" #include "ff.h" mp_import_stat_t mp_import_stat(const char *path) { diff --git a/stmhal/input.c b/stmhal/input.c index 9b67b641c6..b735ca2492 100644 --- a/stmhal/input.c +++ b/stmhal/input.c @@ -24,13 +24,8 @@ * THE SOFTWARE. */ -#include <stdint.h> - -#include "mpconfig.h" -#include "nlr.h" -#include "misc.h" -#include "qstr.h" -#include "obj.h" +#include "py/nlr.h" +#include "py/obj.h" #include "readline.h" #include "usb.h" diff --git a/stmhal/irq.c b/stmhal/irq.c index 286af73cc1..d0d89b394f 100644 --- a/stmhal/irq.c +++ b/stmhal/irq.c @@ -24,11 +24,8 @@ * THE SOFTWARE. */ -#include "mpconfig.h" -#include "misc.h" -#include "nlr.h" -#include "qstr.h" -#include "obj.h" +#include "py/nlr.h" +#include "py/obj.h" #include "irq.h" #include MICROPY_HAL_H diff --git a/stmhal/lcd.c b/stmhal/lcd.c index dbe2be9ecc..22e11d9502 100644 --- a/stmhal/lcd.c +++ b/stmhal/lcd.c @@ -28,17 +28,11 @@ #include <string.h> #include <stm32f4xx_hal.h> -#include "mpconfig.h" -#include "nlr.h" -#include "misc.h" +#include "py/nlr.h" +#include "py/runtime.h" #if MICROPY_HW_HAS_LCD -#include "qstr.h" -#include "parse.h" -#include "obj.h" -#include "runtime.h" - #include "pin.h" #include "genhdr/pins.h" #include "bufhelper.h" diff --git a/stmhal/led.c b/stmhal/led.c index 69d753cff8..4a583d4cf7 100644 --- a/stmhal/led.c +++ b/stmhal/led.c @@ -27,12 +27,8 @@ #include <stdio.h> #include <stm32f4xx_hal.h> -#include "mpconfig.h" -#include "nlr.h" -#include "misc.h" -#include "qstr.h" -#include "obj.h" -#include "runtime.h" +#include "py/nlr.h" +#include "py/runtime.h" #include "timer.h" #include "led.h" #include "pin.h" diff --git a/stmhal/lexerfatfs.c b/stmhal/lexerfatfs.c index ea47aaf884..639cd1f2f1 100644 --- a/stmhal/lexerfatfs.c +++ b/stmhal/lexerfatfs.c @@ -24,13 +24,9 @@ * THE SOFTWARE. */ -#include <stdint.h> #include <stdio.h> -#include "mpconfig.h" -#include "misc.h" -#include "qstr.h" -#include "lexer.h" +#include "py/lexer.h" #include "lexerfatfs.h" #include "ff.h" diff --git a/stmhal/main.c b/stmhal/main.c index a946b86eea..ae5c94b531 100644 --- a/stmhal/main.c +++ b/stmhal/main.c @@ -27,21 +27,16 @@ #include <stdio.h> #include <string.h> -#include "stm32f4xx_hal.h" +#include "py/nlr.h" +#include "py/lexer.h" +#include "py/parse.h" +#include "py/obj.h" +#include "py/runtime.h" +#include "py/stackctrl.h" +#include "py/gc.h" -#include "mpconfig.h" -#include "misc.h" #include "systick.h" #include "pendsv.h" -#include "qstr.h" -#include "misc.h" -#include "nlr.h" -#include "lexer.h" -#include "parse.h" -#include "obj.h" -#include "runtime.h" -#include "stackctrl.h" -#include "gc.h" #include "gccollect.h" #include "readline.h" #include "pyexec.h" diff --git a/stmhal/modnetwork.c b/stmhal/modnetwork.c index 21e279a99d..f1ca4a9546 100644 --- a/stmhal/modnetwork.c +++ b/stmhal/modnetwork.c @@ -29,13 +29,9 @@ #include <string.h> #include <errno.h> -#include "mpconfig.h" -#include "nlr.h" -#include "misc.h" -#include "qstr.h" -#include "obj.h" -#include "objlist.h" -#include "runtime.h" +#include "py/nlr.h" +#include "py/objlist.h" +#include "py/runtime.h" #include "modnetwork.h" /// \module network - network configuration diff --git a/stmhal/modnwcc3k.c b/stmhal/modnwcc3k.c index 41358a06cb..63180caf7d 100644 --- a/stmhal/modnwcc3k.c +++ b/stmhal/modnwcc3k.c @@ -35,16 +35,11 @@ // CC3000 defines its own ENOBUFS (different to standard one!) #undef ENOBUFS -#include "stm32f4xx_hal.h" -#include "mpconfig.h" -#include "nlr.h" -#include "misc.h" -#include "qstr.h" -#include "obj.h" -#include "objtuple.h" -#include "objlist.h" -#include "stream.h" -#include "runtime.h" +#include "py/nlr.h" +#include "py/objtuple.h" +#include "py/objlist.h" +#include "py/stream.h" +#include "py/runtime.h" #include "modnetwork.h" #include "pin.h" #include "genhdr/pins.h" diff --git a/stmhal/modnwwiznet5k.c b/stmhal/modnwwiznet5k.c index 4818ff9eb1..896c4402d8 100644 --- a/stmhal/modnwwiznet5k.c +++ b/stmhal/modnwwiznet5k.c @@ -29,15 +29,9 @@ #include <string.h> #include <errno.h> -#include "stm32f4xx_hal.h" - -#include "mpconfig.h" -#include "nlr.h" -#include "misc.h" -#include "qstr.h" -#include "obj.h" -#include "objlist.h" -#include "runtime.h" +#include "py/nlr.h" +#include "py/objlist.h" +#include "py/runtime.h" #include "modnetwork.h" #include "pin.h" #include "genhdr/pins.h" diff --git a/stmhal/modpyb.c b/stmhal/modpyb.c index 03e65f1be0..91b9464713 100644 --- a/stmhal/modpyb.c +++ b/stmhal/modpyb.c @@ -29,12 +29,9 @@ #include "stm32f4xx_hal.h" -#include "mpconfig.h" -#include "misc.h" -#include "nlr.h" -#include "qstr.h" -#include "obj.h" -#include "gc.h" +#include "py/nlr.h" +#include "py/obj.h" +#include "py/gc.h" #include "gccollect.h" #include "irq.h" #include "systick.h" diff --git a/stmhal/modstm.c b/stmhal/modstm.c index 960476fa95..72f4c67a76 100644 --- a/stmhal/modstm.c +++ b/stmhal/modstm.c @@ -29,11 +29,8 @@ #include "stm32f4xx_hal.h" -#include "mpconfig.h" -#include "nlr.h" -#include "misc.h" -#include "qstr.h" -#include "obj.h" +#include "py/nlr.h" +#include "py/obj.h" #include "portmodules.h" // To use compile-time constants we are restricted to 31-bit numbers (a small int, diff --git a/stmhal/moduos.c b/stmhal/moduos.c index b16891fec8..8706f49816 100644 --- a/stmhal/moduos.c +++ b/stmhal/moduos.c @@ -27,12 +27,9 @@ #include <stdint.h> #include <string.h> -#include "mpconfig.h" -#include "nlr.h" -#include "misc.h" -#include "qstr.h" -#include "obj.h" -#include "objtuple.h" +#include "py/nlr.h" +#include "py/obj.h" +#include "py/objtuple.h" #include "systick.h" #include "rng.h" #include "storage.h" diff --git a/stmhal/moduselect.c b/stmhal/moduselect.c index b354e486e7..1adb6257f1 100644 --- a/stmhal/moduselect.c +++ b/stmhal/moduselect.c @@ -24,16 +24,12 @@ * THE SOFTWARE. */ -#include <stdint.h> #include <stdio.h> #include <errno.h> -#include "mpconfig.h" -#include "misc.h" -#include "nlr.h" -#include "qstr.h" -#include "obj.h" -#include "objlist.h" +#include "py/nlr.h" +#include "py/obj.h" +#include "py/objlist.h" #include "pybioctl.h" #include MICROPY_HAL_H diff --git a/stmhal/modusocket.c b/stmhal/modusocket.c index c2246b3c4d..781720b532 100644 --- a/stmhal/modusocket.c +++ b/stmhal/modusocket.c @@ -25,18 +25,13 @@ */ #include <stdio.h> -#include <stdint.h> #include <string.h> #include <errno.h> -#include "mpconfig.h" -#include "nlr.h" -#include "misc.h" -#include "qstr.h" -#include "obj.h" -#include "objtuple.h" -#include "objlist.h" -#include "runtime.h" +#include "py/nlr.h" +#include "py/objtuple.h" +#include "py/objlist.h" +#include "py/runtime.h" #include "modnetwork.h" /******************************************************************************/ diff --git a/stmhal/modutime.c b/stmhal/modutime.c index 0bc3245c48..b918b1e9a7 100644 --- a/stmhal/modutime.c +++ b/stmhal/modutime.c @@ -28,11 +28,8 @@ #include <string.h> #include "stm32f4xx_hal.h" -#include "mpconfig.h" -#include "nlr.h" -#include "misc.h" -#include "qstr.h" -#include "obj.h" +#include "py/nlr.h" +#include "py/obj.h" #include "portmodules.h" #include "rtc.h" diff --git a/stmhal/mphal.c b/stmhal/mphal.c index 43e1b9ba36..093690d594 100644 --- a/stmhal/mphal.c +++ b/stmhal/mphal.c @@ -1,10 +1,7 @@ #include <errno.h> -#include "mpconfig.h" -#include "nlr.h" -#include "misc.h" -#include "qstr.h" -#include "obj.h" +#include "py/nlr.h" +#include "py/obj.h" #include "usb.h" #include "mphal.h" diff --git a/stmhal/pendsv.c b/stmhal/pendsv.c index e71836d014..c60d91381f 100644 --- a/stmhal/pendsv.c +++ b/stmhal/pendsv.c @@ -27,11 +27,7 @@ #include <stdlib.h> #include <stm32f4xx_hal.h> -#include "mpconfig.h" -#include "misc.h" -#include "qstr.h" -#include "obj.h" -#include "runtime.h" +#include "py/runtime.h" #include "pendsv.h" static void *pendsv_object = NULL; diff --git a/stmhal/pin.c b/stmhal/pin.c index 286e0992c0..b71c93efc3 100644 --- a/stmhal/pin.c +++ b/stmhal/pin.c @@ -28,14 +28,10 @@ #include <stdint.h> #include <string.h> -#include "mpconfig.h" -#include "nlr.h" -#include "misc.h" -#include "qstr.h" -#include "obj.h" -#include "runtime.h" -#include MICROPY_HAL_H +#include "py/nlr.h" +#include "py/runtime.h" #include "pin.h" +#include MICROPY_HAL_H /// \moduleref pyb /// \class Pin - control I/O pins diff --git a/stmhal/pin_defs_stmhal.c b/stmhal/pin_defs_stmhal.c index c2409dc6c0..6dfefb6bb3 100644 --- a/stmhal/pin_defs_stmhal.c +++ b/stmhal/pin_defs_stmhal.c @@ -1,11 +1,6 @@ -#include "mpconfig.h" -#include "nlr.h" -#include "misc.h" -#include "qstr.h" -#include "obj.h" -#include "runtime.h" -#include MICROPY_HAL_H +#include "py/obj.h" #include "pin.h" +#include MICROPY_HAL_H // Returns the pin mode. This value returned by this macro should be one of: // GPIO_MODE_INPUT, GPIO_MODE_OUTPUT_PP, GPIO_MODE_OUTPUT_OD, diff --git a/stmhal/pin_named_pins.c b/stmhal/pin_named_pins.c index 24b6f79b6c..420a5d9e0a 100644 --- a/stmhal/pin_named_pins.c +++ b/stmhal/pin_named_pins.c @@ -25,16 +25,11 @@ */ #include <stdio.h> -#include <stdint.h> #include <string.h> -#include "mpconfig.h" -#include "misc.h" -#include "qstr.h" -#include "obj.h" -#include "runtime.h" -#include MICROPY_HAL_H +#include "py/runtime.h" #include "pin.h" +#include MICROPY_HAL_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) { pin_named_pins_obj_t *self = self_in; diff --git a/stmhal/printf.c b/stmhal/printf.c index ca9b279cdb..a239e898c9 100644 --- a/stmhal/printf.c +++ b/stmhal/printf.c @@ -28,15 +28,12 @@ #include <string.h> #include <stdarg.h> -#include "mpconfig.h" -#include "misc.h" -#include "qstr.h" -#include "obj.h" -#include "pfenv.h" +#include "py/obj.h" +#include "py/pfenv.h" #include "pybstdio.h" #if MICROPY_PY_BUILTINS_FLOAT -#include "formatfloat.h" +#include "py/formatfloat.h" #endif int pfenv_vprintf(const pfenv_t *pfenv, const char *fmt, va_list args); diff --git a/stmhal/pybstdio.c b/stmhal/pybstdio.c index bc9e5d9213..5597bbd689 100644 --- a/stmhal/pybstdio.c +++ b/stmhal/pybstdio.c @@ -29,16 +29,12 @@ #include <string.h> #include <errno.h> -#include "mpconfig.h" -#include "misc.h" -#include "qstr.h" -#include "misc.h" -#include "obj.h" -#include "stream.h" -#include MICROPY_HAL_H +#include "py/obj.h" +#include "py/stream.h" #include "usb.h" #include "uart.h" #include "pybstdio.h" +#include MICROPY_HAL_H // TODO make stdin, stdout and stderr writable objects so they can // be changed by Python code. This requires some changes, as these diff --git a/stmhal/pyexec.c b/stmhal/pyexec.c index f1e645447c..98cdb4ea7a 100644 --- a/stmhal/pyexec.c +++ b/stmhal/pyexec.c @@ -28,14 +28,13 @@ #include <stdio.h> #include <stdint.h> -#include "mpconfig.h" -#include "nlr.h" -#include "obj.h" -#include "parsehelper.h" -#include "compile.h" -#include "runtime.h" -#include "repl.h" -#include "gc.h" +#include "py/nlr.h" +#include "py/parsehelper.h" +#include "py/compile.h" +#include "py/runtime.h" +#include "py/repl.h" +#include "py/gc.h" +#include "py/pfenv.h" #ifdef MICROPY_HAL_H #include MICROPY_HAL_H #endif @@ -44,7 +43,6 @@ #include "pyexec.h" #include "pybstdio.h" #include "genhdr/py-version.h" -#include "pfenv.h" pyexec_mode_kind_t pyexec_mode_kind = PYEXEC_MODE_FRIENDLY_REPL; STATIC bool repl_display_debugging_info = 0; diff --git a/stmhal/readline.c b/stmhal/readline.c index f158ccb900..aa9194a035 100644 --- a/stmhal/readline.c +++ b/stmhal/readline.c @@ -28,8 +28,8 @@ #include <stdint.h> #include <string.h> -#include "mpconfig.h" -#include "misc.h" +#include "py/mpconfig.h" +#include "py/misc.h" #include "readline.h" #include "pybstdio.h" diff --git a/stmhal/rng.c b/stmhal/rng.c index ea636770c0..c2685ce2be 100644 --- a/stmhal/rng.c +++ b/stmhal/rng.c @@ -28,10 +28,7 @@ #include "stm32f4xx_hal.h" -#include "mpconfig.h" -#include "misc.h" -#include "qstr.h" -#include "obj.h" +#include "py/obj.h" #include "rng.h" #if MICROPY_HW_ENABLE_RNG diff --git a/stmhal/rtc.c b/stmhal/rtc.c index f58aa92733..82bb61bbff 100644 --- a/stmhal/rtc.c +++ b/stmhal/rtc.c @@ -28,11 +28,7 @@ #include "stm32f4xx_hal.h" -#include "mpconfig.h" -#include "misc.h" -#include "qstr.h" -#include "obj.h" -#include "runtime.h" +#include "py/runtime.h" #include "rtc.h" /// \moduleref pyb diff --git a/stmhal/sdcard.c b/stmhal/sdcard.c index 63a0bac96e..8c9febd9aa 100644 --- a/stmhal/sdcard.c +++ b/stmhal/sdcard.c @@ -28,12 +28,8 @@ #include <stm32f4xx_hal.h> -#include "mpconfig.h" -#include "nlr.h" -#include "misc.h" -#include "qstr.h" -#include "obj.h" -#include "runtime.h" +#include "py/nlr.h" +#include "py/runtime.h" #include "sdcard.h" #include "pin.h" #include "genhdr/pins.h" diff --git a/stmhal/servo.c b/stmhal/servo.c index 60ba217a95..a9b37a54f3 100644 --- a/stmhal/servo.c +++ b/stmhal/servo.c @@ -28,12 +28,8 @@ #include "stm32f4xx_hal.h" -#include "mpconfig.h" -#include "nlr.h" -#include "misc.h" -#include "qstr.h" -#include "obj.h" -#include "runtime.h" +#include "py/nlr.h" +#include "py/runtime.h" #include "timer.h" #include "servo.h" diff --git a/stmhal/spi.c b/stmhal/spi.c index 9e2aeffe06..364bf21691 100644 --- a/stmhal/spi.c +++ b/stmhal/spi.c @@ -27,12 +27,8 @@ #include <stdio.h> #include <string.h> -#include "mpconfig.h" -#include "nlr.h" -#include "misc.h" -#include "qstr.h" -#include "obj.h" -#include "runtime.h" +#include "py/nlr.h" +#include "py/runtime.h" #include "irq.h" #include "pin.h" #include "genhdr/pins.h" diff --git a/stmhal/stm32f4xx_it.c b/stmhal/stm32f4xx_it.c index eb65b1a548..17ca21f636 100644 --- a/stmhal/stm32f4xx_it.c +++ b/stmhal/stm32f4xx_it.c @@ -70,10 +70,7 @@ #include "stm32f4xx_it.h" #include "stm32f4xx_hal.h" -#include "mpconfig.h" -#include "misc.h" -#include "qstr.h" -#include "obj.h" +#include "py/obj.h" #include "extint.h" #include "timer.h" #include "uart.h" diff --git a/stmhal/storage.c b/stmhal/storage.c index 001d87afe0..be5e400ed7 100644 --- a/stmhal/storage.c +++ b/stmhal/storage.c @@ -28,11 +28,8 @@ #include <string.h> #include <stm32f4xx_hal.h> -#include "mpconfig.h" -#include "misc.h" +#include "py/obj.h" #include "systick.h" -#include "qstr.h" -#include "obj.h" #include "led.h" #include "flash.h" #include "storage.h" diff --git a/stmhal/systick.c b/stmhal/systick.c index fc462943f8..027e72a414 100644 --- a/stmhal/systick.c +++ b/stmhal/systick.c @@ -25,11 +25,8 @@ */ #include <stm32f4xx_hal.h> -#include "mpconfig.h" -#include "misc.h" -#include "nlr.h" -#include "qstr.h" -#include "obj.h" + +#include "py/obj.h" #include "irq.h" #include "systick.h" diff --git a/stmhal/timer.c b/stmhal/timer.c index e95fb5f9ef..7adb98c826 100644 --- a/stmhal/timer.c +++ b/stmhal/timer.c @@ -32,17 +32,13 @@ #include "usbd_cdc_msc_hid.h" #include "usbd_cdc_interface.h" -#include "nlr.h" -#include "misc.h" -#include "mpconfig.h" -#include "qstr.h" -#include "gc.h" -#include "obj.h" -#include "runtime.h" +#include "py/nlr.h" +#include "py/runtime.h" +#include "py/gc.h" +#include "py/pfenv.h" #include "timer.h" #include "servo.h" #include "pin.h" -#include "pfenv.h" /// \moduleref pyb /// \class Timer - periodically call a function diff --git a/stmhal/uart.c b/stmhal/uart.c index 870fa49837..98be745938 100644 --- a/stmhal/uart.c +++ b/stmhal/uart.c @@ -29,13 +29,9 @@ #include <stdarg.h> #include <errno.h> -#include "mpconfig.h" -#include "nlr.h" -#include "misc.h" -#include "qstr.h" -#include "obj.h" -#include "runtime.h" -#include "stream.h" +#include "py/nlr.h" +#include "py/runtime.h" +#include "py/stream.h" #include "uart.h" #include "pybioctl.h" #include MICROPY_HAL_H diff --git a/stmhal/usb.c b/stmhal/usb.c index 82f23c26f2..50a5a7420d 100644 --- a/stmhal/usb.c +++ b/stmhal/usb.c @@ -34,12 +34,8 @@ #include "usbd_cdc_interface.h" #include "usbd_msc_storage.h" -#include "mpconfig.h" -#include "misc.h" -#include "qstr.h" -#include "obj.h" -#include "runtime.h" -#include "stream.h" +#include "py/runtime.h" +#include "py/stream.h" #include "bufhelper.h" #include "usb.h" #include "pybioctl.h" diff --git a/stmhal/usbd_conf.h b/stmhal/usbd_conf.h index 0f7104e2f7..fc8015f318 100644 --- a/stmhal/usbd_conf.h +++ b/stmhal/usbd_conf.h @@ -39,7 +39,7 @@ #include <stdlib.h>
#include <string.h>
-#include "mpconfig.h"
+#include "py/mpconfig.h"
/* Exported types ------------------------------------------------------------*/
/* Exported constants --------------------------------------------------------*/
diff --git a/stmhal/usbd_msc_storage.c b/stmhal/usbd_msc_storage.c index c0e4468362..04a2b53ae9 100644 --- a/stmhal/usbd_msc_storage.c +++ b/stmhal/usbd_msc_storage.c @@ -34,7 +34,7 @@ #include "usbd_cdc_msc_hid.h" #include "usbd_msc_storage.h" -#include "misc.h" +#include "py/misc.h" #include "storage.h" #include "diskio.h" #include "sdcard.h" diff --git a/stmhal/usrsw.c b/stmhal/usrsw.c index 2bcf7b8023..69a636ceac 100644 --- a/stmhal/usrsw.c +++ b/stmhal/usrsw.c @@ -28,11 +28,7 @@ #include "stm32f4xx_hal.h" -#include "mpconfig.h" -#include "misc.h" -#include "qstr.h" -#include "obj.h" -#include "runtime.h" +#include "py/runtime.h" #include "extint.h" #include "pin.h" #include "genhdr/pins.h" |