Merge remote-tracking branch 'upstream/master' into home-assistant-checkbox

This commit is contained in:
iranl
2024-11-03 15:44:06 +01:00
8 changed files with 267 additions and 247 deletions

View File

@@ -201,7 +201,7 @@ void nukiTask(void *pvParameters)
if (needsPairing)
{
delay(5000);
delay(2500);
}
else if (!whiteListed)
{
@@ -500,9 +500,11 @@ void setup()
if(!doOta)
{
psychicServer = new PsychicHttpServer;
psychicServer->config.max_uri_handlers = 40;
psychicServer->config.stack_size = HTTPD_TASK_SIZE;
psychicServer->listen(80);
webCfgServer = new WebCfgServer(network, preferences, network->networkDeviceType() == NetworkDeviceType::WiFi, partitionType, psychicServer);
webCfgServer->initialize();
psychicServer->listen(80);
psychicServer->onNotFound([](PsychicRequest* request)
{
return request->redirect("/");
@@ -591,8 +593,6 @@ void setup()
psychicServer = new PsychicHttpServer;
psychicServer->config.max_uri_handlers = 40;
psychicServer->config.stack_size = HTTPD_TASK_SIZE;
psychicServer->maxUploadSize = 8192;
psychicServer->maxRequestBodySize = 8192;
psychicServer->listen(80);
if(forceEnableWebServer || preferences->getBool(preference_webserver_enabled, true))