diff --git a/src/Makefile b/src/Makefile index fa234cbef..0476555d3 100755 --- a/src/Makefile +++ b/src/Makefile @@ -64,6 +64,7 @@ PIXART_DIR=drivers/pixart DISPLAY_DIR=drivers/display LIBPDM_DIR=lib/libpdm TENSORFLOW_DIR=lib/tflm +CYW4343_FW_DIR=drivers/cyw4343/firmware/ OMV_BOARD_CONFIG_DIR=$(TOP_DIR)/$(OMV_DIR)/boards/$(TARGET)/ OMV_PORT_DIR=$(TOP_DIR)/$(OMV_DIR)/ports/$(PORT) MP_BOARD_CONFIG_DIR=$(TOP_DIR)/$(MICROPY_DIR)/ports/$(PORT)/boards/$(TARGET)/ diff --git a/src/drivers/cyw4343/firmware/cyw4343_7_45_98_102.bin b/src/drivers/cyw4343/firmware/cyw4343_7_45_98_102.bin new file mode 100644 index 000000000..4b96af0ff Binary files /dev/null and b/src/drivers/cyw4343/firmware/cyw4343_7_45_98_102.bin differ diff --git a/src/drivers/cyw4343/firmware/cyw4343_7_45_98_102.h b/src/drivers/cyw4343/firmware/cyw4343_7_45_98_102.h new file mode 100644 index 000000000..bdedadaaa --- /dev/null +++ b/src/drivers/cyw4343/firmware/cyw4343_7_45_98_102.h @@ -0,0 +1,3 @@ +#define CYW43_WIFI_FW_LEN (421331) // 7.45.98.102 +#define CYW43_CLM_LEN (7222) +const uintptr_t fw_data = (uintptr_t) CYW43_FIRMWARE_ADDRESS; diff --git a/src/drivers/cyw4343/firmware/cyw4343.bin b/src/drivers/cyw4343/firmware/cyw4343_7_45_98_50.bin similarity index 100% rename from src/drivers/cyw4343/firmware/cyw4343.bin rename to src/drivers/cyw4343/firmware/cyw4343_7_45_98_50.bin diff --git a/src/drivers/cyw4343/firmware/cyw4343_ext_fw.h b/src/drivers/cyw4343/firmware/cyw4343_7_45_98_50.h similarity index 100% rename from src/drivers/cyw4343/firmware/cyw4343_ext_fw.h rename to src/drivers/cyw4343/firmware/cyw4343_7_45_98_50.h diff --git a/src/drivers/cyw4343/firmware/cyw4343_btfw.bin b/src/drivers/cyw4343/firmware/cyw4343_btfw.bin new file mode 100644 index 000000000..05d655cb4 Binary files /dev/null and b/src/drivers/cyw4343/firmware/cyw4343_btfw.bin differ diff --git a/src/drivers/cyw4343/firmware/cyw4343_btfw.h b/src/drivers/cyw4343/firmware/cyw4343_btfw.h new file mode 100644 index 000000000..299925a92 --- /dev/null +++ b/src/drivers/cyw4343/firmware/cyw4343_btfw.h @@ -0,0 +1,2 @@ +#define CYW43_BT_FW_LEN (35182) +const uintptr_t bt_fw_data = (uintptr_t) CYW43_BT_FIRMWARE_ADDRESS; diff --git a/src/micropython b/src/micropython index ebcd2235c..1fad34d98 160000 --- a/src/micropython +++ b/src/micropython @@ -1 +1 @@ -Subproject commit ebcd2235ca98917bbd2dae45f2e671f6a892565a +Subproject commit 1fad34d982999e3a8f9f1d76479be342d3587d6e diff --git a/src/omv/boards/ARDUINO_GIGA/omv_boardconfig.mk b/src/omv/boards/ARDUINO_GIGA/omv_boardconfig.mk index 641033f7d..934fcd9fe 100755 --- a/src/omv/boards/ARDUINO_GIGA/omv_boardconfig.mk +++ b/src/omv/boards/ARDUINO_GIGA/omv_boardconfig.mk @@ -12,9 +12,13 @@ M4_VECT_TAB_OFFSET=0x20000 M4_APP_ADDR=0x08020000 OMV_HSE_VALUE=16000000 DFU_DEVICE=0x2341:0x035b -OMV_BOARD_EXTRA_CFLAGS = -DCORE_CM7 -DUSE_USB_FS \ +OMV_BOARD_EXTRA_CFLAGS = -DCORE_CM7 \ + -DUSE_USB_FS \ -DCYW43_FIRMWARE_ADDRESS=0x90F00000 \ - -DCYW43_CHIPSET_FIRMWARE_INCLUDE_FILE="\"$(TOP_DIR)/drivers/cyw4343/firmware/cyw4343_ext_fw.h\"" + -DCYW43_CHIPSET_FIRMWARE_INCLUDE_FILE="\"$(TOP_DIR)/$(CYW4343_FW_DIR)/cyw4343_7_45_98_102.h\"" \ + -DCYW43_BT_FIRMWARE_ADDRESS=0x90FC0000 \ + -DCYW43_BT_FIRMWARE_INCLUDE_FILE="\"$(TOP_DIR)/$(CYW4343_FW_DIR)/cyw4343_btfw.h\"" + OMV_ENABLE_BL=0 OMV_ENABLE_UVC=1 OMV_ENABLE_CM4=0 diff --git a/src/omv/boards/ARDUINO_NICLA_VISION/omv_boardconfig.mk b/src/omv/boards/ARDUINO_NICLA_VISION/omv_boardconfig.mk index 453b835f1..61e0852aa 100755 --- a/src/omv/boards/ARDUINO_NICLA_VISION/omv_boardconfig.mk +++ b/src/omv/boards/ARDUINO_NICLA_VISION/omv_boardconfig.mk @@ -12,9 +12,12 @@ M4_VECT_TAB_OFFSET=0x20000 M4_APP_ADDR=0x08020000 OMV_HSE_VALUE=25000000 DFU_DEVICE=0x2341:0x035b -OMV_BOARD_EXTRA_CFLAGS = -DCORE_CM7 -DUSE_USB_HS \ +OMV_BOARD_EXTRA_CFLAGS = -DCORE_CM7 \ + -DUSE_USB_HS \ -DCYW43_FIRMWARE_ADDRESS=0x90F00000 \ - -DCYW43_CHIPSET_FIRMWARE_INCLUDE_FILE="\"$(TOP_DIR)/drivers/cyw4343/firmware/cyw4343_ext_fw.h\"" + -DCYW43_CHIPSET_FIRMWARE_INCLUDE_FILE="\"$(TOP_DIR)/$(CYW4343_FW_DIR)/cyw4343_7_45_98_102.h\"" \ + -DCYW43_BT_FIRMWARE_ADDRESS=0x90FC0000 \ + -DCYW43_BT_FIRMWARE_INCLUDE_FILE="\"$(TOP_DIR)/$(CYW4343_FW_DIR)/cyw4343_btfw.h\"" OMV_ENABLE_BL = 0 OMV_ENABLE_UVC = 1 OMV_ENABLE_CM4 = 0 diff --git a/src/omv/boards/ARDUINO_PORTENTA_H7/omv_boardconfig.mk b/src/omv/boards/ARDUINO_PORTENTA_H7/omv_boardconfig.mk index 41ed0cc13..7a869b373 100755 --- a/src/omv/boards/ARDUINO_PORTENTA_H7/omv_boardconfig.mk +++ b/src/omv/boards/ARDUINO_PORTENTA_H7/omv_boardconfig.mk @@ -12,9 +12,13 @@ M4_VECT_TAB_OFFSET=0x20000 M4_APP_ADDR=0x08020000 OMV_HSE_VALUE=25000000 DFU_DEVICE=0x2341:0x035b -OMV_BOARD_EXTRA_CFLAGS = -DCORE_CM7 -DUSE_USB_HS \ +OMV_BOARD_EXTRA_CFLAGS = -DCORE_CM7 \ + -DUSE_USB_HS \ -DCYW43_FIRMWARE_ADDRESS=0x90F00000 \ - -DCYW43_CHIPSET_FIRMWARE_INCLUDE_FILE="\"$(TOP_DIR)/drivers/cyw4343/firmware/cyw4343_ext_fw.h\"" + -DCYW43_CHIPSET_FIRMWARE_INCLUDE_FILE="\"$(TOP_DIR)/$(CYW4343_FW_DIR)/cyw4343_7_45_98_102.h\"" \ + -DCYW43_BT_FIRMWARE_ADDRESS=0x90FC0000 \ + -DCYW43_BT_FIRMWARE_INCLUDE_FILE="\"$(TOP_DIR)/$(CYW4343_FW_DIR)/cyw4343_btfw.h\"" + OMV_ENABLE_BL=0 OMV_ENABLE_UVC=1 OMV_ENABLE_CM4=0