From c6dde93be0c306e8f6eacb3631fcdf73589cdbf1 Mon Sep 17 00:00:00 2001 From: abratchik Date: Sat, 24 Dec 2022 15:57:46 +0400 Subject: [PATCH] merge PR #249 --- Docs/html/annotated.html | 17 +- Docs/html/app__cam_8h.html | 21 -- Docs/html/app__cam_8h_source.html | 204 ++++++-------- Docs/html/app__component_8h.html | 4 +- Docs/html/app__component_8h_source.html | 12 +- Docs/html/app__config_8h_source.html | 61 ++--- Docs/html/app__httpd_8h.html | 50 +++- Docs/html/app__httpd_8h_source.html | 305 ++++++++++++--------- Docs/html/class_c_l_app_cam.html | 108 +------- Docs/html/class_c_l_app_component.html | 12 +- Docs/html/class_c_l_app_conn.html | 6 +- Docs/html/class_c_l_app_httpd.html | 343 +++++++++++++++++++++--- Docs/html/classes.html | 9 +- Docs/html/functions.html | 26 +- Docs/html/functions_func.html | 24 +- Docs/html/functions_vars.html | 2 - Docs/html/globals.html | 8 +- Docs/html/globals_defs.html | 4 +- Docs/html/hierarchy.html | 17 +- Docs/html/index.html | 18 +- Docs/html/menudata.js | 1 - Docs/html/search/all_0.js | 3 +- Docs/html/search/all_10.js | 3 +- Docs/html/search/all_11.js | 2 +- Docs/html/search/all_3.js | 13 +- Docs/html/search/all_5.js | 68 ++--- Docs/html/search/all_7.js | 2 +- Docs/html/search/all_8.js | 5 +- Docs/html/search/all_c.js | 7 +- Docs/html/search/all_d.js | 2 +- Docs/html/search/all_e.js | 18 +- Docs/html/search/classes_0.js | 6 +- Docs/html/search/classes_1.js | 7 +- Docs/html/search/classes_2.js | 3 +- Docs/html/search/defines_2.js | 2 +- Docs/html/search/defines_4.js | 5 +- Docs/html/search/defines_5.js | 4 +- Docs/html/search/functions_0.js | 2 +- Docs/html/search/functions_4.js | 68 ++--- Docs/html/search/functions_6.js | 2 +- Docs/html/search/functions_a.js | 2 +- Docs/html/search/functions_b.js | 57 ++-- Docs/html/search/functions_d.js | 3 +- Docs/html/search/functions_e.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 | 8 +- README.md | 2 +- data/default_cam.json | 2 - data/default_httpd.json | 4 + data/www/index.html | 13 + data/www/js/cam.js | 53 ++-- data/www/setup.html | 14 +- src/app_cam.cpp | 30 --- src/app_cam.h | 23 -- src/app_config.h | 7 - src/app_httpd.cpp | 285 +++++++++++++++----- src/app_httpd.h | 61 ++++- 59 files changed, 1217 insertions(+), 835 deletions(-) diff --git a/Docs/html/annotated.html b/Docs/html/annotated.html index 8425ee6..4294f9a 100644 --- a/Docs/html/annotated.html +++ b/Docs/html/annotated.html @@ -69,16 +69,15 @@
Here are the data structures with brief descriptions:
- - - - - + + + - - - - + + + +
 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).
+
 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)
 CStaticIPStatic IP strcuture for configuring AP and WiFi parameters
 CStationWiFi connectivity details (SSID/password)
 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.html b/Docs/html/app__cam_8h.html index be3627a..7b335a9 100644 --- a/Docs/html/app__cam_8h.html +++ b/Docs/html/app__cam_8h.html @@ -70,7 +70,6 @@
Data Structures | -Macros | Variables
app_cam.h File Reference
@@ -89,31 +88,11 @@  Camera Manager Manages all interactions with camera. More...
  - - - -

-Macros

#define LAMP_DEFAULT   80
 

Variables

CLAppCam AppCam
 
-

Macro Definition Documentation

- -

◆ LAMP_DEFAULT

- -
-
- - - - -
#define LAMP_DEFAULT   80
-
- -
-

Variable Documentation

◆ AppCam

diff --git a/Docs/html/app__cam_8h_source.html b/Docs/html/app__cam_8h_source.html index 4e3491a..d42c994 100644 --- a/Docs/html/app__cam_8h_source.html +++ b/Docs/html/app__cam_8h_source.html @@ -81,127 +81,99 @@
8#include "app_component.h"
9#include "camera_pins.h"
10
-
11#define LAMP_DEFAULT 80 // initial lamp value, range 0-100
-
12
-
13#if defined(LED_DISABLE)
-
14 #undef LED_PIN // undefining this disables the notification LED
-
15#endif
-
16
-
17
-
22class CLAppCam : public CLAppComponent {
-
23 public:
-
24
-
25 CLAppCam();
-
26
-
27 int start();
-
28 int stop();
-
29 int loadPrefs();
-
30 int savePrefs();
-
31
-
32 void setLamp(int newVal = LAMP_DEFAULT);
-
33 int getLamp() {return lampVal;};
-
34
-
35 void setAutoLamp(bool val) {autoLamp = val;};
-
36 bool isAutoLamp() { return autoLamp;};
-
37
-
38 int getSensorPID() {return (sensor?sensor->id.PID:0);};
-
39 sensor_t * getSensor() {return sensor;};
-
40 String getErr() {return critERR;};
-
41
-
42 int getFrameRate() {return frameRate;};
-
43 void setFrameRate(int newFrameRate) {frameRate = newFrameRate;};
+
11
+
16class CLAppCam : public CLAppComponent {
+
17 public:
+
18
+
19 CLAppCam();
+
20
+
21 int start();
+
22 int stop();
+
23 int loadPrefs();
+
24 int savePrefs();
+
25
+
26 int getSensorPID() {return (sensor?sensor->id.PID:0);};
+
27 sensor_t * getSensor() {return sensor;};
+
28 String getErr() {return critERR;};
+
29
+
30 int getFrameRate() {return frameRate;};
+
31 void setFrameRate(int newFrameRate) {frameRate = newFrameRate;};
+
32
+
33 void setXclk(int val) {xclk = val;};
+
34 int getXclk() {return xclk;};
+
35
+
36 void setRotation(int val) {myRotation = val;};
+
37 int getRotation() {return myRotation;};
+
38
+
39 int snapToBufer();
+
40 uint8_t * getBuffer() {return fb->buf;};
+
41 size_t getBufferSize() {return fb->len;};
+
42 bool isJPEGinBuffer() {return fb->format == PIXFORMAT_JPEG;};
+
43 void releaseBuffer();
44
-
45 void setXclk(int val) {xclk = val;};
-
46 int getXclk() {return xclk;};
-
47
-
48 void setRotation(int val) {myRotation = val;};
-
49 int getRotation() {return myRotation;};
-
50
-
51 int snapToBufer();
-
52 uint8_t * getBuffer() {return fb->buf;};
-
53 size_t getBufferSize() {return fb->len;};
-
54 bool isJPEGinBuffer() {return fb->format == PIXFORMAT_JPEG;};
-
55 void releaseBuffer();
-
56
-
57 private:
-
58 // Camera config structure
-
59 camera_config_t config;
-
60
-
61 // Camera module bus communications frequency.
-
62 // Originally: config.xclk_freq_mhz = 20000000, but this lead to visual artifacts on many modules.
-
63 // See https://github.com/espressif/esp32-camera/issues/150#issuecomment-726473652 et al.
-
64 // Initial setting is configured in /default_prefs.json
-
65 int xclk = 8;
-
66
-
67 // frame rate in FPS
-
68 // default can be set in /default_prefs.json
-
69 int frameRate = 25;
-
70
-
71 // Flash LED lamp parameters.
-
72 bool autoLamp = false; // Automatic lamp (auto on while camera running)
-
73
-
74 // Illumination LAMP and status LED
-
75 #if defined(LAMP_DISABLE)
-
76 int lampVal = -1; // lamp is disabled in config
-
77 #elif defined(LAMP_PIN)
-
78 int lampVal = 0;
-
79 #else
-
80 int lampVal = -1; // no lamp pin assigned
-
81 #endif
-
82
-
83 int lampChannel = 7; // a free PWM channel (some channels used by camera)
-
84 const int pwmfreq = 50000; // 50K pwm frequency
-
85 const int pwmresolution = 9; // duty cycle bit range
-
86 const int pwmMax = pow(2,pwmresolution)-1;
-
87
-
88 // Critical error string; if set during init (camera hardware failure) it
-
89 // will be returned for stream and still image requests
-
90 String critERR = "";
-
91
-
92 // initial rotation
-
93 // default can be set in /default_prefs.json
-
94 int myRotation = 0;
-
95
-
96 // camera buffer pointer
-
97 camera_fb_t * fb = NULL;
-
98
-
99 // camera sensor
-
100 sensor_t * sensor;
-
101
-
102
-
103};
-
104
-
105extern CLAppCam AppCam;
-
106
-
107#endif
-
AppCam
CLAppCam AppCam
Definition: app_cam.cpp:247
-
LAMP_DEFAULT
#define LAMP_DEFAULT
Definition: app_cam.h:11
+
45 private:
+
46 // Camera config structure
+
47 camera_config_t config;
+
48
+
49 // Camera module bus communications frequency.
+
50 // Originally: config.xclk_freq_mhz = 20000000, but this lead to visual artifacts on many modules.
+
51 // See https://github.com/espressif/esp32-camera/issues/150#issuecomment-726473652 et al.
+
52 // Initial setting is configured in /default_prefs.json
+
53 int xclk = 8;
+
54
+
55 // frame rate in FPS
+
56 // default can be set in /default_prefs.json
+
57 int frameRate = 25;
+
58
+
59
+
60 int lampChannel = 7; // a free PWM channel (some channels used by camera)
+
61 const int pwmfreq = 50000; // 50K pwm frequency
+
62 const int pwmresolution = 9; // duty cycle bit range
+
63 const int pwmMax = pow(2,pwmresolution)-1;
+
64
+
65 // Critical error string; if set during init (camera hardware failure) it
+
66 // will be returned for stream and still image requests
+
67 String critERR = "";
+
68
+
69 // initial rotation
+
70 // default can be set in /default_prefs.json
+
71 int myRotation = 0;
+
72
+
73 // camera buffer pointer
+
74 camera_fb_t * fb = NULL;
+
75
+
76 // camera sensor
+
77 sensor_t * sensor;
+
78
+
79
+
80};
+
81
+
82extern CLAppCam AppCam;
+
83
+
84#endif
+
AppCam
CLAppCam AppCam
Definition: app_cam.cpp:217
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:169
-
CLAppCam::isJPEGinBuffer
bool isJPEGinBuffer()
Definition: app_cam.h:54
-
CLAppCam::loadPrefs
int loadPrefs()
Definition: app_cam.cpp:109
-
CLAppCam::setRotation
void setRotation(int val)
Definition: app_cam.h:48
+
CLAppCam
Camera Manager Manages all interactions with camera.
Definition: app_cam.h:16
+
CLAppCam::savePrefs
int savePrefs()
Definition: app_cam.cpp:141
+
CLAppCam::isJPEGinBuffer
bool isJPEGinBuffer()
Definition: app_cam.h:42
+
CLAppCam::loadPrefs
int loadPrefs()
Definition: app_cam.cpp:83
+
CLAppCam::setRotation
void setRotation(int val)
Definition: app_cam.h:36
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:232
-
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: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:238
-
CLAppCam::getSensorPID
int getSensorPID()
Definition: app_cam.h:38
+
CLAppCam::setFrameRate
void setFrameRate(int newFrameRate)
Definition: app_cam.h:31
+
CLAppCam::getRotation
int getRotation()
Definition: app_cam.h:37
+
CLAppCam::getFrameRate
int getFrameRate()
Definition: app_cam.h:30
+
CLAppCam::snapToBufer
int snapToBufer()
Definition: app_cam.cpp:202
+
CLAppCam::getXclk
int getXclk()
Definition: app_cam.h:34
+
CLAppCam::stop
int stop()
Definition: app_cam.cpp:78
+
CLAppCam::getErr
String getErr()
Definition: app_cam.h:28
+
CLAppCam::setXclk
void setXclk(int val)
Definition: app_cam.h:33
+
CLAppCam::getBufferSize
size_t getBufferSize()
Definition: app_cam.h:41
+
CLAppCam::getBuffer
uint8_t * getBuffer()
Definition: app_cam.h:40
+
CLAppCam::releaseBuffer
void releaseBuffer()
Definition: app_cam.cpp:208
+
CLAppCam::getSensorPID
int getSensorPID()
Definition: app_cam.h:26
CLAppCam::start
int start()
Definition: app_cam.cpp:8
-
CLAppCam::getSensor
sensor_t * getSensor()
Definition: app_cam.h:39
+
CLAppCam::getSensor
sensor_t * getSensor()
Definition: app_cam.h:27
CLAppComponent
Abstract root class for the appication components.
Definition: app_component.h:14
diff --git a/Docs/html/app__component_8h.html b/Docs/html/app__component_8h.html index 6085e4c..24f33b5 100644 --- a/Docs/html/app__component_8h.html +++ b/Docs/html/app__component_8h.html @@ -73,8 +73,8 @@
app_component.h File Reference
-
#include <json_generator.h>
-#include <json_parser.h>
+
#include "json_generator.h"
+#include "json_parser.h"
#include "app_config.h"
#include "storage.h"
diff --git a/Docs/html/app__component_8h_source.html b/Docs/html/app__component_8h_source.html index 4c35604..d6f53a9 100644 --- a/Docs/html/app__component_8h_source.html +++ b/Docs/html/app__component_8h_source.html @@ -74,8 +74,8 @@ Go to the documentation of this file.
1#ifndef app_component_h
2#define app_component_h
3
-
4#include <json_generator.h>
-
5#include <json_parser.h>
+
4#include "json_generator.h"
+
5#include "json_parser.h"
6
7#include "app_config.h"
8#include "storage.h"
@@ -105,7 +105,7 @@
36
37 void setErr(int err_code) {last_err = err_code;};
38
-
43 int readJsonIntVal(jparse_ctx_t *jctx, char* token);
+
43 int readJsonIntVal(jparse_ctx_t *jctx, const char* token);
44
45 int parsePrefs(jparse_ctx_t *jctx);
46
@@ -130,16 +130,16 @@
CLAppComponent::loadPrefs
int loadPrefs()
Definition: app_component.h:19
CLAppComponent::savePrefs
int savePrefs()
Definition: app_component.h:20
CLAppComponent::isDebugMode
bool isDebugMode()
Definition: app_component.h:28
+
CLAppComponent::readJsonIntVal
int readJsonIntVal(jparse_ctx_t *jctx, const char *token)
reads the Int value from JSON context by token.
Definition: app_component.cpp:29
CLAppComponent::setTag
void setTag(const char *t)
Definition: app_component.h:35
-
CLAppComponent::parsePrefs
int parsePrefs(jparse_ctx_t *jctx)
Definition: app_component.cpp:51
+
CLAppComponent::parsePrefs
int parsePrefs(jparse_ctx_t *jctx)
Definition: app_component.cpp:54
CLAppComponent::start
int start()
Definition: app_component.h:18
CLAppComponent::setErr
void setErr(int err_code)
Definition: app_component.h:37
CLAppComponent::setDebugMode
void setDebugMode(bool val)
Definition: app_component.h:27
-
CLAppComponent::readJsonIntVal
int readJsonIntVal(jparse_ctx_t *jctx, char *token)
reads the Int value from JSON context by token.
Definition: app_component.cpp:29
CLAppComponent::isConfigured
bool isConfigured()
Definition: app_component.h:32
CLAppComponent::dumpPrefs
void dumpPrefs()
Definition: app_component.cpp:19
CLAppComponent::getPrefsFileName
char * getPrefsFileName(bool forsave=false)
Definition: app_component.cpp:3
-
CLAppComponent::removePrefs
int removePrefs()
Definition: app_component.cpp:37
+
CLAppComponent::removePrefs
int removePrefs()
Definition: app_component.cpp:40
diff --git a/Docs/html/app__config_8h_source.html b/Docs/html/app__config_8h_source.html index 7e5b63a..3444e4e 100644 --- a/Docs/html/app__config_8h_source.html +++ b/Docs/html/app__config_8h_source.html @@ -99,40 +99,33 @@
26// Uncomment to disable the notification LED on the module
27// #define LED_DISABLE
28
-
29// Uncomment to disable the illumination lamp features
-
30// #define LAMP_DISABLE
-
31
-
32// Uncomment this line to use LittleFS instead of SD.
-
33// NOTE!
-
34// LittleFS is still experimental, not recommended. The 'official' library installed from the Library Manager
-
35// seems to be broken, but fixed in this PR: https://github.com/lorol/LITTLEFS/pull/56
-
36// To install it, please navigate to you /libraries sub-folder of your sketch location and then execute
-
37// git clone https://github.com/Michael2MacDonald/LITTLEFS.
-
38// #define USE_LittleFS
-
39
-
40// Define the startup lamp power setting (as a percentage, defaults to 0%)
-
41// Saved user settings will override this
-
42// #define LAMP_DEFAULT 0
-
43
-
44/*
-
45 * Camera Hardware Selectiom
-
46 *
-
47 * You must uncomment one, and only one, of the lines below to select your board model.
-
48 * Remember to also select the board in the Boards Manager
-
49 * This is not optional
-
50 */
-
51#define CAMERA_MODEL_AI_THINKER // default
-
52// #define CAMERA_MODEL_WROVER_KIT
-
53// #define CAMERA_MODEL_ESP_EYE
-
54// #define CAMERA_MODEL_M5STACK_PSRAM
-
55// #define CAMERA_MODEL_M5STACK_V2_PSRAM
-
56// #define CAMERA_MODEL_M5STACK_WIDE
-
57// #define CAMERA_MODEL_M5STACK_ESP32CAM // Originally: CAMERA_MODEL_M5STACK_NO_PSRAM
-
58// #define CAMERA_MODEL_TTGO_T_JOURNAL
-
59// #define CAMERA_MODEL_ARDUCAM_ESP32S_UNO
-
60
-
61
-
62#endif
+
29// Uncomment this line to use LittleFS instead of SD.
+
30// NOTE!
+
31// LittleFS is still experimental, not recommended. The 'official' library installed from the Library Manager
+
32// seems to be broken, but fixed in this PR: https://github.com/lorol/LITTLEFS/pull/56
+
33// To install it, please navigate to you /libraries sub-folder of your sketch location and then execute
+
34// git clone https://github.com/Michael2MacDonald/LITTLEFS.
+
35// #define USE_LittleFS
+
36
+
37/*
+
38 * Camera Hardware Selectiom
+
39 *
+
40 * You must uncomment one, and only one, of the lines below to select your board model.
+
41 * Remember to also select the board in the Boards Manager
+
42 * This is not optional
+
43 */
+
44#define CAMERA_MODEL_AI_THINKER // default
+
45// #define CAMERA_MODEL_WROVER_KIT
+
46// #define CAMERA_MODEL_ESP_EYE
+
47// #define CAMERA_MODEL_M5STACK_PSRAM
+
48// #define CAMERA_MODEL_M5STACK_V2_PSRAM
+
49// #define CAMERA_MODEL_M5STACK_WIDE
+
50// #define CAMERA_MODEL_M5STACK_ESP32CAM // Originally: CAMERA_MODEL_M5STACK_NO_PSRAM
+
51// #define CAMERA_MODEL_TTGO_T_JOURNAL
+
52// #define CAMERA_MODEL_ARDUCAM_ESP32S_UNO
+
53
+
54
+
55#endif
diff --git a/Docs/html/app__httpd_8h.html b/Docs/html/app__httpd_8h.html index 9ecc231..ad1fe57 100644 --- a/Docs/html/app__httpd_8h.html +++ b/Docs/html/app__httpd_8h.html @@ -93,8 +93,6 @@ 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...
@@ -104,6 +102,12 @@ Macros #define MAX_URI_MAPPINGS   32   +#define PWM_DEFAULT_FREQ   50 +  +#define PWM_DEFAULT_RESOLUTION_BITS   10 +  +#define DEFAULT_FLASH   0xFF +  @@ -139,6 +143,20 @@

Enumerations

 

Macro Definition Documentation

+ +

◆ DEFAULT_FLASH

+ +
+
+ + + + +
#define DEFAULT_FLASH   0xFF
+
+ +
+

◆ MAX_URI_MAPPINGS

@@ -151,6 +169,34 @@

+ + + +

◆ PWM_DEFAULT_FREQ

+ +
+
+ + + + +
#define PWM_DEFAULT_FREQ   50
+
+ +
+
+ +

◆ PWM_DEFAULT_RESOLUTION_BITS

+ +
+
+ + + + +
#define PWM_DEFAULT_RESOLUTION_BITS   10
+
+

Enumeration Type Documentation

diff --git a/Docs/html/app__httpd_8h_source.html b/Docs/html/app__httpd_8h_source.html index 6178d21..25bd25c 100644 --- a/Docs/html/app__httpd_8h_source.html +++ b/Docs/html/app__httpd_8h_source.html @@ -86,163 +86,200 @@
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
-
36
-
41struct UriMapping { char uri[32]; char path[32];};
-
42
-
43struct AppServo {int pin; Servo * servo;};
-
44
-
45
-
51class CLAppHttpd : public CLAppComponent {
-
52 public:
-
53 CLAppHttpd();
-
54
-
55 int start();
-
56 int loadPrefs();
+
16#define PWM_DEFAULT_FREQ 50
+
17#define PWM_DEFAULT_RESOLUTION_BITS 10
+
18
+
19#define DEFAULT_FLASH 0xFF
+
20
+
21#ifdef __cplusplus
+
22extern "C" {
+
23#endif
+
24uint8_t temprature_sens_read();
+
25#ifdef __cplusplus
+
26}
+
27#endif
+
28
+
29enum capture_mode {CAPTURE_STILL, CAPTURE_STREAM};
+
30
+
31String processor(const String& var);
+
32void onSystemStatus(AsyncWebServerRequest *request);
+
33void onStatus(AsyncWebServerRequest *request);
+
34void onInfo(AsyncWebServerRequest *request);
+
35void onControl(AsyncWebServerRequest *request);
+
36void onWsEvent(AsyncWebSocket * server, AsyncWebSocketClient * client, AwsEventType type, void * arg, uint8_t *data, size_t len);
+
37void onSnapTimer(TimerHandle_t pxTimer);
+
38
+
39void dumpSystemStatusToJson(char * buf, size_t size);
+
40
+
41
+
46struct UriMapping { char uri[32]; char path[32];};
+
47
+
48
+
54class CLAppHttpd : public CLAppComponent {
+
55 public:
+
56 CLAppHttpd();
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++;};
+
58 int start();
+
59 int loadPrefs();
+
60 int savePrefs();
+
61
+
62 uint32_t getStreamClient() {return stream_client;};
+
63 uint32_t getControlClient() {return control_client;};
+
64 void setControlClient(uint32_t id) {control_client = id;};
65
-
66 void setStreamMode(capture_mode mode) {streammode = mode;};
-
67 capture_mode getStreamMode() {return streammode;};
-
68
-
69 int snapToStream(bool debug = false);
-
70 int startStream(uint32_t id);
-
71 int stopStream(uint32_t id);
-
72
-
73 void updateSnapTimer(int frameRate);
+
66 int8_t getStreamCount() {return streamCount;};
+
67 long getStreamsServed() {return streamsServed;};
+
68 unsigned long getImagesServed() {return imagesServed;};
+
69 int getpwmCount() {return pwmCount;};
+
70 void incImagesServed(){imagesServed++;};
+
71
+
72 void setStreamMode(capture_mode mode) {streammode = mode;};
+
73 capture_mode getStreamMode() {return streammode;};
74
-
75 void serialSendCommand(const char * cmd);
-
76
-
77 int getSketchSize(){ return sketchSize;};
-
78 int getSketchSpace() {return sketchSpace;};
-
79 String getSketchMD5() {return sketchMD5;};
+
75 int snapToStream(bool debug = false);
+
76 int startStream(uint32_t id);
+
77 int stopStream(uint32_t id);
+
78
+
79 void updateSnapTimer(int frameRate);
80
-
81 String getVersion() {return version;};
+
81 void serialSendCommand(const char * cmd);
82
-
83 char * getName() {return myName;};
-
84
-
85 char * getSerialBuffer() {return serialBuffer;};
+
83 int getSketchSize(){ return sketchSize;};
+
84 int getSketchSpace() {return sketchSpace;};
+
85 String getSketchMD5() {return sketchMD5;};
86
-
93 int attachServo(int pin);
-
94
-
95 int writeServo(int pin, int value);
+
87 String getVersion() {return version;};
+
88
+
89 char * getName() {return myName;};
+
90
+
91 char * getSerialBuffer() {return serialBuffer;};
+
92
+
93 void setAutoLamp(bool val) {autoLamp = val;};
+
94 bool isAutoLamp() { return autoLamp;};
+
95 int getFlashLamp() {return flashLamp;};
96
-
97
-
98 private:
+
97 void setLamp(int newVal = DEFAULT_FLASH);
+
98 int getLamp() {return lampVal;};
99
-
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 AsyncWebServer *server;
-
113 AsyncWebSocket *ws;
-
114 uint32_t client_id = 0;
-
115 TimerHandle_t snap_timer = NULL;
-
116
-
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;
+
108 int attachPWM(uint8_t pin, double freq = PWM_DEFAULT_FREQ, uint8_t resolution_bits = PWM_DEFAULT_RESOLUTION_BITS);
+
109
+
119 int writePWM(uint8_t pin, int value, int min_v = DEFAULT_uS_LOW, int max_v = DEFAULT_uS_HIGH);
+
120
+
121 protected:
+
122 int usToTicks(int usec);
+
123
+
124 private:
+
125
+
126 UriMapping *mappingList[MAX_URI_MAPPINGS];
+
127 int mappingCount=0;
128
-
129 const String version = __DATE__ " @ " __TIME__;
+
129 ESP32PWM *pwm[MAX_SERVOS];
130
-
131};
+
131 int pwmCount = 0;
132
-
133
-
134
-
135extern CLAppHttpd AppHttpd;
+
133 // Name of the application used in web interface
+
134 // Can be re-defined in the httpd.json file
+
135 char myName[20] = CAM_NAME;
136
-
137#endif
+
137 char serialBuffer[64];
+
138
+
139 AsyncWebServer *server;
+
140 AsyncWebSocket *ws;
+
141
+
142 uint32_t stream_client;
+
143 uint32_t control_client;
+
144
+
145 TimerHandle_t snap_timer = NULL;
+
146
+
147 // Flash LED lamp parameters.
+
148 // shoudl be defined in the 1st line of the pwm collection in the httpd prefs (httpd.json)
+
149 bool autoLamp = false; // Automatic lamp (auto on while camera running)
+
150 int lampVal = -1; // Lamp brightness
+
151 int flashLamp = 80; // Flash brightness when taking still images
+
152 uint8_t lamppin = 0; // Lamp pin, not defined by default
+
153 int pwmMax = 1; // pwmMax = pow(2,pwmresolution)-1;
+
154
+
155 int8_t streamCount=0;
+
156
+
157 long streamsServed=0;
+
158 unsigned long imagesServed;
+
159
+
160 // mode of the image capture
+
161 capture_mode streammode = CAPTURE_STILL;
+
162
+
163 // Sketch Info
+
164 int sketchSize ;
+
165 int sketchSpace ;
+
166 String sketchMD5;
+
167
+
168 const String version = __DATE__ " @ " __TIME__;
+
169
+
170};
+
171
+
172
+
173
+
174extern CLAppHttpd AppHttpd;
+
175
+
176#endif
app_cam.h
CAM_NAME
#define CAM_NAME
Definition: app_config.h:6
app_conn.h
-
AppHttpd
CLAppHttpd AppHttpd
Definition: app_httpd.cpp:619
-
processor
String processor(const String &var)
Definition: app_httpd.cpp:143
+
AppHttpd
CLAppHttpd AppHttpd
Definition: app_httpd.cpp:772
+
processor
String processor(const String &var)
Definition: app_httpd.cpp:154
+
PWM_DEFAULT_RESOLUTION_BITS
#define PWM_DEFAULT_RESOLUTION_BITS
Definition: app_httpd.h:17
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:24
-
CAPTURE_STILL
@ CAPTURE_STILL
Definition: app_httpd.h:24
-
CAPTURE_STREAM
@ CAPTURE_STREAM
Definition: app_httpd.h:24
+
DEFAULT_FLASH
#define DEFAULT_FLASH
Definition: app_httpd.h:19
+
capture_mode
capture_mode
Definition: app_httpd.h:29
+
CAPTURE_STILL
@ CAPTURE_STILL
Definition: app_httpd.h:29
+
CAPTURE_STREAM
@ CAPTURE_STREAM
Definition: app_httpd.h:29
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:77
-
dumpSystemStatusToJson
void dumpSystemStatusToJson(char *buf, size_t size)
Definition: app_httpd.cpp:461
-
onSystemStatus
void onSystemStatus(AsyncWebServerRequest *request)
Definition: app_httpd.cpp:443
-
onStatus
void onStatus(AsyncWebServerRequest *request)
Definition: app_httpd.cpp:397
-
onControl
void onControl(AsyncWebServerRequest *request)
Definition: app_httpd.cpp:238
-
onInfo
void onInfo(AsyncWebServerRequest *request)
Definition: app_httpd.cpp:387
+
PWM_DEFAULT_FREQ
#define PWM_DEFAULT_FREQ
Definition: app_httpd.h:16
+
dumpSystemStatusToJson
void dumpSystemStatusToJson(char *buf, size_t size)
Definition: app_httpd.cpp:485
+
onSystemStatus
void onSystemStatus(AsyncWebServerRequest *request)
Definition: app_httpd.cpp:467
+
onStatus
void onStatus(AsyncWebServerRequest *request)
Definition: app_httpd.cpp:420
+
onControl
void onControl(AsyncWebServerRequest *request)
Definition: app_httpd.cpp:261
+
onInfo
void onInfo(AsyncWebServerRequest *request)
Definition: app_httpd.cpp:410
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: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:531
-
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:222
-
CLAppHttpd::getSketchSpace
int getSketchSpace()
Definition: app_httpd.h:78
-
CLAppHttpd::snapToStream
int snapToStream(bool debug=false)
Definition: app_httpd.cpp:156
-
CLAppHttpd::getName
char * getName()
Definition: app_httpd.h:83
-
CLAppHttpd::updateSnapTimer
void updateSnapTimer(int frameRate)
Definition: app_httpd.cpp:382
-
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:603
-
CLAppHttpd::getSerialBuffer
char * getSerialBuffer()
Definition: app_httpd.h:85
-
CLAppHttpd::getClientId
uint32_t getClientId()
Definition: app_httpd.h:58
+
CLAppHttpd
WebServer Manager Class for handling web server requests. The web pages are assumed to be stored in t...
Definition: app_httpd.h:54
+
CLAppHttpd::getImagesServed
unsigned long getImagesServed()
Definition: app_httpd.h:68
+
CLAppHttpd::getFlashLamp
int getFlashLamp()
Definition: app_httpd.h:95
+
CLAppHttpd::getStreamsServed
long getStreamsServed()
Definition: app_httpd.h:67
+
CLAppHttpd::getpwmCount
int getpwmCount()
Definition: app_httpd.h:69
+
CLAppHttpd::incImagesServed
void incImagesServed()
Definition: app_httpd.h:70
+
CLAppHttpd::getControlClient
uint32_t getControlClient()
Definition: app_httpd.h:63
+
CLAppHttpd::serialSendCommand
void serialSendCommand(const char *cmd)
Definition: app_httpd.cpp:555
+
CLAppHttpd::setAutoLamp
void setAutoLamp(bool val)
Definition: app_httpd.h:93
+
CLAppHttpd::getVersion
String getVersion()
Definition: app_httpd.h:87
+
CLAppHttpd::setStreamMode
void setStreamMode(capture_mode mode)
Definition: app_httpd.h:72
+
CLAppHttpd::stopStream
int stopStream(uint32_t id)
Definition: app_httpd.cpp:240
+
CLAppHttpd::getSketchSpace
int getSketchSpace()
Definition: app_httpd.h:84
+
CLAppHttpd::snapToStream
int snapToStream(bool debug=false)
Definition: app_httpd.cpp:167
+
CLAppHttpd::setControlClient
void setControlClient(uint32_t id)
Definition: app_httpd.h:64
+
CLAppHttpd::getName
char * getName()
Definition: app_httpd.h:89
+
CLAppHttpd::updateSnapTimer
void updateSnapTimer(int frameRate)
Definition: app_httpd.cpp:405
+
CLAppHttpd::getStreamCount
int8_t getStreamCount()
Definition: app_httpd.h:66
+
CLAppHttpd::getSketchSize
int getSketchSize()
Definition: app_httpd.h:83
+
CLAppHttpd::getSerialBuffer
char * getSerialBuffer()
Definition: app_httpd.h:91
+
CLAppHttpd::getLamp
int getLamp()
Definition: app_httpd.h:98
+
CLAppHttpd::getStreamClient
uint32_t getStreamClient()
Definition: app_httpd.h:62
+
CLAppHttpd::usToTicks
int usToTicks(int usec)
Definition: app_httpd.cpp:751
+
CLAppHttpd::writePWM
int writePWM(uint8_t pin, int value, int min_v=DEFAULT_uS_LOW, int max_v=DEFAULT_uS_HIGH)
writes an angle value to PWM/Servo.
Definition: app_httpd.cpp:710
CLAppHttpd::start
int start()
Definition: app_httpd.cpp:15
+
CLAppHttpd::isAutoLamp
bool isAutoLamp()
Definition: app_httpd.h:94
+
CLAppHttpd::setLamp
void setLamp(int newVal=DEFAULT_FLASH)
Definition: app_httpd.cpp:757
CLAppHttpd::CLAppHttpd
CLAppHttpd()
Definition: app_httpd.cpp:3
-
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:536
-
CLAppHttpd::startStream
int startStream(uint32_t id)
Definition: app_httpd.cpp:179
-
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:569
+
CLAppHttpd::getSketchMD5
String getSketchMD5()
Definition: app_httpd.h:85
+
CLAppHttpd::savePrefs
int savePrefs()
Definition: app_httpd.cpp:623
+
CLAppHttpd::getStreamMode
capture_mode getStreamMode()
Definition: app_httpd.h:73
+
CLAppHttpd::loadPrefs
int loadPrefs()
Definition: app_httpd.cpp:560
+
CLAppHttpd::startStream
int startStream(uint32_t id)
Definition: app_httpd.cpp:192
+
CLAppHttpd::attachPWM
int attachPWM(uint8_t pin, double freq=PWM_DEFAULT_FREQ, uint8_t resolution_bits=PWM_DEFAULT_RESOLUTION_BITS)
attaches a new PWM/servo and returns its ID in case of success, or OS_FAIL otherwise
Definition: app_httpd.cpp:673
-
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
+
UriMapping
Static URI to path mapping.
Definition: app_httpd.h:46
+
UriMapping::path
char path[32]
Definition: app_httpd.h:46
+
UriMapping::uri
char uri[32]
Definition: app_httpd.h:46
diff --git a/Docs/html/class_c_l_app_cam.html b/Docs/html/class_c_l_app_cam.html index f37dec6..c8b038b 100644 --- a/Docs/html/class_c_l_app_cam.html +++ b/Docs/html/class_c_l_app_cam.html @@ -96,14 +96,6 @@   int savePrefs ()   -void setLamp (int newVal=LAMP_DEFAULT) -  -int getLamp () -  -void setAutoLamp (bool val) -  -bool isAutoLamp () -  int getSensorPID ()   sensor_t * getSensor () @@ -161,9 +153,9 @@   void setErr (int err_code)   -int readJsonIntVal (jparse_ctx_t *jctx, char *token) - reads the Int value from JSON context by token. More...
-  +int readJsonIntVal (jparse_ctx_t *jctx, const char *token) + reads the Int value from JSON context by token. More...
+  int parsePrefs (jparse_ctx_t *jctx)   @@ -286,31 +278,6 @@

- - - -

◆ getLamp()

- -
-
- - - - - -
- - - - - - - -
int CLAppCam::getLamp ()
- 		-inline
-
-
@@ -411,31 +378,6 @@

- - - -

◆ isAutoLamp()

- -
-
- - - - - -
- - - - - - - -
bool CLAppCam::isAutoLamp ()
- 		-inline
-
-
@@ -512,32 +454,6 @@

- - - -

◆ setAutoLamp()

- -
-
- - - - - -
- - - - - - - - -
void CLAppCam::setAutoLamp (bool val)
- 		-inline
-
-
@@ -564,24 +480,6 @@

- - - -

◆ setLamp()

- -
-
- - - - - - - - -
void CLAppCam::setLamp (int newVal = LAMP_DEFAULT)
-
-
diff --git a/Docs/html/class_c_l_app_component.html b/Docs/html/class_c_l_app_component.html index 86cab0c..8a9a823 100644 --- a/Docs/html/class_c_l_app_component.html +++ b/Docs/html/class_c_l_app_component.html @@ -116,9 +116,9 @@   void setErr (int err_code)   -int readJsonIntVal (jparse_ctx_t *jctx, char *token) - reads the Int value from JSON context by token. More...
-  +int readJsonIntVal (jparse_ctx_t *jctx, const char *token) + reads the Int value from JSON context by token. More...
+  int parsePrefs (jparse_ctx_t *jctx)   @@ -286,8 +286,8 @@

-

◆ readJsonIntVal()

+ +

◆ readJsonIntVal()

@@ -304,7 +304,7 @@

- char *  + const char *  token  diff --git a/Docs/html/class_c_l_app_conn.html b/Docs/html/class_c_l_app_conn.html index 233d5fc..af03e89 100644 --- a/Docs/html/class_c_l_app_conn.html +++ b/Docs/html/class_c_l_app_conn.html @@ -209,9 +209,9 @@   void setErr (int err_code)   -int readJsonIntVal (jparse_ctx_t *jctx, char *token) - reads the Int value from JSON context by token. More...
-  +int readJsonIntVal (jparse_ctx_t *jctx, const char *token) + reads the Int value from JSON context by token. More...
+  int parsePrefs (jparse_ctx_t *jctx)   diff --git a/Docs/html/class_c_l_app_httpd.html b/Docs/html/class_c_l_app_httpd.html index 820d7c6..30107f7 100644 --- a/Docs/html/class_c_l_app_httpd.html +++ b/Docs/html/class_c_l_app_httpd.html @@ -65,7 +65,8 @@

-Public Member Functions
+Public Member Functions | +Protected Member Functions
CLAppHttpd Class Reference
@@ -93,16 +94,22 @@   int loadPrefs ()   -uint32_t getClientId () -  +int savePrefs () +  +uint32_t getStreamClient () +  +uint32_t getControlClient () +  +void setControlClient (uint32_t id) +  int8_t getStreamCount ()   long getStreamsServed ()   unsigned long getImagesServed ()   -int getServoCount () -  +int getpwmCount () +  void incImagesServed ()   void setStreamMode (capture_mode mode) @@ -131,11 +138,22 @@   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) -  +void setAutoLamp (bool val) +  +bool isAutoLamp () +  +int getFlashLamp () +  +void setLamp (int newVal=DEFAULT_FLASH) +  +int getLamp () +  +int attachPWM (uint8_t pin, double freq=PWM_DEFAULT_FREQ, uint8_t resolution_bits=PWM_DEFAULT_RESOLUTION_BITS) + attaches a new PWM/servo and returns its ID in case of success, or OS_FAIL otherwise More...
+  +int writePWM (uint8_t pin, int value, int min_v=DEFAULT_uS_LOW, int max_v=DEFAULT_uS_HIGH) + writes an angle value to PWM/Servo. More...
+  - Public Member Functions inherited from CLAppComponent int start ()   @@ -158,16 +176,18 @@ bool isConfigured ()   - + + + - - - + + +

-Additional Inherited Members

+Protected Member Functions

int usToTicks (int usec)
 
- Protected Member Functions inherited from CLAppComponent
void setTag (const char *t)
 
void setErr (int err_code)
 
int readJsonIntVal (jparse_ctx_t *jctx, char *token)
 reads the Int value from JSON context by token. More...
 
int readJsonIntVal (jparse_ctx_t *jctx, const char *token)
 reads the Int value from JSON context by token. More...
 
int parsePrefs (jparse_ctx_t *jctx)
 
@@ -193,26 +213,44 @@

Member Function Documentation

- -

◆ attachServo()

+ +

◆ attachPWM()

- + - - + + + + + + + + + + + + + + + + + +
int CLAppHttpd::attachServo int CLAppHttpd::attachPWM (int pin)uint8_t pin,
double freq = PWM_DEFAULT_FREQ,
uint8_t resolution_bits = PWM_DEFAULT_RESOLUTION_BITS 
)
-

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

+

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

Parameters
+ +
pin
freq
resolution_bits
@@ -220,8 +258,8 @@

-

◆ getClientId()

+ +

◆ getControlClient()

@@ -230,7 +268,32 @@

- + + + + + +
uint32_t CLAppHttpd::getClientId uint32_t CLAppHttpd::getControlClient ()
+ + +inline + + +

+ +
+
+ +

◆ getFlashLamp()

+ +
+
+ + +
+ + + @@ -268,6 +331,31 @@

+ + + +

◆ getLamp()

+ +
+
+

int CLAppHttpd::getFlashLamp ( )
+ + + + +
+ + + + + + + +
int CLAppHttpd::getLamp ()
+ 		+inline
+
+
@@ -295,8 +383,8 @@

-

◆ getSerialBuffer()

+ +

◆ getpwmCount()

@@ -305,7 +393,7 @@

- + @@ -320,8 +408,8 @@

-

◆ getServoCount()

+ +

◆ getSerialBuffer()

@@ -330,7 +418,7 @@

char * CLAppHttpd::getSerialBuffer int CLAppHttpd::getpwmCount ( )
- + @@ -418,6 +506,31 @@

+ + + +

◆ getStreamClient()

+ +
+
+
int CLAppHttpd::getServoCount char * CLAppHttpd::getSerialBuffer ( )
+ + + + +
+ + + + + + + +
uint32_t CLAppHttpd::getStreamClient ()
+ 		+inline
+

+
@@ -543,6 +656,31 @@

+ + + +

◆ isAutoLamp()

+ +
+
+ + + + + +
+ + + + + + + +
bool CLAppHttpd::isAutoLamp ()
+ 		+inline
+
+
@@ -560,6 +698,23 @@

+ + + +

◆ savePrefs()

+ +
+
+ + + + + + + +
int CLAppHttpd::savePrefs ()
+
+
@@ -578,6 +733,76 @@

+ + + +

◆ setAutoLamp()

+ +
+
+ + + + + +
+ + + + + + + + +
void CLAppHttpd::setAutoLamp (bool val)
+ 		+inline
+
+ +
+
+ +

◆ setControlClient()

+ +
+
+ + + + + +
+ + + + + + + + +
void CLAppHttpd::setControlClient (uint32_t id)
+ 		+inline
+
+ +
+
+ +

◆ setLamp()

+ +
+
+ + + + + + + + +
void CLAppHttpd::setLamp (int newVal = DEFAULT_FLASH)
+
+
@@ -695,23 +920,61 @@

-

◆ writeServo()

+ +

◆ usToTicks()

+ + + + + +
- + + + + +
int CLAppHttpd::writeServo int CLAppHttpd::usToTicks ( int usec)
+ 		+protected
+
+ +
+
+ +

◆ writePWM()

+ +
+
+ + + + + - + + + + + + + + + + + + + @@ -721,6 +984,18 @@

+

writes an angle value to PWM/Servo.

+
Parameters
+

int CLAppHttpd::writePWM (uint8_t  pin,
int value value,
int min_v = DEFAULT_uS_LOW,
int max_v = DEFAULT_uS_HIGH 
+ + + + +
pin
value
min_v
max_v
+ + +
Returns
int
+
The documentation for this class was generated from the following files: