From 1cab1f5a0d3f5e46b013fa11e1d276ffd548cc8e Mon Sep 17 00:00:00 2001 From: abratchik Date: Thu, 15 Dec 2022 17:11:45 +0400 Subject: [PATCH] Webclient refactoring --- API.md | 10 +- Docs/html/annotated.html | 17 +- Docs/html/app__cam_8h_source.html | 14 +- Docs/html/app__conn_8h.html | 2 + Docs/html/app__conn_8h_source.html | 217 ++++---- Docs/html/app__httpd_8h.html | 3 + Docs/html/app__httpd_8h_source.html | 273 +++++----- Docs/html/class_c_l_app_httpd.html | 87 +++ Docs/html/classes.html | 9 +- Docs/html/functions.html | 9 + Docs/html/functions_func.html | 7 + Docs/html/functions_vars.html | 2 + Docs/html/hierarchy.html | 17 +- Docs/html/index.html | 58 +- Docs/html/md__a_p_i.html | 10 +- Docs/html/menudata.js | 2 + Docs/html/search/all_0.js | 4 +- Docs/html/search/all_11.js | 3 +- Docs/html/search/all_4.js | 2 +- Docs/html/search/all_5.js | 25 +- Docs/html/search/all_c.js | 5 +- Docs/html/search/all_e.js | 49 +- Docs/html/search/classes_0.js | 6 +- Docs/html/search/classes_1.js | 7 +- Docs/html/search/classes_2.js | 3 +- Docs/html/search/classes_3.html | 37 ++ Docs/html/search/classes_3.js | 4 + Docs/html/search/functions_0.js | 7 +- Docs/html/search/functions_1.js | 8 +- Docs/html/search/functions_2.js | 4 +- Docs/html/search/functions_3.js | 36 +- Docs/html/search/functions_4.js | 37 +- Docs/html/search/functions_5.js | 10 +- Docs/html/search/functions_6.js | 10 +- Docs/html/search/functions_7.js | 9 +- Docs/html/search/functions_8.js | 11 +- Docs/html/search/functions_9.js | 9 +- Docs/html/search/functions_a.js | 22 +- Docs/html/search/functions_b.js | 18 +- Docs/html/search/functions_c.js | 2 +- Docs/html/search/functions_d.js | 2 +- Docs/html/search/functions_e.html | 37 ++ Docs/html/search/functions_e.js | 5 + Docs/html/search/pages_2.js | 2 +- Docs/html/search/searchdata.js | 4 +- Docs/html/search/variables_5.js | 3 +- Docs/html/search/variables_6.js | 5 +- Docs/html/struct_app_servo.html | 120 ++++ Docs/html/struct_static_i_p.html | 7 +- Docs/html/struct_station.html | 7 +- README.md | 53 +- data/www/css/style.css | 6 - data/www/index.html | 367 +++++++++++++ data/www/index_ov2640.html | 617 --------------------- data/www/index_ov3660.html | 636 ---------------------- data/www/index_simple.html | 317 ----------- data/www/js/cam.js | 183 +++++++ data/www/js/utils.js | 264 +++++++++ data/www/portal.html | 27 - data/www/{streamviewer.html => view.html} | 2 +- platformio.ini | 4 +- src/app_cam.cpp | 25 +- src/app_httpd.cpp | 141 +++-- src/app_httpd.h | 17 + 64 files changed, 1777 insertions(+), 2139 deletions(-) create mode 100644 Docs/html/search/classes_3.html create mode 100644 Docs/html/search/classes_3.js create mode 100644 Docs/html/search/functions_e.html create mode 100644 Docs/html/search/functions_e.js create mode 100644 Docs/html/struct_app_servo.html create mode 100644 data/www/index.html delete mode 100644 data/www/index_ov2640.html delete mode 100644 data/www/index_ov3660.html delete mode 100644 data/www/index_simple.html create mode 100644 data/www/js/cam.js create mode 100644 data/www/js/utils.js delete mode 100644 data/www/portal.html rename data/www/{streamviewer.html => view.html} (99%) diff --git a/API.md b/API.md index 148afad..b631a87 100644 --- a/API.md +++ b/API.md @@ -4,10 +4,8 @@ this makes controlling all functions of the camera via GET requests possible. ## URI's ### Web UI pages -* `/` or `/portal` - Default index (portal) -* `/view?mode=full|simple|stream|still` - Go direct to specific page: -* - full: taking still and video with complete set of camera controls -* - simple: taking still and video with limited set of camera controls +* `/` Default index (camera view) +* `/view?mode=stream|still` - Go direct to specific page: * - stream: starting video capture with full screen mode * - still: taking a still image with full screen mode * `/dump` - Status page (automatically refreshed every 5 sec) @@ -50,8 +48,6 @@ vflip - 0 = disable, 1 = enable rotate - Rotation Angle; integer, only -90, 0, 90 values are recognised dcw - 0 = disable, 1 = enable colorbar - Overlays a color test pattern on the stream; integer, 1 = enabled -face_detect - Face Detection; 1 = enabled, Only settable if framesize <= 4 (CIF) -face_recognize - Face recognition; 1 = enabled, only settable if Face detection is already enabled ``` ##### Framesize values @@ -81,7 +77,7 @@ the `` parameter. * save_prefs - Saves preferences `val=cam` or not specified will save camera preferences `val=conn` will save network preferences -* clear_prefs - Deletes camera the preferences +* remove_prefs - Deletes camera the preferences `val=cam` or not specified will reset camera preferences `val=conn` will reset network preferences. Attention! after this the server will boot as access point after restart, and all connection settings will be lost. diff --git a/Docs/html/annotated.html b/Docs/html/annotated.html index a9e68fc..8425ee6 100644 --- a/Docs/html/annotated.html +++ b/Docs/html/annotated.html @@ -69,15 +69,16 @@
Here are the data structures with brief descriptions:
- - - - + + + + - - - - + + + +
 CCLAppCamCamera Manager Manages all interactions with camera
 CCLAppComponentAbstract root class for the appication components
 CCLAppConnConnection Manager This class manages everything related to connectivity of the application: WiFi, OTA etc
 CCLAppHttpdWebServer Manager Class for handling web server requests. The web pages are assumed to be stored in the file system (can be SD card or LittleFS).
+
 CAppServo
 CCLAppCamCamera Manager Manages all interactions with camera
 CCLAppComponentAbstract root class for the appication components
 CCLAppConnConnection Manager This class manages everything related to connectivity of the application: WiFi, OTA etc
 CCLAppHttpdWebServer Manager Class for handling web server requests. The web pages are assumed to be stored in the file system (can be SD card or LittleFS).
 CCLStorageStorage Manager Encapsulates access to the file system, which can be either external (SD card) or internal (LittleFS)
 CStaticIP
 CStation
 CUriMappingStatic URI to path mapping
 CCLStorageStorage Manager Encapsulates access to the file system, which can be either external (SD card) or internal (LittleFS)
 CStaticIPStatic IP strcuture for configuring AP and WiFi parameters
 CStationWiFi connectivity details (SSID/password)
 CUriMappingStatic URI to path mapping
diff --git a/Docs/html/app__cam_8h_source.html b/Docs/html/app__cam_8h_source.html index 63be855..e06ec0f 100644 --- a/Docs/html/app__cam_8h_source.html +++ b/Docs/html/app__cam_8h_source.html @@ -174,31 +174,31 @@
105extern CLAppCam AppCam;
106
107#endif
-
AppCam
CLAppCam AppCam
Definition: app_cam.cpp:233
+
AppCam
CLAppCam AppCam
Definition: app_cam.cpp:248
LAMP_DEFAULT
#define LAMP_DEFAULT
Definition: app_cam.h:11
app_component.h
camera_pins.h
CLAppCam
Camera Manager Manages all interactions with camera.
Definition: app_cam.h:22
-
CLAppCam::savePrefs
int savePrefs()
Definition: app_cam.cpp:157
+
CLAppCam::savePrefs
int savePrefs()
Definition: app_cam.cpp:170
CLAppCam::isJPEGinBuffer
bool isJPEGinBuffer()
Definition: app_cam.h:54
-
CLAppCam::loadPrefs
int loadPrefs()
Definition: app_cam.cpp:98
+
CLAppCam::loadPrefs
int loadPrefs()
Definition: app_cam.cpp:109
CLAppCam::setRotation
void setRotation(int val)
Definition: app_cam.h:48
CLAppCam::CLAppCam
CLAppCam()
Definition: app_cam.cpp:3
CLAppCam::setFrameRate
void setFrameRate(int newFrameRate)
Definition: app_cam.h:43
CLAppCam::getRotation
int getRotation()
Definition: app_cam.h:49
CLAppCam::getFrameRate
int getFrameRate()
Definition: app_cam.h:42
CLAppCam::getLamp
int getLamp()
Definition: app_cam.h:33
-
CLAppCam::snapToBufer
int snapToBufer()
Definition: app_cam.cpp:218
-
CLAppCam::setLamp
void setLamp(int newVal=LAMP_DEFAULT)
Definition: app_cam.cpp:85
+
CLAppCam::snapToBufer
int snapToBufer()
Definition: app_cam.cpp:233
+
CLAppCam::setLamp
void setLamp(int newVal=LAMP_DEFAULT)
Definition: app_cam.cpp:96
CLAppCam::getXclk
int getXclk()
Definition: app_cam.h:46
-
CLAppCam::stop
int stop()
Definition: app_cam.cpp:78
+
CLAppCam::stop
int stop()
Definition: app_cam.cpp:89
CLAppCam::getErr
String getErr()
Definition: app_cam.h:40
CLAppCam::setXclk
void setXclk(int val)
Definition: app_cam.h:45
CLAppCam::getBufferSize
size_t getBufferSize()
Definition: app_cam.h:53
CLAppCam::setAutoLamp
void setAutoLamp(bool val)
Definition: app_cam.h:35
CLAppCam::isAutoLamp
bool isAutoLamp()
Definition: app_cam.h:36
CLAppCam::getBuffer
uint8_t * getBuffer()
Definition: app_cam.h:52
-
CLAppCam::releaseBuffer
void releaseBuffer()
Definition: app_cam.cpp:224
+
CLAppCam::releaseBuffer
void releaseBuffer()
Definition: app_cam.cpp:239
CLAppCam::getSensorPID
int getSensorPID()
Definition: app_cam.h:38
CLAppCam::start
int start()
Definition: app_cam.cpp:8
CLAppCam::getSensor
sensor_t * getSensor()
Definition: app_cam.h:39
diff --git a/Docs/html/app__conn_8h.html b/Docs/html/app__conn_8h.html index 842324d..43c19ef 100644 --- a/Docs/html/app__conn_8h.html +++ b/Docs/html/app__conn_8h.html @@ -90,8 +90,10 @@

Data Structures

struct  Station + WiFi connectivity details (SSID/password). More...
  struct  StaticIP + Static IP strcuture for configuring AP and WiFi parameters. More...
  class  CLAppConn  Connection Manager This class manages everything related to connectivity of the application: WiFi, OTA etc. More...
diff --git a/Docs/html/app__conn_8h_source.html b/Docs/html/app__conn_8h_source.html index fc7d394..b4edd93 100644 --- a/Docs/html/app__conn_8h_source.html +++ b/Docs/html/app__conn_8h_source.html @@ -100,98 +100,97 @@
27#define NTP_GMT_OFFSET 14400
28#define NTP_DST_OFFSET 0
29
-
30
-
31struct Station { char ssid[64]; char password[64]; bool dhcp;};
-
32
-
33struct StaticIP { IPAddress *ip; IPAddress *netmask; IPAddress *gateway; IPAddress *dns1; IPAddress *dns2; };
-
34
-
40class CLAppConn : public CLAppComponent {
-
41 public:
-
42 CLAppConn();
-
43
-
44 int loadPrefs();
-
45 int savePrefs();
-
46 int start();
-
47 bool stop() {return WiFi.disconnect();};
-
48
-
49 void enableOTA(bool enable = true);
-
50 void handleOTA() {if(otaEnabled) ArduinoOTA.handle();};
-
51
-
52 void configMDNS();
-
53 void handleDNSRequest(){if (captivePortal) dnsServer.processNextRequest();};
-
54
-
55 void configNTP();
-
56
-
57 char * getNTPServer() { return ntpServer;};
-
58 long getGmtOffset_sec() {return gmtOffset_sec;};
-
59 int getDaylightOffset_sec() {return daylightOffset_sec;};
-
60
-
61 bool isOTAEnabled() {return otaEnabled;};
-
62
-
63 wl_status_t wifiStatus() {return (accesspoint?ap_status:WiFi.status());};
-
64
-
65 char * getHTTPUrl(){ return httpURL;};
-
66 char * getStreamUrl(){ return streamURL;};
-
67 int getPort() {return httpPort;};
-
68
-
69 char * getApName() {return apName;};
-
70
-
71 bool isAccessPoint() {return accesspoint;};
-
72 bool isCaptivePortal() {return captivePortal;};
-
73
-
74 char * getLocalTimeStr();
-
75 char * getUpTimeStr();
-
76 void printLocalTime(bool extraData=false);
+
34struct Station { char ssid[64]; char password[64]; bool dhcp;};
+
35
+
40struct StaticIP { IPAddress *ip; IPAddress *netmask; IPAddress *gateway; IPAddress *dns1; IPAddress *dns2; };
+
41
+
47class CLAppConn : public CLAppComponent {
+
48 public:
+
49 CLAppConn();
+
50
+
51 int loadPrefs();
+
52 int savePrefs();
+
53 int start();
+
54 bool stop() {return WiFi.disconnect();};
+
55
+
56 void enableOTA(bool enable = true);
+
57 void handleOTA() {if(otaEnabled) ArduinoOTA.handle();};
+
58
+
59 void configMDNS();
+
60 void handleDNSRequest(){if (captivePortal) dnsServer.processNextRequest();};
+
61
+
62 void configNTP();
+
63
+
64 char * getNTPServer() { return ntpServer;};
+
65 long getGmtOffset_sec() {return gmtOffset_sec;};
+
66 int getDaylightOffset_sec() {return daylightOffset_sec;};
+
67
+
68 bool isOTAEnabled() {return otaEnabled;};
+
69
+
70 wl_status_t wifiStatus() {return (accesspoint?ap_status:WiFi.status());};
+
71
+
72 char * getHTTPUrl(){ return httpURL;};
+
73 char * getStreamUrl(){ return streamURL;};
+
74 int getPort() {return httpPort;};
+
75
+
76 char * getApName() {return apName;};
77
-
78 private:
-
79 void calcURLs();
+
78 bool isAccessPoint() {return accesspoint;};
+
79 bool isCaptivePortal() {return captivePortal;};
80
-
81 // Known networks structure. Max number of known stations limited for memory considerations
-
82 Station *stationList[MAX_KNOWN_STATIONS];
-
83 int stationCount = 0;
+
81 char * getLocalTimeStr();
+
82 char * getUpTimeStr();
+
83 void printLocalTime(bool extraData=false);
84
-
85 // Static IP structure
-
86 StaticIP staticIP;
+
85 private:
+
86 void calcURLs();
87
-
88 char mdnsName[20];
-
89
-
90 bool accesspoint = false;
-
91 char apName[20];
-
92 char apPass[20];
-
93 int ap_channel=1;
-
94 StaticIP apIP;
-
95 bool ap_dhcp=true;
-
96 wl_status_t ap_status = WL_DISCONNECTED;
-
97
-
98 // DNS server
-
99 const byte DNS_PORT = 53;
-
100 DNSServer dnsServer;
-
101 bool captivePortal = false;
-
102
-
103 // HOST_NAME
-
104 char hostName[64]="";
-
105
-
106 // The app and stream URLs (initialized during WiFi setup)
-
107 char httpURL[64];
-
108 char streamURL[64];
+
88 // Known networks structure. Max number of known stations limited for memory considerations
+
89 Station *stationList[MAX_KNOWN_STATIONS];
+
90 int stationCount = 0;
+
91
+
92 // Static IP structure
+
93 StaticIP staticIP;
+
94
+
95 char mdnsName[20];
+
96
+
97 bool accesspoint = false;
+
98 char apName[20];
+
99 char apPass[20];
+
100 int ap_channel=1;
+
101 StaticIP apIP;
+
102 bool ap_dhcp=true;
+
103 wl_status_t ap_status = WL_DISCONNECTED;
+
104
+
105 // DNS server
+
106 const byte DNS_PORT = 53;
+
107 DNSServer dnsServer;
+
108 bool captivePortal = false;
109
-
110 // HTTP Port. Can be overriden during IP setup
-
111 int httpPort = 80;
+
110 // HOST_NAME
+
111 char hostName[64]="";
112
-
113 // OTA parameters
-
114 bool otaEnabled = false;
-
115 char otaPassword[20] = "";
+
113 // The app and stream URLs (initialized during WiFi setup)
+
114 char httpURL[64];
+
115 char streamURL[64];
116
-
117 // NTP parameters
-
118 char ntpServer[20] = NTPSERVER;
-
119 long gmtOffset_sec = NTP_GMT_OFFSET;
-
120 int daylightOffset_sec = NTP_DST_OFFSET;
-
121
-
122};
+
117 // HTTP Port. Can be overriden during IP setup
+
118 int httpPort = 80;
+
119
+
120 // OTA parameters
+
121 bool otaEnabled = false;
+
122 char otaPassword[20] = "";
123
-
124extern CLAppConn AppConn;
-
125
-
126#endif
+
124 // NTP parameters
+
125 char ntpServer[20] = NTPSERVER;
+
126 long gmtOffset_sec = NTP_GMT_OFFSET;
+
127 int daylightOffset_sec = NTP_DST_OFFSET;
+
128
+
129};
+
130
+
131extern CLAppConn AppConn;
+
132
+
133#endif
app_cam.h
app_component.h
NTP_GMT_OFFSET
#define NTP_GMT_OFFSET
Definition: app_conn.h:27
@@ -200,42 +199,42 @@
NTPSERVER
#define NTPSERVER
Definition: app_conn.h:26
MAX_KNOWN_STATIONS
#define MAX_KNOWN_STATIONS
Definition: app_conn.h:15
CLAppComponent
Abstract root class for the appication components.
Definition: app_component.h:14
-
CLAppConn
Connection Manager This class manages everything related to connectivity of the application: WiFi,...
Definition: app_conn.h:40
+
CLAppConn
Connection Manager This class manages everything related to connectivity of the application: WiFi,...
Definition: app_conn.h:47
CLAppConn::getUpTimeStr
char * getUpTimeStr()
Definition: app_conn.cpp:374
-
CLAppConn::getNTPServer
char * getNTPServer()
Definition: app_conn.h:57
+
CLAppConn::getNTPServer
char * getNTPServer()
Definition: app_conn.h:64
CLAppConn::configNTP
void configNTP()
Definition: app_conn.cpp:352
-
CLAppConn::handleOTA
void handleOTA()
Definition: app_conn.h:50
-
CLAppConn::getApName
char * getApName()
Definition: app_conn.h:69
-
CLAppConn::getStreamUrl
char * getStreamUrl()
Definition: app_conn.h:66
+
CLAppConn::handleOTA
void handleOTA()
Definition: app_conn.h:57
+
CLAppConn::getApName
char * getApName()
Definition: app_conn.h:76
+
CLAppConn::getStreamUrl
char * getStreamUrl()
Definition: app_conn.h:73
CLAppConn::CLAppConn
CLAppConn()
Definition: app_conn.cpp:3
CLAppConn::enableOTA
void enableOTA(bool enable=true)
Definition: app_conn.cpp:276
-
CLAppConn::getPort
int getPort()
Definition: app_conn.h:67
+
CLAppConn::getPort
int getPort()
Definition: app_conn.h:74
CLAppConn::start
int start()
Definition: app_conn.cpp:7
-
CLAppConn::wifiStatus
wl_status_t wifiStatus()
Definition: app_conn.h:63
-
CLAppConn::isAccessPoint
bool isAccessPoint()
Definition: app_conn.h:71
-
CLAppConn::handleDNSRequest
void handleDNSRequest()
Definition: app_conn.h:53
+
CLAppConn::wifiStatus
wl_status_t wifiStatus()
Definition: app_conn.h:70
+
CLAppConn::isAccessPoint
bool isAccessPoint()
Definition: app_conn.h:78
+
CLAppConn::handleDNSRequest
void handleDNSRequest()
Definition: app_conn.h:60
CLAppConn::printLocalTime
void printLocalTime(bool extraData=false)
Definition: app_conn.cpp:356
-
CLAppConn::getGmtOffset_sec
long getGmtOffset_sec()
Definition: app_conn.h:58
-
CLAppConn::stop
bool stop()
Definition: app_conn.h:47
+
CLAppConn::getGmtOffset_sec
long getGmtOffset_sec()
Definition: app_conn.h:65
+
CLAppConn::stop
bool stop()
Definition: app_conn.h:54
CLAppConn::configMDNS
void configMDNS()
Definition: app_conn.cpp:338
-
CLAppConn::isCaptivePortal
bool isCaptivePortal()
Definition: app_conn.h:72
+
CLAppConn::isCaptivePortal
bool isCaptivePortal()
Definition: app_conn.h:79
CLAppConn::savePrefs
int savePrefs()
Definition: app_conn.cpp:271
CLAppConn::getLocalTimeStr
char * getLocalTimeStr()
Definition: app_conn.cpp:364
-
CLAppConn::getHTTPUrl
char * getHTTPUrl()
Definition: app_conn.h:65
+
CLAppConn::getHTTPUrl
char * getHTTPUrl()
Definition: app_conn.h:72
CLAppConn::loadPrefs
int loadPrefs()
Definition: app_conn.cpp:179
-
CLAppConn::getDaylightOffset_sec
int getDaylightOffset_sec()
Definition: app_conn.h:59
-
CLAppConn::isOTAEnabled
bool isOTAEnabled()
Definition: app_conn.h:61
+
CLAppConn::getDaylightOffset_sec
int getDaylightOffset_sec()
Definition: app_conn.h:66
+
CLAppConn::isOTAEnabled
bool isOTAEnabled()
Definition: app_conn.h:68
-
StaticIP
Definition: app_conn.h:33
-
StaticIP::ip
IPAddress * ip
Definition: app_conn.h:33
-
StaticIP::dns2
IPAddress * dns2
Definition: app_conn.h:33
-
StaticIP::dns1
IPAddress * dns1
Definition: app_conn.h:33
-
StaticIP::gateway
IPAddress * gateway
Definition: app_conn.h:33
-
StaticIP::netmask
IPAddress * netmask
Definition: app_conn.h:33
-
Station
Definition: app_conn.h:31
-
Station::dhcp
bool dhcp
Definition: app_conn.h:31
-
Station::ssid
char ssid[64]
Definition: app_conn.h:31
-
Station::password
char password[64]
Definition: app_conn.h:31
+
StaticIP
Static IP strcuture for configuring AP and WiFi parameters.
Definition: app_conn.h:40
+
StaticIP::ip
IPAddress * ip
Definition: app_conn.h:40
+
StaticIP::dns2
IPAddress * dns2
Definition: app_conn.h:40
+
StaticIP::dns1
IPAddress * dns1
Definition: app_conn.h:40
+
StaticIP::gateway
IPAddress * gateway
Definition: app_conn.h:40
+
StaticIP::netmask
IPAddress * netmask
Definition: app_conn.h:40
+
Station
WiFi connectivity details (SSID/password).
Definition: app_conn.h:34
+
Station::dhcp
bool dhcp
Definition: app_conn.h:34
+
Station::ssid
char ssid[64]
Definition: app_conn.h:34
+
Station::password
char password[64]
Definition: app_conn.h:34
diff --git a/Docs/html/app__httpd_8h.html b/Docs/html/app__httpd_8h.html index 42576f0..9ecc231 100644 --- a/Docs/html/app__httpd_8h.html +++ b/Docs/html/app__httpd_8h.html @@ -80,6 +80,7 @@
#include <esp_int_wdt.h>
#include <esp_task_wdt.h>
#include <freertos/timers.h>
+#include "ESP32Servo.h"
#include "ESPAsyncWebServer.h"
#include "storage.h"
#include "app_conn.h"
@@ -92,6 +93,8 @@ struct  UriMapping  Static URI to path mapping. More...
  +struct  AppServo +  class  CLAppHttpd  WebServer Manager Class for handling web server requests. The web pages are assumed to be stored in the file system (can be SD card or LittleFS).
More...
diff --git a/Docs/html/app__httpd_8h_source.html b/Docs/html/app__httpd_8h_source.html index 0d5213b..8427590 100644 --- a/Docs/html/app__httpd_8h_source.html +++ b/Docs/html/app__httpd_8h_source.html @@ -78,154 +78,171 @@
5#include <esp_task_wdt.h>
6#include <freertos/timers.h>
7
-
8#include "ESPAsyncWebServer.h"
-
9#include "storage.h"
-
10#include "app_conn.h"
-
11#include "app_cam.h"
-
12
-
13#define MAX_URI_MAPPINGS 32
-
14
-
15#ifdef __cplusplus
-
16extern "C" {
-
17#endif
-
18uint8_t temprature_sens_read();
-
19#ifdef __cplusplus
-
20}
-
21#endif
-
22
-
23enum capture_mode {CAPTURE_STILL, CAPTURE_STREAM};
-
24
-
25String processor(const String& var);
-
26void onSystemStatus(AsyncWebServerRequest *request);
-
27void onStatus(AsyncWebServerRequest *request);
-
28void onInfo(AsyncWebServerRequest *request);
-
29void onControl(AsyncWebServerRequest *request);
-
30void onWsEvent(AsyncWebSocket * server, AsyncWebSocketClient * client, AwsEventType type, void * arg, uint8_t *data, size_t len);
-
31void onSnapTimer(TimerHandle_t pxTimer);
-
32
-
33void dumpSystemStatusToJson(char * buf, size_t size);
-
34
+
8#include "ESP32Servo.h"
+
9#include "ESPAsyncWebServer.h"
+
10#include "storage.h"
+
11#include "app_conn.h"
+
12#include "app_cam.h"
+
13
+
14#define MAX_URI_MAPPINGS 32
+
15
+
16#ifdef __cplusplus
+
17extern "C" {
+
18#endif
+
19uint8_t temprature_sens_read();
+
20#ifdef __cplusplus
+
21}
+
22#endif
+
23
+
24enum capture_mode {CAPTURE_STILL, CAPTURE_STREAM};
+
25
+
26String processor(const String& var);
+
27void onSystemStatus(AsyncWebServerRequest *request);
+
28void onStatus(AsyncWebServerRequest *request);
+
29void onInfo(AsyncWebServerRequest *request);
+
30void onControl(AsyncWebServerRequest *request);
+
31void onWsEvent(AsyncWebSocket * server, AsyncWebSocketClient * client, AwsEventType type, void * arg, uint8_t *data, size_t len);
+
32void onSnapTimer(TimerHandle_t pxTimer);
+
33
+
34void dumpSystemStatusToJson(char * buf, size_t size);
35
-
40struct UriMapping { char uri[32]; char path[32];};
-
41
+
36
+
41struct UriMapping { char uri[32]; char path[32];};
42
-
48class CLAppHttpd : public CLAppComponent {
-
49 public:
-
50 CLAppHttpd();
-
51
-
52 int start();
-
53 int loadPrefs();
+
43struct AppServo {int pin; Servo * servo;};
+
44
+
45
+
51class CLAppHttpd : public CLAppComponent {
+
52 public:
+
53 CLAppHttpd();
54
-
55 uint32_t getClientId() {return client_id;};
-
56
-
57 int8_t getStreamCount() {return streamCount;};
-
58 long getStreamsServed() {return streamsServed;};
-
59 unsigned long getImagesServed() {return imagesServed;};
-
60 void incImagesServed(){imagesServed++;};
-
61
-
62 void setStreamMode(capture_mode mode) {streammode = mode;};
-
63 capture_mode getStreamMode() {return streammode;};
-
64
-
65 int snapToStream(bool debug = false);
-
66 int startStream(uint32_t id);
-
67 int stopStream(uint32_t id);
+
55 int start();
+
56 int loadPrefs();
+
57
+
58 uint32_t getClientId() {return client_id;};
+
59
+
60 int8_t getStreamCount() {return streamCount;};
+
61 long getStreamsServed() {return streamsServed;};
+
62 unsigned long getImagesServed() {return imagesServed;};
+
63 int getServoCount() {return servoCount;};
+
64 void incImagesServed(){imagesServed++;};
+
65
+
66 void setStreamMode(capture_mode mode) {streammode = mode;};
+
67 capture_mode getStreamMode() {return streammode;};
68
-
69 void updateSnapTimer(int frameRate);
-
70
-
71 void serialSendCommand(const char * cmd);
+
69 int snapToStream(bool debug = false);
+
70 int startStream(uint32_t id);
+
71 int stopStream(uint32_t id);
72
-
73 int getSketchSize(){ return sketchSize;};
-
74 int getSketchSpace() {return sketchSpace;};
-
75 String getSketchMD5() {return sketchMD5;};
+
73 void updateSnapTimer(int frameRate);
+
74
+
75 void serialSendCommand(const char * cmd);
76
-
77 String getVersion() {return version;};
-
78
-
79 char * getName() {return myName;};
+
77 int getSketchSize(){ return sketchSize;};
+
78 int getSketchSpace() {return sketchSpace;};
+
79 String getSketchMD5() {return sketchMD5;};
80
-
81 char * getSerialBuffer() {return serialBuffer;};
+
81 String getVersion() {return version;};
82
-
83
-
84 private:
-
85
-
86 UriMapping *mappingList[MAX_URI_MAPPINGS];
-
87 int mappingCount=0;
-
88
-
89 // Name of the application used in web interface
-
90 // Can be re-defined in the httpd.json file
-
91 char myName[20] = CAM_NAME;
-
92
-
93 char serialBuffer[64];
-
94
-
95 AsyncWebServer *server;
-
96 AsyncWebSocket *ws;
-
97 uint32_t client_id = 0;
-
98 TimerHandle_t snap_timer = NULL;
+
83 char * getName() {return myName;};
+
84
+
85 char * getSerialBuffer() {return serialBuffer;};
+
86
+
93 int attachServo(int pin);
+
94
+
95 int writeServo(int pin, int value);
+
96
+
97
+
98 private:
99
-
100 int8_t streamCount=0;
-
101 long streamsServed=0;
-
102 unsigned long imagesServed;
-
103
-
104 // mode of the image capture
-
105 capture_mode streammode = CAPTURE_STILL;
-
106
-
107 // Sketch Info
-
108 int sketchSize ;
-
109 int sketchSpace ;
-
110 String sketchMD5;
+
100 UriMapping *mappingList[MAX_URI_MAPPINGS];
+
101 int mappingCount=0;
+
102
+
103 AppServo *servos[MAX_SERVOS];
+
104 int servoCount = 0;
+
105
+
106 // Name of the application used in web interface
+
107 // Can be re-defined in the httpd.json file
+
108 char myName[20] = CAM_NAME;
+
109
+
110 char serialBuffer[64];
111
-
112 const String version = __DATE__ " @ " __TIME__;
-
113
-
114};
-
115
+
112 AsyncWebServer *server;
+
113 AsyncWebSocket *ws;
+
114 uint32_t client_id = 0;
+
115 TimerHandle_t snap_timer = NULL;
116
-
117
-
118extern CLAppHttpd AppHttpd;
-
119
-
120#endif
+
117 int8_t streamCount=0;
+
118 long streamsServed=0;
+
119 unsigned long imagesServed;
+
120
+
121 // mode of the image capture
+
122 capture_mode streammode = CAPTURE_STILL;
+
123
+
124 // Sketch Info
+
125 int sketchSize ;
+
126 int sketchSpace ;
+
127 String sketchMD5;
+
128
+
129 const String version = __DATE__ " @ " __TIME__;
+
130
+
131};
+
132
+
133
+
134
+
135extern CLAppHttpd AppHttpd;
+
136
+
137#endif
app_cam.h
CAM_NAME
#define CAM_NAME
Definition: app_config.h:6
app_conn.h
-
AppHttpd
CLAppHttpd AppHttpd
Definition: app_httpd.cpp:507
-
processor
String processor(const String &var)
Definition: app_httpd.cpp:128
+
AppHttpd
CLAppHttpd AppHttpd
Definition: app_httpd.cpp:572
+
processor
String processor(const String &var)
Definition: app_httpd.cpp:139
onSnapTimer
void onSnapTimer(TimerHandle_t pxTimer)
Definition: app_httpd.cpp:11
temprature_sens_read
uint8_t temprature_sens_read()
-
capture_mode
capture_mode
Definition: app_httpd.h:23
-
CAPTURE_STILL
@ CAPTURE_STILL
Definition: app_httpd.h:23
-
CAPTURE_STREAM
@ CAPTURE_STREAM
Definition: app_httpd.h:23
-
MAX_URI_MAPPINGS
#define MAX_URI_MAPPINGS
Definition: app_httpd.h:13
-
onWsEvent
void onWsEvent(AsyncWebSocket *server, AsyncWebSocketClient *client, AwsEventType type, void *arg, uint8_t *data, size_t len)
Definition: app_httpd.cpp:93
-
dumpSystemStatusToJson
void dumpSystemStatusToJson(char *buf, size_t size)
Definition: app_httpd.cpp:411
-
onSystemStatus
void onSystemStatus(AsyncWebServerRequest *request)
Definition: app_httpd.cpp:393
-
onStatus
void onStatus(AsyncWebServerRequest *request)
Definition: app_httpd.cpp:349
-
onControl
void onControl(AsyncWebServerRequest *request)
Definition: app_httpd.cpp:223
-
onInfo
void onInfo(AsyncWebServerRequest *request)
Definition: app_httpd.cpp:339
+
capture_mode
capture_mode
Definition: app_httpd.h:24
+
CAPTURE_STILL
@ CAPTURE_STILL
Definition: app_httpd.h:24
+
CAPTURE_STREAM
@ CAPTURE_STREAM
Definition: app_httpd.h:24
+
MAX_URI_MAPPINGS
#define MAX_URI_MAPPINGS
Definition: app_httpd.h:14
+
onWsEvent
void onWsEvent(AsyncWebSocket *server, AsyncWebSocketClient *client, AwsEventType type, void *arg, uint8_t *data, size_t len)
Definition: app_httpd.cpp:73
+
dumpSystemStatusToJson
void dumpSystemStatusToJson(char *buf, size_t size)
Definition: app_httpd.cpp:426
+
onSystemStatus
void onSystemStatus(AsyncWebServerRequest *request)
Definition: app_httpd.cpp:408
+
onStatus
void onStatus(AsyncWebServerRequest *request)
Definition: app_httpd.cpp:362
+
onControl
void onControl(AsyncWebServerRequest *request)
Definition: app_httpd.cpp:234
+
onInfo
void onInfo(AsyncWebServerRequest *request)
Definition: app_httpd.cpp:352
CLAppComponent
Abstract root class for the appication components.
Definition: app_component.h:14
-
CLAppHttpd
WebServer Manager Class for handling web server requests. The web pages are assumed to be stored in t...
Definition: app_httpd.h:48
-
CLAppHttpd::getImagesServed
unsigned long getImagesServed()
Definition: app_httpd.h:59
-
CLAppHttpd::getStreamsServed
long getStreamsServed()
Definition: app_httpd.h:58
-
CLAppHttpd::incImagesServed
void incImagesServed()
Definition: app_httpd.h:60
-
CLAppHttpd::serialSendCommand
void serialSendCommand(const char *cmd)
Definition: app_httpd.cpp:469
-
CLAppHttpd::getVersion
String getVersion()
Definition: app_httpd.h:77
-
CLAppHttpd::setStreamMode
void setStreamMode(capture_mode mode)
Definition: app_httpd.h:62
-
CLAppHttpd::stopStream
int stopStream(uint32_t id)
Definition: app_httpd.cpp:207
-
CLAppHttpd::getSketchSpace
int getSketchSpace()
Definition: app_httpd.h:74
-
CLAppHttpd::snapToStream
int snapToStream(bool debug=false)
Definition: app_httpd.cpp:141
-
CLAppHttpd::getName
char * getName()
Definition: app_httpd.h:79
-
CLAppHttpd::updateSnapTimer
void updateSnapTimer(int frameRate)
Definition: app_httpd.cpp:334
-
CLAppHttpd::getStreamCount
int8_t getStreamCount()
Definition: app_httpd.h:57
-
CLAppHttpd::getSketchSize
int getSketchSize()
Definition: app_httpd.h:73
-
CLAppHttpd::getSerialBuffer
char * getSerialBuffer()
Definition: app_httpd.h:81
-
CLAppHttpd::getClientId
uint32_t getClientId()
Definition: app_httpd.h:55
+
CLAppHttpd
WebServer Manager Class for handling web server requests. The web pages are assumed to be stored in t...
Definition: app_httpd.h:51
+
CLAppHttpd::getImagesServed
unsigned long getImagesServed()
Definition: app_httpd.h:62
+
CLAppHttpd::getStreamsServed
long getStreamsServed()
Definition: app_httpd.h:61
+
CLAppHttpd::incImagesServed
void incImagesServed()
Definition: app_httpd.h:64
+
CLAppHttpd::serialSendCommand
void serialSendCommand(const char *cmd)
Definition: app_httpd.cpp:484
+
CLAppHttpd::getVersion
String getVersion()
Definition: app_httpd.h:81
+
CLAppHttpd::setStreamMode
void setStreamMode(capture_mode mode)
Definition: app_httpd.h:66
+
CLAppHttpd::stopStream
int stopStream(uint32_t id)
Definition: app_httpd.cpp:218
+
CLAppHttpd::getSketchSpace
int getSketchSpace()
Definition: app_httpd.h:78
+
CLAppHttpd::snapToStream
int snapToStream(bool debug=false)
Definition: app_httpd.cpp:152
+
CLAppHttpd::getName
char * getName()
Definition: app_httpd.h:83
+
CLAppHttpd::updateSnapTimer
void updateSnapTimer(int frameRate)
Definition: app_httpd.cpp:347
+
CLAppHttpd::getStreamCount
int8_t getStreamCount()
Definition: app_httpd.h:60
+
CLAppHttpd::getSketchSize
int getSketchSize()
Definition: app_httpd.h:77
+
CLAppHttpd::getServoCount
int getServoCount()
Definition: app_httpd.h:63
+
CLAppHttpd::writeServo
int writeServo(int pin, int value)
Definition: app_httpd.cpp:556
+
CLAppHttpd::getSerialBuffer
char * getSerialBuffer()
Definition: app_httpd.h:85
+
CLAppHttpd::getClientId
uint32_t getClientId()
Definition: app_httpd.h:58
CLAppHttpd::start
int start()
Definition: app_httpd.cpp:15
CLAppHttpd::CLAppHttpd
CLAppHttpd()
Definition: app_httpd.cpp:3
-
CLAppHttpd::getSketchMD5
String getSketchMD5()
Definition: app_httpd.h:75
-
CLAppHttpd::getStreamMode
capture_mode getStreamMode()
Definition: app_httpd.h:63
-
CLAppHttpd::loadPrefs
int loadPrefs()
Definition: app_httpd.cpp:474
-
CLAppHttpd::startStream
int startStream(uint32_t id)
Definition: app_httpd.cpp:164
+
CLAppHttpd::getSketchMD5
String getSketchMD5()
Definition: app_httpd.h:79
+
CLAppHttpd::getStreamMode
capture_mode getStreamMode()
Definition: app_httpd.h:67
+
CLAppHttpd::loadPrefs
int loadPrefs()
Definition: app_httpd.cpp:489
+
CLAppHttpd::startStream
int startStream(uint32_t id)
Definition: app_httpd.cpp:175
+
CLAppHttpd::attachServo
int attachServo(int pin)
attaches a new servo and returns its ID in case of success, or OS_FAIL otherwise
Definition: app_httpd.cpp:522
-
UriMapping
Static URI to path mapping.
Definition: app_httpd.h:40
-
UriMapping::path
char path[32]
Definition: app_httpd.h:40
-
UriMapping::uri
char uri[32]
Definition: app_httpd.h:40
+
AppServo
Definition: app_httpd.h:43
+
AppServo::servo
Servo * servo
Definition: app_httpd.h:43
+
AppServo::pin
int pin
Definition: app_httpd.h:43
+
UriMapping
Static URI to path mapping.
Definition: app_httpd.h:41
+
UriMapping::path
char path[32]
Definition: app_httpd.h:41
+
UriMapping::uri
char uri[32]
Definition: app_httpd.h:41
diff --git a/Docs/html/class_c_l_app_httpd.html b/Docs/html/class_c_l_app_httpd.html index d548348..9d54252 100644 --- a/Docs/html/class_c_l_app_httpd.html +++ b/Docs/html/class_c_l_app_httpd.html @@ -101,6 +101,8 @@   unsigned long getImagesServed ()   +int getServoCount () +  void incImagesServed ()   void setStreamMode (capture_mode mode) @@ -129,6 +131,11 @@   char * getSerialBuffer ()   +int attachServo (int pin) + attaches a new servo and returns its ID in case of success, or OS_FAIL otherwise More...
+  +int writeServo (int pin, int value) +  - Public Member Functions inherited from CLAppComponent int start ()   @@ -184,6 +191,33 @@

Member Function Documentation

+ +

◆ attachServo()

+ +
+
+ + + + + + + + +
int CLAppHttpd::attachServo (int pin)
+
+ +

attaches a new servo and returns its ID in case of success, or OS_FAIL otherwise

+
Parameters
+ + +
pin
+
+
+
Returns
int
+ +
+

◆ getClientId()

@@ -282,6 +316,31 @@

+ + + +

◆ getServoCount()

+ +
+
+ + + + + +
+ + + + + + + +
int CLAppHttpd::getServoCount ()
+ 		+inline
+
+
@@ -632,6 +691,34 @@

+ + + +

◆ writeServo()

+ +
+
+ + + + + + + + + + + + + + + + + + +
int CLAppHttpd::writeServo (int pin,
int value 
)
+
+
The documentation for this class was generated from the following files: diff --git a/Docs/html/hierarchy.html b/Docs/html/hierarchy.html index de20548..170a0ce 100644 --- a/Docs/html/hierarchy.html +++ b/Docs/html/hierarchy.html @@ -69,15 +69,16 @@
This inheritance list is sorted roughly, but not completely, alphabetically:
[detail level 12]
- - - - + + + + - - - - + + + +
 ▼CCLAppComponentAbstract root class for the appication components
 CCLAppCamCamera Manager Manages all interactions with camera
 CCLAppConnConnection Manager This class manages everything related to connectivity of the application: WiFi, OTA etc
 CCLAppHttpdWebServer Manager Class for handling web server requests. The web pages are assumed to be stored in the file system (can be SD card or LittleFS).
+
 CAppServo
 ▼CCLAppComponentAbstract root class for the appication components
 CCLAppCamCamera Manager Manages all interactions with camera
 CCLAppConnConnection Manager This class manages everything related to connectivity of the application: WiFi, OTA etc
 CCLAppHttpdWebServer Manager Class for handling web server requests. The web pages are assumed to be stored in the file system (can be SD card or LittleFS).
 CCLStorageStorage Manager Encapsulates access to the file system, which can be either external (SD card) or internal (LittleFS)
 CStaticIP
 CStation
 CUriMappingStatic URI to path mapping
 CCLStorageStorage Manager Encapsulates access to the file system, which can be either external (SD card) or internal (LittleFS)
 CStaticIPStatic IP strcuture for configuring AP and WiFi parameters
 CStationWiFi connectivity details (SSID/password)
 CUriMappingStatic URI to path mapping
diff --git a/Docs/html/index.html b/Docs/html/index.html index afe37c1..755eed0 100644 --- a/Docs/html/index.html +++ b/Docs/html/index.html @@ -5,7 +5,7 @@ -ESP32 WebCam Server: ESP32-CAM WebCam Server        +ESP32 WebCam Server: ESP32-CAM WebServer.     <span title="Master branch build status"><a href="https://travis-ci.com/github/easytarget/esp32-cam-webserver" ><img src="https://travis-ci.com/easytarget/esp32-cam-webserver.svg?branch=master" alt="CI Status"/></a></span>    <span title="ESP EYE"><img src="Docs/logo.svg" alt="ESP-EYE logo"/></span> @@ -64,11 +64,11 @@
-
ESP32-CAM WebCam Server       
+
ESP32-CAM WebServer.     CI Status    ESP-EYE logo
-

ESP-EYE logo

-

This sketch is a fully customizable webcam server based on ESP32-based board with camera. It can be used as a starting point for your own webcam solution.

+

This sketch is a fully customizable webcam server based on ESP32-based board with camera. It can be used as a starting point for your own webcam solution.

+

There are many other variants of a webcam server for these modules online, but most are created for a specific scenario and not good for general, casual, webcam use.

Key features:

    @@ -77,41 +77,33 @@

  • Dedicated standalone stream viewer
  • Over The Air firmware updates
  • Optimizing the way how the video stream is processed, thus allowing higher frame rates on high resolution.
    • -
  • Using just one IP port instead of two.
    • +
  • Using just one IP port, easy for proxying.
  • Porting the web server to ESP Async Web Server.
    • -
  • Storing web pages as separate HTML/CSS/JS files on the SD drive, which greatly simplifies development of the interface. Basically, you can swap the face of this project just by replacing files on SD card.
    • -
  • Reduced size of the sketch and improving memory utilization
    • -
  • Porting the code from basic C to C++ object hierarchy, eliminating extensive use of global variables
    • -
  • Lots of minor fixes and tweaks, documentation etc.
    • +
  • Storing web pages as separate HTML/CSS/JS files on the SD drive, which greatly simplifies development of the interface. Basically, one can swap the face of this project just by replacing files on SD card.
    • +
  • Compact size of the sketch and low memory utilization

-Key principles

-

There are many other variants of a webcam server for these modules online, but most are created for a specific scenario and not good for general, casual, webcam use.

-

Hopefully this expanded example is more useful for those users who wish to set up a simple ESP32 based webcam using the cheap(ish) modules freely available online.

-

-Summary of reductions

-

When re-desiginig and refactoring the original ESP32 Camera web server example from Espressve, the following key principles were followed:

-
    -
  1. Any idea can be killed by unnecessary features
    2. -
  2. See this tutorial video.
    3. -
-

Given the above, face recognition feature was removed. The main purpose of this sketch is to make the camera web server easily configurable and reusable.

-

The original example, is a bit incomprehensible and hard to modify as supplied. It is very focused on showing off the face recognition capabilities, and forgets the 'webcam' part.

-

Supported development boards

The sketch has been tested on the AI Thinker ESP32-CAM module. Other ESP32 boards equipped with camera may be compatible but not guaranteed.

-

+

+Supported camera models:

+

The sketch has been tested on the following camera models:

+
    +
  • OV2640 (default)
    • +
  • OV3660
    • +
+

Other camera models are not supported but may work with some limitations.

+

Known Issues

The ESP32 itself is susceptible to the usual list of WiFi problems, not helped by having small antennas, older designs, congested airwaves and demanding users. The majority of disconnects, stutters and other communication problems are simply due to 'WiFi issues'.

The AI-THINKER camera module & esp32 combination is quite susceptible to power supply problems affecting both WiFi conctivity and Video quality; short cabling and decent power supplies are your friend here; also well cooled cases and, if you have the time, decoupling capacitors on the power lines.

A basic limitation of the sketch is that it can can only support one stream at a time. If you try to connect to a cam that is already streaming (or attempting to stream, the first steam will freeze.

-

Currently, camera modules other than ov2640 are not supported.

-

+

Setup:

  • For programming you will need a suitable development environment. Possible options include Visual Studio Code, Arduino Studio or Espressif development environment .
-

+

Wiring for AI-THINKER Boards (and similar clone-alikes)

Is pretty simple, You just need jumper wires, no soldering really required, see the diagram below. Hoockup

  • Connect the RX line from the serial adapter to the TX pin on ESP32
    • @@ -119,12 +111,12 @@

  • The GPIO0 pin of the ESP32 must be held LOW (to ground) when the unit is powered up to allow it to enter it's programming mode. This can be done with simple jumper cable connected at poweron, fitting a switch for this is useful if you will be reprogramming a lot.
  • You will to supply 5v to the ESP32 in order to power it during programming; the FTDI board alone fails to supply this sometimes. The ESP32 CAM board is very sensitive to the quality of power source. Decoupling capacitors are very much recommended.

-

+

Download the Sketch, Unpack and Rename

Download the latest release of the sketch this repository. Once you have done that you can open the sketch in the IDE by going to the esp32-cam-webserver sketch folder and selecting esp32-cam-webserver.ino.

You also need to copy the content of the data folder from this repository to a micro SD flash memory card (must be formatted as FAT32) and insert it into the micro SD slot of the board.

Without the SD card, the sketch will not start. Please ensure the size of the card does not exceed 4GB, which is a maximum supported capacity for ESP32-CAM board. Higher capacity SD card may not work.

-

+

Config

You will need to configure the web server with your WiFi settings. In order to do so, you will need to create a config file in the root folder of your SD card named conn.json and format it as follows:

{
@@ -165,6 +157,8 @@

"frame_rate":25,
"brightness":0,
"contrast":0,
+
"sharpness":0,
+
"denoise":0,
"saturation":0,
"special_effect":0,
"wb_mode":0,"awb":1,
@@ -187,7 +181,7 @@

"rotate":"0",
"debug_mode": false
}
-

+

Programming

Assuming you are using the latest Espressif Arduino core the ESP32 Dev Module board will appear in the ESP32 Arduino section of the boards list. Select this (do not use the AI-THINKER entry listed in the boiards menu, it is not OTA compatible, and will cause the module to crash and reboot rather than updating if you use it. IDE board config

Make sure you select the Minimal SPIFFS (1.9MB APP with OTA/190KB SPIFFS) partition cheme and turn PSRAM on.

@@ -196,15 +190,15 @@

Once you have the initial upload done and the board is connected to the wifi network you should see it appearing in the network ports list of the IDE, and you can upload wirelessly.

If you have a status LED configured it will give a double flash when it begins attempting to conenct to WiFi, and five short flashes once it has succeeded. It will also flash briefly when you access the camera to change settings.

Go to the URL given in the serial output, the web UI should appear with the settings panel open. Click away!

-

+

API

The communications between the web browser and the camera module can also be used to send commands directly to the camera (eg to automate it, etc) and form, in effect, an API for the camera.

-

+

Contributing

Contributions are welcome; please see the Contribution guidelines.

-

+

Future plans

  1. Support of LittleFS.
    2. diff --git a/Docs/html/md__a_p_i.html b/Docs/html/md__a_p_i.html index 99bc97e..8a4243e 100644 --- a/Docs/html/md__a_p_i.html +++ b/Docs/html/md__a_p_i.html @@ -73,10 +73,8 @@

    Web UI pages

      -
    • / or /portal - Default index (portal)
      • -
    • /view?mode=full|simple|stream|still - Go direct to specific page:
      • -
    • - full: taking still and video with complete set of camera controls
      • -
    • - simple: taking still and video with limited set of camera controls
      • +
    • / Default index (camera view)
      • +
    • /view?mode=stream|still - Go direct to specific page:
    • - stream: starting video capture with full screen mode
    • - still: taking a still image with full screen mode
    • /dump - Status page (automatically refreshed every 5 sec)
      • @@ -120,8 +118,6 @@

      rotate - Rotation Angle; integer, only -90, 0, 90 values are recognised
      dcw - 0 = disable, 1 = enable
      colorbar - Overlays a color test pattern on the stream; integer, 1 = enabled
      -
      face_detect - Face Detection; 1 = enabled, Only settable if framesize <= 4 (CIF)
      -
      face_recognize - Face recognition; 1 = enabled, only settable if Face detection is already enabled

Framesize values

These may vary between different ESP framework releases

0 - THUMB (96x96)
@@ -144,7 +140,7 @@

These are commands; they can be sent by calling the /control URI with them as the <key> parameter.

* save_prefs - Saves preferences
`val=cam` or not specified will save camera preferences
`val=conn` will save network preferences
-
* clear_prefs - Deletes camera the preferences
+
* remove_prefs - Deletes camera the preferences
`val=cam` or not specified will reset camera preferences
`val=conn` will reset network preferences. Attention! after this the server will boot as access point after restart, and all
connection settings will be lost.
diff --git a/Docs/html/menudata.js b/Docs/html/menudata.js index 8b04811..12803f4 100644 --- a/Docs/html/menudata.js +++ b/Docs/html/menudata.js @@ -31,6 +31,7 @@ var menudata={children:[ {text:"Class Hierarchy",url:"hierarchy.html"}, {text:"Data Fields",url:"functions.html",children:[ {text:"All",url:"functions.html",children:[ +{text:"a",url:"functions.html#index_a"}, {text:"c",url:"functions.html#index_c"}, {text:"d",url:"functions.html#index_d"}, {text:"e",url:"functions.html#index_e"}, @@ -46,6 +47,7 @@ var menudata={children:[ {text:"u",url:"functions.html#index_u"}, {text:"w",url:"functions.html#index_w"}]}, {text:"Functions",url:"functions_func.html",children:[ +{text:"a",url:"functions_func.html#index_a"}, {text:"c",url:"functions_func.html#index_c"}, {text:"d",url:"functions_func.html#index_d"}, {text:"e",url:"functions_func.html#index_e"}, diff --git a/Docs/html/search/all_0.js b/Docs/html/search/all_0.js index a116542..d34171a 100644 --- a/Docs/html/search/all_0.js +++ b/Docs/html/search/all_0.js @@ -12,5 +12,7 @@ var searchData= ['app_5fhttpd_2eh_9',['app_httpd.h',['../app__httpd_8h.html',1,'']]], ['appcam_10',['AppCam',['../app__cam_8cpp.html#a2c40f09444d86a4ed61c53c20f0c9825',1,'AppCam(): app_cam.cpp'],['../app__cam_8h.html#a2c40f09444d86a4ed61c53c20f0c9825',1,'AppCam(): app_cam.cpp']]], ['appconn_11',['AppConn',['../app__conn_8cpp.html#a3fca6c2df3835192bdadfe6edde1e63b',1,'AppConn(): app_conn.cpp'],['../app__conn_8h.html#a3fca6c2df3835192bdadfe6edde1e63b',1,'AppConn(): app_conn.cpp']]], - ['apphttpd_12',['AppHttpd',['../app__httpd_8cpp.html#a0174a427778b574c2447cf5d8568f986',1,'AppHttpd(): app_httpd.cpp'],['../app__httpd_8h.html#a0174a427778b574c2447cf5d8568f986',1,'AppHttpd(): app_httpd.cpp']]] + ['apphttpd_12',['AppHttpd',['../app__httpd_8cpp.html#a0174a427778b574c2447cf5d8568f986',1,'AppHttpd(): app_httpd.cpp'],['../app__httpd_8h.html#a0174a427778b574c2447cf5d8568f986',1,'AppHttpd(): app_httpd.cpp']]], + ['appservo_13',['AppServo',['../struct_app_servo.html',1,'']]], + ['attachservo_14',['attachServo',['../class_c_l_app_httpd.html#afa2f502272c6e8be33ef908013b0d4c8',1,'CLAppHttpd']]] ]; diff --git a/Docs/html/search/all_11.js b/Docs/html/search/all_11.js index dd6d5f7..a3e0068 100644 --- a/Docs/html/search/all_11.js +++ b/Docs/html/search/all_11.js @@ -1,5 +1,6 @@ var searchData= [ ['wifi_5fwatchdog_0',['WIFI_WATCHDOG',['../app__config_8h.html#abe5fef12849f59923de575b49a6e222c',1,'app_config.h']]], - ['wifistatus_1',['wifiStatus',['../class_c_l_app_conn.html#a790ba7c0b56edae2de159abf29f0127b',1,'CLAppConn']]] + ['wifistatus_1',['wifiStatus',['../class_c_l_app_conn.html#a790ba7c0b56edae2de159abf29f0127b',1,'CLAppConn']]], + ['writeservo_2',['writeServo',['../class_c_l_app_httpd.html#a85c33a135e46369c092c27a7fd5e04bd',1,'CLAppHttpd']]] ]; diff --git a/Docs/html/search/all_4.js b/Docs/html/search/all_4.js index 5f55ed4..218cdf3 100644 --- a/Docs/html/search/all_4.js +++ b/Docs/html/search/all_4.js @@ -1,6 +1,6 @@ var searchData= [ ['enableota_0',['enableOTA',['../class_c_l_app_conn.html#a5e9975f7afdb88ae197fb3ad43942c7f',1,'CLAppConn']]], - ['esp32_2dcam_20webcam_20server_20_26nbsp_3b_26nbsp_3b_26nbsp_3b_20_20_26nbsp_3b_26nbsp_3b_1',['ESP32-CAM WebCam Server &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;',['../index.html',1,'']]], + ['esp32_2dcam_20webserver_2e_20_26nbsp_3b_26nbsp_3b_26nbsp_3b_20_3cspan_20title_3d_22master_20branch_20build_20status_22_3e_3ca_20href_3d_22https_3a_2f_2ftravis_2dci_2ecom_2fgithub_2feasytarget_2fesp32_2dcam_2dwebserver_22_20_3e_3cimg_20src_3d_22https_3a_2f_2ftravis_2dci_2ecom_2feasytarget_2fesp32_2dcam_2dwebserver_2esvg_3fbranch_3dmaster_22_20alt_3d_22ci_20status_22_2f_3e_3c_2fa_3e_3c_2fspan_3e_20_26nbsp_3b_26nbsp_3b_20_3cspan_20title_3d_22esp_20eye_22_3e_3cimg_20src_3d_22docs_2flogo_2esvg_22_20alt_3d_22esp_2deye_20logo_22_2f_3e_3c_2fspan_3e_1',['ESP32-CAM WebServer. &nbsp;&nbsp;&nbsp; <span title="Master branch build status"><a href="https://travis-ci.com/github/easytarget/esp32-cam-webserver" ><img src="https://travis-ci.com/easytarget/esp32-cam-webserver.svg?branch=master" alt="CI Status"/></a></span> &nbsp;&nbsp; <span title="ESP EYE"><img src="Docs/logo.svg" alt="ESP-EYE logo"/></span>',['../index.html',1,'']]], ['exists_2',['exists',['../class_c_l_storage.html#aa5b081483af1fcf83fca0573cc1c6f44',1,'CLStorage']]] ]; diff --git a/Docs/html/search/all_5.js b/Docs/html/search/all_5.js index eedeefd..a405364 100644 --- a/Docs/html/search/all_5.js +++ b/Docs/html/search/all_5.js @@ -23,16 +23,17 @@ var searchData= ['getsensor_20',['getSensor',['../class_c_l_app_cam.html#af812f50b9e35bcdb56af399c4fafd8f2',1,'CLAppCam']]], ['getsensorpid_21',['getSensorPID',['../class_c_l_app_cam.html#ac20c8599dfc6112502b2ca9e446e6af5',1,'CLAppCam']]], ['getserialbuffer_22',['getSerialBuffer',['../class_c_l_app_httpd.html#a86f5338752065817fabed08e118a8ff8',1,'CLAppHttpd']]], - ['getsize_23',['getSize',['../class_c_l_storage.html#a74a864f262e8143d1b82f4c823a7bb45',1,'CLStorage']]], - ['getsketchmd5_24',['getSketchMD5',['../class_c_l_app_httpd.html#add4710263a9093fa4f57a2c26d97310e',1,'CLAppHttpd']]], - ['getsketchsize_25',['getSketchSize',['../class_c_l_app_httpd.html#a80c23913b0e693ae584b8177647cec6c',1,'CLAppHttpd']]], - ['getsketchspace_26',['getSketchSpace',['../class_c_l_app_httpd.html#a4be3e20152216b606c83ae09e74c3840',1,'CLAppHttpd']]], - ['getstreamcount_27',['getStreamCount',['../class_c_l_app_httpd.html#a5f8f1b5b6e4a1da9dbc9788a4442e00c',1,'CLAppHttpd']]], - ['getstreammode_28',['getStreamMode',['../class_c_l_app_httpd.html#aeef90f323bd91eba9d00d0b464177c82',1,'CLAppHttpd']]], - ['getstreamsserved_29',['getStreamsServed',['../class_c_l_app_httpd.html#a2b63e9eb18e2d67fc3f352fec0b66cd9',1,'CLAppHttpd']]], - ['getstreamurl_30',['getStreamUrl',['../class_c_l_app_conn.html#a3b240d40a51a7d76f22be73b2563b412',1,'CLAppConn']]], - ['getuptimestr_31',['getUpTimeStr',['../class_c_l_app_conn.html#a05b74d2731b9c2220c431e354b1b55a5',1,'CLAppConn']]], - ['getused_32',['getUsed',['../class_c_l_storage.html#a9effb4148704bbc571acce5214e5dd74',1,'CLStorage']]], - ['getversion_33',['getVersion',['../class_c_l_app_httpd.html#a3ba8f3dfa8888b198ac9ad69e88f1a5d',1,'CLAppHttpd']]], - ['getxclk_34',['getXclk',['../class_c_l_app_cam.html#a8e19e1d337c7d7406d713a42615005aa',1,'CLAppCam']]] + ['getservocount_23',['getServoCount',['../class_c_l_app_httpd.html#a855bd052a5092da8d8246face69881d9',1,'CLAppHttpd']]], + ['getsize_24',['getSize',['../class_c_l_storage.html#a74a864f262e8143d1b82f4c823a7bb45',1,'CLStorage']]], + ['getsketchmd5_25',['getSketchMD5',['../class_c_l_app_httpd.html#add4710263a9093fa4f57a2c26d97310e',1,'CLAppHttpd']]], + ['getsketchsize_26',['getSketchSize',['../class_c_l_app_httpd.html#a80c23913b0e693ae584b8177647cec6c',1,'CLAppHttpd']]], + ['getsketchspace_27',['getSketchSpace',['../class_c_l_app_httpd.html#a4be3e20152216b606c83ae09e74c3840',1,'CLAppHttpd']]], + ['getstreamcount_28',['getStreamCount',['../class_c_l_app_httpd.html#a5f8f1b5b6e4a1da9dbc9788a4442e00c',1,'CLAppHttpd']]], + ['getstreammode_29',['getStreamMode',['../class_c_l_app_httpd.html#aeef90f323bd91eba9d00d0b464177c82',1,'CLAppHttpd']]], + ['getstreamsserved_30',['getStreamsServed',['../class_c_l_app_httpd.html#a2b63e9eb18e2d67fc3f352fec0b66cd9',1,'CLAppHttpd']]], + ['getstreamurl_31',['getStreamUrl',['../class_c_l_app_conn.html#a3b240d40a51a7d76f22be73b2563b412',1,'CLAppConn']]], + ['getuptimestr_32',['getUpTimeStr',['../class_c_l_app_conn.html#a05b74d2731b9c2220c431e354b1b55a5',1,'CLAppConn']]], + ['getused_33',['getUsed',['../class_c_l_storage.html#a9effb4148704bbc571acce5214e5dd74',1,'CLStorage']]], + ['getversion_34',['getVersion',['../class_c_l_app_httpd.html#a3ba8f3dfa8888b198ac9ad69e88f1a5d',1,'CLAppHttpd']]], + ['getxclk_35',['getXclk',['../class_c_l_app_cam.html#a8e19e1d337c7d7406d713a42615005aa',1,'CLAppCam']]] ]; diff --git a/Docs/html/search/all_c.js b/Docs/html/search/all_c.js index c45aa0b..bae05f8 100644 --- a/Docs/html/search/all_c.js +++ b/Docs/html/search/all_c.js @@ -6,6 +6,7 @@ var searchData= ['parseprefs_3',['parsePrefs',['../class_c_l_app_component.html#a7b23015c89977efd202896a19e7ca319',1,'CLAppComponent']]], ['password_4',['password',['../struct_station.html#adfce66aab835659fef7ab8501def3867',1,'Station']]], ['path_5',['path',['../struct_uri_mapping.html#a28b0be3b16e0a3d7f7bd4ecff420fa4f',1,'UriMapping']]], - ['printlocaltime_6',['printLocalTime',['../class_c_l_app_conn.html#a9a4f24949950433f1672c3db6af49dde',1,'CLAppConn']]], - ['processor_7',['processor',['../app__httpd_8cpp.html#a0c021f9721c3b479757f8e1b40624b6c',1,'processor(const String &var): app_httpd.cpp'],['../app__httpd_8h.html#a0c021f9721c3b479757f8e1b40624b6c',1,'processor(const String &var): app_httpd.cpp']]] + ['pin_6',['pin',['../struct_app_servo.html#ad51201b7ed0aa34d6285cb1fc54d8a69',1,'AppServo']]], + ['printlocaltime_7',['printLocalTime',['../class_c_l_app_conn.html#a9a4f24949950433f1672c3db6af49dde',1,'CLAppConn']]], + ['processor_8',['processor',['../app__httpd_8cpp.html#a0c021f9721c3b479757f8e1b40624b6c',1,'processor(const String &var): app_httpd.cpp'],['../app__httpd_8h.html#a0c021f9721c3b479757f8e1b40624b6c',1,'processor(const String &var): app_httpd.cpp']]] ]; diff --git a/Docs/html/search/all_e.js b/Docs/html/search/all_e.js index 1af90bd..98ebbb1 100644 --- a/Docs/html/search/all_e.js +++ b/Docs/html/search/all_e.js @@ -2,28 +2,29 @@ var searchData= [ ['saveprefs_0',['savePrefs',['../class_c_l_app_cam.html#a0f2bc29dea9609204871b7b5bc281c4f',1,'CLAppCam::savePrefs()'],['../class_c_l_app_component.html#a31a25b7869113a15e18f34b2c690189a',1,'CLAppComponent::savePrefs()'],['../class_c_l_app_conn.html#ace5a052d85379ece71207129edc2a0f1',1,'CLAppConn::savePrefs()']]], ['serialsendcommand_1',['serialSendCommand',['../class_c_l_app_httpd.html#a36be0ed79de4194e8d00b026fd4be4d0',1,'CLAppHttpd']]], - ['setautolamp_2',['setAutoLamp',['../class_c_l_app_cam.html#aa5bd4f968fd8345d3d2a5d8a121586c3',1,'CLAppCam']]], - ['setdebugmode_3',['setDebugMode',['../class_c_l_app_component.html#a9ab4a575691522178eb10d9bffcff5b7',1,'CLAppComponent']]], - ['seterr_4',['setErr',['../class_c_l_app_component.html#a9565596ad1c588c05e349d92b2476e40',1,'CLAppComponent']]], - ['setframerate_5',['setFrameRate',['../class_c_l_app_cam.html#a6581e369883546817a1edaedf4af1734',1,'CLAppCam']]], - ['setlamp_6',['setLamp',['../class_c_l_app_cam.html#a8cab0636ce5e566a7b89016c477aec2b',1,'CLAppCam']]], - ['setrotation_7',['setRotation',['../class_c_l_app_cam.html#a27d4c05b87660b0e04b6a8902f0f173e',1,'CLAppCam']]], - ['setstreammode_8',['setStreamMode',['../class_c_l_app_httpd.html#a40005188d09a72002252fd4b6e2cd2b9',1,'CLAppHttpd']]], - ['settag_9',['setTag',['../class_c_l_app_component.html#a75a706c37e31c3083c845d304e3a519b',1,'CLAppComponent']]], - ['setxclk_10',['setXclk',['../class_c_l_app_cam.html#a9ccd0763eb8eeb559b46e747df25d268',1,'CLAppCam']]], - ['snaptobufer_11',['snapToBufer',['../class_c_l_app_cam.html#a89a7a39bd89130cab06fd7139fc9b6d9',1,'CLAppCam']]], - ['snaptostream_12',['snapToStream',['../class_c_l_app_httpd.html#a4e52f72c1d20cf6420e2f17b0b521da4',1,'CLAppHttpd']]], - ['ssid_13',['ssid',['../struct_station.html#ad635bfe5333139b2596ace399fe5054e',1,'Station']]], - ['start_14',['start',['../class_c_l_app_httpd.html#aaf8a95884768b7ac3e1c04ea041ee514',1,'CLAppHttpd::start()'],['../class_c_l_app_conn.html#a75a0c8c0ab160691ecf58e3c4ad58951',1,'CLAppConn::start()'],['../class_c_l_app_component.html#a7e64a4c55bd1f3216c507101835392b5',1,'CLAppComponent::start()'],['../class_c_l_app_cam.html#af277f42041c7c0a561bd8c8b087f4b3a',1,'CLAppCam::start()']]], - ['startstream_15',['startStream',['../class_c_l_app_httpd.html#af836002eda44f3e400af0808bf9046c1',1,'CLAppHttpd']]], - ['staticip_16',['StaticIP',['../struct_static_i_p.html',1,'']]], - ['station_17',['Station',['../struct_station.html',1,'']]], - ['stop_18',['stop',['../class_c_l_app_cam.html#a8f1da94b3efb536a15419e5983fcac81',1,'CLAppCam::stop()'],['../class_c_l_app_conn.html#ab0a56d0491f5fd3fdce6028447183a25',1,'CLAppConn::stop()']]], - ['stopstream_19',['stopStream',['../class_c_l_app_httpd.html#a4889a2a7ee9a0e5ab558b64983249e46',1,'CLAppHttpd']]], - ['storage_20',['Storage',['../storage_8cpp.html#a47c5a522666eb276db609c3d8049238a',1,'Storage(): storage.cpp'],['../storage_8h.html#a47c5a522666eb276db609c3d8049238a',1,'Storage(): storage.cpp']]], - ['storage_2ecpp_21',['storage.cpp',['../storage_8cpp.html',1,'']]], - ['storage_2eh_22',['storage.h',['../storage_8h.html',1,'']]], - ['storage_5funits_23',['STORAGE_UNITS',['../storage_8h.html#a41be8b1964027c1f9ddfc1e01af3f261',1,'storage.h']]], - ['storage_5funits_5fbt_24',['STORAGE_UNITS_BT',['../storage_8h.html#a58de0b755f7c8d4e84b9be13013c03d2',1,'storage.h']]], - ['storage_5funits_5fmb_25',['STORAGE_UNITS_MB',['../storage_8h.html#acfefb2c2a43c05d5c979ef54f7030a34',1,'storage.h']]] + ['servo_2',['servo',['../struct_app_servo.html#a4dc0cef6f4e75b3335ab1957544fcd7f',1,'AppServo']]], + ['setautolamp_3',['setAutoLamp',['../class_c_l_app_cam.html#aa5bd4f968fd8345d3d2a5d8a121586c3',1,'CLAppCam']]], + ['setdebugmode_4',['setDebugMode',['../class_c_l_app_component.html#a9ab4a575691522178eb10d9bffcff5b7',1,'CLAppComponent']]], + ['seterr_5',['setErr',['../class_c_l_app_component.html#a9565596ad1c588c05e349d92b2476e40',1,'CLAppComponent']]], + ['setframerate_6',['setFrameRate',['../class_c_l_app_cam.html#a6581e369883546817a1edaedf4af1734',1,'CLAppCam']]], + ['setlamp_7',['setLamp',['../class_c_l_app_cam.html#a8cab0636ce5e566a7b89016c477aec2b',1,'CLAppCam']]], + ['setrotation_8',['setRotation',['../class_c_l_app_cam.html#a27d4c05b87660b0e04b6a8902f0f173e',1,'CLAppCam']]], + ['setstreammode_9',['setStreamMode',['../class_c_l_app_httpd.html#a40005188d09a72002252fd4b6e2cd2b9',1,'CLAppHttpd']]], + ['settag_10',['setTag',['../class_c_l_app_component.html#a75a706c37e31c3083c845d304e3a519b',1,'CLAppComponent']]], + ['setxclk_11',['setXclk',['../class_c_l_app_cam.html#a9ccd0763eb8eeb559b46e747df25d268',1,'CLAppCam']]], + ['snaptobufer_12',['snapToBufer',['../class_c_l_app_cam.html#a89a7a39bd89130cab06fd7139fc9b6d9',1,'CLAppCam']]], + ['snaptostream_13',['snapToStream',['../class_c_l_app_httpd.html#a4e52f72c1d20cf6420e2f17b0b521da4',1,'CLAppHttpd']]], + ['ssid_14',['ssid',['../struct_station.html#ad635bfe5333139b2596ace399fe5054e',1,'Station']]], + ['start_15',['start',['../class_c_l_app_httpd.html#aaf8a95884768b7ac3e1c04ea041ee514',1,'CLAppHttpd::start()'],['../class_c_l_app_conn.html#a75a0c8c0ab160691ecf58e3c4ad58951',1,'CLAppConn::start()'],['../class_c_l_app_component.html#a7e64a4c55bd1f3216c507101835392b5',1,'CLAppComponent::start()'],['../class_c_l_app_cam.html#af277f42041c7c0a561bd8c8b087f4b3a',1,'CLAppCam::start()']]], + ['startstream_16',['startStream',['../class_c_l_app_httpd.html#af836002eda44f3e400af0808bf9046c1',1,'CLAppHttpd']]], + ['staticip_17',['StaticIP',['../struct_static_i_p.html',1,'']]], + ['station_18',['Station',['../struct_station.html',1,'']]], + ['stop_19',['stop',['../class_c_l_app_cam.html#a8f1da94b3efb536a15419e5983fcac81',1,'CLAppCam::stop()'],['../class_c_l_app_conn.html#ab0a56d0491f5fd3fdce6028447183a25',1,'CLAppConn::stop()']]], + ['stopstream_20',['stopStream',['../class_c_l_app_httpd.html#a4889a2a7ee9a0e5ab558b64983249e46',1,'CLAppHttpd']]], + ['storage_21',['Storage',['../storage_8cpp.html#a47c5a522666eb276db609c3d8049238a',1,'Storage(): storage.cpp'],['../storage_8h.html#a47c5a522666eb276db609c3d8049238a',1,'Storage(): storage.cpp']]], + ['storage_2ecpp_22',['storage.cpp',['../storage_8cpp.html',1,'']]], + ['storage_2eh_23',['storage.h',['../storage_8h.html',1,'']]], + ['storage_5funits_24',['STORAGE_UNITS',['../storage_8h.html#a41be8b1964027c1f9ddfc1e01af3f261',1,'storage.h']]], + ['storage_5funits_5fbt_25',['STORAGE_UNITS_BT',['../storage_8h.html#a58de0b755f7c8d4e84b9be13013c03d2',1,'storage.h']]], + ['storage_5funits_5fmb_26',['STORAGE_UNITS_MB',['../storage_8h.html#acfefb2c2a43c05d5c979ef54f7030a34',1,'storage.h']]] ]; diff --git a/Docs/html/search/classes_0.js b/Docs/html/search/classes_0.js index 650e3c8..4b25f80 100644 --- a/Docs/html/search/classes_0.js +++ b/Docs/html/search/classes_0.js @@ -1,8 +1,4 @@ var searchData= [ - ['clappcam_0',['CLAppCam',['../class_c_l_app_cam.html',1,'']]], - ['clappcomponent_1',['CLAppComponent',['../class_c_l_app_component.html',1,'']]], - ['clappconn_2',['CLAppConn',['../class_c_l_app_conn.html',1,'']]], - ['clapphttpd_3',['CLAppHttpd',['../class_c_l_app_httpd.html',1,'']]], - ['clstorage_4',['CLStorage',['../class_c_l_storage.html',1,'']]] + ['appservo_0',['AppServo',['../struct_app_servo.html',1,'']]] ]; diff --git a/Docs/html/search/classes_1.js b/Docs/html/search/classes_1.js index 7084ccf..650e3c8 100644 --- a/Docs/html/search/classes_1.js +++ b/Docs/html/search/classes_1.js @@ -1,5 +1,8 @@ var searchData= [ - ['staticip_0',['StaticIP',['../struct_static_i_p.html',1,'']]], - ['station_1',['Station',['../struct_station.html',1,'']]] + ['clappcam_0',['CLAppCam',['../class_c_l_app_cam.html',1,'']]], + ['clappcomponent_1',['CLAppComponent',['../class_c_l_app_component.html',1,'']]], + ['clappconn_2',['CLAppConn',['../class_c_l_app_conn.html',1,'']]], + ['clapphttpd_3',['CLAppHttpd',['../class_c_l_app_httpd.html',1,'']]], + ['clstorage_4',['CLStorage',['../class_c_l_storage.html',1,'']]] ]; diff --git a/Docs/html/search/classes_2.js b/Docs/html/search/classes_2.js index 59ea40b..7084ccf 100644 --- a/Docs/html/search/classes_2.js +++ b/Docs/html/search/classes_2.js @@ -1,4 +1,5 @@ var searchData= [ - ['urimapping_0',['UriMapping',['../struct_uri_mapping.html',1,'']]] + ['staticip_0',['StaticIP',['../struct_static_i_p.html',1,'']]], + ['station_1',['Station',['../struct_station.html',1,'']]] ]; diff --git a/Docs/html/search/classes_3.html b/Docs/html/search/classes_3.html new file mode 100644 index 0000000..995d5d2 --- /dev/null +++ b/Docs/html/search/classes_3.html @@ -0,0 +1,37 @@ + + + + + + + + + + +
+
Loading...
+
+ +
Searching...
+
No Matches
+ +
+ + diff --git a/Docs/html/search/classes_3.js b/Docs/html/search/classes_3.js new file mode 100644 index 0000000..59ea40b --- /dev/null +++ b/Docs/html/search/classes_3.js @@ -0,0 +1,4 @@ +var searchData= +[ + ['urimapping_0',['UriMapping',['../struct_uri_mapping.html',1,'']]] +]; diff --git a/Docs/html/search/functions_0.js b/Docs/html/search/functions_0.js index 1d32ffe..d190359 100644 --- a/Docs/html/search/functions_0.js +++ b/Docs/html/search/functions_0.js @@ -1,9 +1,4 @@ var searchData= [ - ['capacityunits_0',['capacityUnits',['../class_c_l_storage.html#a287d73a832226a938cc114b21bf52fb7',1,'CLStorage']]], - ['clappcam_1',['CLAppCam',['../class_c_l_app_cam.html#a5489d93c51c1b4f3457af58970ff953d',1,'CLAppCam']]], - ['clappconn_2',['CLAppConn',['../class_c_l_app_conn.html#a40ab21138b6b3280000a139da9784f58',1,'CLAppConn']]], - ['clapphttpd_3',['CLAppHttpd',['../class_c_l_app_httpd.html#ad921ac128d82e11c8170847b25970dea',1,'CLAppHttpd']]], - ['configmdns_4',['configMDNS',['../class_c_l_app_conn.html#ab12f6fe1f13192cdcf6c2243c0619a39',1,'CLAppConn']]], - ['configntp_5',['configNTP',['../class_c_l_app_conn.html#a17ffc56321ce2e765ae90d1b27ed10e2',1,'CLAppConn']]] + ['attachservo_0',['attachServo',['../class_c_l_app_httpd.html#afa2f502272c6e8be33ef908013b0d4c8',1,'CLAppHttpd']]] ]; diff --git a/Docs/html/search/functions_1.js b/Docs/html/search/functions_1.js index be0f802..1d32ffe 100644 --- a/Docs/html/search/functions_1.js +++ b/Docs/html/search/functions_1.js @@ -1,5 +1,9 @@ var searchData= [ - ['dumpprefs_0',['dumpPrefs',['../class_c_l_app_component.html#ad90151113ffbbcc630e347580b3ee9fe',1,'CLAppComponent']]], - ['dumpsystemstatustojson_1',['dumpSystemStatusToJson',['../app__httpd_8cpp.html#a93682b89d59abe5dbad7f6d2a7fa8b8e',1,'dumpSystemStatusToJson(char *buf, size_t size): app_httpd.cpp'],['../app__httpd_8h.html#a93682b89d59abe5dbad7f6d2a7fa8b8e',1,'dumpSystemStatusToJson(char *buf, size_t size): app_httpd.cpp']]] + ['capacityunits_0',['capacityUnits',['../class_c_l_storage.html#a287d73a832226a938cc114b21bf52fb7',1,'CLStorage']]], + ['clappcam_1',['CLAppCam',['../class_c_l_app_cam.html#a5489d93c51c1b4f3457af58970ff953d',1,'CLAppCam']]], + ['clappconn_2',['CLAppConn',['../class_c_l_app_conn.html#a40ab21138b6b3280000a139da9784f58',1,'CLAppConn']]], + ['clapphttpd_3',['CLAppHttpd',['../class_c_l_app_httpd.html#ad921ac128d82e11c8170847b25970dea',1,'CLAppHttpd']]], + ['configmdns_4',['configMDNS',['../class_c_l_app_conn.html#ab12f6fe1f13192cdcf6c2243c0619a39',1,'CLAppConn']]], + ['configntp_5',['configNTP',['../class_c_l_app_conn.html#a17ffc56321ce2e765ae90d1b27ed10e2',1,'CLAppConn']]] ]; diff --git a/Docs/html/search/functions_2.js b/Docs/html/search/functions_2.js index ba62a98..be0f802 100644 --- a/Docs/html/search/functions_2.js +++ b/Docs/html/search/functions_2.js @@ -1,5 +1,5 @@ var searchData= [ - ['enableota_0',['enableOTA',['../class_c_l_app_conn.html#a5e9975f7afdb88ae197fb3ad43942c7f',1,'CLAppConn']]], - ['exists_1',['exists',['../class_c_l_storage.html#aa5b081483af1fcf83fca0573cc1c6f44',1,'CLStorage']]] + ['dumpprefs_0',['dumpPrefs',['../class_c_l_app_component.html#ad90151113ffbbcc630e347580b3ee9fe',1,'CLAppComponent']]], + ['dumpsystemstatustojson_1',['dumpSystemStatusToJson',['../app__httpd_8cpp.html#a93682b89d59abe5dbad7f6d2a7fa8b8e',1,'dumpSystemStatusToJson(char *buf, size_t size): app_httpd.cpp'],['../app__httpd_8h.html#a93682b89d59abe5dbad7f6d2a7fa8b8e',1,'dumpSystemStatusToJson(char *buf, size_t size): app_httpd.cpp']]] ]; diff --git a/Docs/html/search/functions_3.js b/Docs/html/search/functions_3.js index ca9f29f..ba62a98 100644 --- a/Docs/html/search/functions_3.js +++ b/Docs/html/search/functions_3.js @@ -1,37 +1,5 @@ var searchData= [ - ['getapname_0',['getApName',['../class_c_l_app_conn.html#a2d4395c692371a87b05ccb3e9b6b33d9',1,'CLAppConn']]], - ['getbuffer_1',['getBuffer',['../class_c_l_app_cam.html#aac54409dcd9344abbbe434b237dc505f',1,'CLAppCam']]], - ['getbuffersize_2',['getBufferSize',['../class_c_l_app_cam.html#aa0f1c434be24055bab3abb459a071abd',1,'CLAppCam']]], - ['getclientid_3',['getClientId',['../class_c_l_app_httpd.html#a9c73098b74bbc4bb1358c2723019e716',1,'CLAppHttpd']]], - ['getdaylightoffset_5fsec_4',['getDaylightOffset_sec',['../class_c_l_app_conn.html#aef2f2c99712b1c867b9d73f5abf4377e',1,'CLAppConn']]], - ['geterr_5',['getErr',['../class_c_l_app_cam.html#a97ffe4ceb1fc0ae537d4e5f96cb7691e',1,'CLAppCam']]], - ['getframerate_6',['getFrameRate',['../class_c_l_app_cam.html#a790db89fdbe6524175ad6f447b863c26',1,'CLAppCam']]], - ['getfs_7',['getFS',['../class_c_l_storage.html#a163976b7c12700a887fe33d797380d36',1,'CLStorage']]], - ['getgmtoffset_5fsec_8',['getGmtOffset_sec',['../class_c_l_app_conn.html#aa10f212281464764cf8b3057290d1722',1,'CLAppConn']]], - ['gethttpurl_9',['getHTTPUrl',['../class_c_l_app_conn.html#ae243b486cbd9ac417ff050df27bab72f',1,'CLAppConn']]], - ['getimagesserved_10',['getImagesServed',['../class_c_l_app_httpd.html#a1682f0b927c3c3691a20c1298e9922c9',1,'CLAppHttpd']]], - ['getlamp_11',['getLamp',['../class_c_l_app_cam.html#a84dc1e1b593b3d4b67889cc88893c92f',1,'CLAppCam']]], - ['getlasterr_12',['getLastErr',['../class_c_l_app_component.html#a0c99f78f5ea7090785c70864b8fd9101',1,'CLAppComponent']]], - ['getlocaltimestr_13',['getLocalTimeStr',['../class_c_l_app_conn.html#add0e97835e7204a17639eb8b4c07cfd0',1,'CLAppConn']]], - ['getname_14',['getName',['../class_c_l_app_httpd.html#a56a97b6250dd609d57e9c84128813846',1,'CLAppHttpd']]], - ['getntpserver_15',['getNTPServer',['../class_c_l_app_conn.html#a0e78e96c67968f486c71658925b53251',1,'CLAppConn']]], - ['getport_16',['getPort',['../class_c_l_app_conn.html#a6fa2c289453dd0849fe5d982d6b0ff59',1,'CLAppConn']]], - ['getprefsfilename_17',['getPrefsFileName',['../class_c_l_app_component.html#ada7959a912692cd2c03bd950faa8c5bc',1,'CLAppComponent']]], - ['getrotation_18',['getRotation',['../class_c_l_app_cam.html#a65918dca872c1d5bdcb0bb556451127f',1,'CLAppCam']]], - ['getsensor_19',['getSensor',['../class_c_l_app_cam.html#af812f50b9e35bcdb56af399c4fafd8f2',1,'CLAppCam']]], - ['getsensorpid_20',['getSensorPID',['../class_c_l_app_cam.html#ac20c8599dfc6112502b2ca9e446e6af5',1,'CLAppCam']]], - ['getserialbuffer_21',['getSerialBuffer',['../class_c_l_app_httpd.html#a86f5338752065817fabed08e118a8ff8',1,'CLAppHttpd']]], - ['getsize_22',['getSize',['../class_c_l_storage.html#a74a864f262e8143d1b82f4c823a7bb45',1,'CLStorage']]], - ['getsketchmd5_23',['getSketchMD5',['../class_c_l_app_httpd.html#add4710263a9093fa4f57a2c26d97310e',1,'CLAppHttpd']]], - ['getsketchsize_24',['getSketchSize',['../class_c_l_app_httpd.html#a80c23913b0e693ae584b8177647cec6c',1,'CLAppHttpd']]], - ['getsketchspace_25',['getSketchSpace',['../class_c_l_app_httpd.html#a4be3e20152216b606c83ae09e74c3840',1,'CLAppHttpd']]], - ['getstreamcount_26',['getStreamCount',['../class_c_l_app_httpd.html#a5f8f1b5b6e4a1da9dbc9788a4442e00c',1,'CLAppHttpd']]], - ['getstreammode_27',['getStreamMode',['../class_c_l_app_httpd.html#aeef90f323bd91eba9d00d0b464177c82',1,'CLAppHttpd']]], - ['getstreamsserved_28',['getStreamsServed',['../class_c_l_app_httpd.html#a2b63e9eb18e2d67fc3f352fec0b66cd9',1,'CLAppHttpd']]], - ['getstreamurl_29',['getStreamUrl',['../class_c_l_app_conn.html#a3b240d40a51a7d76f22be73b2563b412',1,'CLAppConn']]], - ['getuptimestr_30',['getUpTimeStr',['../class_c_l_app_conn.html#a05b74d2731b9c2220c431e354b1b55a5',1,'CLAppConn']]], - ['getused_31',['getUsed',['../class_c_l_storage.html#a9effb4148704bbc571acce5214e5dd74',1,'CLStorage']]], - ['getversion_32',['getVersion',['../class_c_l_app_httpd.html#a3ba8f3dfa8888b198ac9ad69e88f1a5d',1,'CLAppHttpd']]], - ['getxclk_33',['getXclk',['../class_c_l_app_cam.html#a8e19e1d337c7d7406d713a42615005aa',1,'CLAppCam']]] + ['enableota_0',['enableOTA',['../class_c_l_app_conn.html#a5e9975f7afdb88ae197fb3ad43942c7f',1,'CLAppConn']]], + ['exists_1',['exists',['../class_c_l_storage.html#aa5b081483af1fcf83fca0573cc1c6f44',1,'CLStorage']]] ]; diff --git a/Docs/html/search/functions_4.js b/Docs/html/search/functions_4.js index 6fff583..5f4a0f3 100644 --- a/Docs/html/search/functions_4.js +++ b/Docs/html/search/functions_4.js @@ -1,5 +1,38 @@ var searchData= [ - ['handlednsrequest_0',['handleDNSRequest',['../class_c_l_app_conn.html#a841aff4dbe7c1b8f34a9eff36fa1b7fd',1,'CLAppConn']]], - ['handleota_1',['handleOTA',['../class_c_l_app_conn.html#a2471ad68dc8303ebfd945c89151d6f03',1,'CLAppConn']]] + ['getapname_0',['getApName',['../class_c_l_app_conn.html#a2d4395c692371a87b05ccb3e9b6b33d9',1,'CLAppConn']]], + ['getbuffer_1',['getBuffer',['../class_c_l_app_cam.html#aac54409dcd9344abbbe434b237dc505f',1,'CLAppCam']]], + ['getbuffersize_2',['getBufferSize',['../class_c_l_app_cam.html#aa0f1c434be24055bab3abb459a071abd',1,'CLAppCam']]], + ['getclientid_3',['getClientId',['../class_c_l_app_httpd.html#a9c73098b74bbc4bb1358c2723019e716',1,'CLAppHttpd']]], + ['getdaylightoffset_5fsec_4',['getDaylightOffset_sec',['../class_c_l_app_conn.html#aef2f2c99712b1c867b9d73f5abf4377e',1,'CLAppConn']]], + ['geterr_5',['getErr',['../class_c_l_app_cam.html#a97ffe4ceb1fc0ae537d4e5f96cb7691e',1,'CLAppCam']]], + ['getframerate_6',['getFrameRate',['../class_c_l_app_cam.html#a790db89fdbe6524175ad6f447b863c26',1,'CLAppCam']]], + ['getfs_7',['getFS',['../class_c_l_storage.html#a163976b7c12700a887fe33d797380d36',1,'CLStorage']]], + ['getgmtoffset_5fsec_8',['getGmtOffset_sec',['../class_c_l_app_conn.html#aa10f212281464764cf8b3057290d1722',1,'CLAppConn']]], + ['gethttpurl_9',['getHTTPUrl',['../class_c_l_app_conn.html#ae243b486cbd9ac417ff050df27bab72f',1,'CLAppConn']]], + ['getimagesserved_10',['getImagesServed',['../class_c_l_app_httpd.html#a1682f0b927c3c3691a20c1298e9922c9',1,'CLAppHttpd']]], + ['getlamp_11',['getLamp',['../class_c_l_app_cam.html#a84dc1e1b593b3d4b67889cc88893c92f',1,'CLAppCam']]], + ['getlasterr_12',['getLastErr',['../class_c_l_app_component.html#a0c99f78f5ea7090785c70864b8fd9101',1,'CLAppComponent']]], + ['getlocaltimestr_13',['getLocalTimeStr',['../class_c_l_app_conn.html#add0e97835e7204a17639eb8b4c07cfd0',1,'CLAppConn']]], + ['getname_14',['getName',['../class_c_l_app_httpd.html#a56a97b6250dd609d57e9c84128813846',1,'CLAppHttpd']]], + ['getntpserver_15',['getNTPServer',['../class_c_l_app_conn.html#a0e78e96c67968f486c71658925b53251',1,'CLAppConn']]], + ['getport_16',['getPort',['../class_c_l_app_conn.html#a6fa2c289453dd0849fe5d982d6b0ff59',1,'CLAppConn']]], + ['getprefsfilename_17',['getPrefsFileName',['../class_c_l_app_component.html#ada7959a912692cd2c03bd950faa8c5bc',1,'CLAppComponent']]], + ['getrotation_18',['getRotation',['../class_c_l_app_cam.html#a65918dca872c1d5bdcb0bb556451127f',1,'CLAppCam']]], + ['getsensor_19',['getSensor',['../class_c_l_app_cam.html#af812f50b9e35bcdb56af399c4fafd8f2',1,'CLAppCam']]], + ['getsensorpid_20',['getSensorPID',['../class_c_l_app_cam.html#ac20c8599dfc6112502b2ca9e446e6af5',1,'CLAppCam']]], + ['getserialbuffer_21',['getSerialBuffer',['../class_c_l_app_httpd.html#a86f5338752065817fabed08e118a8ff8',1,'CLAppHttpd']]], + ['getservocount_22',['getServoCount',['../class_c_l_app_httpd.html#a855bd052a5092da8d8246face69881d9',1,'CLAppHttpd']]], + ['getsize_23',['getSize',['../class_c_l_storage.html#a74a864f262e8143d1b82f4c823a7bb45',1,'CLStorage']]], + ['getsketchmd5_24',['getSketchMD5',['../class_c_l_app_httpd.html#add4710263a9093fa4f57a2c26d97310e',1,'CLAppHttpd']]], + ['getsketchsize_25',['getSketchSize',['../class_c_l_app_httpd.html#a80c23913b0e693ae584b8177647cec6c',1,'CLAppHttpd']]], + ['getsketchspace_26',['getSketchSpace',['../class_c_l_app_httpd.html#a4be3e20152216b606c83ae09e74c3840',1,'CLAppHttpd']]], + ['getstreamcount_27',['getStreamCount',['../class_c_l_app_httpd.html#a5f8f1b5b6e4a1da9dbc9788a4442e00c',1,'CLAppHttpd']]], + ['getstreammode_28',['getStreamMode',['../class_c_l_app_httpd.html#aeef90f323bd91eba9d00d0b464177c82',1,'CLAppHttpd']]], + ['getstreamsserved_29',['getStreamsServed',['../class_c_l_app_httpd.html#a2b63e9eb18e2d67fc3f352fec0b66cd9',1,'CLAppHttpd']]], + ['getstreamurl_30',['getStreamUrl',['../class_c_l_app_conn.html#a3b240d40a51a7d76f22be73b2563b412',1,'CLAppConn']]], + ['getuptimestr_31',['getUpTimeStr',['../class_c_l_app_conn.html#a05b74d2731b9c2220c431e354b1b55a5',1,'CLAppConn']]], + ['getused_32',['getUsed',['../class_c_l_storage.html#a9effb4148704bbc571acce5214e5dd74',1,'CLStorage']]], + ['getversion_33',['getVersion',['../class_c_l_app_httpd.html#a3ba8f3dfa8888b198ac9ad69e88f1a5d',1,'CLAppHttpd']]], + ['getxclk_34',['getXclk',['../class_c_l_app_cam.html#a8e19e1d337c7d7406d713a42615005aa',1,'CLAppCam']]] ]; diff --git a/Docs/html/search/functions_5.js b/Docs/html/search/functions_5.js index 2ce5efb..6fff583 100644 --- a/Docs/html/search/functions_5.js +++ b/Docs/html/search/functions_5.js @@ -1,11 +1,5 @@ var searchData= [ - ['incimagesserved_0',['incImagesServed',['../class_c_l_app_httpd.html#a2db88a341da481eff2270d5fa8d607a3',1,'CLAppHttpd']]], - ['init_1',['init',['../class_c_l_storage.html#ad93b1e36f1c529d89352699ade07e9d7',1,'CLStorage']]], - ['isaccesspoint_2',['isAccessPoint',['../class_c_l_app_conn.html#a80277e357f23e4dd2de431aecdc326ad',1,'CLAppConn']]], - ['isautolamp_3',['isAutoLamp',['../class_c_l_app_cam.html#aa68f9714fa1c5bdf77708279c8da081b',1,'CLAppCam']]], - ['iscaptiveportal_4',['isCaptivePortal',['../class_c_l_app_conn.html#abbde99435f66b7828a706c15c4317634',1,'CLAppConn']]], - ['isdebugmode_5',['isDebugMode',['../class_c_l_app_component.html#a4891eef9a9970b158d528fef5dda8d30',1,'CLAppComponent']]], - ['isjpeginbuffer_6',['isJPEGinBuffer',['../class_c_l_app_cam.html#a1f01a309f73eb36142ab8b449c81a381',1,'CLAppCam']]], - ['isotaenabled_7',['isOTAEnabled',['../class_c_l_app_conn.html#af5a7071604dbf2bc0ec8b1bdfabd538a',1,'CLAppConn']]] + ['handlednsrequest_0',['handleDNSRequest',['../class_c_l_app_conn.html#a841aff4dbe7c1b8f34a9eff36fa1b7fd',1,'CLAppConn']]], + ['handleota_1',['handleOTA',['../class_c_l_app_conn.html#a2471ad68dc8303ebfd945c89151d6f03',1,'CLAppConn']]] ]; diff --git a/Docs/html/search/functions_6.js b/Docs/html/search/functions_6.js index abb4f01..2ce5efb 100644 --- a/Docs/html/search/functions_6.js +++ b/Docs/html/search/functions_6.js @@ -1,5 +1,11 @@ var searchData= [ - ['listdir_0',['listDir',['../class_c_l_storage.html#aad57cc509fd60ff11bfc55a47b96be9f',1,'CLStorage']]], - ['loadprefs_1',['loadPrefs',['../class_c_l_app_cam.html#a26a9c706c7c9f86adbfa3cfb748760df',1,'CLAppCam::loadPrefs()'],['../class_c_l_app_component.html#a300c0d2775ed4a082f63449826ee3b98',1,'CLAppComponent::loadPrefs()'],['../class_c_l_app_conn.html#ae2c05fac4c38fd444700b3f01eed931f',1,'CLAppConn::loadPrefs()'],['../class_c_l_app_httpd.html#af530618baf6452852e39524efa4fd365',1,'CLAppHttpd::loadPrefs()']]] + ['incimagesserved_0',['incImagesServed',['../class_c_l_app_httpd.html#a2db88a341da481eff2270d5fa8d607a3',1,'CLAppHttpd']]], + ['init_1',['init',['../class_c_l_storage.html#ad93b1e36f1c529d89352699ade07e9d7',1,'CLStorage']]], + ['isaccesspoint_2',['isAccessPoint',['../class_c_l_app_conn.html#a80277e357f23e4dd2de431aecdc326ad',1,'CLAppConn']]], + ['isautolamp_3',['isAutoLamp',['../class_c_l_app_cam.html#aa68f9714fa1c5bdf77708279c8da081b',1,'CLAppCam']]], + ['iscaptiveportal_4',['isCaptivePortal',['../class_c_l_app_conn.html#abbde99435f66b7828a706c15c4317634',1,'CLAppConn']]], + ['isdebugmode_5',['isDebugMode',['../class_c_l_app_component.html#a4891eef9a9970b158d528fef5dda8d30',1,'CLAppComponent']]], + ['isjpeginbuffer_6',['isJPEGinBuffer',['../class_c_l_app_cam.html#a1f01a309f73eb36142ab8b449c81a381',1,'CLAppCam']]], + ['isotaenabled_7',['isOTAEnabled',['../class_c_l_app_conn.html#af5a7071604dbf2bc0ec8b1bdfabd538a',1,'CLAppConn']]] ]; diff --git a/Docs/html/search/functions_7.js b/Docs/html/search/functions_7.js index 39379aa..abb4f01 100644 --- a/Docs/html/search/functions_7.js +++ b/Docs/html/search/functions_7.js @@ -1,10 +1,5 @@ var searchData= [ - ['oncontrol_0',['onControl',['../app__httpd_8cpp.html#ad15b6110c801dc234564fa2f8268a9ab',1,'onControl(AsyncWebServerRequest *request): app_httpd.cpp'],['../app__httpd_8h.html#ad15b6110c801dc234564fa2f8268a9ab',1,'onControl(AsyncWebServerRequest *request): app_httpd.cpp']]], - ['oninfo_1',['onInfo',['../app__httpd_8cpp.html#ad302c9a0a0e16505eef900b55250762e',1,'onInfo(AsyncWebServerRequest *request): app_httpd.cpp'],['../app__httpd_8h.html#ad302c9a0a0e16505eef900b55250762e',1,'onInfo(AsyncWebServerRequest *request): app_httpd.cpp']]], - ['onsnaptimer_2',['onSnapTimer',['../app__httpd_8cpp.html#a1424ebf10d44b20fd79bb8102221a969',1,'onSnapTimer(TimerHandle_t pxTimer): app_httpd.cpp'],['../app__httpd_8h.html#a1424ebf10d44b20fd79bb8102221a969',1,'onSnapTimer(TimerHandle_t pxTimer): app_httpd.cpp']]], - ['onstatus_3',['onStatus',['../app__httpd_8cpp.html#acc8d1122165362713f0823aeb3b25d1e',1,'onStatus(AsyncWebServerRequest *request): app_httpd.cpp'],['../app__httpd_8h.html#acc8d1122165362713f0823aeb3b25d1e',1,'onStatus(AsyncWebServerRequest *request): app_httpd.cpp']]], - ['onsystemstatus_4',['onSystemStatus',['../app__httpd_8cpp.html#a9a31c0a3ca52126629c612c494b8d3c6',1,'onSystemStatus(AsyncWebServerRequest *request): app_httpd.cpp'],['../app__httpd_8h.html#a9a31c0a3ca52126629c612c494b8d3c6',1,'onSystemStatus(AsyncWebServerRequest *request): app_httpd.cpp']]], - ['onwsevent_5',['onWsEvent',['../app__httpd_8cpp.html#a7064e9828984f378d3e04f9b7a47bcae',1,'onWsEvent(AsyncWebSocket *server, AsyncWebSocketClient *client, AwsEventType type, void *arg, uint8_t *data, size_t len): app_httpd.cpp'],['../app__httpd_8h.html#a7064e9828984f378d3e04f9b7a47bcae',1,'onWsEvent(AsyncWebSocket *server, AsyncWebSocketClient *client, AwsEventType type, void *arg, uint8_t *data, size_t len): app_httpd.cpp']]], - ['open_6',['open',['../class_c_l_storage.html#a867f099568b8c4f18f0135ad14260a01',1,'CLStorage']]] + ['listdir_0',['listDir',['../class_c_l_storage.html#aad57cc509fd60ff11bfc55a47b96be9f',1,'CLStorage']]], + ['loadprefs_1',['loadPrefs',['../class_c_l_app_cam.html#a26a9c706c7c9f86adbfa3cfb748760df',1,'CLAppCam::loadPrefs()'],['../class_c_l_app_component.html#a300c0d2775ed4a082f63449826ee3b98',1,'CLAppComponent::loadPrefs()'],['../class_c_l_app_conn.html#ae2c05fac4c38fd444700b3f01eed931f',1,'CLAppConn::loadPrefs()'],['../class_c_l_app_httpd.html#af530618baf6452852e39524efa4fd365',1,'CLAppHttpd::loadPrefs()']]] ]; diff --git a/Docs/html/search/functions_8.js b/Docs/html/search/functions_8.js index 3d3ced6..39379aa 100644 --- a/Docs/html/search/functions_8.js +++ b/Docs/html/search/functions_8.js @@ -1,7 +1,10 @@ var searchData= [ - ['parsebytes_0',['parseBytes',['../parsebytes_8cpp.html#a4d8e6d226a4ee77982a2810ca02a8b77',1,'parseBytes(const char *str, char sep, byte *bytes, int maxBytes, int base): parsebytes.cpp'],['../parsebytes_8h.html#a4d8e6d226a4ee77982a2810ca02a8b77',1,'parseBytes(const char *str, char sep, byte *bytes, int maxBytes, int base): parsebytes.cpp']]], - ['parseprefs_1',['parsePrefs',['../class_c_l_app_component.html#a7b23015c89977efd202896a19e7ca319',1,'CLAppComponent']]], - ['printlocaltime_2',['printLocalTime',['../class_c_l_app_conn.html#a9a4f24949950433f1672c3db6af49dde',1,'CLAppConn']]], - ['processor_3',['processor',['../app__httpd_8cpp.html#a0c021f9721c3b479757f8e1b40624b6c',1,'processor(const String &var): app_httpd.cpp'],['../app__httpd_8h.html#a0c021f9721c3b479757f8e1b40624b6c',1,'processor(const String &var): app_httpd.cpp']]] + ['oncontrol_0',['onControl',['../app__httpd_8cpp.html#ad15b6110c801dc234564fa2f8268a9ab',1,'onControl(AsyncWebServerRequest *request): app_httpd.cpp'],['../app__httpd_8h.html#ad15b6110c801dc234564fa2f8268a9ab',1,'onControl(AsyncWebServerRequest *request): app_httpd.cpp']]], + ['oninfo_1',['onInfo',['../app__httpd_8cpp.html#ad302c9a0a0e16505eef900b55250762e',1,'onInfo(AsyncWebServerRequest *request): app_httpd.cpp'],['../app__httpd_8h.html#ad302c9a0a0e16505eef900b55250762e',1,'onInfo(AsyncWebServerRequest *request): app_httpd.cpp']]], + ['onsnaptimer_2',['onSnapTimer',['../app__httpd_8cpp.html#a1424ebf10d44b20fd79bb8102221a969',1,'onSnapTimer(TimerHandle_t pxTimer): app_httpd.cpp'],['../app__httpd_8h.html#a1424ebf10d44b20fd79bb8102221a969',1,'onSnapTimer(TimerHandle_t pxTimer): app_httpd.cpp']]], + ['onstatus_3',['onStatus',['../app__httpd_8cpp.html#acc8d1122165362713f0823aeb3b25d1e',1,'onStatus(AsyncWebServerRequest *request): app_httpd.cpp'],['../app__httpd_8h.html#acc8d1122165362713f0823aeb3b25d1e',1,'onStatus(AsyncWebServerRequest *request): app_httpd.cpp']]], + ['onsystemstatus_4',['onSystemStatus',['../app__httpd_8cpp.html#a9a31c0a3ca52126629c612c494b8d3c6',1,'onSystemStatus(AsyncWebServerRequest *request): app_httpd.cpp'],['../app__httpd_8h.html#a9a31c0a3ca52126629c612c494b8d3c6',1,'onSystemStatus(AsyncWebServerRequest *request): app_httpd.cpp']]], + ['onwsevent_5',['onWsEvent',['../app__httpd_8cpp.html#a7064e9828984f378d3e04f9b7a47bcae',1,'onWsEvent(AsyncWebSocket *server, AsyncWebSocketClient *client, AwsEventType type, void *arg, uint8_t *data, size_t len): app_httpd.cpp'],['../app__httpd_8h.html#a7064e9828984f378d3e04f9b7a47bcae',1,'onWsEvent(AsyncWebSocket *server, AsyncWebSocketClient *client, AwsEventType type, void *arg, uint8_t *data, size_t len): app_httpd.cpp']]], + ['open_6',['open',['../class_c_l_storage.html#a867f099568b8c4f18f0135ad14260a01',1,'CLStorage']]] ]; diff --git a/Docs/html/search/functions_9.js b/Docs/html/search/functions_9.js index b38b2b0..3d3ced6 100644 --- a/Docs/html/search/functions_9.js +++ b/Docs/html/search/functions_9.js @@ -1,8 +1,7 @@ var searchData= [ - ['readfiletostring_0',['readFileToString',['../class_c_l_storage.html#a837b93ce2190684b5f17cc5b9da6f6ba',1,'CLStorage']]], - ['readjsonintval_1',['readJsonIntVal',['../class_c_l_app_component.html#aae2aee9e4a8001900d8b380adb66a8e3',1,'CLAppComponent']]], - ['releasebuffer_2',['releaseBuffer',['../class_c_l_app_cam.html#aaf9c6d7306c5122eb6766011b8fc4c4c',1,'CLAppCam']]], - ['remove_3',['remove',['../class_c_l_storage.html#afa5139f3590aba42b3de2c8e1786a43b',1,'CLStorage']]], - ['removeprefs_4',['removePrefs',['../class_c_l_app_component.html#af763174f3eed76761a2eeab9aa845e6a',1,'CLAppComponent']]] + ['parsebytes_0',['parseBytes',['../parsebytes_8cpp.html#a4d8e6d226a4ee77982a2810ca02a8b77',1,'parseBytes(const char *str, char sep, byte *bytes, int maxBytes, int base): parsebytes.cpp'],['../parsebytes_8h.html#a4d8e6d226a4ee77982a2810ca02a8b77',1,'parseBytes(const char *str, char sep, byte *bytes, int maxBytes, int base): parsebytes.cpp']]], + ['parseprefs_1',['parsePrefs',['../class_c_l_app_component.html#a7b23015c89977efd202896a19e7ca319',1,'CLAppComponent']]], + ['printlocaltime_2',['printLocalTime',['../class_c_l_app_conn.html#a9a4f24949950433f1672c3db6af49dde',1,'CLAppConn']]], + ['processor_3',['processor',['../app__httpd_8cpp.html#a0c021f9721c3b479757f8e1b40624b6c',1,'processor(const String &var): app_httpd.cpp'],['../app__httpd_8h.html#a0c021f9721c3b479757f8e1b40624b6c',1,'processor(const String &var): app_httpd.cpp']]] ]; diff --git a/Docs/html/search/functions_a.js b/Docs/html/search/functions_a.js index b073fdb..b38b2b0 100644 --- a/Docs/html/search/functions_a.js +++ b/Docs/html/search/functions_a.js @@ -1,20 +1,8 @@ var searchData= [ - ['saveprefs_0',['savePrefs',['../class_c_l_app_cam.html#a0f2bc29dea9609204871b7b5bc281c4f',1,'CLAppCam::savePrefs()'],['../class_c_l_app_component.html#a31a25b7869113a15e18f34b2c690189a',1,'CLAppComponent::savePrefs()'],['../class_c_l_app_conn.html#ace5a052d85379ece71207129edc2a0f1',1,'CLAppConn::savePrefs()']]], - ['serialsendcommand_1',['serialSendCommand',['../class_c_l_app_httpd.html#a36be0ed79de4194e8d00b026fd4be4d0',1,'CLAppHttpd']]], - ['setautolamp_2',['setAutoLamp',['../class_c_l_app_cam.html#aa5bd4f968fd8345d3d2a5d8a121586c3',1,'CLAppCam']]], - ['setdebugmode_3',['setDebugMode',['../class_c_l_app_component.html#a9ab4a575691522178eb10d9bffcff5b7',1,'CLAppComponent']]], - ['seterr_4',['setErr',['../class_c_l_app_component.html#a9565596ad1c588c05e349d92b2476e40',1,'CLAppComponent']]], - ['setframerate_5',['setFrameRate',['../class_c_l_app_cam.html#a6581e369883546817a1edaedf4af1734',1,'CLAppCam']]], - ['setlamp_6',['setLamp',['../class_c_l_app_cam.html#a8cab0636ce5e566a7b89016c477aec2b',1,'CLAppCam']]], - ['setrotation_7',['setRotation',['../class_c_l_app_cam.html#a27d4c05b87660b0e04b6a8902f0f173e',1,'CLAppCam']]], - ['setstreammode_8',['setStreamMode',['../class_c_l_app_httpd.html#a40005188d09a72002252fd4b6e2cd2b9',1,'CLAppHttpd']]], - ['settag_9',['setTag',['../class_c_l_app_component.html#a75a706c37e31c3083c845d304e3a519b',1,'CLAppComponent']]], - ['setxclk_10',['setXclk',['../class_c_l_app_cam.html#a9ccd0763eb8eeb559b46e747df25d268',1,'CLAppCam']]], - ['snaptobufer_11',['snapToBufer',['../class_c_l_app_cam.html#a89a7a39bd89130cab06fd7139fc9b6d9',1,'CLAppCam']]], - ['snaptostream_12',['snapToStream',['../class_c_l_app_httpd.html#a4e52f72c1d20cf6420e2f17b0b521da4',1,'CLAppHttpd']]], - ['start_13',['start',['../class_c_l_app_cam.html#af277f42041c7c0a561bd8c8b087f4b3a',1,'CLAppCam::start()'],['../class_c_l_app_component.html#a7e64a4c55bd1f3216c507101835392b5',1,'CLAppComponent::start()'],['../class_c_l_app_conn.html#a75a0c8c0ab160691ecf58e3c4ad58951',1,'CLAppConn::start()'],['../class_c_l_app_httpd.html#aaf8a95884768b7ac3e1c04ea041ee514',1,'CLAppHttpd::start()']]], - ['startstream_14',['startStream',['../class_c_l_app_httpd.html#af836002eda44f3e400af0808bf9046c1',1,'CLAppHttpd']]], - ['stop_15',['stop',['../class_c_l_app_cam.html#a8f1da94b3efb536a15419e5983fcac81',1,'CLAppCam::stop()'],['../class_c_l_app_conn.html#ab0a56d0491f5fd3fdce6028447183a25',1,'CLAppConn::stop()']]], - ['stopstream_16',['stopStream',['../class_c_l_app_httpd.html#a4889a2a7ee9a0e5ab558b64983249e46',1,'CLAppHttpd']]] + ['readfiletostring_0',['readFileToString',['../class_c_l_storage.html#a837b93ce2190684b5f17cc5b9da6f6ba',1,'CLStorage']]], + ['readjsonintval_1',['readJsonIntVal',['../class_c_l_app_component.html#aae2aee9e4a8001900d8b380adb66a8e3',1,'CLAppComponent']]], + ['releasebuffer_2',['releaseBuffer',['../class_c_l_app_cam.html#aaf9c6d7306c5122eb6766011b8fc4c4c',1,'CLAppCam']]], + ['remove_3',['remove',['../class_c_l_storage.html#afa5139f3590aba42b3de2c8e1786a43b',1,'CLStorage']]], + ['removeprefs_4',['removePrefs',['../class_c_l_app_component.html#af763174f3eed76761a2eeab9aa845e6a',1,'CLAppComponent']]] ]; diff --git a/Docs/html/search/functions_b.js b/Docs/html/search/functions_b.js index 4248ec1..b073fdb 100644 --- a/Docs/html/search/functions_b.js +++ b/Docs/html/search/functions_b.js @@ -1,4 +1,20 @@ var searchData= [ - ['temprature_5fsens_5fread_0',['temprature_sens_read',['../app__httpd_8h.html#a2188b2e5ed72e93782e0a6d59111a180',1,'app_httpd.h']]] + ['saveprefs_0',['savePrefs',['../class_c_l_app_cam.html#a0f2bc29dea9609204871b7b5bc281c4f',1,'CLAppCam::savePrefs()'],['../class_c_l_app_component.html#a31a25b7869113a15e18f34b2c690189a',1,'CLAppComponent::savePrefs()'],['../class_c_l_app_conn.html#ace5a052d85379ece71207129edc2a0f1',1,'CLAppConn::savePrefs()']]], + ['serialsendcommand_1',['serialSendCommand',['../class_c_l_app_httpd.html#a36be0ed79de4194e8d00b026fd4be4d0',1,'CLAppHttpd']]], + ['setautolamp_2',['setAutoLamp',['../class_c_l_app_cam.html#aa5bd4f968fd8345d3d2a5d8a121586c3',1,'CLAppCam']]], + ['setdebugmode_3',['setDebugMode',['../class_c_l_app_component.html#a9ab4a575691522178eb10d9bffcff5b7',1,'CLAppComponent']]], + ['seterr_4',['setErr',['../class_c_l_app_component.html#a9565596ad1c588c05e349d92b2476e40',1,'CLAppComponent']]], + ['setframerate_5',['setFrameRate',['../class_c_l_app_cam.html#a6581e369883546817a1edaedf4af1734',1,'CLAppCam']]], + ['setlamp_6',['setLamp',['../class_c_l_app_cam.html#a8cab0636ce5e566a7b89016c477aec2b',1,'CLAppCam']]], + ['setrotation_7',['setRotation',['../class_c_l_app_cam.html#a27d4c05b87660b0e04b6a8902f0f173e',1,'CLAppCam']]], + ['setstreammode_8',['setStreamMode',['../class_c_l_app_httpd.html#a40005188d09a72002252fd4b6e2cd2b9',1,'CLAppHttpd']]], + ['settag_9',['setTag',['../class_c_l_app_component.html#a75a706c37e31c3083c845d304e3a519b',1,'CLAppComponent']]], + ['setxclk_10',['setXclk',['../class_c_l_app_cam.html#a9ccd0763eb8eeb559b46e747df25d268',1,'CLAppCam']]], + ['snaptobufer_11',['snapToBufer',['../class_c_l_app_cam.html#a89a7a39bd89130cab06fd7139fc9b6d9',1,'CLAppCam']]], + ['snaptostream_12',['snapToStream',['../class_c_l_app_httpd.html#a4e52f72c1d20cf6420e2f17b0b521da4',1,'CLAppHttpd']]], + ['start_13',['start',['../class_c_l_app_cam.html#af277f42041c7c0a561bd8c8b087f4b3a',1,'CLAppCam::start()'],['../class_c_l_app_component.html#a7e64a4c55bd1f3216c507101835392b5',1,'CLAppComponent::start()'],['../class_c_l_app_conn.html#a75a0c8c0ab160691ecf58e3c4ad58951',1,'CLAppConn::start()'],['../class_c_l_app_httpd.html#aaf8a95884768b7ac3e1c04ea041ee514',1,'CLAppHttpd::start()']]], + ['startstream_14',['startStream',['../class_c_l_app_httpd.html#af836002eda44f3e400af0808bf9046c1',1,'CLAppHttpd']]], + ['stop_15',['stop',['../class_c_l_app_cam.html#a8f1da94b3efb536a15419e5983fcac81',1,'CLAppCam::stop()'],['../class_c_l_app_conn.html#ab0a56d0491f5fd3fdce6028447183a25',1,'CLAppConn::stop()']]], + ['stopstream_16',['stopStream',['../class_c_l_app_httpd.html#a4889a2a7ee9a0e5ab558b64983249e46',1,'CLAppHttpd']]] ]; diff --git a/Docs/html/search/functions_c.js b/Docs/html/search/functions_c.js index 05f2a22..4248ec1 100644 --- a/Docs/html/search/functions_c.js +++ b/Docs/html/search/functions_c.js @@ -1,4 +1,4 @@ var searchData= [ - ['updatesnaptimer_0',['updateSnapTimer',['../class_c_l_app_httpd.html#a58f5ed0635650911e1540f138df24b29',1,'CLAppHttpd']]] + ['temprature_5fsens_5fread_0',['temprature_sens_read',['../app__httpd_8h.html#a2188b2e5ed72e93782e0a6d59111a180',1,'app_httpd.h']]] ]; diff --git a/Docs/html/search/functions_d.js b/Docs/html/search/functions_d.js index 1fe1fee..05f2a22 100644 --- a/Docs/html/search/functions_d.js +++ b/Docs/html/search/functions_d.js @@ -1,4 +1,4 @@ var searchData= [ - ['wifistatus_0',['wifiStatus',['../class_c_l_app_conn.html#a790ba7c0b56edae2de159abf29f0127b',1,'CLAppConn']]] + ['updatesnaptimer_0',['updateSnapTimer',['../class_c_l_app_httpd.html#a58f5ed0635650911e1540f138df24b29',1,'CLAppHttpd']]] ]; diff --git a/Docs/html/search/functions_e.html b/Docs/html/search/functions_e.html new file mode 100644 index 0000000..1297715 --- /dev/null +++ b/Docs/html/search/functions_e.html @@ -0,0 +1,37 @@ + + + + + + + + + + +
+
Loading...
+
+ +
Searching...
+
No Matches
+ +
+ + diff --git a/Docs/html/search/functions_e.js b/Docs/html/search/functions_e.js new file mode 100644 index 0000000..8d42903 --- /dev/null +++ b/Docs/html/search/functions_e.js @@ -0,0 +1,5 @@ +var searchData= +[ + ['wifistatus_0',['wifiStatus',['../class_c_l_app_conn.html#a790ba7c0b56edae2de159abf29f0127b',1,'CLAppConn']]], + ['writeservo_1',['writeServo',['../class_c_l_app_httpd.html#a85c33a135e46369c092c27a7fd5e04bd',1,'CLAppHttpd']]] +]; diff --git a/Docs/html/search/pages_2.js b/Docs/html/search/pages_2.js index 34c2691..becb98d 100644 --- a/Docs/html/search/pages_2.js +++ b/Docs/html/search/pages_2.js @@ -1,4 +1,4 @@ var searchData= [ - ['esp32_2dcam_20webcam_20server_20_26nbsp_3b_26nbsp_3b_26nbsp_3b_20_20_26nbsp_3b_26nbsp_3b_0',['ESP32-CAM WebCam Server &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;',['../index.html',1,'']]] + ['esp32_2dcam_20webserver_2e_20_26nbsp_3b_26nbsp_3b_26nbsp_3b_20_3cspan_20title_3d_22master_20branch_20build_20status_22_3e_3ca_20href_3d_22https_3a_2f_2ftravis_2dci_2ecom_2fgithub_2feasytarget_2fesp32_2dcam_2dwebserver_22_20_3e_3cimg_20src_3d_22https_3a_2f_2ftravis_2dci_2ecom_2feasytarget_2fesp32_2dcam_2dwebserver_2esvg_3fbranch_3dmaster_22_20alt_3d_22ci_20status_22_2f_3e_3c_2fa_3e_3c_2fspan_3e_20_26nbsp_3b_26nbsp_3b_20_3cspan_20title_3d_22esp_20eye_22_3e_3cimg_20src_3d_22docs_2flogo_2esvg_22_20alt_3d_22esp_2deye_20logo_22_2f_3e_3c_2fspan_3e_0',['ESP32-CAM WebServer. &nbsp;&nbsp;&nbsp; <span title="Master branch build status"><a href="https://travis-ci.com/github/easytarget/esp32-cam-webserver" ><img src="https://travis-ci.com/easytarget/esp32-cam-webserver.svg?branch=master" alt="CI Status"/></a></span> &nbsp;&nbsp; <span title="ESP EYE"><img src="Docs/logo.svg" alt="ESP-EYE logo"/></span>',['../index.html',1,'']]] ]; diff --git a/Docs/html/search/searchdata.js b/Docs/html/search/searchdata.js index f8ab6fa..47496cf 100644 --- a/Docs/html/search/searchdata.js +++ b/Docs/html/search/searchdata.js @@ -1,9 +1,9 @@ var indexSectionsWithContent = { 0: "abcdeghilmnoprstuw", - 1: "csu", + 1: "acsu", 2: "acprs", - 3: "cdeghiloprstuw", + 3: "acdeghiloprstuw", 4: "adginpsu", 5: "c", 6: "c", diff --git a/Docs/html/search/variables_5.js b/Docs/html/search/variables_5.js index d73e62f..44e10cd 100644 --- a/Docs/html/search/variables_5.js +++ b/Docs/html/search/variables_5.js @@ -1,5 +1,6 @@ var searchData= [ ['password_0',['password',['../struct_station.html#adfce66aab835659fef7ab8501def3867',1,'Station']]], - ['path_1',['path',['../struct_uri_mapping.html#a28b0be3b16e0a3d7f7bd4ecff420fa4f',1,'UriMapping']]] + ['path_1',['path',['../struct_uri_mapping.html#a28b0be3b16e0a3d7f7bd4ecff420fa4f',1,'UriMapping']]], + ['pin_2',['pin',['../struct_app_servo.html#ad51201b7ed0aa34d6285cb1fc54d8a69',1,'AppServo']]] ]; diff --git a/Docs/html/search/variables_6.js b/Docs/html/search/variables_6.js index b58281a..746f5dc 100644 --- a/Docs/html/search/variables_6.js +++ b/Docs/html/search/variables_6.js @@ -1,5 +1,6 @@ var searchData= [ - ['ssid_0',['ssid',['../struct_station.html#ad635bfe5333139b2596ace399fe5054e',1,'Station']]], - ['storage_1',['Storage',['../storage_8cpp.html#a47c5a522666eb276db609c3d8049238a',1,'Storage(): storage.cpp'],['../storage_8h.html#a47c5a522666eb276db609c3d8049238a',1,'Storage(): storage.cpp']]] + ['servo_0',['servo',['../struct_app_servo.html#a4dc0cef6f4e75b3335ab1957544fcd7f',1,'AppServo']]], + ['ssid_1',['ssid',['../struct_station.html#ad635bfe5333139b2596ace399fe5054e',1,'Station']]], + ['storage_2',['Storage',['../storage_8cpp.html#a47c5a522666eb276db609c3d8049238a',1,'Storage(): storage.cpp'],['../storage_8h.html#a47c5a522666eb276db609c3d8049238a',1,'Storage(): storage.cpp']]] ]; diff --git a/Docs/html/struct_app_servo.html b/Docs/html/struct_app_servo.html new file mode 100644 index 0000000..82829a0 --- /dev/null +++ b/Docs/html/struct_app_servo.html @@ -0,0 +1,120 @@ + + + + + + + +ESP32 WebCam Server: AppServo Struct Reference + + + + + + + + + +
+
+ + + + + + + +
+
ESP32 WebCam Server 5.0 +
+
Fully customizable WebCam server based on Espressif ESP32-based board with a camera.
+
+
+ + + + + + + + +
+
+ + +
+ +
+ +
+
+
+Data Fields
+
AppServo Struct Reference
+
+
+ +

#include <app_httpd.h>

+ + + + + + +

+Data Fields

int pin
 
Servo * servo
 
+

Field Documentation

+ +

◆ pin

+ +
+
+ + + + +
int AppServo::pin
+
+ +
+
+ +

◆ servo

+ +
+
+ + + + +
Servo* AppServo::servo
+
+ +
+
+
The documentation for this struct was generated from the following file: +
+ +
+Generated by doxygen 1.9.3 +
+ + diff --git a/Docs/html/struct_static_i_p.html b/Docs/html/struct_static_i_p.html index 672020f..196d9fc 100644 --- a/Docs/html/struct_static_i_p.html +++ b/Docs/html/struct_static_i_p.html @@ -70,6 +70,9 @@
+

Static IP strcuture for configuring AP and WiFi parameters. + More...

+

#include <app_conn.h>

@@ -85,7 +88,9 @@

IPAddress * dns2
 
-

Field Documentation

+

Detailed Description

+

Static IP strcuture for configuring AP and WiFi parameters.

+

Field Documentation

◆ dns1

diff --git a/Docs/html/struct_station.html b/Docs/html/struct_station.html index 521affc..fe67d75 100644 --- a/Docs/html/struct_station.html +++ b/Docs/html/struct_station.html @@ -70,6 +70,9 @@
+

WiFi connectivity details (SSID/password). + More...

+

#include <app_conn.h>

@@ -81,7 +84,9 @@

bool dhcp
 
-

Field Documentation

+

Detailed Description

+

WiFi connectivity details (SSID/password).

+

Field Documentation

◆ dhcp

diff --git a/README.md b/README.md index fb48928..35cd016 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,11 @@ -# ESP32-CAM WebCam Server        -![ESP-EYE logo](data/www/img/logo.svg) +# ESP32-CAM WebServer.     [![CI Status](https://travis-ci.com/easytarget/esp32-cam-webserver.svg?branch=master)](https://travis-ci.com/github/easytarget/esp32-cam-webserver)    ![ESP-EYE logo](Docs/logo.svg) -This sketch is a fully customizable webcam server based on ESP32-based board with camera. It can be used as a starting point for -your own webcam solution. +This sketch is a fully customizable webcam server based on ESP32-based board with camera. +It can be used as a starting point for your own webcam solution. + +There are many other variants of a webcam server for these modules online, +but most are created for a specific scenario and not good for general, casual, +webcam use. ### Key features: ### * Extended options for default network and camera settings @@ -10,39 +13,23 @@ your own webcam solution. * Dedicated standalone stream viewer * Over The Air firmware updates * Optimizing the way how the video stream is processed, thus allowing higher frame rates on high resolution. -* Using just one IP port instead of two. +* Using just one IP port, easy for proxying. * Porting the web server to [ESP Async Web Server](https://github.com/me-no-dev/ESPAsyncWebServer). -* Storing web pages as separate HTML/CSS/JS files on the SD drive, which greatly simplifies development of the interface. Basically, you can swap the face of this project just by replacing files on SD card. -* Reduced size of the sketch and improving memory utilization -* Porting the code from basic C to C++ object hierarchy, eliminating extensive use of global variables -* Lots of minor fixes and tweaks, documentation etc. - -### Key principles ### -There are many other variants of a webcam server for these modules online, -but most are created for a specific scenario and not good for general, casual, -webcam use. - -Hopefully this expanded example is more useful for those users who wish to set up -a simple ESP32 based webcam using the cheap(ish) modules freely available online. - -### Summary of reductions ### -When re-desiginig and refactoring the original ESP32 Camera web server example from -Espressve, the following key principles were followed: - -1. Any idea can be killed by unnecessary features -2. See [this tutorial video](https://www.youtube.com/watch?v=iMULJIXPxK4). - -Given the above, face recognition feature was removed. The main purpose of this -sketch is to make the camera web server easily configurable and reusable. - -The original example, is a bit incomprehensible and hard to modify as supplied. -It is very focused on showing off the face recognition capabilities, and forgets -the 'webcam' part. +* Storing web pages as separate HTML/CSS/JS files on the SD drive, which greatly simplifies development of the interface. Basically, one can swap the face of this project just by replacing files on SD card. +* Compact size of the sketch and low memory utilization ### Supported development boards ### The sketch has been tested on the [AI Thinker ESP32-CAM](https://github.com/raphaelbs/esp32-cam-ai-thinker/blob/master/assets/ESP32-CAM_Product_Specification.pdf) module. Other ESP32 boards equipped with camera may be compatible but not guaranteed. +### Supported camera models: +The sketch has been tested on the following camera models: + +* OV2640 (default) +* OV3660 + +Other camera models are not supported but may work with some limitations. + ### Known Issues The ESP32 itself is susceptible to the usual list of WiFi problems, not helped by having @@ -58,8 +45,6 @@ A basic limitation of the sketch is that it can can only support one stream at a If you try to connect to a cam that is already streaming (or attempting to stream, the first steam will freeze. -Currently, camera modules other than ov2640 are not supported. - ## Setup: * For programming you will need a suitable development environment. Possible options @@ -148,6 +133,8 @@ Similarly, default camera configuration parameters can be set by creating the fi "frame_rate":25, "brightness":0, "contrast":0, + "sharpness":0, + "denoise":0, "saturation":0, "special_effect":0, "wb_mode":0,"awb":1, diff --git a/data/www/css/style.css b/data/www/css/style.css index 89c2438..a3c50f0 100644 --- a/data/www/css/style.css +++ b/data/www/css/style.css @@ -34,12 +34,6 @@ section.main { margin-right: 10px; } -/* #content { - display: flex; - flex-wrap: wrap; - align-items: stretch -} -*/ figure { padding: 0px; margin: 0; diff --git a/data/www/index.html b/data/www/index.html new file mode 100644 index 0000000..441316f --- /dev/null +++ b/data/www/index.html @@ -0,0 +1,367 @@ + + + + + + ESP32 Camera + + + + + + + +
+ +
+ + +
+ +
+
+
+ + + + + diff --git a/data/www/index_ov2640.html b/data/www/index_ov2640.html deleted file mode 100644 index 4360cad..0000000 --- a/data/www/index_ov2640.html +++ /dev/null @@ -1,617 +0,0 @@ - - - - - - ESP32 OV2640 - - - - - - - -
- -
- -
- -
-
-
- - - - diff --git a/data/www/index_ov3660.html b/data/www/index_ov3660.html deleted file mode 100644 index c888e23..0000000 --- a/data/www/index_ov3660.html +++ /dev/null @@ -1,636 +0,0 @@ - - - - - - ESP32 OV3660 - - - - - - - -
- -
- -
- -
-
-
- - - - diff --git a/data/www/index_simple.html b/data/www/index_simple.html deleted file mode 100644 index fd41218..0000000 --- a/data/www/index_simple.html +++ /dev/null @@ -1,317 +0,0 @@ - - - - - - %CAMNAME% Simplified View - - - - - - - -
- -
- -
- -
-
-
- - - - diff --git a/data/www/js/cam.js b/data/www/js/cam.js new file mode 100644 index 0000000..cf37441 --- /dev/null +++ b/data/www/js/cam.js @@ -0,0 +1,183 @@ +const cameraTypes = [{"pid": 38, + "name": "OV2640", + "optionfilters": {"hide": [{"field": "framesize", + "options": [14,17] + }] + } } , + {"pid": 13920, + "name": "OV3660", + "fieldupdates": + {"update": [{"id": "quality", "changes": {"min_value": "4"}}, + {"id": "brightness", "changes": {"min_value": "-3","min_caption": "-3", + "max_value": "3", "max_caption": "3"}}, + {"id": "contrast", "changes": {"min_value": "-3", "min_caption": "-3", + "max_value": "3", "max_caption": "3"}}, + {"id": "saturation", "changes": {"min_value": "-4","min_caption": "-4", + "max_value": "4", "max_caption": "4"}}, + {"id": "ae_level", "changes": {"min_value": "-5","min_caption": "-5", + "max_value": "5", "max_caption": "5"}}, + {"id": "gainceiling", "changes": {"min_caption": "0", + "max_value": "511", "max_caption": "511"}}, + {"id": "aec_value", "changes": {"max_value": "1536", "max_caption": "1536", + "default_value": "320"}}, + {"id": "agc_gain", "changes": {"max_value": "63", "max_caption": "64x"}}], + "create": [{"id": "sharpness", "name": "Sharpness", "after": "saturation", + "control": "range", + "min_value": "-3", "max_value": "3", "default_value": "0", + "min_caption": "-3", "max_caption":"3", + "classes": "default-action", + "simple":"true"}, + {"id": "denoise", "name": "De-Noise", "after": "sharpness", + "control": "range", + "min_value": "0", "max_value": "8", "default_value": "0", + "min_caption": "Auto", "max_caption":"8", + "classes": "default-action"}] + } } + ]; + +const selectOptions = [{"field": "framesize", + "options": [{"id": 0, "name": "THUMB (96x96)"}, + {"id": 1, "name": "QQVGA (160x120)"}, + {"id": 3, "name": "HQVGA (240x176)"}, + {"id": 3, "name": "HQVGA (240x176)"}, + {"id": 5, "name": "QVGA (320x240)"}, + {"id": 6, "name": "CIF (400x296)"}, + {"id": 7, "name": "HVGA (480x320)"}, + {"id": 8, "name": "VGA (640x480)"}, + {"id": 9, "name": "SVGA (800x600)"}, + {"id": 10, "name": "XGA (1024x768)"}, + {"id": 11, "name": "HD (1280x720)"}, + {"id": 12, "name": "SXGA (1280x1024)"}, + {"id": 13, "name": "UXGA (1600x1200)"}, + {"id": 14, "name": "FHD (1920x1080)"}, + {"id": 17, "name": "QXGA (2048x1536)"}]}, + {"field": "frame_rate", + "options": [{"id": 60, "name": "60 fps"}, + {"id": 50, "name": "50 fps"}, + {"id": 30, "name": "30 fps"}, + {"id": 25, "name": "25 fps"}, + {"id": 24, "name": "24 fps"}, + {"id": 20, "name": "20 fps"}, + {"id": 12, "name": "12 fps"}]}, + {"field": "special_effect", + "options": [{"id": 0, "name": "No Effect"}, + {"id": 1, "name": "Negative"}, + {"id": 2, "name": "Grayscale"}, + {"id": 3, "name": "Red Tint"}, + {"id": 4, "name": "Green Tint"}, + {"id": 5, "name": "Blue Tint"}, + {"id": 6, "name": "Sepia"}]}, + {"field": "wb_mode", + "options": [{"id": 0, "name": "Auto"}, + {"id": 1, "name": "Sunny"}, + {"id": 2, "name": "Cloudy"}, + {"id": 3, "name": "Office"}, + {"id": 4, "name": "Home"}]}, + {"field": "rotate", + "options": [{"id": 90, "name": "90° (Right)"}, + {"id": 0, "name": "0° (None)"}, + {"id": -90, "name": "-90° (Left)"}]}]; + + +var cameraFormFields = [{"id": "lamp", "name": "Light", "control": "range", + "title":"Flashlight LED. Warning: Built-In lamps can be Very Bright! Avoid looking directly at LED Can draw a lot of power and may cause visual artifacts, affect WiFi or even brownout the camera on high settings", + "min_value": "0", "max_value": "100", "default_value": "0", + "min_caption": "Off", "max_caption":"⚠Full", + "classes": "default-action", + "show": "lamp autolamp", + "simple":"true"}, + {"id": "autolamp", "name": "Auto Lamp", "control": "switch", + "title":"When enabled the lamp will only turn on while the camera is active", + "classes": "default-action", "simple":"true"}, + {"id": "framesize", "name": "Resolution", "control": "select", + "title":"Camera resolution", + "classes": "default-action", + "simple":"true"}, + {"id": "frame_rate", "name": "Frame Rate", "control": "select", + "title":"Frame rate Use this for a smoother stream and to reduce load on the WiFi and browser", + "classes": "default-action", + "simple":"true"}, + {"id": "quality", "name": "Quality", "control": "range", + "title":"Camera Image and Stream quality factor Higher settings will result in lower framerates", + "min_value": "6", "max_value": "63", "default_value": "10", + "min_caption": "Low", "max_caption":"High", + "classes": "default-action", + "simple":"true"}, + {"id": "xclk", "name": "XCLK", "control": "text", + "title":"Camera Bus Clock Frequency Increasing this will raise the camera framerate and capture speed Raising too far will result in visual artifacts and/or incomplete frames This setting can vary a lot between boards, budget boards typically need lower values", + "min_value": "2", "max_value": "32", "default_value": "8", "size": "3", "step": "1", + "max_caption":"MHz", + "classes": "default-action"}, + {"id": "brightness", "name": "Brightness", "control": "range", + "min_value": "-2", "max_value": "2", "default_value": "0", + "min_caption": "-2", "max_caption":"2", + "classes": "default-action", + "simple":"true"}, + {"id": "contrast", "name": "Contrast", "control": "range", + "min_value": "-2", "max_value": "2", "default_value": "0", + "min_caption": "-2", "max_caption":"2", + "classes": "default-action", + "simple":"true"}, + {"id": "saturation", "name": "Saturation", "control": "range", + "min_value": "-2", "max_value": "2", "default_value": "0", + "min_caption": "-2", "max_caption":"2", + "classes": "default-action", + "simple":"true"}, + {"id": "special_effect", "name": "Special Effect", "control": "select", + "classes": "default-action"}, + {"id": "awb", "name": "AWB Enable", "control": "switch", + "classes": "default-action"}, + {"id": "awb_gain", "name": "Manual AWB Gain", "control": "switch", + "classes": "default-action", + "show":"wb_mode"}, + {"id": "wb_mode", "name": "WB Mode", "control": "select", + "classes": "default-action"}, + {"id": "aec", "name": "AEC Sensor Enable", "control": "switch", + "classes": "default-action", + "hide":"aec_value"}, + {"id": "aec2", "name": "AEC DSP", "control": "switch", + "classes": "default-action"}, + {"id": "ae_level", "name": "AE Level", "control": "range", + "min_value": "-2", "max_value": "2", "default_value": "0", + "min_caption": "-2", "max_caption":"2", + "classes": "default-action"}, + {"id": "aec_value", "name": "Exposure", "control": "range", + "min_value": "0", "max_value": "1200", "default_value": "204", + "min_caption": "0", "max_caption":"1200", + "classes": "default-action"}, + {"id": "agc", "name": "AGC", "control": "switch", + "classes": "default-action", + "hide":"agc_gain", "show":"gainceiling"}, + {"id": "agc_gain", "name": "Gain", "control": "range", + "min_value": "0", "max_value": "30", "default_value": "5", + "min_caption": "1x", "max_caption":"31x", + "classes": "default-action"}, + {"id": "gainceiling", "name": "Gain Ceiling", "control": "range", + "min_value": "0", "max_value": "6", "default_value": "0", + "min_caption": "2x", "max_caption":"128x", + "classes": "default-action"}, + {"id": "bpc", "name": "BPC", "control": "switch", + "classes": "default-action"}, + {"id": "wpc", "name": "WPC", "control": "switch", + "classes": "default-action"}, + {"id": "raw_gma", "name": "Raw GMA Enable", "control": "switch", + "classes": "default-action"}, + {"id": "lenc", "name": "Lens Correction", "control": "switch", + "classes": "default-action"}, + {"id": "hmirror", "name": "H-Mirror Stream", "control": "switch", + "classes": "default-action", + "simple":"true"}, + {"id": "vflip", "name": "V-Flip Stream", "control": "switch", + "classes": "default-action", + "simple":"true"}, + {"id": "rotate", "name": "Rotate in Browser", "control": "select", + "classes": "default-action", + "simple":"true"}, + {"id": "dcw", "name": "DCW (Downsize EN)", "control": "switch", + "classes": "default-action"}, + {"id": "colorbar", "name": "Test Pattern", "control": "switch", + "classes": "default-action"}, + {"id": "stream_url", "name": "Stream URL", "control": "readonly", + "hidden":"true", + "classes": "default-action"}]; + diff --git a/data/www/js/utils.js b/data/www/js/utils.js new file mode 100644 index 0000000..97175dc --- /dev/null +++ b/data/www/js/utils.js @@ -0,0 +1,264 @@ +const hide = el => { + el.classList.add('hidden'); +}; + + +const show = el => { + el.classList.remove('hidden'); +}; + +const showhide = (sids, mode) => { + if(!sids) return; + var ids = sids.trim().split(/\s+/); + + for(let i in ids) { + var el = document.getElementById(ids[i]+"-group"); + if(el) { + if(mode) + show(el); + else + hide(el); + } + } +}; + +const disable = el => { + el.classList.add('disabled') + el.disabled = true +}; + +const enable = el => { + el.classList.remove('disabled') + el.disabled = false +}; + +const createInputGroup = (field) => { + var div_group = document.createElement("div"); + div_group.classList.add("input-group"); + div_group.setAttribute("id", field.id + "-group"); + if(field.simple) div_group.setAttribute("data-simple", "true"); + if(field.title) div_group.setAttribute("title", field.title); + if(field.hidden && field.hidden == "true") div_group.classList.add("hidden"); + return div_group; +} + +const createLabelFor = (field) => { + var lbl = document.createElement("label"); + lbl.innerHTML = field.name; + lbl.setAttribute("for", field.id); + return lbl +}; + +const addRange = (parent, field) => { + var div_group = createInputGroup(field); + + div_group.appendChild(createLabelFor(field)); + + var div_min = document.createElement("div"); + div_min.classList.add("range-min"); + div_min.innerHTML = field.min_caption; + div_group.appendChild(div_min); + + var input = document.createElement("input"); + input.setAttribute("type", "range"); + input.setAttribute("id", field.id); + input.setAttribute("min", field.min_value); + input.setAttribute("max", field.max_value); + input.setAttribute("value", field.default_value); + input.setAttribute("class", field.classes); + if(field.show) input.setAttribute("data-show", field.show); + if(field.hide) input.setAttribute("data-hide", field.hide); + div_group.appendChild(input); + + var div_max = document.createElement("div"); + div_max.classList.add("range-max"); + div_max.innerHTML = field.max_caption; + div_group.appendChild(div_max); + + parent.appendChild(div_group); +}; + + +const addSwitch = (parent, field) => { + var div_group = createInputGroup(field); + div_group.appendChild(createLabelFor(field)); + + var div_sw = document.createElement("div"); + div_sw.classList.add("switch"); + + var input = document.createElement("input"); + input.setAttribute("id", field.id); + input.setAttribute("type", "checkbox"); + input.setAttribute("class", field.classes); + if(field.default_value) input.setAttribute("checked", "checked"); + if(field.show) input.setAttribute("data-show", field.show); + if(field.hide) input.setAttribute("data-hide", field.hide); + div_sw.appendChild(input); + + var lbl_slider = document.createElement("label"); + lbl_slider.classList.add("slider"); + lbl_slider.setAttribute("for", field.id); + div_sw.appendChild(lbl_slider); + + div_group.appendChild(div_sw); + + parent.appendChild(div_group); + +}; + +const addSelector = (parent, field, opts, optfilters) => { + var div_group = createInputGroup(field); + div_group.appendChild(createLabelFor(field)); + + var sel = document.createElement("select"); + sel.setAttribute("id", field.id); + sel.setAttribute("class", field.classes); + + var opt_defs = opts.find(item => item.field == field.id); + if(opt_defs) { + for(let i in opt_defs.options) { + var opt_def = opt_defs.options[i]; + if(!isOptionFiltered(field, optfilters, opt_def)) { + var opt = document.createElement("option"); + opt.setAttribute("value", opt_def.id); + opt.innerHTML = opt_def.name; + if(field.default_value && opt_def.id == field.default_value) { + opt.setAttribute("selected", "selected"); + } + sel.appendChild(opt); + } + } + } + else { + console.log("Did not find options for "+field.id); + } + + div_group.appendChild(sel); + + parent.appendChild(div_group); +}; + +const isOptionFiltered = (field, optfilters, opt_def) => { + if(!optfilters) return false; + + if(optfilters.show) { + var allowed = optfilters.show.find(item => item.field == field.id); + if(allowed) { + return !allowed.options.includes(opt_def.id); + } + else + return false; + } + if(optfilters.hide) { + var forbidden = optfilters.hide.find(item => item.field == field.id); + if(forbidden) { + return forbidden.options.includes(opt_def.id); + } + } + return false; + +}; + +const addTextInput = (parent, field) => { + var div_group = createInputGroup(field); + div_group.appendChild(createLabelFor(field)); + + var div_txt = document.createElement("div"); + div_txt.classList.add("text"); + + var input = document.createElement("input"); + input.setAttribute("type", "number"); + input.setAttribute("id", field.id); + if(field.min_value) input.setAttribute("min", field.min_value); + if(field.max_value) input.setAttribute("max", field.max_value); + if(field.size) input.setAttribute("size", field.size); + if(field.step) input.setAttribute("step", field.step); + if(field.classes) input.setAttribute("class", field.classes); + div_txt.appendChild(input); + + if(field.max_caption) { + var lbl_max = document.createElement("div"); + lbl_max.classList.add("range-max"); + lbl_max.innerHTML = field.max_caption; + div_txt.appendChild(lbl_max); + } + + div_group.appendChild(div_txt); + + parent.appendChild(div_group); +}; + +const addReadOnly = (parent, field) => { + var div_group = createInputGroup(field); + div_group.appendChild(createLabelFor(field)); + + var div_val = document.createElement("div"); + div_val.setAttribute("id", field.id); + div_val.setAttribute("class", field.classes); + div_group.appendChild(div_val); + + parent.appendChild(div_group); +}; + + + +const createButton = (id, name, title, confirm) => { + var btn = document.createElement("button"); + btn.setAttribute("id", id); + btn.setAttribute("title", title); + btn.setAttribute("class", "default-action"); + btn.setAttribute("data-ask", confirm) + btn.innerHTML = name; + + return btn; +}; + +const addFormFields = (parent, fields, opts, optfilters) => { + // console.log("adding form fields"); + for(let i in fields) { + var field = fields[i]; + + switch(field.control) { + case "readonly": + addReadOnly(parent, field); + break; + case "switch": + addSwitch(parent, field); + break; + case "range": + addRange(parent, field); + break; + case "select": + addSelector(parent, field, opts, optfilters); + break; + default: + addTextInput(parent, field); + break; + } + } + +}; + +const updateFormFieldDefs = (fields, fieldupdates) => { + if(!fieldupdates) return; + + if(fieldupdates.update) { + let updates = fieldupdates.update; + for(let i in updates) { + var index = fields.findIndex((field) => field.id == updates[i].id); + if(index >= 0 ) { + var changes = updates[i].changes + for(const key of Object.keys(changes)) + fields[index][key] = changes[key]; + } + } + } + + if(fieldupdates.create) { + let creates = fieldupdates.create; + for(let i in creates) { + var index = fields.findIndex((field) => field.id == creates[i].after); + fields.splice(index+1, 0, creates[i]); + } + } +}; diff --git a/data/www/portal.html b/data/www/portal.html deleted file mode 100644 index eac0e7f..0000000 --- a/data/www/portal.html +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - %CAMNAME% - portal - - - - - - -

%CAMNAME% - Portal

-
- - - - - - - - -
-
- Camera Details
- - diff --git a/data/www/streamviewer.html b/data/www/view.html similarity index 99% rename from data/www/streamviewer.html rename to data/www/view.html index 8601323..252c74b 100644 --- a/data/www/streamviewer.html +++ b/data/www/view.html @@ -76,7 +76,7 @@ }) const startStream = () => { - ws.send('s'); + ws.send('u'); stream.style.display = `block`; } diff --git a/platformio.ini b/platformio.ini index b8838b0..c732c97 100644 --- a/platformio.ini +++ b/platformio.ini @@ -44,7 +44,9 @@ build_flags = -mfix-esp32-psram-cache-issue ; using the latest stable version -lib_deps = https://github.com/me-no-dev/ESPAsyncWebServer.git +lib_deps = + https://github.com/jkb-git/ESP32Servo.git + https://github.com/me-no-dev/ESPAsyncWebServer.git ; For OTA uploading uncomment the next lines and add the IP address or mDNS name of the camera module, and the OTA password ;upload_protocol = espota diff --git a/src/app_cam.cpp b/src/app_cam.cpp index d5dc8d4..e98330a 100644 --- a/src/app_cam.cpp +++ b/src/app_cam.cpp @@ -52,12 +52,23 @@ int CLAppCam::start() { // Dump camera module, warn for unsupported modules. switch (sensor->id.PID) { - case OV9650_PID: Serial.println("WARNING: OV9650 camera module is not properly supported, will fallback to OV2640 operation"); break; - case OV7725_PID: Serial.println("WARNING: OV7725 camera module is not properly supported, will fallback to OV2640 operation"); break; - case OV2640_PID: Serial.println("OV2640 camera module detected"); break; - case OV3660_PID: Serial.println("OV3660 camera module detected"); break; - default: Serial.println("WARNING: Camera module is unknown and not properly supported, will fallback to OV2640 operation"); + case OV9650_PID: + Serial.print("OV9650"); + break; + case OV7725_PID: + Serial.print("OV7725"); + break; + case OV2640_PID: + Serial.print("OV2640"); + break; + case OV3660_PID: + Serial.print("OV3660"); + break; + default: + Serial.print("UNKNOWN"); + break; } + Serial.println(" camera module detected"); } @@ -120,6 +131,8 @@ int CLAppCam::loadPrefs() { s->set_brightness(s, readJsonIntVal(&jctx, "brightness")); s->set_contrast(s, readJsonIntVal(&jctx, "contrast")); s->set_saturation(s, readJsonIntVal(&jctx, "saturation")); + s->set_sharpness(s, readJsonIntVal(&jctx, "sharpness")); + s->set_denoise(s, readJsonIntVal(&jctx, "denoise")); s->set_special_effect(s, readJsonIntVal(&jctx, "special_effect")); s->set_wb_mode(s, readJsonIntVal(&jctx, "wb_mode")); s->set_whitebal(s, readJsonIntVal(&jctx, "awb")); @@ -179,6 +192,8 @@ int CLAppCam::savePrefs(){ json_gen_obj_set_int(&jstr, "brightness", s->status.brightness); json_gen_obj_set_int(&jstr, "contrast", s->status.contrast); json_gen_obj_set_int(&jstr, "saturation", s->status.saturation); + json_gen_obj_set_int(&jstr, "sharpness", s->status.sharpness); + json_gen_obj_set_int(&jstr, "denoise", s->status.denoise); json_gen_obj_set_int(&jstr, "special_effect", s->status.special_effect); json_gen_obj_set_int(&jstr, "wb_mode", s->status.wb_mode); json_gen_obj_set_int(&jstr, "awb", s->status.awb); diff --git a/src/app_httpd.cpp b/src/app_httpd.cpp index f7ae9ec..1c27cce 100644 --- a/src/app_httpd.cpp +++ b/src/app_httpd.cpp @@ -21,43 +21,23 @@ int CLAppHttpd::start() { server->on("/", HTTP_GET, [](AsyncWebServerRequest *request){ if(AppConn.isAccessPoint()) - request->redirect("/setup"); + request->send(Storage.getFS(), "/www/setup.html", "", false, processor); else - request->redirect("/portal"); - }); - - server->on("/setup", HTTP_GET, [](AsyncWebServerRequest *request){ - request->send(Storage.getFS(), "/www/setup.html", "", false, processor); - }); - - server->on("/portal", HTTP_GET, [](AsyncWebServerRequest *request){ - request->send(Storage.getFS(), "/www/portal.html", "", false, processor); + request->send(Storage.getFS(), "/www/index.html", "", false, processor); }); server->on("/view", HTTP_GET, [](AsyncWebServerRequest *request){ - if(request->hasArg("mode")) { - if(request->arg("mode") == "simple") { - request->send(Storage.getFS(), "/www/index_simple.html", "", false, processor); - } - else if(request->arg("mode") == "full") { - if (AppCam.getSensorPID() == OV3660_PID) - request->send(Storage.getFS(), "/www/index_ov3660.html", "", false, processor); - request->send(Storage.getFS(), "/www/index_ov2640.html", "", false, processor); - } - else if(request->arg("mode") == "stream" || - request->arg("mode") == "still") { - if(!AppCam.getLastErr()) { - AppHttpd.setStreamMode((request->arg("mode") == "stream"? CAPTURE_STREAM:CAPTURE_STILL)); - request->send(Storage.getFS(), "/www/streamviewer.html", "", false, processor); - } - else - request->send(Storage.getFS(), "/www/error.html", "", false, processor); + if(request->arg("mode") == "stream" || + request->arg("mode") == "still") { + if(!AppCam.getLastErr()) { + AppHttpd.setStreamMode((request->arg("mode") == "stream"? CAPTURE_STREAM:CAPTURE_STILL)); + request->send(Storage.getFS(), "/www/view.html", "", false, processor); } else - request->send(400); + request->send(Storage.getFS(), "/www/error.html", "", false, processor); } else - request->send(Storage.getFS(), "/www/index_simple.html", "", false, processor); + request->send(400); }); // adding fixed mappigs @@ -108,17 +88,48 @@ void onWsEvent(AsyncWebSocket * server, AsyncWebSocketClient * client, AwsEventT } else if(type == WS_EVT_DATA){ AwsFrameInfo * info = (AwsFrameInfo*)arg; - Serial.printf("ws[%s][%u] frame[%u] %u %s[%llu - %llu]: ", server->url(), client->id(), info->num, - info->message_opcode, (info->message_opcode == WS_TEXT)?"text":"binary", info->index, info->index + len); + uint8_t* msg = (uint8_t*) data; + + switch(*msg) { + case (uint8_t)'u': + AppHttpd.startStream(client->id()); + break; + case (uint8_t)'s': + AppHttpd.setStreamMode(CAPTURE_STREAM); + AppHttpd.startStream(client->id()); + break; + case (uint8_t)'p': + AppHttpd.setStreamMode(CAPTURE_STILL); + AppHttpd.startStream(client->id()); + break; + case (uint8_t)'a': // attach servo + if(len == 2) { + int pin = *(msg+1); + AppHttpd.attachServo(pin); + } + break; + case (uint8_t)'w': // write servo value + if(len == 3) { + int pin = *(msg+1); + int value = *(msg+2); + AppHttpd.writeServo(pin, value); + } + break; + case (uint8_t)'t': // terminate stream + AppHttpd.stopStream(client->id()); + break; + default: + Serial.printf("ws[%s] client[%u] frame[%u] %u %s[%llu - %llu]: ", server->url(), client->id(), info->num, + info->message_opcode, (info->message_opcode == WS_TEXT)?"text":"binary", info->index, info->index + len); + for(int i=0; i< len; i++) { + Serial.printf("%d,", *msg); + msg++; + } + Serial.println(); + break; + } - char* msg = (char*) data; - if(*msg == 's') { - AppHttpd.startStream(client->id()); - } - else if(*msg, 't') { - AppHttpd.stopStream(client->id()); - } } @@ -277,6 +288,8 @@ void onControl(AsyncWebServerRequest *request) { else if(variable == "contrast") res = s->set_contrast(s, val); else if(variable == "brightness") res = s->set_brightness(s, val); else if(variable == "saturation") res = s->set_saturation(s, val); + else if(variable == "sharpness") res = s->set_sharpness(s, val); + else if(variable == "denoise") res = s->set_denoise(s, val); else if(variable == "gainceiling") res = s->set_gainceiling(s, (gainceiling_t)val); else if(variable == "colorbar") res = s->set_colorbar(s, val); else if(variable == "awb") res = s->set_whitebal(s, val); @@ -381,6 +394,8 @@ void onStatus(AsyncWebServerRequest *request) { response->printf("\"hmirror\":%u,", s->status.hmirror); response->printf("\"dcw\":%u,", s->status.dcw); response->printf("\"colorbar\":%u,", s->status.colorbar); + response->printf("\"cam_pid\":%u,", s->id.PID); + response->printf("\"cam_ver\":%u,", s->id.VER); response->printf("\"cam_name\":\"%s\",", AppHttpd.getName()); response->printf("\"code_ver\":\"%s\",", AppHttpd.getVersion().c_str()); response->printf("\"rotate\":\"%d\",", AppCam.getRotation()); @@ -504,4 +519,54 @@ int CLAppHttpd::loadPrefs() { return ret; } +int CLAppHttpd::attachServo(int pin) { + + if(servoCount >= MAX_SERVOS) return OS_FAIL; + + for(int i=0; ipin == pin) return OS_FAIL; // pin already used + + AppServo * newservo = (AppServo*) malloc(sizeof(AppServo)); + newservo->pin = pin; + newservo->servo = new Servo(); + if(!newservo->servo) { + Serial.println("Failed to create Servo"); + free(newservo); + return OS_FAIL; + } + + newservo->servo->attach(pin); + + if(!newservo->servo->attached()) { + Serial.print("Failed to attach Servo on pin "); Serial.println(pin); + free(newservo->servo); + free(newservo); + return OS_FAIL; + } + + Serial.print("Created a new servo on pin "); Serial.println(pin); + + servos[servoCount] = newservo; + + servoCount++; + + return servoCount - 1; +} + +int CLAppHttpd::writeServo(int pin, int value) { + for(int i=0; ipin == pin) { + Servo * servo = servos[i]->servo; + if(servo->attached()) { + servo->write(value); + return OS_SUCCESS; + } + else + return OS_FAIL; + } + } + + return OS_FAIL; +} + CLAppHttpd AppHttpd; diff --git a/src/app_httpd.h b/src/app_httpd.h index 5c230d2..b3bf756 100644 --- a/src/app_httpd.h +++ b/src/app_httpd.h @@ -5,6 +5,7 @@ #include #include +#include "ESP32Servo.h" #include "ESPAsyncWebServer.h" #include "storage.h" #include "app_conn.h" @@ -39,6 +40,8 @@ void dumpSystemStatusToJson(char * buf, size_t size); */ struct UriMapping { char uri[32]; char path[32];}; +struct AppServo {int pin; Servo * servo;}; + /** * @brief WebServer Manager @@ -57,6 +60,7 @@ class CLAppHttpd : public CLAppComponent { int8_t getStreamCount() {return streamCount;}; long getStreamsServed() {return streamsServed;}; unsigned long getImagesServed() {return imagesServed;}; + int getServoCount() {return servoCount;}; void incImagesServed(){imagesServed++;}; void setStreamMode(capture_mode mode) {streammode = mode;}; @@ -80,12 +84,25 @@ class CLAppHttpd : public CLAppComponent { char * getSerialBuffer() {return serialBuffer;}; + /** + * @brief attaches a new servo and returns its ID in case of success, or OS_FAIL otherwise + * + * @param pin + * @return int + */ + int attachServo(int pin); + + int writeServo(int pin, int value); + private: UriMapping *mappingList[MAX_URI_MAPPINGS]; int mappingCount=0; + AppServo *servos[MAX_SERVOS]; + int servoCount = 0; + // Name of the application used in web interface // Can be re-defined in the httpd.json file char myName[20] = CAM_NAME;