FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-09 20:57:11 +00:00
Code Issues Releases Wiki Activity

70_BRAVIA.pm: renamed reading/internal modelName to model

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@14883 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
vuffiraa 2017-08-12 20:08:52 +00:00
parent d7eaa1842f
commit 93c34cffad
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fhem/CHANGED
View File

@ -1,5 +1,6 @@
# Add changes at the top of the list. Keep it in ASCII, and 80-char wide.
# Do not insert empty lines here, update check depends on it.
- changed: 70_BRAVIA: renamed reading/internal modelName to model
- new: 98_GOOGLECAST: first release, read commandref for requirements
- changed: 74_AMADautomagicFlowset_4.0.3.xml: workaround for better auto
flowsetupdate

12
fhem/FHEM/70_BRAVIA.pm
View File

@ -611,7 +611,7 @@ sub BRAVIA_Define($$) {
$hash->{name} = ReadingsVal($name, "name", "");
$hash->{modelName} = ReadingsVal($name, "modelName", "");
$hash->{model} = ReadingsVal($name, "model", "");
$hash->{generation} = ReadingsVal($name, "generation", "");
@ -1181,7 +1181,7 @@ sub BRAVIA_ProcessCommandData ($$) {
# read system information if not existing
BRAVIA_SendCommand( $hash, "getSystemInformation" )
if ( ReadingsVal($name, "name", "0") eq "0" );
if ( ReadingsVal($name, "name", "0") eq "0" || ReadingsVal($name, "model", "0") eq "0" );
# read content information
if ( ReadingsVal($name, "generation", "1.0") ne "1.0" ) {
@ -1217,10 +1217,10 @@ sub BRAVIA_ProcessCommandData ($$) {
readingsBulkUpdate( $hash, "area", $sysInfo->{area} );
readingsBulkUpdate( $hash, "language", $sysInfo->{language} );
readingsBulkUpdate( $hash, "country", $sysInfo->{region} );
readingsBulkUpdate( $hash, "modelName", $sysInfo->{model} );
readingsBulkUpdate( $hash, "model", $sysInfo->{model} );
readingsBulkUpdate( $hash, "macAddr", $sysInfo->{macAddr} );
$hash->{name} = $sysInfo->{name};
$hash->{modelName} = $sysInfo->{model};
$hash->{model} = $sysInfo->{model};
$hash->{generation} = $sysInfo->{generation};
} else {
readingsBulkUpdate( $hash, "name", $return->{name} );
@ -1228,9 +1228,9 @@ sub BRAVIA_ProcessCommandData ($$) {
readingsBulkUpdate( $hash, "area", $return->{area} );
readingsBulkUpdate( $hash, "language", $return->{language} );
readingsBulkUpdate( $hash, "country", $return->{country} );
readingsBulkUpdate( $hash, "modelName", $return->{modelName} );
readingsBulkUpdate( $hash, "model", $return->{modelName} );
$hash->{name} = $return->{name};
$hash->{modelName} = $return->{modelName};
$hash->{model} = $return->{modelName};
$hash->{generation} = $return->{generation};
}
readingsEndUpdate( $hash, 1 );