diff --git a/packages/alexa.yaml b/packages/alexa.yaml index 52d91cf..52f64b5 100644 --- a/packages/alexa.yaml +++ b/packages/alexa.yaml @@ -106,31 +106,15 @@ automation: id: security-yes then: - service: script.security_arm_home - - delay: - seconds: 1 - - service: script.speech_engine - data: - who: "{{ states('sensor.last_alexa') }}" - message: > - {{ [ "Security is armed, guard dogs deployed, and lasers set from stun to kill!", - "The security system is armed. Sentry turrets active, be careful out there!", - "Your security is our number one priority. Flamethrower turrets deployed!" - ] | random }} - - alias: 'If no, leave security alone and be a smartass about it' + - alias: 'If no, leave security alone' if: - condition: trigger id: security-no then: - - service: script.speech_engine + - service: script.status_annc data: who: "{{ states('sensor.last_alexa') }}" - message: > - {{ [ "Security squadron is standing down, but always at your service!", - "Our security forces are currently twiddling their thumbs, awaiting some purpose in their life!", - "Security not armed. Hopefully the defense turrets do not become bored!" - ] | random }} - - + call_security_not_armed: 1 script: activate_alexa_actionable_notification: diff --git a/packages/security.yaml b/packages/security.yaml index 54f9ffc..a742208 100644 --- a/packages/security.yaml +++ b/packages/security.yaml @@ -314,6 +314,10 @@ script: - service: input_boolean.turn_off target: entity_id: input_boolean.lockdown_issue + - service: script.status_annc + data: + who: living_room + call_security_armed: 1 else: - service: input_boolean.turn_on target: @@ -356,4 +360,8 @@ script: entity_id: alarm_control_panel.alexa_guard_9ee3b - service: input_boolean.turn_off target: - entity_id: input_boolean.lockdown_issue \ No newline at end of file + entity_id: input_boolean.lockdown_issue + - service: script.status_annc + data: + who: living_room + call_security_not_armed: 1 \ No newline at end of file