Merge branch 'master' into 4-0-rc1

easytarget · Mar 9, 2022 · d064e88 · d064e88
2 parents 04a94ed + ed71e54
commit d064e88
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -153,4 +153,3 @@ V4
 * OSD
   * Temperature/humidity/pressure sensor support (bme20,dht11)
 You can check the [enhancement list](https://github.com/easytarget/esp32-cam-webserver/issues?q=is%3Aissue+label%3Aenhancement) (past and present), and add any thoughts you may have there.
-
diff --git a/esp32-cam-webserver.ino b/esp32-cam-webserver.ino
@@ -6,6 +6,7 @@
 #include <ArduinoOTA.h>
 #include "src/parsebytes.h"
 #include "time.h"
+#include <ESPmDNS.h>
 
 
 /* This sketch is a extension/expansion/reork of the 'official' ESP32 Camera example
@@ -714,8 +715,17 @@ void setup() {
         ArduinoOTA.begin();
     } else {
         Serial.println("OTA is disabled");
+
+        if (!MDNS.begin(myName)) {
+          Serial.println("Error setting up MDNS responder!");
+        }
+        Serial.println("mDNS responder started");
     }
 
+    //MDNS Config -- note that if OTA is NOT enabled this needs prior steps!
+    MDNS.addService("http", "tcp", 80);
+    Serial.println("Added HTTP service to MDNS server");
+
     // Set time via NTP server when enabled
     if (haveTime) {
         Serial.print("Time: ");

diff --git a/index_other.h b/index_other.h
@@ -36,11 +36,11 @@ const uint8_t index_simple_html[] = R"=====(<!doctype html>
         <div class="hidden" id="sidebar">
           <input type="checkbox" id="nav-toggle-cb">
             <nav id="menu" style="width:24em;">
-              <div class="input-group hidden" id="lamp-group">
+              <div class="input-group hidden" id="lamp-group" title="Brightness of flashlight LED. Warning: Very bright! Be careful when increasing. Avoid looking directly at LED!>
                 <label for="lamp">Light</label>
                 <div class="range-min">Off</div>
                 <input type="range" id="lamp" min="0" max="100" value="0" class="action-setting">
-                <div class="range-max">Full</div>
+                <div class="range-max">Full&#9888;</div>
               </div>
               <div class="input-group" id="framesize-group">
                 <label for="framesize">Resolution</label>

diff --git a/index_ov2640.h b/index_ov2640.h
@@ -35,16 +35,16 @@ const uint8_t index_ov2640_html[] = R"=====(<!doctype html>
         <div class="hidden" id="sidebar">
           <input type="checkbox" id="nav-toggle-cb" checked="checked">
             <nav id="menu">
-              <div class="input-group hidden" id="lamp-group">
+              <div class="input-group hidden" id="lamp-group" title="Brightness of flashlight LED. Warning: Very bright! Be careful when increasing. Avoid looking directly at LED!">
                 <label for="lamp">Light</label>
                 <div class="range-min">Off</div>
                 <input type="range" id="lamp" min="0" max="100" value="0" class="default-action">
-                <div class="range-max">Full</div>
+                <div class="range-max">Full&#9888;</div>
               </div>
-              <div class="input-group hidden" id="autolamp-group">
+              <div class="input-group hidden" id="autolamp-group" title="Lamp only on when camera active">
                 <label for="autolamp">Auto Lamp</label>
                 <div class="switch">
-                  <input id="autolamp" type="checkbox" class="default-action" title="Lamp only on when camera active">
+                  <input id="autolamp" type="checkbox" class="default-action">
                   <label class="slider" for="autolamp"></label>
                 </div>
               </div>
@@ -245,7 +245,7 @@ const uint8_t index_ov2640_html[] = R"=====(<!doctype html>
                 </div>
               </div>
               <div class="input-group" id="preferences-group">
-                <label for="reboot" style="line-height: 2em;">Preferences</label>
+                <label for="prefs" style="line-height: 2em;">Preferences</label>
                 <button id="reboot" title="Reboot the camera module">Reboot</button>
                 <button id="save_prefs" title="Save Preferences on camera module">Save</button>
                 <button id="clear_prefs" title="Erase saved Preferences on camera module">Erase</button>

diff --git a/index_ov3660.h b/index_ov3660.h
@@ -35,16 +35,16 @@ const uint8_t index_ov3660_html[] = R"=====(<!doctype html>
         <div class="hidden" id="sidebar">
           <input type="checkbox" id="nav-toggle-cb" checked="checked">
             <nav id="menu">
-              <div class="input-group hidden" id="lamp-group">
+              <div class="input-group hidden" id="lamp-group" title="Brightness of flashlight LED. Warning: Very bright! Be careful when increasing. Avoid looking directly at LED!">
                 <label for="lamp">Light</label>
                 <div class="range-min">Off</div>
                 <input type="range" id="lamp" min="0" max="100" value="0" class="default-action">
-                <div class="range-max">Full</div>
+                <div class="range-max">Full&#9888;</div>
               </div>
-              <div class="input-group hidden" id="autolamp-group">
+              <div class="input-group hidden" id="autolamp-group" title="Lamp only on when camera active">
                 <label for="autolamp">Auto Lamp</label>
                 <div class="switch">
-                  <input id="autolamp" type="checkbox" class="default-action" title="Lamp only on when camera active">
+                  <input id="autolamp" type="checkbox" class="default-action">
                   <label class="slider" for="autolamp"></label>
                 </div>
               </div>
@@ -259,7 +259,7 @@ const uint8_t index_ov3660_html[] = R"=====(<!doctype html>
                 </div>
               </div>
               <div class="input-group" id="preferences-group">
-                <label for="reboot" style="line-height: 2em;">Preferences</label>
+                <label for="prefs" style="line-height: 2em;">Preferences</label>
                 <button id="reboot" title="Reboot the camera module">Reboot</button>
                 <button id="save_prefs" title="Save Preferences on camera module">Save</button>
                 <button id="clear_prefs" title="Erase saved Preferences on camera module">Erase</button>

diff --git a/myconfig.sample.h b/myconfig.sample.h
@@ -5,7 +5,10 @@
  */
 
 
-/* Give the camera a name for the web interface */
+/* Give the camera a name for the web interface
+ * A word of warning: This name is also used for OTA updates and MDNS addressing.
+ * Pick something convenient!
+ */
 #define CAM_NAME "ESP32 camera server"
 
 
@@ -191,3 +194,4 @@ struct station stationList[] = {{"ssid1", "pass1", true},
 // For clone modules that have camera module and SPIFFS startup issues try setting
 // this very low (start at 2MHZ and increase):
 // #define XCLK_FREQ_MHZ 2
+
Original file line number	Diff line number	Diff line change
Expand Up		@@ -153,4 +153,3 @@ V4
		* OSD
		* Temperature/humidity/pressure sensor support (bme20,dht11)
		You can check the [enhancement list](https://github.com/easytarget/esp32-cam-webserver/issues?q=is%3Aissue+label%3Aenhancement) (past and present), and add any thoughts you may have there.