fix camera FB macro

This commit is contained in:
ZanzyTHEbar 2022-12-14 18:37:01 +00:00
parent 965499e067
commit 1066caf6cd
2 changed files with 1 additions and 12 deletions

View File

@ -43,13 +43,10 @@ void CameraHandler::setupBasicResolution()
config.pixel_format = PIXFORMAT_JPEG; config.pixel_format = PIXFORMAT_JPEG;
config.frame_size = FRAMESIZE_240X240; config.frame_size = FRAMESIZE_240X240;
#if PSRAM_INIT_FAILURE
config.fb_location = CAMERA_FB_IN_DRAM;
#endif
if (!psramFound()) if (!psramFound())
{ {
log_e("Did not find psram, setting lower image quality"); log_e("Did not find psram, setting lower image quality");
config.fb_location = CAMERA_FB_IN_DRAM;
config.jpeg_quality = 1; config.jpeg_quality = 1;
config.fb_count = 1; config.fb_count = 1;
return; return;

View File

@ -26,13 +26,6 @@ enableADHOC=0 ; 0 = disable, 1 = enable
adhocChannel=1 ; channel to use for adhoc network adhocChannel=1 ; channel to use for adhoc network
enableOTA=1 ; 0 = disable, 1 = enable 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 ; DO NOT EDIT BELOW THIS LINE UNLESS YOU KNOW WHAT YOU ARE DOING
[ESP_GITHUB_OTA] [ESP_GITHUB_OTA]
@ -269,7 +262,6 @@ build_flags =
${ESP_GITHUB_OTA.build_flags} ${ESP_GITHUB_OTA.build_flags}
!python tools\autoversioning.py ; add build version to build as preprocessor defines !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 !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 -DOTA_SERVER_PORT=${wifi.OTAServerPort} ; Set the OTA server
-DENABLE_ADHOC=${wifi.enableADHOC} -DENABLE_ADHOC=${wifi.enableADHOC}
-DADHOC_CHANNEL=${wifi.adhocChannel} -DADHOC_CHANNEL=${wifi.adhocChannel}