mirror of
https://github.com/esphome/esphome.git
synced 2024-12-22 13:34:54 +01:00
Fix bad merge
This commit is contained in:
parent
4c4dd23e15
commit
bb86db869a
1 changed files with 0 additions and 13 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_)
|
||||||
|
|
Loading…
Reference in a new issue