mirror of
https://github.com/esphome/esphome.git
synced 2024-11-13 02:37:47 +01:00
Merge branch 'dev' into beta
This commit is contained in:
commit
7006aa0d2a
5 changed files with 2 additions and 22 deletions
|
@ -161,19 +161,6 @@ void APIConnection::on_disconnect_response(const DisconnectResponse &value) {
|
||||||
// pass
|
// 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
|
#ifdef USE_BINARY_SENSOR
|
||||||
bool APIConnection::send_binary_sensor_state(binary_sensor::BinarySensor *binary_sensor, bool state) {
|
bool APIConnection::send_binary_sensor_state(binary_sensor::BinarySensor *binary_sensor, bool state) {
|
||||||
if (!this->state_subscription_)
|
if (!this->state_subscription_)
|
||||||
|
|
|
@ -4,6 +4,7 @@
|
||||||
#include "esphome/core/component.h"
|
#include "esphome/core/component.h"
|
||||||
#include "esphome/core/entity_base.h"
|
#include "esphome/core/entity_base.h"
|
||||||
#include "esphome/core/helpers.h"
|
#include "esphome/core/helpers.h"
|
||||||
|
#include "esphome/components/sensor/filter.h"
|
||||||
|
|
||||||
namespace esphome {
|
namespace esphome {
|
||||||
namespace sensor {
|
namespace sensor {
|
||||||
|
|
|
@ -11,10 +11,6 @@
|
||||||
#include <lwip/sockets.h>
|
#include <lwip/sockets.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef ARDUINO_ARCH_ESP32
|
|
||||||
#include <esp_idf_version.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
namespace esphome {
|
namespace esphome {
|
||||||
namespace socket {
|
namespace socket {
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#ifdef USE_ARDUINO
|
#ifdef USE_ARDUINO
|
||||||
|
|
||||||
#include "web_server.h"
|
#include "web_server.h"
|
||||||
#include "esphome/components/json/json_util.h"
|
#include "esphome/core/log.h"
|
||||||
#include "esphome/core/application.h"
|
#include "esphome/core/application.h"
|
||||||
#include "esphome/core/entity_base.h"
|
#include "esphome/core/entity_base.h"
|
||||||
#include "esphome/core/util.h"
|
#include "esphome/core/util.h"
|
||||||
|
|
|
@ -21,10 +21,6 @@ _FLAGS_QR_QUERY = 0x0000 # query
|
||||||
_TYPE_A = 1
|
_TYPE_A = 1
|
||||||
_LOGGER = logging.getLogger(__name__)
|
_LOGGER = logging.getLogger(__name__)
|
||||||
|
|
||||||
_CLASS_IN = 1
|
|
||||||
_FLAGS_QR_QUERY = 0x0000 # query
|
|
||||||
_TYPE_A = 1
|
|
||||||
|
|
||||||
|
|
||||||
class HostResolver(RecordUpdateListener):
|
class HostResolver(RecordUpdateListener):
|
||||||
def __init__(self, name: str):
|
def __init__(self, name: str):
|
||||||
|
|
Loading…
Reference in a new issue