Skip to content

Commit 8311bff

Browse files
committed
Fix Webcam compilation with define USE_WEBCAM but without define ENABLE_RTSPSERVER (#22686)
1 parent fde529f commit 8311bff

File tree

3 files changed

+8
-5
lines changed

3 files changed

+8
-5
lines changed

CHANGELOG.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,13 @@ All notable changes to this project will be documented in this file.
1111
### Breaking Changed
1212

1313
### Changed
14-
- ESP32 disable PSRAM check (and on restart some relay toggles) with `#define DISABLE_PSRAMCHECK` (#21266)
14+
- ESP32 disable PSRAM check (and on restart some relay toggles) with `#define DISABLE_PSRAMCHECK true` (#21266)
1515
- TLS disable ECDSA for MQTT to ensure we don't break fingerprints after #22649
1616

1717
### Fixed
1818
- Berry Zigbee fix wrong attributes (#22684)
19-
- Berry fix walrus operator
19+
- Berry walrus operator (#22685)
20+
- Webcam compilation with `define USE_WEBCAM` but without `define ENABLE_RTSPSERVER` (#22686)
2021

2122
### Removed
2223

RELEASENOTES.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,9 +122,11 @@ The latter links can be used for OTA upgrades too like ``OtaUrl https://ota.tasm
122122
### Breaking Changed
123123

124124
### Changed
125-
- ESP32 disable PSRAM check (and on restart some relay toggles) with `#define DISABLE_PSRAMCHECK` [#21266](https://github.com/arendst/Tasmota/issues/21266)
125+
- ESP32 disable PSRAM check (and on restart some relay toggles) with `#define DISABLE_PSRAMCHECK true` [#21266](https://github.com/arendst/Tasmota/issues/21266)
126126

127127
### Fixed
128+
- Webcam compilation with `define USE_WEBCAM` but without `define ENABLE_RTSPSERVER` [#22686](https://github.com/arendst/Tasmota/issues/22686)
128129
- Berry Zigbee fix wrong attributes [#22684](https://github.com/arendst/Tasmota/issues/22684)
130+
- Berry walrus operator [#22685](https://github.com/arendst/Tasmota/issues/22685)
129131

130132
### Removed

tasmota/tasmota_xdrv_driver/xdrv_81_esp32_webcam.ino

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ struct {
159159
uint16_t width;
160160
uint16_t height;
161161
uint8_t stream_active;
162-
#ifndef USE_WEBCAM_SETUP_ONLY
162+
#ifndef USE_WEBCAM_SETUP_ONLY
163163
WiFiClient client;
164164
ESP8266WebServer *CamServer;
165165
struct PICSTORE picstore[MAX_PICSTORE];
@@ -169,9 +169,9 @@ struct {
169169
CRtspSession *rtsp_session;
170170
WiFiClient rtsp_client;
171171
uint8_t rtsp_start;
172-
#endif // ENABLE_RTSPSERVER
173172
OV2640 cam;
174173
uint32_t rtsp_lastframe_time;
174+
#endif // ENABLE_RTSPSERVER
175175
#endif // USE_WEBCAM_SETUP_ONLY
176176
} Wc;
177177

0 commit comments

Comments
 (0)