diff --git a/html/index.html b/html/index.html index ade0827..3f88b6f 100644 --- a/html/index.html +++ b/html/index.html @@ -175,10 +175,9 @@
Camera stream

The camera stream can be found at the following location: - rtsp://{{HostName}}:{{RtspPort}}/mjpeg/1 + rtsp://{{HostName}}:{{RtspPort}}/mjpeg/1

- Camera image +
diff --git a/include/html_data.h b/include/html_data.h index 08b65f9..6e9fa00 100644 --- a/include/html_data.h +++ b/include/html_data.h @@ -4,5 +4,5 @@ // ****************************************************************************** -constexpr char file_data_index_html[] = "{{AppTitle}} v{{AppVersion}}

{{ThingName}}

{{#ConfigChanged}} {{/ConfigChanged}}
ESP32
CPU model:
{{ChipModel}} rev. {{ChipRevision}}
CPU speed:
{{CpuFreqMHz}} Mhz
CPU cores:
{{CpuCores}}
RAM size:
{{HeapSize}}
PSRAM size:
{{PsRamSize}}
Flash size:
{{FlashSize}}
Diagnostics
Uptime:
{{Uptime}}
RTSP sessions:
{{NumRTSPSessions}}
Free heap:
{{FreeHeap}}
Max free block:
{{MaxAllocHeap}}
Network
Host name:
{{HostName}}
Mac address:
{{MacAddress}}
Wifi mode:
{{WifiMode}}
Access point:
{{AccessPoint}}
Signal strength:
{{SignalStrength}} dbm
IPv4 address:
{{IpV4}}
IPv6 address:
{{IpV6}}
{{#NetworkState.ApMode}} {{/NetworkState.ApMode}} {{#NetworkState.OnLine}} {{/NetworkState.OnLine}}
Settings
Camera type:
{{CameraType}}
Frame rate:
{{FrameDuration}} ms ({{FrameFrequency}} f/s)
Frame size:
{{FrameSize}}
Frame buffer location:
{{FrameBufferLocation}}
Frame buffers:
{{FrameBuffers}}
JPEG quality:
{{JpegQuality}} (0-100)
{{#CameraInitialized}} {{/CameraInitialized}} {{^CameraInitialized}} {{/CameraInitialized}}
Camera stream

The camera stream can be found at the following location: rtsp://{{HostName}}:{{RtspPort}}/mjpeg/1

\"Camera
"; +constexpr char file_data_index_html[] = "{{AppTitle}} v{{AppVersion}}

{{ThingName}}

{{#ConfigChanged}} {{/ConfigChanged}}
ESP32
CPU model:
{{ChipModel}} rev. {{ChipRevision}}
CPU speed:
{{CpuFreqMHz}} Mhz
CPU cores:
{{CpuCores}}
RAM size:
{{HeapSize}}
PSRAM size:
{{PsRamSize}}
Flash size:
{{FlashSize}}
Diagnostics
Uptime:
{{Uptime}}
RTSP sessions:
{{NumRTSPSessions}}
Free heap:
{{FreeHeap}}
Max free block:
{{MaxAllocHeap}}
Network
Host name:
{{HostName}}
Mac address:
{{MacAddress}}
Wifi mode:
{{WifiMode}}
Access point:
{{AccessPoint}}
Signal strength:
{{SignalStrength}} dbm
IPv4 address:
{{IpV4}}
IPv6 address:
{{IpV6}}
{{#NetworkState.ApMode}} {{/NetworkState.ApMode}} {{#NetworkState.OnLine}} {{/NetworkState.OnLine}}
Settings
Camera type:
{{CameraType}}
Frame rate:
{{FrameDuration}} ms ({{FrameFrequency}} f/s)
Frame size:
{{FrameSize}}
Frame buffer location:
{{FrameBufferLocation}}
Frame buffers:
{{FrameBuffers}}
JPEG quality:
{{JpegQuality}} (0-100)
{{#CameraInitialized}} {{/CameraInitialized}} {{^CameraInitialized}} {{/CameraInitialized}}
Camera stream

The camera stream can be found at the following location: rtsp://{{HostName}}:{{RtspPort}}/mjpeg/1

"; constexpr char file_data_restart_html[] = "{{AppTitle}} v{{AppVersion}}

{{ThingName}}

Restart

The device is restarting.

In some cases, the device requires a hard reset (power cycle).

If this page takes longer than a minute, consider performing a power cycle.

"; diff --git a/src/main.cpp b/src/main.cpp index 7602d86..e70dca3 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -149,10 +149,9 @@ void handle_snapshot() return; } - cam.run(); - if (cam.getSize() == 0 || cam.getfb() == nullptr) + if (cam.getfb() == nullptr) { - web_server.send(404, "text/plain", "Unable to obtain framebuffer"); + web_server.send(404, "text/plain", "Unable to obtain frame buffer from the camera"); return; }