Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
yozik04 committed Jun 25, 2024
2 parents 8beac19 + c2bc296 commit 572846c
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/publish_docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Build and push
id: docker_build
uses: docker/build-push-action@v5
uses: docker/build-push-action@v6
with:
context: .
platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm64/v8
Expand Down
2 changes: 1 addition & 1 deletion paradox/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
VERSION = "3.4.1"
VERSION = "3.4.2-dev"

__version__ = VERSION
2 changes: 1 addition & 1 deletion paradox/hardware/evo/event.py
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,7 @@ def _zone_generated_alarm(event, storage, *_, **__):
level=EventLevel.INFO,
tags=["tamper", "restore"],
type="zone",
change=dict(zone_tamper_trouble=True),
change=dict(zone_tamper_trouble=False),
message="Zone {label} tamper restore",
),
35: dict(
Expand Down
6 changes: 6 additions & 0 deletions paradox/interfaces/mqtt/entities/alarm_control_panel.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,12 @@ def serialize(self):
))
if self.code is not None:
config['code']=self.code
else:
config.update(dict(
code_arm_required=False,
code_disarm_required=False,
code_trigger_required=False
))
return config

@property
Expand Down
3 changes: 3 additions & 0 deletions tests/interfaces/mqtt/test_entities.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@ def test_alarm_control_panel_serialize(mqtt_entity_factory):
'payload_arm_home': 'arm_stay',
'payload_arm_night': 'arm_sleep',
'payload_disarm': 'disarm',
'code_arm_required': False,
'code_disarm_required': False,
'code_trigger_required': False
}

assert alarm_control_panel.configuration_topic == "homeassistant/alarm_control_panel/1234abcd/partition_partition_1/config"
Expand Down
5 changes: 4 additions & 1 deletion tests/interfaces/mqtt/test_homeassistant.py
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,10 @@ async def test_hass(mocker):
"payload_disarm": "disarm",
"payload_arm_home": "arm_stay",
"payload_arm_away": "arm",
"payload_arm_night": "arm_sleep"
"payload_arm_night": "arm_sleep",
'code_arm_required': False,
'code_disarm_required': False,
'code_trigger_required': False
},
0,
True
Expand Down

0 comments on commit 572846c

Please sign in to comment.