From aadc5b0c8f7e474cb761bb7a31bb536637c1e31b Mon Sep 17 00:00:00 2001 From: jpawlowski Date: Tue, 13 Oct 2015 13:47:30 +0000 Subject: [PATCH] 99_msg: add schema for AMAD, Fhemapppush, TelegramBot git-svn-id: https://svn.fhem.de/fhem/trunk@9449 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/contrib/99_msg.pm | 65 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 58 insertions(+), 7 deletions(-) diff --git a/fhem/contrib/99_msg.pm b/fhem/contrib/99_msg.pm index c12ed3fe8..3a2cea8d2 100644 --- a/fhem/contrib/99_msg.pm +++ b/fhem/contrib/99_msg.pm @@ -144,6 +144,17 @@ sub CommandMsg($$;$$) { my $cmdSchema = { 'audio' => { + 'AMAD' => { + 'Normal' => 'set %DEVICE% ttsMsg %MSG%', + 'ShortPrio' => 'set %DEVICE% ttsMsg %MSGSH%', + 'Short' => 'set %DEVICE% notifySndFile %FILENAME%', + 'defaultValues' => { + 'ShortPrio' => { + 'MSGSH' => 'Achtung!', + }, + }, + }, + 'SONOSPLAYER' => { 'Normal' => 'set %DEVICE% Speak %VOLUME% %LANG% |%TITLE%| %MSG%', 'ShortPrio' => 'set %DEVICE% Speak %VOLUME% %LANG% |%TITLE%| %MSGSH%', @@ -190,27 +201,44 @@ sub CommandMsg($$;$$) { 'push' => { - 'Pushover' => { - 'Normal' => 'set %DEVICE% msg \'%TITLE%\' \'%MSG%\' \'%PUSHDEVICE%\' %PRIORITY% \'\' %RETRY% %EXPIRE% %URLTITLE% %ACTION%', - 'High' => 'set %DEVICE% msg \'%TITLE%\' \'%MSG%\' \'%PUSHDEVICE%\' %PRIORITY% \'\' %RETRY% %EXPIRE% %URLTITLE% %ACTION%', - 'Low' => 'set %DEVICE% msg \'%TITLE%\' \'%MSG%\' \'%PUSHDEVICE%\' %PRIORITY% \'\' %RETRY% %EXPIRE% %URLTITLE% %ACTION%', + 'Fhemapppush' => { + 'Normal' => 'set %DEVICE% message \'%TITLE%: %MSG%\' %ACTION%', + 'High' => 'set %DEVICE% message \'%TITLE%: %MSG%\' %ACTION%', + 'Low' => 'set %DEVICE% message \'%TITLE%: %MSG%\' %ACTION%', 'defaultValues' => { 'Normal' => { - 'PUSHDEVICE' => '', + 'ACTION' => '', + }, + 'High' => { + 'ACTION' => '', + }, + 'Low' => { + 'ACTION' => '', + }, + }, + }, + + 'Pushover' => { + 'Normal' => 'set %DEVICE% msg \'%TITLE%\' \'%MSG%\' \'%PORECIPIENT%\' %PRIORITY% \'\' %RETRY% %EXPIRE% %URLTITLE% %ACTION%', + 'High' => 'set %DEVICE% msg \'%TITLE%\' \'%MSG%\' \'%PORECIPIENT%\' %PRIORITY% \'\' %RETRY% %EXPIRE% %URLTITLE% %ACTION%', + 'Low' => 'set %DEVICE% msg \'%TITLE%\' \'%MSG%\' \'%PORECIPIENT%\' %PRIORITY% \'\' %RETRY% %EXPIRE% %URLTITLE% %ACTION%', + 'defaultValues' => { + 'Normal' => { + 'PORECIPIENT' => '', 'RETRY' => '', 'EXPIRE' => '', 'URLTITLE' => '', 'ACTION' => '', }, 'High' => { - 'PUSHDEVICE' => '', + 'PORECIPIENT' => '', 'RETRY' => '120', 'EXPIRE' => '600', 'URLTITLE' => '', 'ACTION' => '', }, 'Low' => { - 'PUSHDEVICE' => '', + 'PORECIPIENT' => '', 'RETRY' => '', 'EXPIRE' => '', 'URLTITLE' => '', @@ -219,10 +247,33 @@ sub CommandMsg($$;$$) { }, }, + 'TelegramBot' => { + 'Normal' => 'set %DEVICE% message %RECIPIENT% %TITLE%: %MSG%', + 'High' => 'set %DEVICE% message %RECIPIENT% %TITLE%: %MSG%', + 'Low' => 'set %DEVICE% message %RECIPIENT% %TITLE%: %MSG%', + 'defaultValues' => { + 'Normal' => { + 'TGRECIPIENT' => '', + }, + 'High' => { + 'TGRECIPIENT' => '', + }, + 'Low' => { + 'TGRECIPIENT' => '', + }, + }, + }, + }, 'screen' => { + 'AMAD' => { + 'Normal' => 'set %DEVICE% screenMsg %TITLE%: %MSG%', + 'High' => 'set %DEVICE% screenMsg %TITLE%: %MSG%', + 'Low' => 'set %DEVICE% screenMsg %TITLE%: %MSG%', + }, + 'ENIGMA2' => { 'Normal' => 'set %DEVICE% msg %TYPE% %TIMEOUT% %MSG%', 'High' => 'set %DEVICE% msg %TYPE% %TIMEOUT% %MSG%',