From 420c86042443daff4a075b8fedde80c65f37cc03 Mon Sep 17 00:00:00 2001 From: Guillermo Ruffino Date: Tue, 31 Dec 2019 00:20:11 -0300 Subject: [PATCH] fix climate-ir bad merge (#935) * fix climate-ir bad merge * add mitshubishi test --- esphome/components/climate_ir/climate_ir.cpp | 1 - esphome/components/climate_ir/climate_ir.h | 3 --- tests/test1.yaml | 3 ++- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/esphome/components/climate_ir/climate_ir.cpp b/esphome/components/climate_ir/climate_ir.cpp index 92a5b2423a..8f06ff2214 100644 --- a/esphome/components/climate_ir/climate_ir.cpp +++ b/esphome/components/climate_ir/climate_ir.cpp @@ -116,7 +116,6 @@ void ClimateIR::dump_config() { ESP_LOGCONFIG(TAG, " Supports HEAT: %s", YESNO(this->supports_heat_)); ESP_LOGCONFIG(TAG, " Supports COOL: %s", YESNO(this->supports_cool_)); } -bool ClimateIR::on_receive(remote_base::RemoteReceiveData data) { return false; } } // namespace climate_ir } // namespace esphome diff --git a/esphome/components/climate_ir/climate_ir.h b/esphome/components/climate_ir/climate_ir.h index 82bf4247b0..7a69b19786 100644 --- a/esphome/components/climate_ir/climate_ir.h +++ b/esphome/components/climate_ir/climate_ir.h @@ -63,9 +63,6 @@ class ClimateIR : public climate::Climate, public Component, public remote_base: remote_transmitter::RemoteTransmitterComponent *transmitter_; sensor::Sensor *sensor_{nullptr}; - - /// Handle received IR Buffer, so it is optional to implement - bool on_receive(remote_base::RemoteReceiveData data) override; }; } // namespace climate_ir diff --git a/tests/test1.yaml b/tests/test1.yaml index 1080339b67..043fafc9c3 100644 --- a/tests/test1.yaml +++ b/tests/test1.yaml @@ -1192,7 +1192,8 @@ climate: name: Fujitsu General Climate - platform: yashima name: Yashima Climate - + - platform: mitsubishi + name: Mitsubishi switch: - platform: gpio