sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-09-23 13:42:27 +01:00
Code Issues Releases Wiki Activity

Merge branch 'integration' into memory_api

Browse Source
This commit is contained in:
J. Nick Koston
2025-09-15 19:01:16 -05:00
parent cd15a43d77 bf7b5309b8
commit f37c833c38
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
esphome/components/web_server/web_server.cpp
View File

@@ -1290,9 +1290,11 @@ void WebServer::handle_climate_request(AsyncWebServerRequest *request, const Url
request->send(404); request->send(404);
} }
std::string WebServer::climate_state_json_generator(WebServer *web_server, void *source) { std::string WebServer::climate_state_json_generator(WebServer *web_server, void *source) {
// NOLINTNEXTLINE(clang-analyzer-cplusplus.NewDeleteLeaks) false positive with ArduinoJson
return web_server->climate_json((climate::Climate *) (source), DETAIL_STATE); return web_server->climate_json((climate::Climate *) (source), DETAIL_STATE);
} }
std::string WebServer::climate_all_json_generator(WebServer *web_server, void *source) { std::string WebServer::climate_all_json_generator(WebServer *web_server, void *source) {
// NOLINTNEXTLINE(clang-analyzer-cplusplus.NewDeleteLeaks) false positive with ArduinoJson
return web_server->climate_json((climate::Climate *) (source), DETAIL_ALL); return web_server->climate_json((climate::Climate *) (source), DETAIL_ALL);
} }
std::string WebServer::climate_json(climate::Climate *obj, JsonDetail start_config) { std::string WebServer::climate_json(climate::Climate *obj, JsonDetail start_config) {
@@ -1697,9 +1699,11 @@ void WebServer::handle_update_request(AsyncWebServerRequest *request, const UrlM
request->send(404); request->send(404);
} }
std::string WebServer::update_state_json_generator(WebServer *web_server, void *source) { std::string WebServer::update_state_json_generator(WebServer *web_server, void *source) {
// NOLINTNEXTLINE(clang-analyzer-cplusplus.NewDeleteLeaks) false positive with ArduinoJson
return web_server->update_json((update::UpdateEntity *) (source), DETAIL_STATE); return web_server->update_json((update::UpdateEntity *) (source), DETAIL_STATE);
} }
std::string WebServer::update_all_json_generator(WebServer *web_server, void *source) { std::string WebServer::update_all_json_generator(WebServer *web_server, void *source) {
// NOLINTNEXTLINE(clang-analyzer-cplusplus.NewDeleteLeaks) false positive with ArduinoJson
return web_server->update_json((update::UpdateEntity *) (source), DETAIL_STATE); return web_server->update_json((update::UpdateEntity *) (source), DETAIL_STATE);
} }
std::string WebServer::update_json(update::UpdateEntity *obj, JsonDetail start_config) { std::string WebServer::update_json(update::UpdateEntity *obj, JsonDetail start_config) {

4
esphome/components/web_server_idf/web_server_idf.cpp
View File

@@ -317,8 +317,8 @@ AsyncEventSource::~AsyncEventSource() {
} }
void AsyncEventSource::handleRequest(AsyncWebServerRequest *request) { void AsyncEventSource::handleRequest(AsyncWebServerRequest *request) {
auto *rsp = // NOLINT(cppcoreguidelines-owning-memory) // NOLINTNEXTLINE(cppcoreguidelines-owning-memory,clang-analyzer-cplusplus.NewDeleteLeaks)
new AsyncEventSourceResponse(request, this, this->web_server_); auto *rsp = new AsyncEventSourceResponse(request, this, this->web_server_);
if (this->on_connect_) { if (this->on_connect_) {
this->on_connect_(rsp); this->on_connect_(rsp);
} }