Add Satel_integra switchable outputs and multiple partitions #21992

c-soft · 2019-03-12T22:34:02Z

Description:

Added multiple partitions support as well as editable outputs, so one can use Satel outputs as switches. Additionally improved reporting of arming and disarming states of the alarm.

Breaking change:
The component now supports multiple partitions and this forced change in config: instead of single parameters partition and single_home_mode there is now section partitions:. If your config so far was:

satel_integra:
  host: 192.168.1.100
  port: 7094
  partition: 1
  arm_home_mode: 1
  zones:
   (...)

... change it to:

satel_integra:
  host: 192.168.1.100
  port: 7094
  partitions: 
    01:
      name: 'House'
      arm_home_mode: 1
  zones:
    (...)

... and your config will be OK again after upgrade.

Related issue (if applicable): fixes #21589, fixes #19796, fixes #19361.

Pull request in home-assistant.io with documentation (if applicable): home-assistant/home-assistant.io#8922

Example entry for `configuration.yaml` (if applicable):

satel_integra:
  host: 192.168.17.141
  port: 7094
  code: !secret alarm_code  
  partitions:
    01:
      name: 'Dom'
      arm_home_mode: 2
  zones:
    01:
      name: 'czujka wejście'
      type: 'motion'
    02:
      name: 'hol'
      type: 'motion'
    05:
      name: 'salon'
      type: 'motion'
  outputs:
    06:
      name: 'salon zb'
      type: 'motion'
    07:
      name: 'kuchnia dym'
      type: 'smoke'
  switchable_outputs:
    8:
      name: 'Brama garaż'
    9:
      name: 'Otwarcie bramy'

Checklist:

The code change is tested and works locally.
Local tests pass with tox. Your PR cannot be merged unless tests pass
There is no commented out code in this PR.

If user exposed functionality or configuration variables are added/changed:

Documentation added/updated in home-assistant.io

If the code communicates with devices, web services, or third-party tools:

New dependencies have been added to the REQUIREMENTS variable (example).
New dependencies are only imported inside functions that use them (example).
New or updated dependencies have been added to requirements_all.txt by running script/gen_requirements_all.py.
New files were added to .coveragerc.

If the code does not interact with devices:

Tests have been added to verify that the new code works.

amelchio

This looks very good 👍. Just a couple of questions ...

homeassistant/components/satel_integra/__init__.py

homeassistant/components/satel_integra/switch.py

c-soft · 2019-03-27T15:18:13Z

Thanks for the review, Im on my vacation till next week, will fix it then.

homeassistant/components/satel_integra/__init__.py

homeassistant/components/satel_integra/switch.py

homeassistant/components/satel_integra/__init__.py

homeassistant/components/satel_integra/alarm_control_panel.py

MartinHjelmare · 2019-04-05T11:27:30Z

There is a merge conflict.

c-soft · 2019-04-12T16:31:49Z

There is a merge conflict.

Fixed, everything should be fine now.

homeassistant/components/satel_integra/__init__.py

MartinHjelmare · 2019-04-12T22:10:17Z

homeassistant/components/satel_integra/__init__.py

 from homeassistant.core import callback
 from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.discovery import async_load_platform
 from homeassistant.helpers.dispatcher import async_dispatcher_send

+REQUIREMENTS = ['satel_integra==0.3.4']


We have removed this. Please remove it. It's now enough to define the requirements in the manifest.json file and run the scripts to validate the manifest.

Done - this was a merge error on my behalf.

MartinHjelmare · 2019-04-12T22:16:02Z

homeassistant/components/satel_integra/alarm_control_panel.py


    async def async_alarm_arm_home(self, code=None):
        """Send arm home command."""
        _LOGGER.debug("Arming home")

        if code:
-            await self.hass.data[DATA_SATEL].arm(
-                code, self._arm_home_mode)
+            await self._satel\


Please break the line after the first parenthesis. That's the best way of formatting line breaks.

await self._satel.arm( code, [self._partition_id], self._arm_home_mode)

MartinHjelmare · 2019-04-12T22:20:23Z

homeassistant/components/satel_integra/switch.py

+"""Support for Satel Integra modifiable outputs represented as switches."""
+import logging
+
+


Please remove one blank line.

MartinHjelmare · 2019-04-12T22:21:42Z

homeassistant/components/satel_integra/switch.py

+    @callback
+    def _devices_updated(self, zones):
+        """Update switch state, if needed."""
+        _LOGGER.debug("Update switch name: %s zones: %s.", self._name, zones)


We don't end logging messages with period.

codecov · 2019-04-13T09:07:54Z

Codecov Report

Merging #21992 into dev will increase coverage by <.01%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##              dev   #21992      +/-   ##
==========================================
+ Coverage   93.93%   93.94%   +<.01%     
==========================================
  Files         451      451              
  Lines       36759    36758       -1     
==========================================
  Hits        34531    34531              
+ Misses       2228     2227       -1

Impacted Files	Coverage Δ
homeassistant/components/rainmachine/const.py	`100% <0%> (ø)`	⬆️
homeassistant/components/aws/const.py	`100% <0%> (ø)`	⬆️
homeassistant/helpers/translation.py	`98.73% <0%> (+0.03%)`	⬆️
homeassistant/components/uk_transport/sensor.py	`94.16% <0%> (+0.72%)`	⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 73a473a...93d1084. Read the comment docs.

codecov · 2019-04-13T09:07:54Z

Codecov Report

Merging #21992 into dev will increase coverage by <.01%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##              dev   #21992      +/-   ##
==========================================
+ Coverage   93.93%   93.94%   +<.01%     
==========================================
  Files         451      451              
  Lines       36759    36759              
==========================================
+ Hits        34531    34532       +1     
+ Misses       2228     2227       -1

Impacted Files	Coverage Δ
homeassistant/components/uk_transport/sensor.py	`94.16% <0%> (+0.72%)`	⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 73a473a...93d1084. Read the comment docs.

MartinHjelmare

Great!

homeassistant added integration: satel_integra new-platform cla-signed labels Mar 12, 2019

ghost added the in progress label Mar 12, 2019

amelchio reviewed Mar 25, 2019

View reviewed changes

homeassistant/components/satel_integra/__init__.py Outdated Show resolved Hide resolved

homeassistant/components/satel_integra/__init__.py Show resolved Hide resolved

homeassistant/components/satel_integra/switch.py Outdated Show resolved Hide resolved

MartinHjelmare reviewed Mar 28, 2019

View reviewed changes

MartinHjelmare changed the title ~~Satel_integra added switchable outputs and multiple partitions~~ Add Satel_integra switchable outputs and multiple partitions Mar 28, 2019

MartinHjelmare added the breaking-change label Apr 5, 2019

MartinHjelmare reviewed Apr 5, 2019

View reviewed changes

homeassistant/components/satel_integra/alarm_control_panel.py Outdated Show resolved Hide resolved

MartinHjelmare requested changes Apr 12, 2019

View reviewed changes

homeassistant/components/satel_integra/__init__.py Outdated Show resolved Hide resolved

homeassistant/components/satel_integra/__init__.py Outdated Show resolved Hide resolved

homeassistant/components/satel_integra/__init__.py Outdated Show resolved Hide resolved

This comment has been minimized.

Sign in to view

MartinHjelmare reviewed Apr 12, 2019

View reviewed changes

c-soft added 13 commits April 13, 2019 10:27

Added editable outputs and multiple zones.

3e52893

Updated requirements_all.txt

e66d8b1

Linter fixes.

152ac41

Post-review changes

97ce6d6

Fixed too many lines separation error

c29ca1e

Passing satel controller as parameter to entities.

c1d60ef

Fixed linter error.

9bd3a22

Fixed forgotten requirements update.

2a35629

Fixed satel_integra version (again!?!)

6991f17

Fixed manifest.json.

ba96ba5

Fixed passing non-serializable controller

60055db

Removed unnecessary isinstance check.

245660d

Post review changes

93d1084

MartinHjelmare approved these changes Apr 13, 2019

View reviewed changes

MartinHjelmare merged commit 2f17529 into home-assistant:dev Apr 13, 2019

ghost removed the in progress label Apr 13, 2019

c-soft mentioned this pull request Apr 13, 2019

Add satel integra multiple partitions and switchable outputs home-assistant/home-assistant.io#8922

Merged

2 tasks

nyxnyx mentioned this pull request May 24, 2019

After upgrade HA to 0.92.3 alarm_control_panel.alarm_panel is not available in Lovelance c-soft/satel_integra#12

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add Satel_integra switchable outputs and multiple partitions #21992

Add Satel_integra switchable outputs and multiple partitions #21992

c-soft commented Mar 12, 2019 •

edited

Loading

amelchio left a comment

c-soft commented Mar 27, 2019

MartinHjelmare commented Apr 5, 2019 •

edited

Loading

c-soft commented Apr 12, 2019 •

edited

Loading

This comment has been minimized.

MartinHjelmare Apr 12, 2019

c-soft Apr 13, 2019

MartinHjelmare Apr 12, 2019

c-soft Apr 13, 2019

MartinHjelmare Apr 12, 2019

c-soft Apr 13, 2019

MartinHjelmare Apr 12, 2019

c-soft Apr 13, 2019

codecov bot commented Apr 13, 2019

codecov bot commented Apr 13, 2019 •

edited

Loading

MartinHjelmare left a comment

		"""Support for Satel Integra modifiable outputs represented as switches."""
		import logging

Add Satel_integra switchable outputs and multiple partitions #21992

Add Satel_integra switchable outputs and multiple partitions #21992

Conversation

c-soft commented Mar 12, 2019 • edited Loading

Description:

Example entry for configuration.yaml (if applicable):

Checklist:

amelchio left a comment

Choose a reason for hiding this comment

c-soft commented Mar 27, 2019

MartinHjelmare commented Apr 5, 2019 • edited Loading

c-soft commented Apr 12, 2019 • edited Loading

This comment has been minimized.

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

codecov bot commented Apr 13, 2019

Codecov Report

codecov bot commented Apr 13, 2019 • edited Loading

Codecov Report

MartinHjelmare left a comment

Choose a reason for hiding this comment

c-soft commented Mar 12, 2019 •

edited

Loading

Example entry for `configuration.yaml` (if applicable):

MartinHjelmare commented Apr 5, 2019 •

edited

Loading

c-soft commented Apr 12, 2019 •

edited

Loading

codecov bot commented Apr 13, 2019 •

edited

Loading