From 088b1480ee6226bc6f3591445fa93a7de16d980c Mon Sep 17 00:00:00 2001 From: iabdalkader Date: Wed, 30 Dec 2020 01:45:05 +0200 Subject: [PATCH] Enable FIR drivers in NRF port. --- src/omv/boards/NANO33/omv_boardconfig.h | 11 +++++++++++ src/omv/ports/nrf/omv_portconfig.mk | 11 ++++++++--- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/src/omv/boards/NANO33/omv_boardconfig.h b/src/omv/boards/NANO33/omv_boardconfig.h index 525d49384..74e1ccfd3 100644 --- a/src/omv/boards/NANO33/omv_boardconfig.h +++ b/src/omv/boards/NANO33/omv_boardconfig.h @@ -67,6 +67,10 @@ #define JPEG_QUALITY_LOW 50 #define JPEG_QUALITY_HIGH 90 +// Low and high JPEG QS. +#define JPEG_QUALITY_LOW 50 +#define JPEG_QUALITY_HIGH 90 + // FB Heap Block Size #define OMV_UMM_BLOCK_SIZE 16 @@ -91,4 +95,11 @@ #define OMV_TEXT_LENGTH 808K // FLASH_SIZE - SD_SIZE - FS_SIZE #define OMV_SRAM_ORIGIN 0x20004000 // Reserve 16K for SD memory. #define OMV_SRAM_LENGTH 240K // RAM_SIZE - SD_RAM_SIZE + +// FIR I2C +#define FIR_I2C_ID (0) +#define FIR_I2C_SCL_PIN (2) +#define FIR_I2C_SDA_PIN (31) +#define FIR_I2C_SPEED (CAMBUS_SPEED_FULL) + #endif //__OMV_BOARDCONFIG_H__ diff --git a/src/omv/ports/nrf/omv_portconfig.mk b/src/omv/ports/nrf/omv_portconfig.mk index e22830327..3c9aeae2f 100644 --- a/src/omv/ports/nrf/omv_portconfig.mk +++ b/src/omv/ports/nrf/omv_portconfig.mk @@ -48,10 +48,11 @@ OMV_CFLAGS += -I$(TOP_DIR)/$(OMV_DIR)/ports/$(PORT)/ OMV_CFLAGS += -I$(TOP_DIR)/$(OMV_DIR)/ports/$(PORT)/modules/ OMV_CFLAGS += -I$(TOP_DIR)/$(LEPTON_DIR)/include/ -OMV_CFLAGS += -I$(TOP_DIR)/$(MLX_DIR)/include/ OMV_CFLAGS += -I$(TOP_DIR)/$(LSM6DS3_DIR)/include/ -OMV_CFLAGS += -I$(TOP_DIR)/$(TENSORFLOW_DIR)/$(CPU)/ OMV_CFLAGS += -I$(TOP_DIR)/$(WINC1500_DIR)/include/ +OMV_CFLAGS += -I$(TOP_DIR)/$(MLX90621_DIR)/include/ +OMV_CFLAGS += -I$(TOP_DIR)/$(MLX90640_DIR)/include/ +OMV_CFLAGS += -I$(TOP_DIR)/$(TENSORFLOW_DIR)/$(CPU)/ OMV_CFLAGS += -I$(TOP_DIR)/$(LIBPDM_DIR)/ CFLAGS += $(HAL_CFLAGS) $(MPY_CFLAGS) $(OMV_CFLAGS) @@ -76,13 +77,14 @@ FIRM_OBJ += $(wildcard $(BUILD)/$(CMSIS_DIR)/src/nn/ConvolutionFunctions/*.o) FIRM_OBJ += $(wildcard $(BUILD)/$(HAL_DIR)/src/*.o) FIRM_OBJ += $(wildcard $(BUILD)/$(LEPTON_DIR)/src/*.o) -FIRM_OBJ += $(wildcard $(BUILD)/$(MLX_DIR)/src/*.o) ifeq ($(MICROPY_PY_IMU), 1) FIRM_OBJ += $(wildcard $(BUILD)/$(LSM6DS3_DIR)/src/*.o) endif ifeq ($(MICROPY_PY_WINC1500), 1) FIRM_OBJ += $(wildcard $(BUILD)/$(WINC1500_DIR)/src/*.o) endif +FIRM_OBJ += $(wildcard $(BUILD)/$(MLX90621_DIR)/src/*.o) +FIRM_OBJ += $(wildcard $(BUILD)/$(MLX90640_DIR)/src/*.o) #------------- OpenMV Objects ----------------# FIRM_OBJ += $(addprefix $(BUILD)/$(CMSIS_DIR)/src/, \ @@ -127,6 +129,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/, \ @@ -335,6 +338,8 @@ FIRMWARE_OBJS: | $(BUILD) $(FW_DIR) $(MAKE) -C $(CMSIS_DIR) BUILD=$(BUILD)/$(CMSIS_DIR) CFLAGS="$(CFLAGS) -fno-strict-aliasing -MMD" $(MAKE) -C $(MICROPY_DIR)/ports/$(PORT) BUILD=$(BUILD)/$(MICROPY_DIR) $(MICROPY_ARGS) $(MAKE) -C $(HAL_DIR) BUILD=$(BUILD)/$(HAL_DIR) CFLAGS="$(CFLAGS) -MMD" + $(MAKE) -C $(MLX90621_DIR) BUILD=$(BUILD)/$(MLX90621_DIR) CFLAGS="$(CFLAGS) -MMD" + $(MAKE) -C $(MLX90640_DIR) BUILD=$(BUILD)/$(MLX90640_DIR) CFLAGS="$(CFLAGS) -MMD" $(MAKE) -C $(OMV_DIR) BUILD=$(BUILD)/$(OMV_DIR) CFLAGS="$(CFLAGS) -MMD" $(FIRMWARE): FIRMWARE_OBJS