FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-03 16:56:54 +00:00
Code Issues Releases Wiki Activity

HOMESTATEtk: fix typo

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@14288 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
jpawlowski 2017-05-14 17:29:28 +00:00
parent 99aa787c95
commit de89203890
1 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
fhem/FHEM/HOMESTATEtk.pm
View File

@ -14,9 +14,9 @@ my %stateSecurity = (
de => de =>
[ 'unverriegelt', 'verriegelt', 'geschützt', 'gesichert', 'überwacht' ], [ 'unverriegelt', 'verriegelt', 'geschützt', 'gesichert', 'überwacht' ],
icons => [ icons => [
'status_open', 'status_standby', 'status_open@yellow', 'status_standby@yellow@green',
'status_night', 'status_locked', 'status_night@green', 'status_locked@green',
'building_security' 'building_security@green'
], ],
); );
@ -391,10 +391,10 @@ sub HOMESTATEtk_Set($$$) {
my $name = shift @$a; my $name = shift @$a;
my $lang = my $lang =
lc( AttrVal( $name, "Lang", AttrVal( "global", "language", "EN" ) ) ); lc( AttrVal( $name, "Lang", AttrVal( "global", "language", "EN" ) ) );
my $langUc = uc($lang); my $langUc = uc($lang);
my $residents = ( $hash->{RESIDENTS} ? $hash->{RESIDENTS} : undef ); my $state = ReadingsVal( $name, "state", "" );
my $state = ReadingsVal( $name, "state", "" ); my $mode = ReadingsVal( $name, "mode", "" );
my $mode = ReadingsVal( $name, "mode", "" ); my $security = ReadingsVal( $name, "security", "" );
my $autoMode = my $autoMode =
HOMESTATEtk_GetIndexFromArray( ReadingsVal( $name, "autoMode", "on" ), HOMESTATEtk_GetIndexFromArray( ReadingsVal( $name, "autoMode", "on" ),
$stateOnoff{en} ); $stateOnoff{en} );
@ -454,6 +454,10 @@ sub HOMESTATEtk_Set($$$) {
return "Set usage: choose one of $usage" return "Set usage: choose one of $usage"
unless ( $cmd && $cmd ne "?" ); unless ( $cmd && $cmd ne "?" );
return
"Device is currently $security and cannot be controlled at this state"
unless ( $security =~ m/^unlocked|locked$/ );
# mode # mode
if ( $cmd eq "state" if ( $cmd eq "state"
|| $cmd eq "mode" || $cmd eq "mode"
@ -670,8 +674,13 @@ sub HOMESTATEtk_Get($$$) {
sub HOMESTATEtk_Attr(@) { sub HOMESTATEtk_Attr(@) {
my ( $cmd, $name, $attribute, $value ) = @_; my ( $cmd, $name, $attribute, $value ) = @_;
my $hash = $defs{$name}; my $hash = $defs{$name};
my $TYPE = $hash->{TYPE}; my $TYPE = $hash->{TYPE};
my $security = ReadingsVal( $name, "security", "" );
return
"Device is currently $security and attributes cannot be changed at this state"
unless ( !$init_done || $security =~ m/^unlocked|locked$/ );
if ( $attribute eq "HomestateDevices" ) { if ( $attribute eq "HomestateDevices" ) {
return "Value for $attribute has invalid format" return "Value for $attribute has invalid format"
@ -815,11 +824,10 @@ sub HOMESTATEtk_Attr(@) {
sub HOMESTATEtk_Notify($$) { sub HOMESTATEtk_Notify($$) {
my ( $hash, $dev ) = @_; my ( $hash, $dev ) = @_;
my $name = $hash->{NAME}; my $name = $hash->{NAME};
my $TYPE = $hash->{TYPE}; my $TYPE = $hash->{TYPE};
my $devName = $dev->{NAME}; my $devName = $dev->{NAME};
my $devPrefix = RESIDENTStk_GetPrefixFromType($devName); my $devType = GetType($devName);
my $devType = GetType($devName);
if ( $devName eq "global" ) { if ( $devName eq "global" ) {
my $events = deviceEvents( $dev, 1 ); my $events = deviceEvents( $dev, 1 );
@ -917,6 +925,8 @@ m/^((?:DELETE)?ATTR)\s+([A-Za-z\d._]+)\s+([A-Za-z\d_\.\-\/]+)(?:\s+(.*)\s*)?$/
if ( $event !~ /^[a-zA-Z\d._]+:/ if ( $event !~ /^[a-zA-Z\d._]+:/
|| $event =~ /^state:/ || $event =~ /^state:/
|| $event =~ /^presence:/ || $event =~ /^presence:/
|| $event =~ /^mode:/
|| $event =~ /^security:/
|| $event =~ /^wayhome:/ || $event =~ /^wayhome:/
|| $event =~ /^wakeup:/ ) || $event =~ /^wakeup:/ )
{ {
@ -1092,7 +1102,7 @@ sub HOMESTATEtk_GetDaySchedule($;$$$$$) {
foreach my $holidayDev ( split( /,/, $holidayDevs ) ) { foreach my $holidayDev ( split( /,/, $holidayDevs ) ) {
next next
unless ( IsDevice( $holidayDev, "holiday" ) unless ( IsDevice( $holidayDev, "holiday" )
&& AttVal( "global", "holiday2we", "" ) ne $holidayDev ); && AttrVal( "global", "holiday2we", "" ) ne $holidayDev );
my $date = sprintf( "%02d-%02d", $ret->{monISO}, $ret->{mday} ); my $date = sprintf( "%02d-%02d", $ret->{monISO}, $ret->{mday} );
my $tod = holiday_refresh( $holidayDev, $date ); my $tod = holiday_refresh( $holidayDev, $date );