Skip to content

Commit c702e10

Browse files
committed
merging and refactoring esp32pwm
1 parent 0aa5527 commit c702e10

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+3050
-566
lines changed

API.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ the `<key>` parameter.
9797
format.
9898
* `http://<IP-ADDRESS>/status`
9999
* Returns:
100-
``` {"lamp":0,"autolamp":0,"frame_rate":0,"framesize":9,"quality":10,"xclk":8,"brightness":0,"contrast":0,"saturation":0,"sharpness":0,"special_effect":0,"wb_mode":0,"awb":1,"awb_gain":1,"aec":1,"aec2":0,"ae_level":0,"aec_value":204,"agc":1,"agc_gain":0,"gainceiling":0,"bpc":0,"wpc":1,"raw_gma":1,"lenc":1,"vflip":1,"hmirror":1,"dcw":1,"colorbar":0,"cam_name":"ESP32 test camera","code_ver":"Mar 10 2022 @ 14:00:45","rotate":"0","stream_url":"ws://<IP-ADDRESS>/ws"}```
100+
``` {"lamp":0,"autolamp":0,"frame_rate":0,"framesize":9,"quality":10,"xclk":8,"brightness":0,"contrast":0,"saturation":0,"sharpness":0,"special_effect":0,"wb_mode":0,"awb":1,"awb_gain":1,"aec":1,"aec2":0,"ae_level":0,"aec_value":204,"agc":1,"agc_gain":0,"gainceiling":0,"bpc":0,"wpc":1,"raw_gma":1,"lenc":1,"vflip":1,"hmirror":1,"dcw":1,"colorbar":0,"cam_name":"ESP32 test camera","code_ver":"Mar 10 2022 @ 14:00:45","rotate":"0"}```
101101
* Reboot the camera
102102
* `http://<IP-ADDRESS>/control?var=reboot&val=0`
103103

Docs/html/annotated.html

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,10 @@
7575
<tr id="row_3_"><td class="entry"><span style="width:16px;display:inline-block;">&#160;</span><span class="icona"><span class="icon">C</span></span><a class="el" href="class_c_l_app_httpd.html" target="_self">CLAppHttpd</a></td><td class="desc">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). <br />
7676
</td></tr>
7777
<tr id="row_4_" class="even"><td class="entry"><span style="width:16px;display:inline-block;">&#160;</span><span class="icona"><span class="icon">C</span></span><a class="el" href="class_c_l_storage.html" target="_self">CLStorage</a></td><td class="desc">Storage Manager Encapsulates access to the file system, which can be either external (SD card) or internal (LittleFS) </td></tr>
78-
<tr id="row_5_"><td class="entry"><span style="width:16px;display:inline-block;">&#160;</span><span class="icona"><span class="icon">C</span></span><a class="el" href="struct_static_i_p.html" target="_self">StaticIP</a></td><td class="desc">Static IP strcuture for configuring AP and WiFi parameters </td></tr>
79-
<tr id="row_6_" class="even"><td class="entry"><span style="width:16px;display:inline-block;">&#160;</span><span class="icona"><span class="icon">C</span></span><a class="el" href="struct_station.html" target="_self">Station</a></td><td class="desc">WiFi connectivity details (SSID/password) </td></tr>
80-
<tr id="row_7_"><td class="entry"><span style="width:16px;display:inline-block;">&#160;</span><span class="icona"><span class="icon">C</span></span><a class="el" href="struct_uri_mapping.html" target="_self">UriMapping</a></td><td class="desc">Static URI to path mapping </td></tr>
78+
<tr id="row_5_"><td class="entry"><span style="width:16px;display:inline-block;">&#160;</span><span class="icona"><span class="icon">C</span></span><a class="el" href="class_e_s_p32_p_w_m.html" target="_self">ESP32PWM</a></td><td class="desc"></td></tr>
79+
<tr id="row_6_" class="even"><td class="entry"><span style="width:16px;display:inline-block;">&#160;</span><span class="icona"><span class="icon">C</span></span><a class="el" href="struct_static_i_p.html" target="_self">StaticIP</a></td><td class="desc">Static IP strcuture for configuring AP and WiFi parameters </td></tr>
80+
<tr id="row_7_"><td class="entry"><span style="width:16px;display:inline-block;">&#160;</span><span class="icona"><span class="icon">C</span></span><a class="el" href="struct_station.html" target="_self">Station</a></td><td class="desc">WiFi connectivity details (SSID/password) </td></tr>
81+
<tr id="row_8_" class="even"><td class="entry"><span style="width:16px;display:inline-block;">&#160;</span><span class="icona"><span class="icon">C</span></span><a class="el" href="struct_uri_mapping.html" target="_self">UriMapping</a></td><td class="desc">Static URI to path mapping </td></tr>
8182
</table>
8283
</div><!-- directory -->
8384
</div><!-- contents -->

Docs/html/app__config_8h_source.html

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -105,27 +105,28 @@
105105
<div class="line"><a id="l00032" name="l00032"></a><span class="lineno"> 32</span><span class="comment">// seems to be broken, but fixed in this PR: https://github.com/lorol/LITTLEFS/pull/56 </span></div>
106106
<div class="line"><a id="l00033" name="l00033"></a><span class="lineno"> 33</span><span class="comment">// To install it, please navigate to you /libraries sub-folder of your sketch location and then execute </span></div>
107107
<div class="line"><a id="l00034" name="l00034"></a><span class="lineno"> 34</span><span class="comment">// git clone https://github.com/Michael2MacDonald/LITTLEFS.</span></div>
108-
<div class="line"><a id="l00035" name="l00035"></a><span class="lineno"> 35</span><span class="comment">// #define USE_LittleFS</span></div>
109-
<div class="line"><a id="l00036" name="l00036"></a><span class="lineno"> 36</span> </div>
110-
<div class="line"><a id="l00037" name="l00037"></a><span class="lineno"> 37</span><span class="comment">/*</span></div>
111-
<div class="line"><a id="l00038" name="l00038"></a><span class="lineno"> 38</span><span class="comment"> * Camera Hardware Selectiom</span></div>
112-
<div class="line"><a id="l00039" name="l00039"></a><span class="lineno"> 39</span><span class="comment"> *</span></div>
113-
<div class="line"><a id="l00040" name="l00040"></a><span class="lineno"> 40</span><span class="comment"> * You must uncomment one, and only one, of the lines below to select your board model.</span></div>
114-
<div class="line"><a id="l00041" name="l00041"></a><span class="lineno"> 41</span><span class="comment"> * Remember to also select the board in the Boards Manager</span></div>
115-
<div class="line"><a id="l00042" name="l00042"></a><span class="lineno"> 42</span><span class="comment"> * This is not optional</span></div>
116-
<div class="line"><a id="l00043" name="l00043"></a><span class="lineno"> 43</span><span class="comment"> */</span></div>
117-
<div class="line"><a id="l00044" name="l00044"></a><span class="lineno"><a class="line" href="app__config_8h.html#af3ad6cce87c9d1876247f85e3cece96e"> 44</a></span><span class="preprocessor">#define CAMERA_MODEL_AI_THINKER </span><span class="comment">// default</span></div>
118-
<div class="line"><a id="l00045" name="l00045"></a><span class="lineno"> 45</span><span class="comment">// #define CAMERA_MODEL_WROVER_KIT</span></div>
119-
<div class="line"><a id="l00046" name="l00046"></a><span class="lineno"> 46</span><span class="comment">// #define CAMERA_MODEL_ESP_EYE</span></div>
120-
<div class="line"><a id="l00047" name="l00047"></a><span class="lineno"> 47</span><span class="comment">// #define CAMERA_MODEL_M5STACK_PSRAM</span></div>
121-
<div class="line"><a id="l00048" name="l00048"></a><span class="lineno"> 48</span><span class="comment">// #define CAMERA_MODEL_M5STACK_V2_PSRAM</span></div>
122-
<div class="line"><a id="l00049" name="l00049"></a><span class="lineno"> 49</span><span class="comment">// #define CAMERA_MODEL_M5STACK_WIDE</span></div>
123-
<div class="line"><a id="l00050" name="l00050"></a><span class="lineno"> 50</span><span class="comment">// #define CAMERA_MODEL_M5STACK_ESP32CAM // Originally: CAMERA_MODEL_M5STACK_NO_PSRAM</span></div>
124-
<div class="line"><a id="l00051" name="l00051"></a><span class="lineno"> 51</span><span class="comment">// #define CAMERA_MODEL_TTGO_T_JOURNAL</span></div>
125-
<div class="line"><a id="l00052" name="l00052"></a><span class="lineno"> 52</span><span class="comment">// #define CAMERA_MODEL_ARDUCAM_ESP32S_UNO</span></div>
126-
<div class="line"><a id="l00053" name="l00053"></a><span class="lineno"> 53</span> </div>
108+
<div class="line"><a id="l00035" name="l00035"></a><span class="lineno"> 35</span> </div>
109+
<div class="line"><a id="l00036" name="l00036"></a><span class="lineno"> 36</span><span class="comment">// #define USE_LittleFS</span></div>
110+
<div class="line"><a id="l00037" name="l00037"></a><span class="lineno"> 37</span> </div>
111+
<div class="line"><a id="l00038" name="l00038"></a><span class="lineno"> 38</span><span class="comment">/*</span></div>
112+
<div class="line"><a id="l00039" name="l00039"></a><span class="lineno"> 39</span><span class="comment"> * Camera Hardware Selectiom</span></div>
113+
<div class="line"><a id="l00040" name="l00040"></a><span class="lineno"> 40</span><span class="comment"> *</span></div>
114+
<div class="line"><a id="l00041" name="l00041"></a><span class="lineno"> 41</span><span class="comment"> * You must uncomment one, and only one, of the lines below to select your board model.</span></div>
115+
<div class="line"><a id="l00042" name="l00042"></a><span class="lineno"> 42</span><span class="comment"> * Remember to also select the board in the Boards Manager</span></div>
116+
<div class="line"><a id="l00043" name="l00043"></a><span class="lineno"> 43</span><span class="comment"> * This is not optional</span></div>
117+
<div class="line"><a id="l00044" name="l00044"></a><span class="lineno"> 44</span><span class="comment"> */</span></div>
118+
<div class="line"><a id="l00045" name="l00045"></a><span class="lineno"><a class="line" href="app__config_8h.html#af3ad6cce87c9d1876247f85e3cece96e"> 45</a></span><span class="preprocessor">#define CAMERA_MODEL_AI_THINKER </span><span class="comment">// default</span></div>
119+
<div class="line"><a id="l00046" name="l00046"></a><span class="lineno"> 46</span><span class="comment">// #define CAMERA_MODEL_WROVER_KIT</span></div>
120+
<div class="line"><a id="l00047" name="l00047"></a><span class="lineno"> 47</span><span class="comment">// #define CAMERA_MODEL_ESP_EYE</span></div>
121+
<div class="line"><a id="l00048" name="l00048"></a><span class="lineno"> 48</span><span class="comment">// #define CAMERA_MODEL_M5STACK_PSRAM</span></div>
122+
<div class="line"><a id="l00049" name="l00049"></a><span class="lineno"> 49</span><span class="comment">// #define CAMERA_MODEL_M5STACK_V2_PSRAM</span></div>
123+
<div class="line"><a id="l00050" name="l00050"></a><span class="lineno"> 50</span><span class="comment">// #define CAMERA_MODEL_M5STACK_WIDE</span></div>
124+
<div class="line"><a id="l00051" name="l00051"></a><span class="lineno"> 51</span><span class="comment">// #define CAMERA_MODEL_M5STACK_ESP32CAM // Originally: CAMERA_MODEL_M5STACK_NO_PSRAM</span></div>
125+
<div class="line"><a id="l00052" name="l00052"></a><span class="lineno"> 52</span><span class="comment">// #define CAMERA_MODEL_TTGO_T_JOURNAL</span></div>
126+
<div class="line"><a id="l00053" name="l00053"></a><span class="lineno"> 53</span><span class="comment">// #define CAMERA_MODEL_ARDUCAM_ESP32S_UNO</span></div>
127127
<div class="line"><a id="l00054" name="l00054"></a><span class="lineno"> 54</span> </div>
128-
<div class="line"><a id="l00055" name="l00055"></a><span class="lineno"> 55</span><span class="preprocessor">#endif</span></div>
128+
<div class="line"><a id="l00055" name="l00055"></a><span class="lineno"> 55</span> </div>
129+
<div class="line"><a id="l00056" name="l00056"></a><span class="lineno"> 56</span><span class="preprocessor">#endif</span></div>
129130
</div><!-- fragment --></div><!-- contents -->
130131
<!-- start footer part -->
131132
<hr class="footer"/><address class="footer"><small>

Docs/html/app__httpd_8h.html

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
<div class="textblock"><code>#include &lt;esp_int_wdt.h&gt;</code><br />
8181
<code>#include &lt;esp_task_wdt.h&gt;</code><br />
8282
<code>#include &lt;freertos/timers.h&gt;</code><br />
83-
<code>#include &quot;ESP32Servo.h&quot;</code><br />
83+
<code>#include &quot;<a class="el" href="esp32pwm_8h_source.html">esp32pwm.h</a>&quot;</code><br />
8484
<code>#include &quot;ESPAsyncWebServer.h&quot;</code><br />
8585
<code>#include &quot;<a class="el" href="storage_8h_source.html">storage.h</a>&quot;</code><br />
8686
<code>#include &quot;<a class="el" href="app__conn_8h_source.html">app_conn.h</a>&quot;</code><br />
@@ -106,6 +106,10 @@
106106
<tr class="separator:a8791ebb56b256ad962ec5e05162c78e7"><td class="memSeparator" colspan="2">&#160;</td></tr>
107107
<tr class="memitem:a1103a8e595e190825db719eaed2b5d5a"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="app__httpd_8h.html#a1103a8e595e190825db719eaed2b5d5a">PWM_DEFAULT_RESOLUTION_BITS</a>&#160;&#160;&#160;10</td></tr>
108108
<tr class="separator:a1103a8e595e190825db719eaed2b5d5a"><td class="memSeparator" colspan="2">&#160;</td></tr>
109+
<tr class="memitem:ae5c73e62b0f79ae4f83bb715f5fa89de"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="app__httpd_8h.html#ae5c73e62b0f79ae4f83bb715f5fa89de">DEFAULT_uS_LOW</a>&#160;&#160;&#160;544</td></tr>
110+
<tr class="separator:ae5c73e62b0f79ae4f83bb715f5fa89de"><td class="memSeparator" colspan="2">&#160;</td></tr>
111+
<tr class="memitem:a12e0b64b830ce153c3624bf7a8bdd311"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="app__httpd_8h.html#a12e0b64b830ce153c3624bf7a8bdd311">DEFAULT_uS_HIGH</a>&#160;&#160;&#160;2400</td></tr>
112+
<tr class="separator:a12e0b64b830ce153c3624bf7a8bdd311"><td class="memSeparator" colspan="2">&#160;</td></tr>
109113
<tr class="memitem:a31c6807de63083a9717bbd5fde5089ed"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="app__httpd_8h.html#a31c6807de63083a9717bbd5fde5089ed">DEFAULT_FLASH</a>&#160;&#160;&#160;0xFF</td></tr>
110114
<tr class="separator:a31c6807de63083a9717bbd5fde5089ed"><td class="memSeparator" colspan="2">&#160;</td></tr>
111115
</table><table class="memberdecls">
@@ -155,6 +159,34 @@ <h2 class="memtitle"><span class="permalink"><a href="#a31c6807de63083a9717bbd5f
155159
</table>
156160
</div><div class="memdoc">
157161

162+
</div>
163+
</div>
164+
<a id="a12e0b64b830ce153c3624bf7a8bdd311" name="a12e0b64b830ce153c3624bf7a8bdd311"></a>
165+
<h2 class="memtitle"><span class="permalink"><a href="#a12e0b64b830ce153c3624bf7a8bdd311">&#9670;&nbsp;</a></span>DEFAULT_uS_HIGH</h2>
166+
167+
<div class="memitem">
168+
<div class="memproto">
169+
<table class="memname">
170+
<tr>
171+
<td class="memname">#define DEFAULT_uS_HIGH&#160;&#160;&#160;2400</td>
172+
</tr>
173+
</table>
174+
</div><div class="memdoc">
175+
176+
</div>
177+
</div>
178+
<a id="ae5c73e62b0f79ae4f83bb715f5fa89de" name="ae5c73e62b0f79ae4f83bb715f5fa89de"></a>
179+
<h2 class="memtitle"><span class="permalink"><a href="#ae5c73e62b0f79ae4f83bb715f5fa89de">&#9670;&nbsp;</a></span>DEFAULT_uS_LOW</h2>
180+
181+
<div class="memitem">
182+
<div class="memproto">
183+
<table class="memname">
184+
<tr>
185+
<td class="memname">#define DEFAULT_uS_LOW&#160;&#160;&#160;544</td>
186+
</tr>
187+
</table>
188+
</div><div class="memdoc">
189+
158190
</div>
159191
</div>
160192
<a id="a637263863b33a51633c07ec542547fc1" name="a637263863b33a51633c07ec542547fc1"></a>

0 commit comments

Comments
 (0)