mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix Webcam compilation with `define USE_WEBCAM` but without `define ENABLE_RTSPSERVER` (#22686)

This commit is contained in:
Theo Arends 2024-12-20 11:07:52 +01:00
parent fde529fac4
commit 8311bff7ee
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@ -11,12 +11,13 @@ All notable changes to this project will be documented in this file.
### Breaking Changed ### Breaking Changed
### Changed ### Changed
- ESP32 disable PSRAM check (and on restart some relay toggles) with `#define DISABLE_PSRAMCHECK` (#21266) - ESP32 disable PSRAM check (and on restart some relay toggles) with `#define DISABLE_PSRAMCHECK true` (#21266)
- TLS disable ECDSA for MQTT to ensure we don't break fingerprints after #22649 - TLS disable ECDSA for MQTT to ensure we don't break fingerprints after #22649
### Fixed ### Fixed
- Berry Zigbee fix wrong attributes (#22684) - Berry Zigbee fix wrong attributes (#22684)
- Berry fix walrus operator - Berry walrus operator (#22685)
- Webcam compilation with `define USE_WEBCAM` but without `define ENABLE_RTSPSERVER` (#22686)
### Removed ### Removed

4
RELEASENOTES.md
View File

@ -122,9 +122,11 @@ The latter links can be used for OTA upgrades too like ``OtaUrl https://ota.tasm
### Breaking Changed ### Breaking Changed
### Changed ### Changed
- ESP32 disable PSRAM check (and on restart some relay toggles) with `#define DISABLE_PSRAMCHECK` [#21266](https://github.com/arendst/Tasmota/issues/21266) - ESP32 disable PSRAM check (and on restart some relay toggles) with `#define DISABLE_PSRAMCHECK true` [#21266](https://github.com/arendst/Tasmota/issues/21266)
### Fixed ### Fixed
- Webcam compilation with `define USE_WEBCAM` but without `define ENABLE_RTSPSERVER` [#22686](https://github.com/arendst/Tasmota/issues/22686)
- Berry Zigbee fix wrong attributes [#22684](https://github.com/arendst/Tasmota/issues/22684) - Berry Zigbee fix wrong attributes [#22684](https://github.com/arendst/Tasmota/issues/22684)
- Berry walrus operator [#22685](https://github.com/arendst/Tasmota/issues/22685)
### Removed ### Removed

4
tasmota/tasmota_xdrv_driver/xdrv_81_esp32_webcam.ino
View File

@ -159,7 +159,7 @@ struct {
uint16_t width; uint16_t width;
uint16_t height; uint16_t height;
uint8_t stream_active; uint8_t stream_active;
#ifndef USE_WEBCAM_SETUP_ONLY #ifndef USE_WEBCAM_SETUP_ONLY
WiFiClient client; WiFiClient client;
ESP8266WebServer *CamServer; ESP8266WebServer *CamServer;
struct PICSTORE picstore[MAX_PICSTORE]; struct PICSTORE picstore[MAX_PICSTORE];
@ -169,9 +169,9 @@ struct {
CRtspSession *rtsp_session; CRtspSession *rtsp_session;
WiFiClient rtsp_client; WiFiClient rtsp_client;
uint8_t rtsp_start; uint8_t rtsp_start;
#endif // ENABLE_RTSPSERVER
OV2640 cam; OV2640 cam;
uint32_t rtsp_lastframe_time; uint32_t rtsp_lastframe_time;
#endif // ENABLE_RTSPSERVER
#endif // USE_WEBCAM_SETUP_ONLY #endif // USE_WEBCAM_SETUP_ONLY
} Wc; } Wc;