Merge branch 'main' into dev-v2.3

This commit is contained in:
Gunnar Skjold
2023-11-25 10:46:46 +01:00
15 changed files with 95 additions and 46 deletions

View File

@@ -122,6 +122,8 @@ void AmsWebServer::setup(AmsConfiguration* config, GpioConfig* gpioConfig, AmsDa
server.on(F("/library/test/success.html"), HTTP_GET, std::bind(&AmsWebServer::redirectToMain, this)); // Apple connectivity check: http://www.apple.com/library/test/success.html
*/
server.on("/ssdp/schema.xml", HTTP_GET, std::bind(&AmsWebServer::ssdpSchema, this));
server.onNotFound(std::bind(&AmsWebServer::notFound, this));
server.begin(); // Web server start
@@ -436,7 +438,7 @@ void AmsWebServer::dataJson() {
mqttStatus = 0;
} else if(mqttHandler != NULL && mqttHandler->connected()) {
mqttStatus = 1;
} else if(mqttHandler != NULL && mqttHandler->lastError() == 0) {
} else if(mqttHandler == NULL || mqttHandler->lastError() == 0) {
mqttStatus = 2;
} else {
mqttStatus = 3;
@@ -2436,4 +2438,8 @@ void AmsWebServer::configFileUpload() {
void AmsWebServer::redirectToMain() {
server.sendHeader(HEADER_LOCATION,F("/"));
server.send(302);
}
void AmsWebServer::ssdpSchema() {
SSDP.schema(server.client());
}