mirror of
https://github.com/rzeldent/esp32cam-rtsp.git
synced 2025-11-12 19:26:22 +00:00
- Changed order cards in HTML
- Optimization lookups
This commit is contained in:
@@ -79,6 +79,19 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-sm-6">
|
<div class="col-sm-6">
|
||||||
|
<div class="card bg-light mb-3">
|
||||||
|
<h5 class="card-header">Peripheral</h5>
|
||||||
|
<div class="card-body">
|
||||||
|
<div class="row">
|
||||||
|
<div class="col-4">Board type:</div>
|
||||||
|
<div class="col-8">{{BoardType}}</div>
|
||||||
|
</div>
|
||||||
|
<div class="row">
|
||||||
|
<div class="col-4">LED intensity:</div>
|
||||||
|
<div class="col-8">{{LedIntensity}} [0-100]</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
<div class="card bg-light mb-3">
|
<div class="card bg-light mb-3">
|
||||||
<h5 class="card-header">Network</h5>
|
<h5 class="card-header">Network</h5>
|
||||||
<div class="card-body">
|
<div class="card-body">
|
||||||
@@ -122,19 +135,6 @@
|
|||||||
{{/NetworkState.OnLine}}
|
{{/NetworkState.OnLine}}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="card bg-light mb-3">
|
|
||||||
<h5 class="card-header">Peripheral</h5>
|
|
||||||
<div class="card-body">
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-4">Board type:</div>
|
|
||||||
<div class="col-8">{{BoardType}}</div>
|
|
||||||
</div>
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-4">LED intensity:</div>
|
|
||||||
<div class="col-8">{{LedIntensity}} [0-100]</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
<div class="col-sm-6">
|
<div class="col-sm-6">
|
||||||
<div class="card bg-light mb-3">
|
<div class="card bg-light mb-3">
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@@ -3,10 +3,9 @@
|
|||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <esp_camera.h>
|
#include <esp_camera.h>
|
||||||
|
|
||||||
typedef char camera_config_name_t[11];
|
|
||||||
typedef struct
|
typedef struct
|
||||||
{
|
{
|
||||||
const camera_config_name_t name;
|
const char name[11];
|
||||||
const camera_config_t config;
|
const camera_config_t config;
|
||||||
} camera_config_entry_t;
|
} camera_config_entry_t;
|
||||||
|
|
||||||
@@ -146,9 +145,8 @@ const camera_config_t lookup_camera_config(const char *name)
|
|||||||
{
|
{
|
||||||
// Lookup table for the frame name to framesize_t
|
// Lookup table for the frame name to framesize_t
|
||||||
for (const auto &entry : camera_configs)
|
for (const auto &entry : camera_configs)
|
||||||
if (strncmp(entry.name, name, sizeof(camera_config_name_t)) == 0)
|
if (strncmp(entry.name, name, sizeof(entry.name)) == 0)
|
||||||
return entry.config;
|
return entry.config;
|
||||||
|
|
||||||
return camera_config_t{};
|
return camera_config_t{};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -2,10 +2,9 @@
|
|||||||
|
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
typedef char camera_effect_name_t[11];
|
|
||||||
typedef struct
|
typedef struct
|
||||||
{
|
{
|
||||||
const camera_effect_name_t name;
|
const char name[11];
|
||||||
const int value;
|
const int value;
|
||||||
} camera_effect_entry_t;
|
} camera_effect_entry_t;
|
||||||
|
|
||||||
@@ -22,7 +21,7 @@ const int lookup_camera_effect(const char *name)
|
|||||||
{
|
{
|
||||||
// Lookup table for the frame name to framesize_t
|
// Lookup table for the frame name to framesize_t
|
||||||
for (const auto &entry : camera_effects)
|
for (const auto &entry : camera_effects)
|
||||||
if (strncmp(entry.name, name, sizeof(camera_effect_entry_t)) == 0)
|
if (strncmp(entry.name, name, sizeof(entry.name)) == 0)
|
||||||
return entry.value;
|
return entry.value;
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|||||||
@@ -3,11 +3,9 @@
|
|||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <sensor.h>
|
#include <sensor.h>
|
||||||
|
|
||||||
typedef char frame_size_name_t[18];
|
|
||||||
|
|
||||||
typedef struct frame_size_entry
|
typedef struct frame_size_entry
|
||||||
{
|
{
|
||||||
const frame_size_name_t name;
|
const char name[17];
|
||||||
const framesize_t frame_size;
|
const framesize_t frame_size;
|
||||||
} frame_size_entry_t;
|
} frame_size_entry_t;
|
||||||
|
|
||||||
@@ -30,7 +28,7 @@ const framesize_t lookup_frame_size(const char *pin)
|
|||||||
{
|
{
|
||||||
// Lookup table for the frame name to framesize_t
|
// Lookup table for the frame name to framesize_t
|
||||||
for (const auto &entry : frame_sizes)
|
for (const auto &entry : frame_sizes)
|
||||||
if (strncmp(entry.name, pin, sizeof(frame_size_name_t)) == 0)
|
if (strncmp(entry.name, pin, sizeof(entry.name)) == 0)
|
||||||
return entry.frame_size;
|
return entry.frame_size;
|
||||||
|
|
||||||
return FRAMESIZE_INVALID;
|
return FRAMESIZE_INVALID;
|
||||||
|
|||||||
@@ -3,10 +3,9 @@
|
|||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <esp_camera.h>
|
#include <esp_camera.h>
|
||||||
|
|
||||||
typedef char camera_gainceiling_name_t[5];
|
|
||||||
typedef struct
|
typedef struct
|
||||||
{
|
{
|
||||||
const camera_gainceiling_name_t name;
|
const char name[5];
|
||||||
const gainceiling_t value;
|
const gainceiling_t value;
|
||||||
} camera_gainceiling_entry_t;
|
} camera_gainceiling_entry_t;
|
||||||
|
|
||||||
@@ -23,7 +22,7 @@ const gainceiling_t lookup_camera_gainceiling(const char *name)
|
|||||||
{
|
{
|
||||||
// Lookup table for the frame name to framesize_t
|
// Lookup table for the frame name to framesize_t
|
||||||
for (const auto &entry : camera_gain_ceilings)
|
for (const auto &entry : camera_gain_ceilings)
|
||||||
if (strncmp(entry.name, name, sizeof(camera_gainceiling_entry_t)) == 0)
|
if (strncmp(entry.name, name, sizeof(entry.name)) == 0)
|
||||||
return entry.value;
|
return entry.value;
|
||||||
|
|
||||||
return GAINCEILING_2X;
|
return GAINCEILING_2X;
|
||||||
|
|||||||
@@ -2,10 +2,9 @@
|
|||||||
|
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
typedef char camera_wb_mode_name_t[7];
|
|
||||||
typedef struct
|
typedef struct
|
||||||
{
|
{
|
||||||
const camera_wb_mode_name_t name;
|
const char name[7];
|
||||||
const int value;
|
const int value;
|
||||||
} camera_wb_mode_entry_t;
|
} camera_wb_mode_entry_t;
|
||||||
|
|
||||||
@@ -20,7 +19,7 @@ const int lookup_camera_wb_mode(const char *name)
|
|||||||
{
|
{
|
||||||
// Lookup table for the frame name to framesize_t
|
// Lookup table for the frame name to framesize_t
|
||||||
for (const auto &entry : camera_wb_modes)
|
for (const auto &entry : camera_wb_modes)
|
||||||
if (strncmp(entry.name, name, sizeof(camera_wb_mode_entry_t)) == 0)
|
if (strncmp(entry.name, name, sizeof(entry.name)) == 0)
|
||||||
return entry.value;
|
return entry.value;
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|||||||
Reference in New Issue
Block a user