Skip to content

Commit

Permalink
Merge branch 'beta'
Browse files Browse the repository at this point in the history
  • Loading branch information
@MiguelRipoll23
MiguelRipoll23 committed Jul 5, 2020
2 parents 7baafdf + 6133856 commit 69c8f97
Show file tree
Hide file tree
Showing 6 changed files with 240 additions and 137 deletions.
1 change: 1 addition & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ Use Eve or a similar app to create automations like these:
| show_mode_pause_switch | Shows the `Mode Pause` switch to temporarily disarm the security system. | false | true |
| override_off | Allows to trigger the security system while disarmed. | false | true |
| audio | Play audio sounds (requires ffmpeg installed). | false | true |
| audio_custom | Use custom sounds for all events (add `-custom` before `.mp3` in the filename). | false | true |
| audio_language | Set language used for the audio warnings. | en-US | de-DE |
| audio_alert_looped | Loop alert sound that plays when the security system's countdown has started. | false | true |
| save_state | State persistence for shutdowns and reboots. | false | true |
Expand Down
101 changes: 61 additions & 40 deletions accessories.schema.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,19 @@
"required": false,
"minimum": 0
},
"siren_sensor": {
"title": "Show Siren Sensor",
"type": "boolean",
"default": false,
"required": false
},
"siren_sensor_seconds": {
"title": "Seconds",
"type": "integer",
"default": 5,
"required": false,
"minimum": 0
},
"trigger_seconds": {
"title": "Trigger Delay Seconds",
"type": "integer",
Expand All @@ -84,19 +97,6 @@
"default": true,
"required": false
},
"siren_sensor": {
"title": "Show Siren Sensor",
"type": "boolean",
"default": false,
"required": false
},
"siren_sensor_seconds": {
"title": "Seconds",
"type": "integer",
"default": 5,
"required": false,
"minimum": 0
},
"siren_mode_switches": {
"title": "Show Siren Mode Switches",
"type": "boolean",
Expand Down Expand Up @@ -128,6 +128,12 @@
"default": false,
"required": false
},
"audio_custom": {
"title": "Use Custom Sounds",
"type": "boolean",
"default": false,
"required": false
},
"audio_language": {
"title": "Audio Language",
"type": "string",
Expand Down Expand Up @@ -171,18 +177,6 @@
"format": "uri",
"placeholder": "http://localhost"
},
"webhook_triggered": {
"title": "Current Mode: Triggered",
"type": "string",
"required": false,
"placeholder": "/triggered"
},
"webhook_alert": {
"title": "Current Event: Alert",
"type": "string",
"required": false,
"placeholder": "/alert"
},
"webhook_target_home": {
"title": "Target Mode: Home",
"type": "string",
Expand All @@ -201,6 +195,12 @@
"required": false,
"placeholder": "/target/night"
},
"webhook_target_off": {
"title": "Target Mode: Off",
"type": "string",
"required": false,
"placeholder": "/target/off"
},
"webhook_current_home": {
"title": "Current Mode: Home",
"type": "string",
Expand All @@ -219,23 +219,23 @@
"required": false,
"placeholder": "/current/night"
},
"webhook_off": {
"webhook_current_off": {
"title": "Current Mode: Off",
"type": "string",
"required": false,
"placeholder": "/off"
"placeholder": "/current/off"
},
"command_triggered": {
"title": "Current Mode: Triggered",
"webhook_alert": {
"title": "Current Event: Alert",
"type": "string",
"required": false,
"placeholder": "echo triggered"
"placeholder": "/event/alert"
},
"command_alert": {
"title": "Current Event: Alert",
"webhook_triggered": {
"title": "Current Mode: Triggered",
"type": "string",
"required": false,
"placeholder": "echo alert"
"placeholder": "/current/triggered"
},
"command_target_home": {
"title": "Target Mode: Home",
Expand All @@ -249,6 +249,12 @@
"required": false,
"placeholder": "echo target away"
},
"command_target_off": {
"title": "Target Mode: Off",
"type": "string",
"required": false,
"placeholder": "echo target off"
},
"command_target_night": {
"title": "Target Mode: Night",
"type": "string",
Expand All @@ -273,11 +279,23 @@
"required": false,
"placeholder": "echo current night"
},
"command_off": {
"command_current_off": {
"title": "Current Mode: Off",
"type": "string",
"required": false,
"placeholder": "echo off"
"placeholder": "echo current off"
},
"command_alert": {
"title": "Current Event: Alert",
"type": "string",
"required": false,
"placeholder": "echo event alert"
},
"command_triggered": {
"title": "Current Mode: Triggered",
"type": "string",
"required": false,
"placeholder": "echo current triggered"
}
}
}],
Expand Down Expand Up @@ -316,9 +334,10 @@
"expandable": true,
"expanded": false,
"items": [
"audio_custom",
"audio_alert_looped",
"unsafe_mode_switches",
"hide_mode_off_switch",
"audio_alert_looped",
"siren_switch",
"siren_mode_switches",
"override_off",
Expand Down Expand Up @@ -377,12 +396,13 @@
"webhook_target_home",
"webhook_target_away",
"webhook_target_night",
"webhook_target_off",
"webhook_current_home",
"webhook_current_away",
"webhook_current_night",
"webhook_triggered",
"webhook_current_off",
"webhook_alert",
"webhook_off"
"webhook_triggered"
]
},
{
Expand All @@ -395,12 +415,13 @@
"command_target_home",
"command_target_away",
"command_target_night",
"command_target_off",
"command_current_home",
"command_current_away",
"command_current_night",
"command_triggered",
"command_current_off",
"command_alert",
"command_off"
"command_triggered"
]
}
]
Expand Down
77 changes: 49 additions & 28 deletions config.schema.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"pluginAlias": "security-system",
"pluginType": "accessory",
"headerDisplay": "Create a security system accessory that can be triggered by HomeKit accessories.",
"footerDisplay": "Need help? [Ask me anything!](https://github.com/MiguelRipoll23/homebridge-securitysystem/issues) | [Donate](https://paypal.me/miguelripoll23)",
"footerDisplay": "Need help? [Ask me anything](https://github.com/MiguelRipoll23/homebridge-securitysystem/issues) | [Donate](https://paypal.me/miguelripoll23)",
"schema": {
"title": "Security System",
"type": "object",
Expand Down Expand Up @@ -125,6 +125,12 @@
"default": false,
"required": false
},
"audio_custom": {
"title": "Use Custom Sounds",
"type": "boolean",
"default": false,
"required": false
},
"audio_language": {
"title": "Audio Language",
"type": "string",
Expand Down Expand Up @@ -168,18 +174,6 @@
"format": "uri",
"placeholder": "http://localhost"
},
"webhook_triggered": {
"title": "Current Mode: Triggered",
"type": "string",
"required": false,
"placeholder": "/triggered"
},
"webhook_alert": {
"title": "Current Event: Alert",
"type": "string",
"required": false,
"placeholder": "/alert"
},
"webhook_target_home": {
"title": "Target Mode: Home",
"type": "string",
Expand All @@ -198,6 +192,12 @@
"required": false,
"placeholder": "/target/night"
},
"webhook_target_off": {
"title": "Target Mode: Off",
"type": "string",
"required": false,
"placeholder": "/target/off"
},
"webhook_current_home": {
"title": "Current Mode: Home",
"type": "string",
Expand All @@ -216,23 +216,23 @@
"required": false,
"placeholder": "/current/night"
},
"webhook_off": {
"webhook_current_off": {
"title": "Current Mode: Off",
"type": "string",
"required": false,
"placeholder": "/off"
"placeholder": "/current/off"
},
"command_triggered": {
"title": "Current Mode: Triggered",
"webhook_alert": {
"title": "Current Event: Alert",
"type": "string",
"required": false,
"placeholder": "echo triggered"
"placeholder": "/event/alert"
},
"command_alert": {
"title": "Current Event: Alert",
"webhook_triggered": {
"title": "Current Mode: Triggered",
"type": "string",
"required": false,
"placeholder": "echo alert"
"placeholder": "/current/triggered"
},
"command_target_home": {
"title": "Target Mode: Home",
Expand All @@ -246,6 +246,12 @@
"required": false,
"placeholder": "echo target away"
},
"command_target_off": {
"title": "Target Mode: Off",
"type": "string",
"required": false,
"placeholder": "echo target off"
},
"command_target_night": {
"title": "Target Mode: Night",
"type": "string",
Expand All @@ -270,11 +276,23 @@
"required": false,
"placeholder": "echo current night"
},
"command_off": {
"command_current_off": {
"title": "Current Mode: Off",
"type": "string",
"required": false,
"placeholder": "echo off"
"placeholder": "echo current off"
},
"command_alert": {
"title": "Current Event: Alert",
"type": "string",
"required": false,
"placeholder": "echo event alert"
},
"command_triggered": {
"title": "Current Mode: Triggered",
"type": "string",
"required": false,
"placeholder": "echo current triggered"
}
}
},
Expand Down Expand Up @@ -313,9 +331,10 @@
"expandable": true,
"expanded": false,
"items": [
"audio_custom",
"audio_alert_looped",
"unsafe_mode_switches",
"hide_mode_off_switch",
"audio_alert_looped",
"siren_switch",
"siren_mode_switches",
"override_off",
Expand Down Expand Up @@ -374,12 +393,13 @@
"webhook_target_home",
"webhook_target_away",
"webhook_target_night",
"webhook_target_off",
"webhook_current_home",
"webhook_current_away",
"webhook_current_night",
"webhook_triggered",
"webhook_current_off",
"webhook_alert",
"webhook_off"
"webhook_triggered"
]
},
{
Expand All @@ -392,12 +412,13 @@
"command_target_home",
"command_target_away",
"command_target_night",
"command_target_off",
"command_current_home",
"command_current_away",
"command_current_night",
"command_triggered",
"command_current_off",
"command_alert",
"command_off"
"command_triggered"
]
}
]
Expand Down
Loading

0 comments on commit 69c8f97

Please sign in to comment.