ryan/esp32cam-rtsp
1
0
Fork 0
forked from external-repos/esp32cam-rtsp
Code Pull Requests Activity

fixed html

Browse Source
This commit is contained in:
Rene Zeldenthuis
2022-09-13 01:03:05 +02:00
parent a4006af9af
commit 0ac251cf42
3 changed files with 62 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
html/index.html
View File

@@ -24,13 +24,26 @@
<div class="card bg-light mb-3"> <div class="card bg-light mb-3">
<h5 class="card-header">ESP32</h5> <h5 class="card-header">ESP32</h5>
<div class="card-body"> <div class="card-body">
<ul> <div class="row">
<li>CPU model: {{ChipModel}}</li> <div class="col-4">CPU model:</div>
<li>CPU speed: {{CpuFreqMHz}}Mhz</li> <div class="col-8">{{ChipModel}}</div>
<li>Mac address: {{MacAddress}}</li> </div>
<li>IPv4 address: {{IpV4}}</li> <div class="row">
<li>IPv6 address: {{IpV6}}</li> <div class="col-4">CPU speed:</div>
</ul> <div class="col-8">{{CpuFreqMHz}}Mhz</div>
</div>
<div class="row">
<div class="col-4">Mac address:</div>
<div class="col-8">{{MacAddress}}</div>
</div>
<div class="row">
<div class="col-4">IPv4 address:</div>
<div class="col-8">{{IpV4}}</div>
</div>
<div class="row">
<div class="col-4">IPv6 address:</div>
<div class="col-8">{{IpV6}}</div>
</div>
{{#NetworkState.ApMode}} {{#NetworkState.ApMode}}
<div class="alert alert-warning" role="alert"> <div class="alert alert-warning" role="alert">
<p>Not connected to an access point. Please configure!</p> <p>Not connected to an access point. Please configure!</p>
@@ -41,33 +54,41 @@
<p>Connected to the access point</p> <p>Connected to the access point</p>
</div> </div>
{{/NetworkState.OnLine}} {{/NetworkState.OnLine}}
</ul>
</div> </div>
</div> </div>
<div class="card bg-light mb-3"> <div class="card bg-light mb-3">
<h5 class="card-header">Settings</h5> <h5 class="card-header">Settings</h5>
<div class="card-body"> <div class="card-body">
<ul> <div class="row">
<li>Camera type: {{CameraType}}</li> <div class="col-4">Camera type:</div>
<li>Frame rate: {{FrameDuration}} ms ({{FrameFrequency}} f/s)</li> <div class="col-8">{{CameraType}}</div>
<li>Frame size: {{FrameSize}}</li> </div>
<li>Frame buffer location: {{FrameBufferLocation}}</li> <div class="row">
<li>Frame buffers: {{FrameBuffers}}</li> <div class="col-4">Frame rate:</div>
<li> <div class="col-8">{{FrameDuration}} ms ({{FrameFrequency}} f/s)</div>
<div class="d-flex justify-content-start"> </div>
JPEG quality: <div class="row">
<div class="col-4">Frame size:</div>
<div class="col-8">{{FrameSize}}</div>
</div>
<div class="row">
<div class="col-4">Frame buffer location:</div>
<div class="col-8">{{FrameBufferLocation}}</div>
</div>
<div class="row">
<div class="col-4">Frame buffers:</div>
<div class="col-8">{{FrameBuffers}}</div>
</div>
<div class="row">
<p class="col-4">JPEG quality:</p>
<div class="progress col-8">
<div class="progress-bar" role="progressbar" style="width: 25%;" aria-valuenow="{{JpegQuality}}"
aria-valuemin="0" aria-valuemax="100">
{{JpegQuality}}
</div> </div>
<div class="d-flex justify-content-end"> </div>
<div class="progress"> </div>
<div class="progress-bar" role="progressbar" style="width: 25%;"
aria-valuenow="{{JpegQuality}}" aria-valuemin="0" aria-valuemax="100">
{{JpegQuality}}
</div>
</div>
</div>
</li>
</ul>
{{#CameraInitialized}} {{#CameraInitialized}}
<div class="alert alert-success" role="alert"> <div class="alert alert-success" role="alert">
<p>Camera was initialized successfully!</p> <p>Camera was initialized successfully!</p>
@@ -86,11 +107,18 @@
<div class="card bg-light mb-3"> <div class="card bg-light mb-3">
<h5 class="card-header">Diagnostics</h5> <h5 class="card-header">Diagnostics</h5>
<div class="card-body"> <div class="card-body">
<ul> <div class="row">
<li>Uptime: {{Uptime}}</li> <div class="col-4">Uptime:</div>
<li>Free heap: {{FreeHeap}}b</li> <div class="col-8">{{Uptime}}</div>
<li>Max free block: {{MaxAllocHeap}}b</li> </div>
</ul> <div class="row">
<div class="col-4">Free heap:</div>
<div class="col-8">{{FreeHeap}}b</div>
</div>
<div class="row">
<div class="col-4">Max free block:</div>
<div class="col-8">{{MaxAllocHeap}}b</div>
</div>
</div> </div>
</div> </div>

2
include/html_data.h
View File

File diff suppressed because one or more lines are too long

3
src/main.cpp
View File

@@ -82,7 +82,7 @@ void handle_root()
{"CameraInitResult", "0x" + String(camera_init_result, 16)}, {"CameraInitResult", "0x" + String(camera_init_result, 16)},
{"CameraInitResultText", esp_err_to_name(camera_init_result)}}; {"CameraInitResultText", esp_err_to_name(camera_init_result)}};
web_server.sendHeader("Cache-Control", "no-cache"); web_server.sendHeader("Cache-Control", "no-cache, no-store, must-revalidate");
auto html = template_render(file_data_index_html, substitutions); auto html = template_render(file_data_index_html, substitutions);
web_server.send(200, "text/html", html); web_server.send(200, "text/html", html);
} }
@@ -103,7 +103,6 @@ void handle_restart()
{"AppVersion", APP_VERSION}, {"AppVersion", APP_VERSION},
{"ThingName", iotWebConf.getThingName()}}; {"ThingName", iotWebConf.getThingName()}};
web_server.sendHeader("Cache-Control", "no-cache");
auto html = template_render(file_data_restart_html, substitutions); auto html = template_render(file_data_restart_html, substitutions);
web_server.send(200, "text/html", html); web_server.send(200, "text/html", html);
log_v("Restarting... Press refresh to connect again"); log_v("Restarting... Press refresh to connect again");