mirror of
https://github.com/openmv/openmv.git
synced 2025-11-04 14:49:50 +08:00
Merge pull request #705 from openmv/winc_config
Make WINC1500 module configurable.
This commit is contained in:
commit
a5235a5176
@ -115,6 +115,9 @@ MP_CFLAGS += -I$(TOP_DIR)/$(MICROPY_DIR)/ports/stm32/
|
||||
MP_CFLAGS += -I$(TOP_DIR)/$(MICROPY_DIR)/ports/stm32/usbdev/core/inc/
|
||||
MP_CFLAGS += -I$(TOP_DIR)/$(MICROPY_DIR)/ports/stm32/usbdev/class/inc/
|
||||
MP_CFLAGS += -I$(MP_BOARD_CONFIG_DIR)
|
||||
ifeq ($(MICROPY_PY_WINC1500), 1)
|
||||
MP_CFLAGS += -DMICROPY_PY_WINC1500=1
|
||||
endif
|
||||
|
||||
OMV_CFLAGS += -I$(TOP_DIR)/$(OMV_DIR)/
|
||||
OMV_CFLAGS += -I$(TOP_DIR)/$(OMV_DIR)/py/
|
||||
@ -166,7 +169,9 @@ endif
|
||||
FIRM_OBJ += $(wildcard $(BUILD)/$(STHAL_DIR)/src/*.o)
|
||||
FIRM_OBJ += $(wildcard $(BUILD)/$(LEPTON_DIR)/src/*.o)
|
||||
FIRM_OBJ += $(wildcard $(BUILD)/$(MLX_DIR)/src/*.o)
|
||||
ifeq ($(MICROPY_PY_WINC1500), 1)
|
||||
FIRM_OBJ += $(wildcard $(BUILD)/$(WINC1500_DIR)/src/*.o)
|
||||
endif
|
||||
|
||||
#------------- OpenMV Objects ----------------#
|
||||
FIRM_OBJ += $(addprefix $(BUILD)/$(OMV_DIR)/, \
|
||||
@ -562,7 +567,9 @@ FIRMWARE_OBJS: | $(BUILD) $(FW_DIR)
|
||||
$(MAKE) -C $(MICROPY_DIR)/ports/stm32 BUILD=$(BUILD)/$(MICROPY_DIR) BOARD=$(TARGET) DEBUG=$(DEBUG) QSTR_DEFS="$(OMV_QSTR_DEFS)"
|
||||
$(MAKE) -C $(LEPTON_DIR) BUILD=$(BUILD)/$(LEPTON_DIR) CFLAGS="$(CFLAGS) -MMD"
|
||||
$(MAKE) -C $(MLX_DIR) BUILD=$(BUILD)/$(MLX_DIR) CFLAGS="$(CFLAGS) -MMD"
|
||||
ifeq ($(MICROPY_PY_WINC1500), 1)
|
||||
$(MAKE) -C $(WINC1500_DIR) BUILD=$(BUILD)/$(WINC1500_DIR) CFLAGS="$(CFLAGS) -MMD"
|
||||
endif
|
||||
$(MAKE) -C $(OMV_DIR) BUILD=$(BUILD)/$(OMV_DIR) CFLAGS="$(CFLAGS) -MMD"
|
||||
ifeq ($(CUBEAI), 1)
|
||||
$(MAKE) -C $(CUBEAI_DIR) BUILD=$(BUILD)/$(CUBEAI_DIR) CFLAGS="$(CFLAGS) -fno-strict-aliasing -MMD"
|
||||
|
||||
@ -1 +1 @@
|
||||
Subproject commit 73d0dd7933632ee10cec0d68bfa0d3c7bc445ed7
|
||||
Subproject commit 5323b77dd2087f094d0c73074a8b80bacb96799f
|
||||
@ -8,3 +8,4 @@ CFLAGS_MCU=MCU_SERIES_F4
|
||||
STARTUP=startup_stm32f407xx
|
||||
VECT_TAB_OFFSET=0x10000
|
||||
MAIN_APP_ADDR=0x08010000
|
||||
MICROPY_PY_WINC1500 = 1
|
||||
|
||||
@ -8,3 +8,4 @@ CFLAGS_MCU=MCU_SERIES_F4
|
||||
STARTUP=startup_stm32f427xx
|
||||
VECT_TAB_OFFSET=0x10000
|
||||
MAIN_APP_ADDR=0x08010000
|
||||
MICROPY_PY_WINC1500 = 1
|
||||
|
||||
@ -10,3 +10,4 @@ VECT_TAB_OFFSET=0x20000
|
||||
MAIN_APP_ADDR=0x08020000
|
||||
FROZEN_MPY_DIR=$(TOP_DIR)/../scripts/libraries
|
||||
MICROPY_PY_ULAB = 1
|
||||
MICROPY_PY_WINC1500 = 1
|
||||
|
||||
@ -10,3 +10,4 @@ VECT_TAB_OFFSET=0x40000
|
||||
MAIN_APP_ADDR=0x08040000
|
||||
FROZEN_MPY_DIR=$(TOP_DIR)/../scripts/libraries
|
||||
MICROPY_PY_ULAB = 1
|
||||
MICROPY_PY_WINC1500 = 1
|
||||
|
||||
@ -10,3 +10,4 @@ VECT_TAB_OFFSET=0x40000
|
||||
MAIN_APP_ADDR=0x08040000
|
||||
FROZEN_MPY_DIR=$(TOP_DIR)/../scripts/libraries
|
||||
MICROPY_PY_ULAB = 1
|
||||
MICROPY_PY_WINC1500 = 1
|
||||
|
||||
@ -560,7 +560,7 @@ soft_reset:
|
||||
memset(&openmv_config, 0, sizeof(openmv_config));
|
||||
// Parse config, and init wifi if enabled.
|
||||
ini_parse(&vfs_fat->fatfs, "/openmv.config", ini_handler_callback, &openmv_config);
|
||||
#if defined(OMV_ENABLE_WIFIDBG)
|
||||
#if OMV_ENABLE_WIFIDBG && MICROPY_PY_WINC1500
|
||||
if (openmv_config.wifidbg == true &&
|
||||
wifidbg_init(&openmv_config.wifidbg_config) != 0) {
|
||||
openmv_config.wifidbg = false;
|
||||
|
||||
@ -30,6 +30,7 @@
|
||||
#include "socket/include/socket.h"
|
||||
#include "driver/include/m2m_wifi.h"
|
||||
|
||||
#if MICROPY_PY_WINC1500
|
||||
typedef struct _winc_obj_t {
|
||||
mp_obj_base_t base;
|
||||
} winc_obj_t;
|
||||
@ -625,3 +626,4 @@ const mod_network_nic_type_t mod_network_nic_type_winc = {
|
||||
.settimeout = py_winc_socket_settimeout,
|
||||
.ioctl = py_winc_socket_ioctl,
|
||||
};
|
||||
#endif // MICROPY_PY_WINC1500
|
||||
|
||||
@ -33,7 +33,7 @@
|
||||
|
||||
#include STM32_HAL_H
|
||||
|
||||
#if defined(OMV_ENABLE_WIFIDBG)
|
||||
#if OMV_ENABLE_WIFIDBG && MICROPY_PY_WINC1500
|
||||
|
||||
#ifndef MIN
|
||||
#define MIN(x, y) ((x) < (y) ? (x) : (y))
|
||||
@ -247,4 +247,4 @@ void wifidbg_dispatch()
|
||||
}
|
||||
#else
|
||||
void wifidbg_dispatch(){};
|
||||
#endif // #defined(OMV_ENABLE_WIFIDBG)
|
||||
#endif // OMV_ENABLE_WIFIDBG && MICROPY_PY_WINC1500
|
||||
|
||||
Loading…
Reference in New Issue
Block a user