From 28f3b5b7da2156ce0041931b839a6ca4b92c2c4d Mon Sep 17 00:00:00 2001 From: jpawlowski Date: Sun, 15 Nov 2015 13:16:40 +0000 Subject: [PATCH] msgSchema.pm: update schema for Pushbullet, Pushover and XBMC git-svn-id: https://svn.fhem.de/fhem/trunk@9902 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/msgSchema.pm | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/fhem/FHEM/msgSchema.pm b/fhem/FHEM/msgSchema.pm index 0b8896d67..6d2f066dd 100755 --- a/fhem/FHEM/msgSchema.pm +++ b/fhem/FHEM/msgSchema.pm @@ -138,6 +138,17 @@ my $db = { 'Normal' => 'set %DEVICE% message %MSG% | %TITLE% %RECIPIENT%', 'High' => 'set %DEVICE% message %MSG% | %TITLE% %RECIPIENT%', 'Low' => 'set %DEVICE% message %MSG% | %TITLE% %RECIPIENT%', + 'defaultValues' => { + 'Normal' => { + 'RECIPIENT' => '', + }, + 'High' => { + 'RECIPIENT' => '', + }, + 'Low' => { + 'RECIPIENT' => '', + }, + }, }, 'PushNotifier' => { @@ -147,9 +158,9 @@ my $db = { }, 'Pushover' => { - 'Normal' => 'set %DEVICE% msg \'%TITLE%\' \'%MSG%\' \'%RECIPIENT%\' %PRIORITY% \'\' %RETRY% %EXPIRE% %URLTITLE% %ACTION%', - 'High' => 'set %DEVICE% msg \'%TITLE%\' \'%MSG%\' \'%RECIPIENT%\' %PRIORITY% \'\' %RETRY% %EXPIRE% %URLTITLE% %ACTION%', - 'Low' => 'set %DEVICE% msg \'%TITLE%\' \'%MSG%\' \'%RECIPIENT%\' %PRIORITY% \'\' %RETRY% %EXPIRE% %URLTITLE% %ACTION%', + 'Normal' => 'set %DEVICE% msg \'%TITLE%\' \'%MSG%\' \'%RECIPIENT%\' %PRIORITY% \'%Pushover_SOUND%\' %RETRY% %EXPIRE% %URLTITLE% %ACTION%', + 'High' => 'set %DEVICE% msg \'%TITLE%\' \'%MSG%\' \'%RECIPIENT%\' %PRIORITY% \'%Pushover_SOUND%\' %RETRY% %EXPIRE% %URLTITLE% %ACTION%', + 'Low' => 'set %DEVICE% msg \'%TITLE%\' \'%MSG%\' \'%RECIPIENT%\' %PRIORITY% \'%Pushover_SOUND%\' %RETRY% %EXPIRE% %URLTITLE% %ACTION%', 'defaultValues' => { 'Normal' => { 'RECIPIENT' => '', @@ -157,6 +168,7 @@ my $db = { 'EXPIRE' => '', 'URLTITLE' => '', 'ACTION' => '', + 'Pushover_SOUND' => '', }, 'High' => { 'RECIPIENT' => '', @@ -164,6 +176,7 @@ my $db = { 'EXPIRE' => '600', 'URLTITLE' => '', 'ACTION' => '', + 'Pushover_SOUND' => '', }, 'Low' => { 'RECIPIENT' => '', @@ -171,6 +184,7 @@ my $db = { 'EXPIRE' => '', 'URLTITLE' => '', 'ACTION' => '', + 'Pushover_SOUND' => '', }, }, }, @@ -229,9 +243,9 @@ my $db = { }, 'XBMC' => { - 'Normal' => '{ my $dev=\'%DEVICE%\'; my $title=\'%TITLE%\'; my $msg=\'%MSG%\'; $timeout=\'%TIMEOUT%\'*1000; fhem "set $dev msg $msg $timeout %XBMC_ICON%"; }', - 'High' => '{ my $dev=\'%DEVICE%\'; my $title=\'%TITLE%\'; my $msg=\'%MSG%\'; $timeout=\'%TIMEOUT%\'*1000; fhem "set $dev msg $msg $timeout %XBMC_ICON%"; }', - 'Low' => '{ my $dev=\'%DEVICE%\'; my $title=\'%TITLE%\'; my $msg=\'%MSG%\'; $timeout=\'%TIMEOUT%\'*1000; fhem "set $dev msg $msg $timeout %XBMC_ICON%"; }', + 'Normal' => '{ my $dev=\'%DEVICE%\'; my $title=\'%TITLE%\'; my $msg=\'%MSG%\'; $timeout=%TIMEOUT%*1000; fhem "set $dev msg $msg $timeout %XBMC_ICON%"; }', + 'High' => '{ my $dev=\'%DEVICE%\'; my $title=\'%TITLE%\'; my $msg=\'%MSG%\'; $timeout=%TIMEOUT%*1000; fhem "set $dev msg $msg $timeout %XBMC_ICON%"; }', + 'Low' => '{ my $dev=\'%DEVICE%\'; my $title=\'%TITLE%\'; my $msg=\'%MSG%\'; $timeout=%TIMEOUT%*1000; fhem "set $dev msg $msg $timeout %XBMC_ICON%"; }', 'defaultValues' => { 'Normal' => { 'TIMEOUT' => 8,