FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-27 10:37:13 +00:00
Code Issues Releases Wiki Activity

72_TA_CMI_JSON: added readOutputStates and according attributes

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@23769 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
delmar 2021-02-18 14:01:01 +00:00
parent e5c19009a8
commit 27deb1ead3
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
fhem/FHEM/72_TA_CMI_JSON.pm
View File

@ -190,8 +190,8 @@ sub SetupIntervals {
} }
my $outputStatesInterval = AttrVal( $name, 'outputStatesInterval', undef); my $outputStatesInterval = AttrVal( $name, 'outputStatesInterval', undef);
Log3 $name, 0, "TA_CMI_JSON ($name) - Define::outputStatesInterval: $outputStatesInterval";
if ( defined $outputStatesInterval ) { if ( defined $outputStatesInterval ) {
Log3 $name, 0, "TA_CMI_JSON ($name) - Define::outputStatesInterval: $outputStatesInterval";
RequestOutputStates ( $hash ); RequestOutputStates ( $hash );
} }
@ -217,7 +217,10 @@ sub Undef {
sub PerformHttpRequest { sub PerformHttpRequest {
my ($hash, $def) = @_; my ($hash, $def) = @_;
my $name = $hash->{NAME}; my $name = $hash->{NAME};
my $url = "http://$hash->{CMIURL}/INCLUDE/api.cgi?jsonnode=$hash->{NODEID}&jsonparam=$hash->{QUERYPARAM}";
my $queryParam = $hash->{QUERYPARAM};
$queryParam = '' unless defined $queryParam;
my $url = "http://$hash->{CMIURL}/INCLUDE/api.cgi?jsonnode=$hash->{NODEID}&jsonparam=$queryParam";
my $username = AttrVal($name, 'username', 'admin'); my $username = AttrVal($name, 'username', 'admin');
my $password = AttrVal($name, 'password', 'admin'); my $password = AttrVal($name, 'password', 'admin');
@ -260,6 +263,7 @@ sub ParseHttpResponse {
readingsBulkUpdateIfChanged($hash, 'state', $keyValues->{Status}); readingsBulkUpdateIfChanged($hash, 'state', $keyValues->{Status});
if ( $keyValues->{Status} eq 'OK' ) { if ( $keyValues->{Status} eq 'OK' ) {
my $queryParams = $hash->{QUERYPARAM}; my $queryParams = $hash->{QUERYPARAM};
$queryParams = '' unless defined $queryParams;
extractReadings($hash, $keyValues, 'Inputs', 'Inputs') if ($queryParams =~ /I/); extractReadings($hash, $keyValues, 'Inputs', 'Inputs') if ($queryParams =~ /I/);
extractReadings($hash, $keyValues, 'Outputs', 'Outputs') if ($queryParams =~ /O/); extractReadings($hash, $keyValues, 'Outputs', 'Outputs') if ($queryParams =~ /O/);
@ -294,9 +298,11 @@ sub ParseHttpResponse {
# Log3 $name, 3, "TA_CMI_JSON ($name) - Device: $keyValues->{Header_Device}"; # Log3 $name, 3, "TA_CMI_JSON ($name) - Device: $keyValues->{Header_Device}";
} }
my $functionName = "TA_CMI_JSON::GetStatus"; if ( defined $hash->{QUERYPARAM} ) {
RemoveInternalTimer($hash, $functionName); my $functionName = "TA_CMI_JSON::GetStatus";
InternalTimer( gettimeofday() + $hash->{INTERVAL}, $functionName, $hash, 0 ); RemoveInternalTimer($hash, $functionName);
InternalTimer( gettimeofday() + $hash->{INTERVAL}, $functionName, $hash, 0 );
}
return undef; return undef;
} }