Michel2/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2026-07-28 04:15:53 +00:00
Code Issues Releases Activity

fix: Regression from PR #24518 forgotten change ESP8266WebServer to TasmotaWebServer (#24568)

Browse Source 
* Change Webserver type from ESP8266WebServer to TasmotaWebServer
* Cast webcam resolution to int32_t in WcSetup calls
This commit is contained in:
Jason2866
2026-03-18 16:39:55 +01:00
committed by GitHub
parent 7f9fdb7255
commit d7533aae2b
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tasmota/tasmota_xdrv_driver/xdrv_81_esp32_webcam.ino
+6 -6
View File
@@ -157,7 +157,7 @@ SemaphoreHandle_t WebcamMutex = nullptr;
#ifndef USE_WEBCAM_SETUP_ONLY
bool HttpCheckPriviledgedAccess(bool);
extern ESP8266WebServer *Webserver;
extern TasmotaWebServer *Webserver;
// use mutex like:
// TasAutoMutex localmutex(&WebcamMutex, "somename");
@@ -192,7 +192,7 @@ struct {
uint8_t stream_active;
#ifndef USE_WEBCAM_SETUP_ONLY
WiFiClient client;
ESP8266WebServer *CamServer;
TasmotaWebServer *CamServer;
struct PICSTORE picstore[MAX_PICSTORE];
#ifdef ENABLE_RTSPSERVER
WiFiServer *rtspp;
@@ -1059,7 +1059,7 @@ uint32_t WcSetStreamserver(uint32_t flag) {
if (flag) {
if (!Wc.CamServer) {
Wc.stream_active = 0;
Wc.CamServer = new ESP8266WebServer(81);
Wc.CamServer = new TasmotaWebServer(81);
Wc.CamServer->on("/", HandleWebcamRoot);
Wc.CamServer->on("/cam.mjpeg", HandleWebcamMjpeg);
Wc.CamServer->on("/cam.jpg", HandleWebcamMjpeg);
@@ -1084,7 +1084,7 @@ void WcInterruptControl() {
WcSetStreamserver(Settings->webcam_config.stream);
if(Wc.up == 0) {
WcSetup(Settings->webcam_config.resolution);
WcSetup((int32_t)Settings->webcam_config.resolution);
}
}
@@ -1501,7 +1501,7 @@ void CmndWebcamClock(void){
}
void CmndWebcamInit(void) {
WcSetup(Settings->webcam_config.resolution);
WcSetup((int32_t)Settings->webcam_config.resolution);
WcInterruptControl();
ResponseCmndDone();
}
@@ -1594,7 +1594,7 @@ bool Xdrv81(uint32_t function) {
WcInit();
break;
case FUNC_INIT:
if(Wc.up == 0) WcSetup(Settings->webcam_config.resolution);
if(Wc.up == 0) WcSetup((int32_t)Settings->webcam_config.resolution);
break;
case FUNC_ACTIVE:
result = true;