jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-23 21:27:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add MySensors ACK (#26894)

Browse Source 
* Add MySensors ACK

The addition of the ACK will ask sensors to respond to commands sent to them which will update the MySensors device in Home Assistant.
 Currently, if a default MySensors sketch is used the device will update but Home Assistant does not reflect the update and custom code has to be added to tell Home Assistant the command was received.  With the ACK set to 1 in the message all this is taken care of by MySensors.

* Run black
This commit is contained in:
petewill 2019-09-25 15:20:02 -06:00 committed by Martin Hjelmare
parent b75639d9d1
commit d1b4bd22ce
4 changed files with 37 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
homeassistant/components/mysensors/climate.py
View File

@ -156,7 +156,9 @@ class MySensorsHVAC(mysensors.device.MySensorsEntity, ClimateDevice):
(set_req.V_HVAC_SETPOINT_COOL, high), (set_req.V_HVAC_SETPOINT_COOL, high),
] ]
for value_type, value in updates: for value_type, value in updates:
self.gateway.set_child_value(self.node_id, self.child_id, value_type, value) self.gateway.set_child_value(
self.node_id, self.child_id, value_type, value, ack=1
)
if self.gateway.optimistic: if self.gateway.optimistic:
# Optimistically assume that device has changed state # Optimistically assume that device has changed state
self._values[value_type] = value self._values[value_type] = value
@ -166,7 +168,7 @@ class MySensorsHVAC(mysensors.device.MySensorsEntity, ClimateDevice):
"""Set new target temperature.""" """Set new target temperature."""
set_req = self.gateway.const.SetReq set_req = self.gateway.const.SetReq
self.gateway.set_child_value( self.gateway.set_child_value(
self.node_id, self.child_id, set_req.V_HVAC_SPEED, fan_mode self.node_id, self.child_id, set_req.V_HVAC_SPEED, fan_mode, ack=1
) )
if self.gateway.optimistic: if self.gateway.optimistic:
# Optimistically assume that device has changed state # Optimistically assume that device has changed state
@ -176,7 +178,11 @@ class MySensorsHVAC(mysensors.device.MySensorsEntity, ClimateDevice):
async def async_set_hvac_mode(self, hvac_mode): async def async_set_hvac_mode(self, hvac_mode):
"""Set new target temperature.""" """Set new target temperature."""
self.gateway.set_child_value( self.gateway.set_child_value(
self.node_id, self.child_id, self.value_type, DICT_HA_TO_MYS[hvac_mode] self.node_id,
self.child_id,
self.value_type,
DICT_HA_TO_MYS[hvac_mode],
ack=1,
) )
if self.gateway.optimistic: if self.gateway.optimistic:
# Optimistically assume that device has changed state # Optimistically assume that device has changed state

14
homeassistant/components/mysensors/cover.py
View File

@ -43,7 +43,9 @@ class MySensorsCover(mysensors.device.MySensorsEntity, CoverDevice):
async def async_open_cover(self, **kwargs): async def async_open_cover(self, **kwargs):
"""Move the cover up.""" """Move the cover up."""
set_req = self.gateway.const.SetReq set_req = self.gateway.const.SetReq
self.gateway.set_child_value(self.node_id, self.child_id, set_req.V_UP, 1) self.gateway.set_child_value(
self.node_id, self.child_id, set_req.V_UP, 1, ack=1
)
if self.gateway.optimistic: if self.gateway.optimistic:
# Optimistically assume that cover has changed state. # Optimistically assume that cover has changed state.
if set_req.V_DIMMER in self._values: if set_req.V_DIMMER in self._values:
@ -55,7 +57,9 @@ class MySensorsCover(mysensors.device.MySensorsEntity, CoverDevice):
async def async_close_cover(self, **kwargs): async def async_close_cover(self, **kwargs):
"""Move the cover down.""" """Move the cover down."""
set_req = self.gateway.const.SetReq set_req = self.gateway.const.SetReq
self.gateway.set_child_value(self.node_id, self.child_id, set_req.V_DOWN, 1) self.gateway.set_child_value(
self.node_id, self.child_id, set_req.V_DOWN, 1, ack=1
)
if self.gateway.optimistic: if self.gateway.optimistic:
# Optimistically assume that cover has changed state. # Optimistically assume that cover has changed state.
if set_req.V_DIMMER in self._values: if set_req.V_DIMMER in self._values:
@ -69,7 +73,7 @@ class MySensorsCover(mysensors.device.MySensorsEntity, CoverDevice):
position = kwargs.get(ATTR_POSITION) position = kwargs.get(ATTR_POSITION)
set_req = self.gateway.const.SetReq set_req = self.gateway.const.SetReq
self.gateway.set_child_value( self.gateway.set_child_value(
self.node_id, self.child_id, set_req.V_DIMMER, position self.node_id, self.child_id, set_req.V_DIMMER, position, ack=1
) )
if self.gateway.optimistic: if self.gateway.optimistic:
# Optimistically assume that cover has changed state. # Optimistically assume that cover has changed state.
@ -79,4 +83,6 @@ class MySensorsCover(mysensors.device.MySensorsEntity, CoverDevice):
async def async_stop_cover(self, **kwargs): async def async_stop_cover(self, **kwargs):
"""Stop the device.""" """Stop the device."""
set_req = self.gateway.const.SetReq set_req = self.gateway.const.SetReq
self.gateway.set_child_value(self.node_id, self.child_id, set_req.V_STOP, 1) self.gateway.set_child_value(
self.node_id, self.child_id, set_req.V_STOP, 1, ack=1
)

10
homeassistant/components/mysensors/light.py
View File

@ -75,7 +75,9 @@ class MySensorsLight(mysensors.device.MySensorsEntity, Light):
if self._state: if self._state:
return return
self.gateway.set_child_value(self.node_id, self.child_id, set_req.V_LIGHT, 1) self.gateway.set_child_value(
self.node_id, self.child_id, set_req.V_LIGHT, 1, ack=1
)
if self.gateway.optimistic: if self.gateway.optimistic:
# optimistically assume that light has changed state # optimistically assume that light has changed state
@ -96,7 +98,7 @@ class MySensorsLight(mysensors.device.MySensorsEntity, Light):
brightness = kwargs[ATTR_BRIGHTNESS] brightness = kwargs[ATTR_BRIGHTNESS]
percent = round(100 * brightness / 255) percent = round(100 * brightness / 255)
self.gateway.set_child_value( self.gateway.set_child_value(
self.node_id, self.child_id, set_req.V_DIMMER, percent self.node_id, self.child_id, set_req.V_DIMMER, percent, ack=1
) )
if self.gateway.optimistic: if self.gateway.optimistic:
@ -129,7 +131,7 @@ class MySensorsLight(mysensors.device.MySensorsEntity, Light):
if len(rgb) > 3: if len(rgb) > 3:
white = rgb.pop() white = rgb.pop()
self.gateway.set_child_value( self.gateway.set_child_value(
self.node_id, self.child_id, self.value_type, hex_color self.node_id, self.child_id, self.value_type, hex_color, ack=1
) )
if self.gateway.optimistic: if self.gateway.optimistic:
@ -141,7 +143,7 @@ class MySensorsLight(mysensors.device.MySensorsEntity, Light):
async def async_turn_off(self, **kwargs): async def async_turn_off(self, **kwargs):
"""Turn the device off.""" """Turn the device off."""
value_type = self.gateway.const.SetReq.V_LIGHT value_type = self.gateway.const.SetReq.V_LIGHT
self.gateway.set_child_value(self.node_id, self.child_id, value_type, 0) self.gateway.set_child_value(self.node_id, self.child_id, value_type, 0, ack=1)
if self.gateway.optimistic: if self.gateway.optimistic:
# optimistically assume that light has changed state # optimistically assume that light has changed state
self._state = False self._state = False

16
homeassistant/components/mysensors/switch.py
View File

@ -92,7 +92,9 @@ class MySensorsSwitch(mysensors.device.MySensorsEntity, SwitchDevice):
async def async_turn_on(self, **kwargs): async def async_turn_on(self, **kwargs):
"""Turn the switch on.""" """Turn the switch on."""
self.gateway.set_child_value(self.node_id, self.child_id, self.value_type, 1) self.gateway.set_child_value(
self.node_id, self.child_id, self.value_type, 1, ack=1
)
if self.gateway.optimistic: if self.gateway.optimistic:
# Optimistically assume that switch has changed state # Optimistically assume that switch has changed state
self._values[self.value_type] = STATE_ON self._values[self.value_type] = STATE_ON
@ -100,7 +102,9 @@ class MySensorsSwitch(mysensors.device.MySensorsEntity, SwitchDevice):
async def async_turn_off(self, **kwargs): async def async_turn_off(self, **kwargs):
"""Turn the switch off.""" """Turn the switch off."""
self.gateway.set_child_value(self.node_id, self.child_id, self.value_type, 0) self.gateway.set_child_value(
self.node_id, self.child_id, self.value_type, 0, ack=1
)
if self.gateway.optimistic: if self.gateway.optimistic:
# Optimistically assume that switch has changed state # Optimistically assume that switch has changed state
self._values[self.value_type] = STATE_OFF self._values[self.value_type] = STATE_OFF
@ -129,7 +133,9 @@ class MySensorsIRSwitch(MySensorsSwitch):
self.gateway.set_child_value( self.gateway.set_child_value(
self.node_id, self.child_id, self.value_type, self._ir_code self.node_id, self.child_id, self.value_type, self._ir_code
) )
self.gateway.set_child_value(self.node_id, self.child_id, set_req.V_LIGHT, 1) self.gateway.set_child_value(
self.node_id, self.child_id, set_req.V_LIGHT, 1, ack=1
)
if self.gateway.optimistic: if self.gateway.optimistic:
# Optimistically assume that switch has changed state # Optimistically assume that switch has changed state
self._values[self.value_type] = self._ir_code self._values[self.value_type] = self._ir_code
@ -141,7 +147,9 @@ class MySensorsIRSwitch(MySensorsSwitch):
async def async_turn_off(self, **kwargs): async def async_turn_off(self, **kwargs):
"""Turn the IR switch off.""" """Turn the IR switch off."""
set_req = self.gateway.const.SetReq set_req = self.gateway.const.SetReq
self.gateway.set_child_value(self.node_id, self.child_id, set_req.V_LIGHT, 0) self.gateway.set_child_value(
self.node_id, self.child_id, set_req.V_LIGHT, 0, ack=1
)
if self.gateway.optimistic: if self.gateway.optimistic:
# Optimistically assume that switch has changed state # Optimistically assume that switch has changed state
self._values[set_req.V_LIGHT] = STATE_OFF self._values[set_req.V_LIGHT] = STATE_OFF