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)
easytarget · May 3, 2021 · 83de1d5 · 83de1d5
1 parent 71db7b9
commit 83de1d5
Show file tree

Hide file tree

Showing 6 changed files with 63 additions and 34 deletions.
diff --git 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
@@ -25,7 +25,7 @@ Call `/control?var=<key>&val=<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 `<key>` *(a `<val>` must also be supplied, but can be any value and is ignored)*.
 ```

diff --git a/index_other.h b/index_other.h
@@ -38,15 +38,18 @@ const uint8_t index_simple_html[] = R"=====(<!doctype html>
               <div class="input-group" id="framesize-group">
                 <label for="framesize">Resolution</label>
                 <select id="framesize" class="action-setting">
-                  <option value="10">UXGA(1600x1200)</option>
-                  <option value="9">SXGA(1280x1024)</option>
-                  <option value="8">XGA(1024x768)</option>
-                  <option value="7">SVGA(800x600)</option>
-                  <option value="6">VGA(640x480)</option>
-                  <option value="5">CIF(400x296)</option>
-                  <option value="4">QVGA(320x240)</option>
-                  <option value="3">HQVGA(240x176)</option>
-                  <option value="0">QQVGA(160x120)</option>
+                  <option value="13">UXGA (1600x1200)</option>
+                  <option value="12">SXGA (1280x1024)</option>
+                  <option value="11">HD (1280x720)</option>
+                  <option value="10">XGA (1024x768)</option>
+                  <option value="9">SVGA (800x600)</option>
+                  <option value="8">VGA (640x480)</option>
+                  <option value="7">HVGA (480x320)</option>
+                  <option value="6">CIF (400x296)</option>
+                  <option value="5">QVGA (320x240)</option>
+                  <option value="3">HQVGA (240x176)</option>
+                  <option value="1">QQVGA (160x120)</option>
+                  <option value="0">THUMB (96x96)</option>
                 </select>
               </div>
               <!-- Hide the next entries, they are present in the body so that we

diff --git a/index_ov2640.h b/index_ov2640.h
@@ -52,15 +52,18 @@ const uint8_t index_ov2640_html[] = R"=====(<!doctype html>
               <div class="input-group" id="framesize-group">
                 <label for="framesize">Resolution</label>
                 <select id="framesize" class="default-action">
-                  <option value="10">UXGA(1600x1200)</option>
-                  <option value="9">SXGA(1280x1024)</option>
-                  <option value="8">XGA(1024x768)</option>
-                  <option value="7">SVGA(800x600)</option>
-                  <option value="6">VGA(640x480)</option>
-                  <option value="5">CIF(400x296)</option>
-                  <option value="4">QVGA(320x240)</option>
-                  <option value="3">HQVGA(240x176)</option>
-                  <option value="0">QQVGA(160x120)</option>
+                  <option value="13">UXGA (1600x1200)</option>
+                  <option value="12">SXGA (1280x1024)</option>
+                  <option value="11">HD (1280x720)</option>
+                  <option value="10">XGA (1024x768)</option>
+                  <option value="9">SVGA (800x600)</option>
+                  <option value="8">VGA (640x480)</option>
+                  <option value="7">HVGA (480x320)</option>
+                  <option value="6">CIF (400x296)</option>
+                  <option value="5">QVGA (320x240)</option>
+                  <option value="3">HQVGA (240x176)</option>
+                  <option value="1">QQVGA (160x120)</option>
+                  <option value="0">THUMB (96x96)</option>
                 </select>
               </div>
               <div class="input-group" id="quality-group">

diff --git a/index_ov3660.h b/index_ov3660.h
@@ -52,16 +52,20 @@ const uint8_t index_ov3660_html[] = R"=====(<!doctype html>
               <div class="input-group" id="framesize-group">
                 <label for="framesize">Resolution</label>
                 <select id="framesize" class="default-action">
-                  <option value="11">QXGA(2048x1564)</option>
-                  <option value="10">UXGA(1600x1200)</option>
-                  <option value="9">SXGA(1280x1024)</option>
-                  <option value="8">XGA(1024x768)</option>
-                  <option value="7">SVGA(800x600)</option>
-                  <option value="6">VGA(640x480)</option>
-                  <option value="5">CIF(400x296)</option>
-                  <option value="4">QVGA(320x240)</option>
-                  <option value="3">HQVGA(240x176)</option>
-                  <option value="0">QQVGA(160x120)</option>
+                  <option value="17">QXGA (2048x1536)</option>
+                  <option value="14">FHD (1920x1080)</option>
+                  <option value="13">UXGA (1600x1200)</option>
+                  <option value="12">SXGA (1280x1024)</option>
+                  <option value="11">HD (1280x720)</option>
+                  <option value="10">XGA (1024x768)</option>
+                  <option value="9">SVGA (800x600)</option>
+                  <option value="8">VGA (640x480)</option>
+                  <option value="7">HVGA (480x320)</option>
+                  <option value="6">CIF (400x296)</option>
+                  <option value="5">QVGA (320x240)</option>
+                  <option value="3">HQVGA (240x176)</option>
+                  <option value="1">QQVGA (160x120)</option>
+                  <option value="0">THUMB (96x96)</option>
                 </select>
               </div>
               <div class="input-group" id="quality-group">

diff --git a/myconfig.sample.h b/myconfig.sample.h
@@ -108,7 +108,7 @@ struct station stationList[] = {{"ssid1", "pass1", true},
  *
  */
 // Initial Reslolution, default SVGA
-// available values are: FRAMESIZE_[QQVGA|HQVGA|QVGA|CIF|VGA|SVGA|XGA|SXGA|UXGA|QXGA(ov3660)]
+// available values are: FRAMESIZE_[THUMB|QQVGA|HQVGA|QVGA|CIF|HVGA|VGA|SVGA|XGA|HD|SXGA|UXGA] + [FHD|QXGA] for 3Mp Sensors; eg ov3660
 // #define DEFAULT_RESOLUTION FRAMESIZE_SVGA
 
 // Hardware Horizontal Mirror, 0 or 1 (overrides default board setting)