Upstream/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-11-24 12:06:26 +01:00
Code Issues Projects Releases Wiki Activity

corrected merge errors

Browse Source
This commit is contained in:
KoenBreeman 2024-08-16 13:11:13 +02:00
parent 3eb42c4ccb
commit 75bc99e07e
2 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
esphome/components/seeedmultichannelrelay/switch/__init__.py
View File

@ -17,18 +17,6 @@ SeeedMultiChannelRelaySwitch = seeedmultichannelrelay_ns.class_(
CONF_INTERLOCK_WAIT_TIME = "interlock_wait_time" CONF_INTERLOCK_WAIT_TIME = "interlock_wait_time"
<<<<<<< HEAD
=======
CONF_Relay_1 = 1
CONF_Relay_2 = 2
CONF_Relay_3 = 3
CONF_Relay_4 = 4
CONF_Relay_5 = 5
CONF_Relay_6 = 6
CONF_Relay_7 = 7
CONF_Relay_8 = 8
>>>>>>> 50580e13d9408947ba9253f034cae2466b2703d5
RelayBit_ = seeedmultichannelrelay_ns.enum("RelayBit", is_class=True) RelayBit_ = seeedmultichannelrelay_ns.enum("RelayBit", is_class=True)
CONFIG_SCHEMA = ( CONFIG_SCHEMA = (

4
esphome/components/seeedmultichannelrelay/switch/seeedmultichannelrelay_switch.cpp
View File

@ -63,11 +63,7 @@ void SeeedMultiChannelRelaySwitch::write_state(bool state) {
} }
// This will be called every time the user requests a state change. // This will be called every time the user requests a state change.
<<<<<<< HEAD
this->parent_->relay_write(this->channel_-1, state); this->parent_->relay_write(this->channel_-1, state);
=======
this->parent_->relay_write(this->channel_, state);
>>>>>>> 50580e13d9408947ba9253f034cae2466b2703d5
// Acknowledge new state by publishing it // Acknowledge new state by publishing it
this->publish_state(state); this->publish_state(state);