mirror of
https://github.com/EyeTrackVR/OpenIris.git
synced 2025-11-04 15:39:42 +08:00
fix double esp-eye error
fix version control error
This commit is contained in:
parent
fe43b35a3f
commit
cb036af724
@ -64,13 +64,8 @@ void CameraHandler::setupBasicResolution()
|
||||
{
|
||||
log_e("Did not find psram, setting lower image quality");
|
||||
config.fb_location = CAMERA_FB_IN_DRAM;
|
||||
<<<<<<< HEAD
|
||||
config.jpeg_quality = 9;
|
||||
config.fb_count = 2;
|
||||
=======
|
||||
config.jpeg_quality = 1;
|
||||
config.fb_count = 1;
|
||||
>>>>>>> 5e4e1a971c57061f1d3d896b518c2e2828e22500
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@ -337,64 +337,6 @@ upload_flags =
|
||||
build_type = release
|
||||
extra_scripts = ${common.extra_scripts}
|
||||
|
||||
[env:esp_eye]
|
||||
platform = ${common.platform}
|
||||
board = esp32cam
|
||||
framework = ${common.framework}
|
||||
monitor_speed = ${common.monitor_speed}
|
||||
monitor_filters = ${common.monitor_filters}
|
||||
board_build.partitions = ${common.board_build.partitions}
|
||||
lib_ldf_mode = ${common.lib_ldf_mode}
|
||||
upload_speed = ${common.upload_speed}
|
||||
lib_deps =
|
||||
${common.lib_deps}
|
||||
build_type = ${common.build_type}
|
||||
extra_scripts = ${common.extra_scripts}
|
||||
build_flags = ${common.build_flags}
|
||||
-DDEBUG_MODE=1
|
||||
-DCORE_DEBUG_LEVEL=4
|
||||
${pinoutsESP-EYE.build_flags}
|
||||
|
||||
[env:esp_eye_release]
|
||||
platform = ${common.platform}
|
||||
board = esp32cam
|
||||
framework = ${common.framework}
|
||||
monitor_speed = ${common.monitor_speed}
|
||||
board_build.partitions = ${common.board_build.partitions}
|
||||
lib_ldf_mode = ${common.lib_ldf_mode}
|
||||
upload_speed = ${common.upload_speed}
|
||||
lib_deps =
|
||||
${common.lib_deps}
|
||||
build_type = release
|
||||
extra_scripts = ${common.extra_scripts}
|
||||
build_flags = ${common.build_flags}
|
||||
-DDEBUG_MODE=0
|
||||
-DCORE_DEBUG_LEVEL=1
|
||||
${pinoutsESP-EYE.build_flags}
|
||||
|
||||
[env:esp_eye_OTA]
|
||||
platform = ${common.platform}
|
||||
board = esp32cam
|
||||
framework = ${common.framework}
|
||||
build_flags = ${common.build_flags}
|
||||
-DDEBUG_MODE=0
|
||||
-DCORE_DEBUG_LEVEL=1
|
||||
-DDEBUG_ESP_OTA
|
||||
${pinoutsESP-EYE.build_flags}
|
||||
lib_deps =
|
||||
${common.lib_deps}
|
||||
upload_speed = ${common.upload_speed}
|
||||
monitor_speed = ${common.monitor_speed}
|
||||
board_build.partitions = ${common.board_build.partitions}
|
||||
lib_ldf_mode = ${common.lib_ldf_mode}
|
||||
upload_port = 192.168.1.38
|
||||
upload_protocol = espota
|
||||
upload_flags =
|
||||
--port=3232
|
||||
--auth=12345678
|
||||
build_type = release
|
||||
extra_scripts = ${common.extra_scripts}
|
||||
|
||||
[env:esp32M5Stack]
|
||||
platform = ${common.platform}
|
||||
board = esp32cam
|
||||
|
||||
@ -1 +1 @@
|
||||
v1.0.10
|
||||
v1.4.10
|
||||
Loading…
Reference in New Issue
Block a user