iProdding and poking into a releasable form

Author: easytarget

.gitignore

@@ -1 +1 @@
-mywifi.h
+myconfig.h

camera_index_ov2640.h

@@ -583,7 +583,7 @@ const uint8_t index_ov2640_html[] PROGMEM = R"=====(
             </div>
         </section>
     </body>
-    
+
     <script>
 document.addEventListener('DOMContentLoaded', function (event) {
   var baseHost = document.location.origin
@@ -725,6 +725,7 @@ document.addEventListener('DOMContentLoaded', function (event) {
     stopStream()
     view.src = `${baseHost}/capture?_cb=${Date.now()}`
     show(viewContainer)
+    view.scrollIntoView();
   }
 
   closeButton.onclick = () => {

camera_index_ov3660.h

@@ -258,6 +258,15 @@ const uint8_t index_ov3660_html[] PROGMEM = R"=====(
                 background: #363636
             }
 
+            input[type=text] {
+                border: 1px solid #363636;
+                font-size: 14px;
+                height: 20px;
+                margin: 1px;
+                outline: 0;
+                border-radius: 5px
+            }
+
             .switch {
                 display: block;
                 position: relative;
@@ -337,15 +346,6 @@ const uint8_t index_ov3660_html[] PROGMEM = R"=====(
                 display: none
             }
 
-            input[type=text] {
-                border: 1px solid #363636;
-                font-size: 14px;
-                height: 20px;
-                margin: 1px;
-                outline: 0;
-                border-radius: 5px
-            }
-
             .inline-button {
                 line-height: 20px;
                 margin: 2px;
@@ -378,9 +378,9 @@ const uint8_t index_ov3660_html[] PROGMEM = R"=====(
                                 <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="7" selected="selected">SVGA(800x600)</option>
                                 <option value="6">VGA(640x480)</option>
-                                <option value="5" selected="selected">CIF(400x296)</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>
@@ -576,6 +576,15 @@ const uint8_t index_ov3660_html[] PROGMEM = R"=====(
                         <section id="buttons">
                             <button id="face_enroll" class="disabled" disabled="disabled">Enroll Face</button>
                         </section>
+                        <div class="input-group" id="cam_name-group">
+                            <label for="cam_name">Name:</label>
+                            <div id="cam_name" class="default-action"></div>
+                        </div>
+                        <div class="input-group" id="code_ver-group">
+                            <label for="code_ver">Firmware:</label>
+                            <div id="code_ver" class="default-action"></div>
+                        </div>
+
                     </nav>
                 </div>
                 <figure>
@@ -586,7 +595,9 @@ const uint8_t index_ov3660_html[] PROGMEM = R"=====(
                 </figure>
             </div>
         </section>
-        <script>
+    </body>
+
+    <script>
 document.addEventListener('DOMContentLoaded', function (event) {
   var baseHost = document.location.origin
   var streamUrl = baseHost + ':81'
@@ -621,6 +632,8 @@ document.addEventListener('DOMContentLoaded', function (event) {
     }
 
     const lampGroup = document.getElementById('lamp-group')
+    const camName = document.getElementById('cam_name')
+    const codeVer = document.getElementById('code_ver')
 
     if (updateRemote && initialValue !== value) {
       updateConfig(el);
@@ -643,6 +656,11 @@ document.addEventListener('DOMContentLoaded', function (event) {
         } else {
           show(lampGroup)
         }
+      } else if(el.id === "cam_name"){
+        camName.innerHTML = value;
+        window.document.title = value;
+      } else if(el.id === "code_ver"){
+        codeVer.innerHTML = value;
       }
     }
   }
@@ -709,6 +727,7 @@ document.addEventListener('DOMContentLoaded', function (event) {
   const startStream = () => {
     view.src = `${streamUrl}/stream`
     show(viewContainer)
+    view.scrollIntoView();
     streamButton.innerHTML = 'Stop Stream'
   }
 
@@ -717,6 +736,7 @@ document.addEventListener('DOMContentLoaded', function (event) {
     stopStream()
     view.src = `${baseHost}/capture?_cb=${Date.now()}`
     show(viewContainer)
+    view.scrollIntoView();
   }
 
   closeButton.onclick = () => {
@@ -815,8 +835,8 @@ document.addEventListener('DOMContentLoaded', function (event) {
   }
 })
 
-        </script>
-    </body>
+    </script>
+
 </html>
 )=====";
 

camera_pins.h

@@ -1,3 +1,7 @@
+// Pin definitions for soem common ESP-CAM modules
+
+// ESP WROVER 
+// https://dl.espressif.com/dl/schematics/ESP-WROVER-KIT_SCH-2.pdf
 
 #if defined(CAMERA_MODEL_WROVER_KIT)
 #define PWDN_GPIO_NUM    -1
@@ -18,6 +22,15 @@
 #define HREF_GPIO_NUM    23
 #define PCLK_GPIO_NUM    22
 
+#define LED_PIN            2 // A status led on the RGB; could also use pin 0 or 4
+#define LED_ON          HIGH // 
+#define LED_OFF          LOW //
+//#define LAMP_PIN         x // No LED FloodLamp.
+
+
+// ESP-EYE
+// https://twitter.com/esp32net/status/1085488403460882437
+
 #elif defined(CAMERA_MODEL_ESP_EYE)
 #define PWDN_GPIO_NUM    -1
 #define RESET_GPIO_NUM   -1
@@ -37,6 +50,14 @@
 #define HREF_GPIO_NUM    27
 #define PCLK_GPIO_NUM    25
 
+#define LED_PIN           21 // Status led
+#define LED_ON          HIGH //
+#define LED_OFF          LOW //
+//#define LAMP_PIN   v     x // No LED FloodLamp.
+
+
+// ESP32 M5STACK
+
 #elif defined(CAMERA_MODEL_M5STACK_PSRAM)
 #define PWDN_GPIO_NUM     -1
 #define RESET_GPIO_NUM    15
@@ -75,13 +96,22 @@
 #define HREF_GPIO_NUM     26
 #define PCLK_GPIO_NUM     21
 
+// M5 Stack status/illumination LED details unknown/unclear
+//#define LED_PIN          x // Status led
+//#define LED_ON        HIGH // 
+//#define LED_OFF        LOW //
+//#define LAMP_PIN        x  // LED FloodLamp.
+
+
+// AI Thinker
+// https://github.com/SeeedDocument/forum_doc/raw/master/reg/ESP32_CAM_V1.6.pdf
+
 #elif defined(CAMERA_MODEL_AI_THINKER)
 #define PWDN_GPIO_NUM     32
 #define RESET_GPIO_NUM    -1
 #define XCLK_GPIO_NUM      0
 #define SIOD_GPIO_NUM     26
 #define SIOC_GPIO_NUM     27
-
 #define Y9_GPIO_NUM       35
 #define Y8_GPIO_NUM       34
 #define Y7_GPIO_NUM       39

esp32-cam-webserver.ino

@@ -31,15 +31,15 @@
 #define CAMERA_MODULE_OV2640
 //#define CAMERA_MODULE_OV3660
 
-#if __has_include("mywifi.h")
+#if __has_include("myconfig.h")
   // I keep my settings in a seperate header file
-  #include "mywifi.h"
+  #include "myconfig.h"
 #else
   const char* ssid = "my-access-point-ssid";
   const char* password = "my-access-point-password";
 #endif
 
-// A Name for the Camera. (can be set in wifi.h)
+// A Name for the Camera. (can be set in myconfig.h)
 #ifdef CAM_NAME
   char myName[] = CAM_NAME;
 #else
@@ -50,7 +50,6 @@
 char myVer[] PROGMEM = __DATE__ " @ " __TIME__;
 
 
-
 #include "camera_pins.h"
 
 // Status and illumination LED's
@@ -76,7 +75,7 @@ void setup() {
   Serial.print("Code Built: ");
   Serial.println(myVer);
 
-#ifdef LED_PIN  // If we have  notification LED, set it to output
+#ifdef LED_PIN  // If we have a notification LED set it to output
     pinMode(LED_PIN, OUTPUT);
     digitalWrite(LED_PIN, LED_OFF); 
 #endif

mywifi.sample.h myconfig.sample.hmywifi.sample.h renamed to myconfig.sample.h

@@ -6,5 +6,6 @@ const char* password = "my-access-point-password";
 
 
 // Optionally give the camera a name for the web interface 
-//  (this is not a network hostname)
-// #define CAM_NAME "Chocolate Store"
+//  (nb: this is not the network hostname)
+
+#define CAM_NAME "my-awesome-webcam"