From 83de1d552dead35a5432bd7f0f5d92f060907e1f Mon Sep 17 00:00:00 2001 From: Owen Carter Date: Mon, 3 May 2021 10:35:12 +0200 Subject: [PATCH] Fix the framesize list for latest ESP IDE (#102) * #98 : Fix the framesize list for latest ESP IDE * Add framesize info to API doc * Dont use ESP-IDE HEAD for travis, use target version instead (currently 1.0.6) --- .travis.yml | 8 ++++---- API.md | 21 ++++++++++++++++++++- index_other.h | 21 ++++++++++++--------- index_ov2640.h | 21 ++++++++++++--------- index_ov3660.h | 24 ++++++++++++++---------- myconfig.sample.h | 2 +- 6 files changed, 63 insertions(+), 34 deletions(-) diff --git a/.travis.yml b/.travis.yml index e0ac039..db24e40 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,10 +16,10 @@ before_script: - cd $HOME/arduino_ide/hardware - mkdir esp32 - cd esp32 - - git clone --depth 1 https://github.com/espressif/arduino-esp32.git esp32 - - cd esp32 - - git submodule update --init --recursive - - cd tools + - wget https://github.com/espressif/arduino-esp32/archive/refs/tags/1.0.6.tar.gz + - tar -xzf 1.0.6.tar.gz + - mv arduino-esp32-1.0.6/ esp32 + - cd esp32/tools - python --version - python get.py - pip install --user platformio diff --git a/API.md b/API.md index 90896ec..c54c504 100644 --- a/API.md +++ b/API.md @@ -25,7 +25,7 @@ Call `/control?var=&val=` with a settings key and value to set camera #### Settings ``` lamp - Lamp value in percent; integer, 0 - 100 (-1 = disabled) -framesize - 0=QQVGA, 3=HQVGA, QVGA=4, CIF=5, VGA=6, SVGA=7, XGA=8, SXGA=9, UXGA=10, QXGA(ov3660)=11 +framesize - See below quality - 10 to 63 (ov3660: 4 to 10) contrast - -2 to 2 (ov3660: -3 to 3) brightness - -2 to 2 (ov3660: -3 to 3) @@ -63,6 +63,25 @@ cam_name - Camera Name; String code_ver - Code compile date and time; String stream_url - Raw stream URL; string ``` +##### Framesize values +These may vary between different ESP framework releases +``` + 0 - THUMB (96x96) + 1 - QQVGA (160x120) + 3 - HQVGA (240x176) + 5 - QVGA (320x240) + 6 - CIF (400x296) + 7 - HVGA (480x320) + 8 - VGA (640x480) + 9 - SVGA (800x600) +10 - XGA (1024x768) +11 - HD (1280x720) +12 - SXGA (1280x1024) +13 - UXGA (1600x1200) +Only for 3Mp+ camera modules: +14 - FHD (1920x1080) +17 - QXGA (2048x1536) +``` #### Commands These are commands; they can be sent by calling the `/control` URI with them as the `` *(a `` must also be supplied, but can be any value and is ignored)*. ``` diff --git a/index_other.h b/index_other.h index aff496b..c1c58a0 100644 --- a/index_other.h +++ b/index_other.h @@ -38,15 +38,18 @@ const uint8_t index_simple_html[] = R"=====(