From 0c6ecadfa98932dbeab320923a5afa4b9ff0e45a Mon Sep 17 00:00:00 2001 From: iabdalkader Date: Wed, 30 Dec 2020 01:50:49 +0200 Subject: [PATCH] Move py_fir module to generic modules. --- src/micropython | 2 +- src/omv/Makefile | 1 + src/omv/{ports/stm32 => }/modules/py_fir.c | 2 -- src/omv/{ports/stm32 => }/modules/py_fir.h | 0 src/omv/ports/nrf/omv_portconfig.mk | 1 + src/omv/ports/stm32/omv_portconfig.mk | 1 + 6 files changed, 4 insertions(+), 3 deletions(-) rename src/omv/{ports/stm32 => }/modules/py_fir.c (99%) rename src/omv/{ports/stm32 => }/modules/py_fir.h (100%) diff --git a/src/micropython b/src/micropython index 92c5b3604..dfb96a35a 160000 --- a/src/micropython +++ b/src/micropython @@ -1 +1 @@ -Subproject commit 92c5b360464995d95e861bd72f707d88097f4bca +Subproject commit dfb96a35ae19e8439842b0bbb43ce00515409cf4 diff --git a/src/omv/Makefile b/src/omv/Makefile index 6a5505dd8..9920d96f7 100644 --- a/src/omv/Makefile +++ b/src/omv/Makefile @@ -44,6 +44,7 @@ SRCS += $(addprefix modules/, \ py_omv.c \ py_sensor.c \ py_tf.c \ + py_fir.c \ ) SRCS += $(addprefix imlib/, \ diff --git a/src/omv/ports/stm32/modules/py_fir.c b/src/omv/modules/py_fir.c similarity index 99% rename from src/omv/ports/stm32/modules/py_fir.c rename to src/omv/modules/py_fir.c index 12d5a2a70..231c29857 100644 --- a/src/omv/ports/stm32/modules/py_fir.c +++ b/src/omv/modules/py_fir.c @@ -13,7 +13,6 @@ #include "py/nlr.h" #include "py/gc.h" #include "py/mphal.h" -#include "systick.h" #include "cambus.h" #include "MLX90640_API.h" @@ -24,7 +23,6 @@ #include "omv_boardconfig.h" #include "framebuffer.h" -#include "sensor.h" #include "py_helper.h" #include "py_assert.h" #include "py_image.h" diff --git a/src/omv/ports/stm32/modules/py_fir.h b/src/omv/modules/py_fir.h similarity index 100% rename from src/omv/ports/stm32/modules/py_fir.h rename to src/omv/modules/py_fir.h diff --git a/src/omv/ports/nrf/omv_portconfig.mk b/src/omv/ports/nrf/omv_portconfig.mk index e22830327..67bb800a8 100644 --- a/src/omv/ports/nrf/omv_portconfig.mk +++ b/src/omv/ports/nrf/omv_portconfig.mk @@ -127,6 +127,7 @@ FIRM_OBJ += $(addprefix $(BUILD)/$(OMV_DIR)/modules/, \ py_omv.o \ py_sensor.o \ py_tf.o \ + py_fir.o \ ) FIRM_OBJ += $(addprefix $(BUILD)/$(OMV_DIR)/imlib/, \ diff --git a/src/omv/ports/stm32/omv_portconfig.mk b/src/omv/ports/stm32/omv_portconfig.mk index afef3de14..1a22f268b 100644 --- a/src/omv/ports/stm32/omv_portconfig.mk +++ b/src/omv/ports/stm32/omv_portconfig.mk @@ -145,6 +145,7 @@ FIRM_OBJ += $(addprefix $(BUILD)/$(OMV_DIR)/modules/, \ py_omv.o \ py_sensor.o \ py_tf.o \ + py_fir.o \ ) FIRM_OBJ += $(addprefix $(BUILD)/$(OMV_DIR)/imlib/, \