Merge branch 'dev' into beta

esphome/components/api/api_connection.cpp

@@ -161,19 +161,6 @@ void APIConnection::on_disconnect_response(const DisconnectResponse &value) {
   // pass
 }
 
-DisconnectResponse APIConnection::disconnect(const DisconnectRequest &msg) {
-  // remote initiated disconnect_client
-  // don't close yet, we still need to send the disconnect response
-  // close will happen on next loop
-  ESP_LOGD(TAG, "%s requested disconnected", client_info_.c_str());
-  this->next_close_ = true;
-  DisconnectResponse resp;
-  return resp;
-}
-void APIConnection::on_disconnect_response(const DisconnectResponse &value) {
-  // pass
-}
-
 #ifdef USE_BINARY_SENSOR
 bool APIConnection::send_binary_sensor_state(binary_sensor::BinarySensor *binary_sensor, bool state) {
   if (!this->state_subscription_)

esphome/components/sensor/sensor.h

@@ -4,6 +4,7 @@
 #include "esphome/core/component.h"
 #include "esphome/core/entity_base.h"
 #include "esphome/core/helpers.h"
+#include "esphome/components/sensor/filter.h"
 
 namespace esphome {
 namespace sensor {

esphome/components/socket/bsd_sockets_impl.cpp

@@ -11,10 +11,6 @@
 #include <lwip/sockets.h>
 #endif
 
-#ifdef ARDUINO_ARCH_ESP32
-#include <esp_idf_version.h>
-#endif
-
 namespace esphome {
 namespace socket {
 

esphome/components/web_server/web_server.cpp

@@ -1,7 +1,7 @@
 #ifdef USE_ARDUINO
 
 #include "web_server.h"
-#include "esphome/components/json/json_util.h"
+#include "esphome/core/log.h"
 #include "esphome/core/application.h"
 #include "esphome/core/entity_base.h"
 #include "esphome/core/util.h"

esphome/zeroconf.py

@@ -21,10 +21,6 @@ _FLAGS_QR_QUERY = 0x0000  # query
 _TYPE_A = 1
 _LOGGER = logging.getLogger(__name__)
 
-_CLASS_IN = 1
-_FLAGS_QR_QUERY = 0x0000  # query
-_TYPE_A = 1
-
 
 class HostResolver(RecordUpdateListener):
     def __init__(self, name: str):