From abde3275e85ced7f54b905d6b2d7f94d6309a650 Mon Sep 17 00:00:00 2001 From: iabdalkader Date: Tue, 26 Nov 2019 00:06:30 +0200 Subject: [PATCH] Disable WiFi debug for older boards (especially OMV3). * OMV3 is running out of memory because of tf global variables. --- src/omv/boards/OPENMV4/omv_boardconfig.h | 3 +++ src/omv/boards/OPENMV4R/omv_boardconfig.h | 3 +++ src/omv/main.c | 5 +++++ src/omv/wifidbg.c | 6 ++++++ 4 files changed, 17 insertions(+) diff --git a/src/omv/boards/OPENMV4/omv_boardconfig.h b/src/omv/boards/OPENMV4/omv_boardconfig.h index 5f7219772..ac365f670 100644 --- a/src/omv/boards/OPENMV4/omv_boardconfig.h +++ b/src/omv/boards/OPENMV4/omv_boardconfig.h @@ -49,6 +49,9 @@ #define OMV_ENABLE_MT9V034 (1) #define OMV_ENABLE_LEPTON (1) +// Enable WiFi debug +#define OMV_ENABLE_WIFIDBG (1) + // If buffer size is bigger than this threshold, the quality is reduced. // This is only used for JPEG images sent to the IDE not normal compression. #define JPEG_QUALITY_THRESH (320*240*2) diff --git a/src/omv/boards/OPENMV4R/omv_boardconfig.h b/src/omv/boards/OPENMV4R/omv_boardconfig.h index e2a12d5d7..9142e6b02 100644 --- a/src/omv/boards/OPENMV4R/omv_boardconfig.h +++ b/src/omv/boards/OPENMV4R/omv_boardconfig.h @@ -49,6 +49,9 @@ #define OMV_ENABLE_MT9V034 (1) #define OMV_ENABLE_LEPTON (1) +// Enable WiFi debug +#define OMV_ENABLE_WIFIDBG (1) + // If buffer size is bigger than this threshold, the quality is reduced. // This is only used for JPEG images sent to the IDE not normal compression. #define JPEG_QUALITY_THRESH (1920*1080*2) diff --git a/src/omv/main.c b/src/omv/main.c index 6eabf90c3..387c08cd6 100644 --- a/src/omv/main.c +++ b/src/omv/main.c @@ -75,6 +75,7 @@ #include "framebuffer.h" #include "ini.h" +#include "omv_boardconfig.h" int errno; extern char _vfs_buf; @@ -560,10 +561,14 @@ 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 (openmv_config.wifidbg == true && wifidbg_init(&openmv_config.wifidbg_config) != 0) { openmv_config.wifidbg = false; } + #else + openmv_config.wifidbg = false; + #endif // Run boot script(s) if (first_soft_reset) { diff --git a/src/omv/wifidbg.c b/src/omv/wifidbg.c index ddbb520e7..0b77844fa 100644 --- a/src/omv/wifidbg.c +++ b/src/omv/wifidbg.c @@ -29,9 +29,12 @@ #include "lib/utils/pyexec.h" #include "wifidbg.h" #include "led.h" +#include "omv_boardconfig.h" #include STM32_HAL_H +#if defined(OMV_ENABLE_WIFIDBG) + #ifndef MIN #define MIN(x, y) ((x) < (y) ? (x) : (y)) #endif @@ -242,3 +245,6 @@ void wifidbg_dispatch() } } } +#else +void wifidbg_dispatch(){}; +#endif // #defined(OMV_ENABLE_WIFIDBG)