github/esphome
2
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-10-07 03:16:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/dev' into integration

Browse Source 
# Conflicts:
#	esphome/components/api/api_connection.cpp
#	esphome/components/api/api_server.cpp
#	esphome/components/api/api_server.h
#	esphome/components/wifi_signal/wifi_signal_sensor.h
#	esphome/core/string_ref.h
This commit is contained in:
J. Nick Koston
2025-12-09 23:51:44 +01:00
parent ed8b21aec3 1e23b10eed
commit 724fb222dc
89 changed files with 1634 additions and 384 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esphome/components/web_server/web_server.h
+1 -1
View File
@@ -171,7 +171,7 @@ class DeferredUpdateEventSourceList : public std::list<DeferredUpdateEventSource
* by esphome.io by default), an event source under '/events' that automatically sends
* all state updates in real time + the debug log. Lastly, there's an REST API available
* under the '/light/...', '/sensor/...', ... URLs. A full documentation for this API
* can be found under https://esphome.io/web-api/index.html.
* can be found under https://esphome.io/web-api/.
*/
class WebServer : public Controller,
public Component,
esphome/components/web_server/web_server_v1.cpp
+2 -3
View File
@@ -190,9 +190,8 @@ void WebServer::handle_index_request(AsyncWebServerRequest *request) {
}
#endif
stream->print(
ESPHOME_F("</tbody></table><p>See <a href=\"https://esphome.io/web-api/index.html\">ESPHome Web API</a> for "
"REST API documentation.</p>"));
stream->print(ESPHOME_F("</tbody></table><p>See <a href=\"https://esphome.io/web-api/\">ESPHome Web API</a> for "
"REST API documentation.</p>"));
#if defined(USE_WEBSERVER_OTA) && !defined(USE_WEBSERVER_OTA_DISABLED)
// Show OTA form only if web_server OTA is not explicitly disabled
// Note: USE_WEBSERVER_OTA_DISABLED only affects web_server, not captive_portal