From 1066caf6cdf5a0f69af08f3e86239dd2849d8f1e Mon Sep 17 00:00:00 2001 From: ZanzyTHEbar Date: Wed, 14 Dec 2022 18:37:01 +0000 Subject: [PATCH] fix camera FB macro --- ESP/lib/src/io/camera/cameraHandler.cpp | 5 +---- ESP/platformio.ini | 8 -------- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/ESP/lib/src/io/camera/cameraHandler.cpp b/ESP/lib/src/io/camera/cameraHandler.cpp index 354adeb..2fa6ceb 100644 --- a/ESP/lib/src/io/camera/cameraHandler.cpp +++ b/ESP/lib/src/io/camera/cameraHandler.cpp @@ -43,13 +43,10 @@ void CameraHandler::setupBasicResolution() config.pixel_format = PIXFORMAT_JPEG; config.frame_size = FRAMESIZE_240X240; -#if PSRAM_INIT_FAILURE - config.fb_location = CAMERA_FB_IN_DRAM; -#endif - if (!psramFound()) { log_e("Did not find psram, setting lower image quality"); + config.fb_location = CAMERA_FB_IN_DRAM; config.jpeg_quality = 1; config.fb_count = 1; return; diff --git a/ESP/platformio.ini b/ESP/platformio.ini index 34592d5..2ebe6cc 100644 --- a/ESP/platformio.ini +++ b/ESP/platformio.ini @@ -26,13 +26,6 @@ enableADHOC=0 ; 0 = disable, 1 = enable adhocChannel=1 ; channel to use for adhoc network enableOTA=1 ; 0 = disable, 1 = enable -[esp_no_psram] -# If the ESP32 fails the PSRAM test, set this to 1 -# and comment out the lines in [common] that say -#-DBOARD_HAS_PSRAM ; enable psram -#-mfix-esp32-psram-cache-issue ; fix for psram -noPSRAM=0 ; 0 = disable, 1 = enable - ; DO NOT EDIT BELOW THIS LINE UNLESS YOU KNOW WHAT YOU ARE DOING [ESP_GITHUB_OTA] @@ -269,7 +262,6 @@ build_flags = ${ESP_GITHUB_OTA.build_flags} !python tools\autoversioning.py ; add build version to build as preprocessor defines !python tools\git_rev.py ; add git revision to build as preprocessor defines - -DPSRAM_INIT_FAILURE=${esp_no_psram.noPSRAM} ; add psram error build flags -DOTA_SERVER_PORT=${wifi.OTAServerPort} ; Set the OTA server -DENABLE_ADHOC=${wifi.enableADHOC} -DADHOC_CHANNEL=${wifi.adhocChannel}