FHEM/mod-CmdMSG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dev #2

Merged
marko merged 4 commits from dev into main 2023-01-05 06:22:02 +00:00
Conversation 0 Commits 4 Files Changed 2 +23 -13
2 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e4e366d817 - Show all commits

20
75_MSG.pm
View File

@ -42,6 +42,7 @@ sub MSG_Initialize($$) {
# regular Fn ##################################################################
sub CommandMsg($$;$$);
sub CommandMsg($$;$$) {
my ( $cl, $msg, $testMode ) = @_;
my $return = "";
@ -638,8 +639,7 @@ m/^@?([A-Za-z0-9._]+):([A-Za-z0-9._\-\/@+]*):?([A-Za-z0-9._\-\/@+]*)$/
ReadingsVal(
$gatewayDev,
"presence",
"present"
) eq $_
"present" ) eq $_
} @unavailabilityIndicators
)
@ -648,8 +648,7 @@ m/^@?([A-Za-z0-9._]+):([A-Za-z0-9._\-\/@+]*):?([A-Za-z0-9._\-\/@+]*)$/
ReadingsVal(
$gatewayDev,
"state",
"present"
) eq $_
"present" ) eq $_
} @unavailabilityIndicators
)
@ -1955,19 +1954,24 @@ m/^(absent|disappeared|unauthorized|disconnected|unreachable)$/i
Log3 $logDevice, 5,
"msg $device: "
. "$type[$i] route command (Perl): $cmd";
#eval $cmd;
my $ret = AnalyzePerlCommand(undef, $cmd);
unless ( !$ret || $ret =~ m/^[\s\t\n ]*$/ )
my $ret =
AnalyzePerlCommand( undef, $cmd );
unless ( !$ret
|| $ret =~ m/^[\s\t\n ]*$/ )
{
$error = 1;
$loopReturn3 .= "$gatewayDev: $ret\n";
$loopReturn3 .=
"$gatewayDev: $ret\n";
}
}
else {
Log3 $logDevice, 5,
"msg $device: "
. "$type[$i] route command (fhem): $cmd";
my $ret = AnalyzeCommandChain(undef,$cmd);
my $ret =
AnalyzeCommandChain( undef, $cmd );
unless ( !$ret
|| $ret =~ m/^[\s\t\n ]*$/ )
{

8
msgSchema.pm
View File

@ -201,6 +201,12 @@ my $db = {
'Low' => 'set %DEVICE% message %MSG%',
},
'Matrix' => {
'Normal' => 'set %DEVICE% msg %MSG%',
'High' => 'set %DEVICE% msg %MSG%',
'Low' => 'set %DEVICE% msg %MSG%',
},
'Pushover' => {
'Normal' =>
'set %DEVICE% %Pushover_MTYPE% title=\'%TITLE%\' device=\'%RECIPIENT%:%TERMINAL%\' priority=%PRIORITY% url_title="%URLTITLE%" message=\'%MSG%\'',
@ -342,7 +348,7 @@ my $db = {
},
},
'LGTV_WEBOS' => {
'LGTV_WebOS' => {
'Normal' => 'set %DEVICE% screenMsg %MSG%',
'High' => 'set %DEVICE% screenMsg %MSG%',
'Low' => 'set %DEVICE% screenMsg %MSG%',