Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

88_xs1Bridge: fixed blacklist option (Forum #790923)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@16556 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
HomeAuto_User 2018-04-05 18:29:17 +00:00
parent 1f8c5e773b
commit 9d8e9ce730
2 changed files with 10 additions and 3 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. # 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. # Do not insert empty lines here, update check depends on it.
- bugfix: 88_xs1Bridge: blacklist option (forum #790923)
- bugfix: 49_SSCam: V3.8.3, fix of version 3.8.2 - bugfix: 49_SSCam: V3.8.3, fix of version 3.8.2
- change: 49_SSCam: V3.8.2, internal codereview, minor fixes - change: 49_SSCam: V3.8.2, internal codereview, minor fixes
- feature: 73_GardenaSmartBridge/74_GardenaSmartDevice: rewrite parts of - feature: 73_GardenaSmartBridge/74_GardenaSmartDevice: rewrite parts of

10
fhem/FHEM/88_xs1Bridge.pm
View File

@ -87,7 +87,7 @@ sub xs1Bridge_Define($$) {
$hash->{STATE} = "Initialized"; ## Der Status des Modules nach Initialisierung. $hash->{STATE} = "Initialized"; ## Der Status des Modules nach Initialisierung.
$hash->{TIME} = time(); ## Zeitstempel, derzeit vom anlegen des Moduls $hash->{TIME} = time(); ## Zeitstempel, derzeit vom anlegen des Moduls
$hash->{VERSION} = "1.20"; ## Version $hash->{VERSION} = "1.21"; ## Version
$hash->{BRIDGE} = 1; $hash->{BRIDGE} = 1;
# Attribut gesetzt # Attribut gesetzt
@ -176,8 +176,14 @@ sub xs1Bridge_Attr(@) {
} }
### Blacklist - Aktor / Sensor ### ### Blacklist - Aktor / Sensor ###
}elsif ($attrName eq "xs1_blackl_aktor") { ## Handling xs1_blackl_aktor }elsif ($attrName eq "xs1_blackl_aktor") { ## Handling xs1_blackl_aktor
if ($attrValue < 1 || $attrValue > 64) { ## Value only 1 to 64
return "Value must be 1 to 64";
}
Log3 $name, 4, "$typ: Attribut xs1_blackl_aktor $attrValue"; Log3 $name, 4, "$typ: Attribut xs1_blackl_aktor $attrValue";
}elsif ($attrName eq "xs1_blackl_sensor") { ## Handling xs1_blackl_sensor }elsif ($attrName eq "xs1_blackl_sensor") { ## Handling xs1_blackl_sensor
if ($attrValue < 1 || $attrValue > 64) { ## Value only 1 to 64
return "Value must be 1 to 64";
}
Log3 $name, 4, "$typ: Attribut xs1_blackl_sensor $attrValue"; Log3 $name, 4, "$typ: Attribut xs1_blackl_sensor $attrValue";
} }
} }
@ -333,7 +339,7 @@ sub xs1Bridge_GetUpDate() {
foreach my $f ( @array ) { foreach my $f ( @array ) {
$i3++; $i3++;
$xs1_id = $f->{"id"}; $xs1_id = $i3;
#### Test ob Aktoren / Sensoren auf xs1_blackl #### Test ob Aktoren / Sensoren auf xs1_blackl
if ($f->{"type"} ne "disabled" && is_in_array($hash,$xs1_id,$i) == 0) { if ($f->{"type"} ne "disabled" && is_in_array($hash,$xs1_id,$i) == 0) {