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_xs1Dev: | 88_xs1Bridge: Typ timerswitch added

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@16393 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
HomeAuto_User 2018-03-12 18:13:12 +00:00
parent 2ca8ec62c9
commit c18e5e9ee8
3 changed files with 133 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGED
View File

@ -1,5 +1,7 @@
# 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.
- change: 88_xs1Bridge: Typ timerswitch added
- change: 88_xs1Dev: Typ timerswitch added
- feature: 72_FB_CALLMONITOR: new reverse search provider 11880.com (german) - feature: 72_FB_CALLMONITOR: new reverse search provider 11880.com (german)
and herold.at (austrian) and herold.at (austrian)
- change: 93_DbRep: V7.14.4, increased timeout of special function - change: 93_DbRep: V7.14.4, increased timeout of special function

97
FHEM/88_xs1Bridge.pm
View File

@ -81,7 +81,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.14"; ## Version $hash->{VERSION} = "1.15"; ## Version
$hash->{BRIDGE} = 1; $hash->{BRIDGE} = 1;
# Attribut gesetzt # Attribut gesetzt
@ -119,7 +119,8 @@ sub xs1Bridge_Attr(@) {
# $name - Gerätename # $name - Gerätename
# $attrName/$attrValue sind Attribut-Name und Attribut-Wert # $attrName/$attrValue sind Attribut-Name und Attribut-Wert
if ($cmd eq "set") { ## Handling bei set .. attribute #### Handling bei set .. attribute
if ($cmd eq "set") {
RemoveInternalTimer($hash); ## Timer löschen RemoveInternalTimer($hash); ## Timer löschen
Debug " $typ: Attr | Cmd:$cmd | RemoveInternalTimer" if($debug); Debug " $typ: Attr | Cmd:$cmd | RemoveInternalTimer" if($debug);
if ($attrName eq "interval") { ## Abfrage Attribute if ($attrName eq "interval") { ## Abfrage Attribute
@ -175,7 +176,8 @@ sub xs1Bridge_Attr(@) {
} }
} }
if ($cmd eq "del") { ## Handling bei del ... attribute #### Handling bei del ... attribute
if ($cmd eq "del") {
if ($attrName eq "disable" && !defined $attrValue) { if ($attrName eq "disable" && !defined $attrValue) {
readingsSingleUpdate($hash, "state", "active", 1); readingsSingleUpdate($hash, "state", "active", 1);
Debug " $typ: Attr | Cmd:$cmd | $attrName=$attrValue" if($debug); Debug " $typ: Attr | Cmd:$cmd | $attrName=$attrValue" if($debug);
@ -202,9 +204,9 @@ sub xs1Bridge_Attr(@) {
elsif ($attrName eq "update_only_difference") { elsif ($attrName eq "update_only_difference") {
Log3 $name, 3, "$typ: Attribut update_only_difference delete"; Log3 $name, 3, "$typ: Attribut update_only_difference delete";
} }
} }
#### Handling bei state active
if ($hash->{STATE} eq "active") { if ($hash->{STATE} eq "active") {
RemoveInternalTimer($hash); RemoveInternalTimer($hash);
InternalTimer(gettimeofday()+$interval, "xs1Bridge_GetUpDate", $hash); InternalTimer(gettimeofday()+$interval, "xs1Bridge_GetUpDate", $hash);
@ -245,6 +247,7 @@ sub xs1Bridge_GetUpDate() {
my $update_only_difference = AttrVal($hash->{NAME},"update_only_difference",0); my $update_only_difference = AttrVal($hash->{NAME},"update_only_difference",0);
my $xs1_control = AttrVal($hash->{NAME},"xs1_control",0); my $xs1_control = AttrVal($hash->{NAME},"xs1_control",0);
#### xs1Bridge disable Option = 0 -> aktiviert zum auslesen
if (AttrVal($hash->{NAME},"disable",0) == 0 && $xs1_ConnectionTry <= 5) { if (AttrVal($hash->{NAME},"disable",0) == 0 && $xs1_ConnectionTry <= 5) {
RemoveInternalTimer($hash); ## Timer löschen RemoveInternalTimer($hash); ## Timer löschen
InternalTimer(gettimeofday()+$interval, "xs1Bridge_GetUpDate", $hash); InternalTimer(gettimeofday()+$interval, "xs1Bridge_GetUpDate", $hash);
@ -267,9 +270,9 @@ sub xs1Bridge_GetUpDate() {
#Log3 $name, 3, "$typ: GetUpDate | xs1Dev_check = $xs1Dev_check"; #Log3 $name, 3, "$typ: GetUpDate | xs1Dev_check = $xs1Dev_check";
} }
### JSON Abfrage - Schleife #### JSON Abfrage - Schleife
for my $i (0..3) { for my $i (0..3) {
### HTTP Requests #### Start #### #### HTTP Requests #### Start ####
my $connection; my $connection;
my $Http_err = ""; my $Http_err = "";
my $Http_data = ""; my $Http_data = "";
@ -281,7 +284,7 @@ sub xs1Bridge_GetUpDate() {
HttpUtils_BlockingGet($param); HttpUtils_BlockingGet($param);
($Http_err, $Http_data) = HttpUtils_BlockingGet($param); ($Http_err, $Http_data) = HttpUtils_BlockingGet($param);
### HTTP Requests #### END #### #### HTTP Requests #### END ####
my $adress = "http://".$xs1_ip.$cmd.$cmdtyp[$i]; my $adress = "http://".$xs1_ip.$cmd.$cmdtyp[$i];
my $json; my $json;
@ -291,7 +294,8 @@ sub xs1Bridge_GetUpDate() {
Debug " $typ: GetUpDate | Adresse: $adress | xs1_ConnectionTry=$xs1_ConnectionTry" if($debug && $Http_err eq ""); Debug " $typ: GetUpDate | Adresse: $adress | xs1_ConnectionTry=$xs1_ConnectionTry" if($debug && $Http_err eq "");
Debug " $typ: GetUpDate | HTTP request: ".$Http_err."| xs1_ConnectionTry=$xs1_ConnectionTry" if($debug && $Http_err ne ""); Debug " $typ: GetUpDate | HTTP request: ".$Http_err."| xs1_ConnectionTry=$xs1_ConnectionTry" if($debug && $Http_err ne "");
if ($Http_err ne "") { ## HTTP Requests, ERROR #### HTTP Requests, ERROR
if ($Http_err ne "") {
# ERROR Message # ERROR Message
# http://192.168.2.5/control?callback=cname&cmd=get_list_actuators: Can't connect(1) to http://192.168.2.5:80: IO::Socket::INET: connect: No route to host # http://192.168.2.5/control?callback=cname&cmd=get_list_actuators: Can't connect(1) to http://192.168.2.5:80: IO::Socket::INET: connect: No route to host
# http://192.168.2.5/control?callback=cname&cmd=get_config_info: empty answer received # http://192.168.2.5/control?callback=cname&cmd=get_config_info: empty answer received
@ -301,13 +305,16 @@ sub xs1Bridge_GetUpDate() {
Log3 $name, 3, "$typ: GetUpDate | Try=$xs1_ConnectionTry loop=$i | Error: ".$Http_err; Log3 $name, 3, "$typ: GetUpDate | Try=$xs1_ConnectionTry loop=$i | Error: ".$Http_err;
$xs1_ConnectionTry++; $xs1_ConnectionTry++;
last; ## Abbruch Schleife last; ## Abbruch Schleife
} elsif ($Http_data ne "") { ## HTTP Requests, OK dann ARRAY Verarbeitung }
#### HTTP Requests, OK dann ARRAY Verarbeitung
elsif ($Http_data ne "") {
($json) = $Http_data =~ /[^(]*[}]/g; ## cut cname( + ) am Ende von Ausgabe -> ARRAY Struktur als Antwort vom xs1 ($json) = $Http_data =~ /[^(]*[}]/g; ## cut cname( + ) am Ende von Ausgabe -> ARRAY Struktur als Antwort vom xs1
$json_utf8 = eval {encode_utf8( $json )}; ## UTF-8 character Bearbeitung, da xs1 TempSensoren ERROR $json_utf8 = eval {encode_utf8( $json )}; ## UTF-8 character Bearbeitung, da xs1 TempSensoren ERROR
$decoded = eval {decode_json( $json_utf8 )}; $decoded = eval {decode_json( $json_utf8 )};
$xs1_ConnectionTry = 1; $xs1_ConnectionTry = 1;
if ($i <= 1 ) { ### xs1 Aktoren / Sensoren #### xs1 Aktoren / Sensoren als Readings
if ($i <= 1 ) {
my $xs1_data; my $xs1_data;
my @array; my @array;
@ -325,14 +332,14 @@ sub xs1Bridge_GetUpDate() {
if ($f->{"type"} ne "disabled") { if ($f->{"type"} ne "disabled") {
my $xs1Dev = "xs1Dev"; my $xs1Dev = "xs1Dev";
### Aktoren spezifisch #### Aktoren spezifisch
my $xs1_function1 = "-"; my $xs1_function1 = "-";
my $xs1_function2 = "-"; my $xs1_function2 = "-";
my $xs1_function3 = "-"; my $xs1_function3 = "-";
my $xs1_function4 = "-"; my $xs1_function4 = "-";
if ($i == 0) { if ($i == 0) {
### xs1 Aktoren nur update bei differenten Wert #### xs1 Aktoren nur update bei differenten Wert
if ($update_only_difference == 1) { if ($update_only_difference == 1) {
my $oldState = ReadingsVal($name, $readingsname[$i]."_".sprintf("%02d", $i3), "unknown"); ## Readings Wert my $oldState = ReadingsVal($name, $readingsname[$i]."_".sprintf("%02d", $i3), "unknown"); ## Readings Wert
my $newState = sprintf("%.1f" , $f->{"value"}); ## ARRAY Wert xs1 aktuell my $newState = sprintf("%.1f" , $f->{"value"}); ## ARRAY Wert xs1 aktuell
@ -344,14 +351,14 @@ sub xs1Bridge_GetUpDate() {
} }
} }
### xs1 Aktoren / Funktion != disable #### xs1 Aktoren / Funktion != disable
my @array2 = @{ $decoded->{'actuator'}->[$i3-1]->{$arrayname[4]} }; my @array2 = @{ $decoded->{'actuator'}->[$i3-1]->{$arrayname[4]} };
my $i2 = 0; ## Funktionscounter my $i2 = 0; ## Funktionscounter
foreach my $f2 ( @array2 ) { foreach my $f2 ( @array2 ) {
$i2++; $i2++;
### xs1 Option - Ansicht Funktionsname #### xs1 Option - Ansicht Funktionsname
if ($viewDeviceFunction == 1) { if ($viewDeviceFunction == 1) {
my $oldState = ReadingsVal($name, $readingsname[$i]."_".sprintf("%02d", $i3)."_".$arrayname[4]."_".$i2, "unknown"); ## Readings Wert my $oldState = ReadingsVal($name, $readingsname[$i]."_".sprintf("%02d", $i3)."_".$arrayname[4]."_".$i2, "unknown"); ## Readings Wert
my $newState = $f2->{'type'}; ## ARRAY Wert xs1 aktuell my $newState = $f2->{'type'}; ## ARRAY Wert xs1 aktuell
@ -368,8 +375,8 @@ sub xs1Bridge_GetUpDate() {
} }
} }
if ($f2->{"type"} ne "disabled") { ## Funktion != function -> type disable #### Funktion != function -> type disable
if ($f2->{"type"} ne "disabled") {
if ($i2 == 1) { if ($i2 == 1) {
$xs1_function1 = $f2->{"type"}; $xs1_function1 = $f2->{"type"};
}elsif ($i2 == 2) { }elsif ($i2 == 2) {
@ -380,11 +387,10 @@ sub xs1Bridge_GetUpDate() {
$xs1_function4 = $f2->{"type"}; $xs1_function4 = $f2->{"type"};
} }
} }
} }
} }
### Value der Aktoren | Sensoren #### Value der Aktoren | Sensoren
if ($i == 1 || $i == 0 && $update_only_difference == 0) { # Aktoren | Sensoren im intervall - Format 0.0 bzw. 37.0 wie aus xs1 if ($i == 1 || $i == 0 && $update_only_difference == 0) { # Aktoren | Sensoren im intervall - Format 0.0 bzw. 37.0 wie aus xs1
readingsSingleUpdate($hash, $readingsname[$i]."_".sprintf("%02d", $i3) , sprintf("%.1f" , $f->{"value"}), 0); readingsSingleUpdate($hash, $readingsname[$i]."_".sprintf("%02d", $i3) , sprintf("%.1f" , $f->{"value"}), 0);
$xs1_data = $xs1Dev."#".$readingsname[$i]."#".sprintf("%02d", $i3)."#".$f->{"type"}."#".sprintf("%.1f" , $f->{"value"})."#"."$xs1_function1"."#"."$xs1_function2"."#"."$xs1_function3"."#"."$xs1_function4"."#".$f->{"name"}; $xs1_data = $xs1Dev."#".$readingsname[$i]."#".sprintf("%02d", $i3)."#".$f->{"type"}."#".sprintf("%.1f" , $f->{"value"})."#"."$xs1_function1"."#"."$xs1_function2"."#"."$xs1_function3"."#"."$xs1_function4"."#".$f->{"name"};
@ -392,13 +398,19 @@ sub xs1Bridge_GetUpDate() {
$xs1_data = $xs1Dev."#".$readingsname[$i]."#".sprintf("%02d", $i3)."#".$f->{"type"}."#".sprintf("%.1f" , $f->{"value"})."#"."$xs1_function1"."#"."$xs1_function2"."#"."$xs1_function3"."#"."$xs1_function4"."#".$f->{"name"}; $xs1_data = $xs1Dev."#".$readingsname[$i]."#".sprintf("%02d", $i3)."#".$f->{"type"}."#".sprintf("%.1f" , $f->{"value"})."#"."$xs1_function1"."#"."$xs1_function2"."#"."$xs1_function3"."#"."$xs1_function4"."#".$f->{"name"};
} }
### Ausgaben je Typ unterschiedlich !!! #### Ausgaben je Typ unterschiedlich !!!
Debug " $typ: ".$readingsname[$i]."_".sprintf("%02d", $i3)." | ".$f->{"type"}." | ".$f->{"name"}." | ". $f->{"value"}." | "."F1 $xs1_function1 | F2 $xs1_function2 | F3 $xs1_function3 | F4 $xs1_function4" if($debug == 1 && $i == 0); Debug " $typ: ".$readingsname[$i]."_".sprintf("%02d", $i3)." | ".$f->{"type"}." | ".$f->{"name"}." | ". $f->{"value"}." | "."F1 $xs1_function1 | F2 $xs1_function2 | F3 $xs1_function3 | F4 $xs1_function4" if($debug == 1 && $i == 0);
Debug " $typ: ".$readingsname[$i]."_".sprintf("%02d", $i3)." | ".$f->{"type"}." | ".$f->{"name"}." | ". $f->{"value"} if($debug == 1 && $i != 0); Debug " $typ: ".$readingsname[$i]."_".sprintf("%02d", $i3)." | ".$f->{"type"}." | ".$f->{"name"}." | ". $f->{"value"} if($debug == 1 && $i != 0);
### Namen der Aktoren | Sensoren ### Ansicht Namen der Aktoren | Sensoren als Readings
if ($viewDeviceName == 1) { if ($viewDeviceName == 1) {
readingsSingleUpdate($hash, $readingsname[$i]."_".sprintf("%02d", $i3)."_name" , $f->{"name"} , 0); my $oldState = ReadingsVal($name, $readingsname[$i]."_".sprintf("%02d", $i3)."_name", "unknown"); ## Readings Wert
my $newState = $f->{"name"}; ## ARRAY Wert xs1 aktuell
if ($oldState ne $newState) { ## Namen nur bei Änderung schreiben
#Log3 $name, 3, "$typ: GetUpDate | newState=$newState ne oldState=$oldState";
readingsSingleUpdate($hash, $readingsname[$i]."_".sprintf("%02d", $i3)."_name" , $f->{"name"} , 1);
}
} }
### Dispatch an xs1Device Modul ### Dispatch an xs1Device Modul
@ -407,7 +419,7 @@ sub xs1Bridge_GetUpDate() {
Dispatch($hash,$xs1_data,undef) if($xs1_data); Dispatch($hash,$xs1_data,undef) if($xs1_data);
} }
} else { } else {
#### ID bzw. Speicherplatz xs1 ist disabled | Reading are delete #### #### ID bzw. Speicherplatz xs1 ist disabled | Reading are delete
delete $hash->{READINGS}{$readingsname[$i]."_".sprintf("%02d", $i3)} if($hash->{READINGS}); delete $hash->{READINGS}{$readingsname[$i]."_".sprintf("%02d", $i3)} if($hash->{READINGS});
delete $hash->{READINGS}{$readingsname[$i]."_".sprintf("%02d", $i3)."_name"} if($hash->{READINGS}); delete $hash->{READINGS}{$readingsname[$i]."_".sprintf("%02d", $i3)."_name"} if($hash->{READINGS});
@ -416,10 +428,11 @@ sub xs1Bridge_GetUpDate() {
delete $hash->{READINGS}{$readingsname[$i]."_".sprintf("%02d", $i3)."_function_".$count} if($hash->{READINGS}); delete $hash->{READINGS}{$readingsname[$i]."_".sprintf("%02d", $i3)."_function_".$count} if($hash->{READINGS});
} }
} }
#### #### #### ####
} }
} }
} elsif ($i == 2) { ### xs1 Info´s nur bei uptime Änderung }
#### xs1 Info´s nur bei uptime Änderung als Readings
elsif ($i == 2) {
my $features; my $features;
my $features_i=0; my $features_i=0;
@ -434,7 +447,8 @@ sub xs1Bridge_GetUpDate() {
my @newState = split (/[-,:,\s\/]/, $newState); ## Split $year, $month, $mday, $hour, $min, $sec my @newState = split (/[-,:,\s\/]/, $newState); ## Split $year, $month, $mday, $hour, $min, $sec
$newState = fhemTimeGm($newState[5], $newState[4], $newState[3], $newState[2], $newState[1]-1, $newState[0]-1900); ## Verarbeitung $sec, $min, $hour, $mday, $month-1, $year-1900 $newState = fhemTimeGm($newState[5], $newState[4], $newState[3], $newState[2], $newState[1]-1, $newState[0]-1900); ## Verarbeitung $sec, $min, $hour, $mday, $month-1, $year-1900
if (abs($oldState - $newState) > 5 || $debug == 1) { ## Vergleich mit 5 Sekunden Tolleranz je Verarbeitungszeit Netzwerk | DLAN | CPU #### Vergleich mit 5 Sekunden Tolleranz je Verarbeitungszeit Netzwerk | DLAN | CPU
if (abs($oldState - $newState) > 5 || $debug == 1) {
readingsBeginUpdate($hash); readingsBeginUpdate($hash);
for my $i2 (0..7) { for my $i2 (0..7) {
if ($i2 == 4) { if ($i2 == 4) {
@ -454,7 +468,9 @@ sub xs1Bridge_GetUpDate() {
} }
readingsEndUpdate($hash, 1); readingsEndUpdate($hash, 1);
} }
} elsif ($i == 3) { ### xs1 Timers }
#### xs1 Timers als Readings
elsif ($i == 3) {
my @array = @{ $decoded->{$arrayname[$i]} }; my @array = @{ $decoded->{$arrayname[$i]} };
foreach my $f ( @array ) { foreach my $f ( @array ) {
my $oldState = ReadingsVal($name, $readingsname[$i]."_".sprintf("%02d", $f->{"id"}), "unknown"); ## Readings Wert my $oldState = ReadingsVal($name, $readingsname[$i]."_".sprintf("%02d", $f->{"id"}), "unknown"); ## Readings Wert
@ -499,10 +515,28 @@ sub xs1Bridge_Write($) ## Zustellen von Daten via IOWrite() vom logischen zum
## Anfrage (Client -> XS1): http://192.168.1.242/control?callback=cname&cmd=set_state_actuator&number=1&value=100 ## Anfrage (Client -> XS1): http://192.168.1.242/control?callback=cname&cmd=set_state_actuator&number=1&value=100
## Aktor Typen aus xs1: (notwendig zur Verarbeitung)
## -------------------------------------------------
## blind - Jalousie | dimmer - Dimmer | door - Tür | disabled - deaktivert
## switch - Schalter | shutter - Rolladen | sound - Ton | sun-blind - Markise
## temperature - Temperatur | timerswitch - Zeitschalter | window - Fenster
## Sensor Typen (Auswahl) aus xs1: (nur Info)
## ------------------------------------------
## alarmmat - Alarmmatte | disabled - deaktivert
## gas_butan - Gasmelder Butan | gas_peak - Gas Spitzenwert
## mail - Briefmelder | motion - Bewegung
## other - Andere | presence - Anwesenheit
## pwr_consump - Energiezähler | pwr_peak - Energie Spitzenwert
## soilmoisture - Bodenfeuchte | soiltemp - Bodentemperatur
## leafwetness - Blattfeuchte | remotecontrol - Fernbedienung
## windowopen - Fenstermelder ...
$Aktor_ID = substr($Aktor_ID, 1,2); $Aktor_ID = substr($Aktor_ID, 1,2);
my $xs1cmd; my $xs1cmd;
if ($xs1_typ eq "switch" || $xs1_typ eq "shutter") { ## Anpassung Sendebefehl xs1 #### xs1 Typ switch || shutter || timerswitch - Anpassung Sendebefehl
if ($xs1_typ eq "switch" || $xs1_typ eq "shutter" || $xs1_typ eq "timerswitch") {
$xs1cmd = "http://$xs1_ip/control?callback=cname&cmd=set_state_actuator&number=$Aktor_ID&$cmd2"; $xs1cmd = "http://$xs1_ip/control?callback=cname&cmd=set_state_actuator&number=$Aktor_ID&$cmd2";
} elsif ($xs1_typ eq "dimmer") { } elsif ($xs1_typ eq "dimmer") {
if ($cmd eq "off") { if ($cmd eq "off") {
@ -510,8 +544,8 @@ sub xs1Bridge_Write($) ## Zustellen von Daten via IOWrite() vom logischen zum
} }
$xs1cmd = "http://$xs1_ip/control?callback=cname&cmd=set_state_actuator&number=$Aktor_ID&value=$cmd"; $xs1cmd = "http://$xs1_ip/control?callback=cname&cmd=set_state_actuator&number=$Aktor_ID&value=$cmd";
} else { } else {
### keine Verarbeitung zum senden #### #### keine Verarbeitung zum senden ####
Log3 $name, 3, "$typ: Write | $xs1_typ not control xs1"; Log3 $name, 3, "$typ: Write | $xs1_typ not control xs1. Please inform me!";
last; last;
} }
@ -534,7 +568,7 @@ sub xs1Bridge_Write($) ## Zustellen von Daten via IOWrite() vom logischen zum
Log3 $name, 3, "$typ: Write | no Control possible | Error".$Http_err; Log3 $name, 3, "$typ: Write | no Control possible | Error".$Http_err;
return undef; return undef;
} elsif ($Http_data ne "") { } elsif ($Http_data ne "") {
Log3 $name, 3, "$typ: Write | Send to xs1 -> $xs1cmd"; Log3 $name, 4, "$typ: Write | Send to xs1 -> $xs1cmd"; ## Kontrolle Sendebefehl
} }
} }
@ -739,7 +773,8 @@ sub xs1Bridge_Undef($$)
(Das kann h&auml;ufiger bei DLAN vorkommen.)<br><br></li> (Das kann h&auml;ufiger bei DLAN vorkommen.)<br><br></li>
<li>Sollte das Ger&auml;t nach 5 Verbindungsversuchen ebenfalls keine Verbindung erhalten haben, so schaltet das Modul auf < disable > !</li><br> <li>Sollte das Ger&auml;t nach 5 Verbindungsversuchen ebenfalls keine Verbindung erhalten haben, so schaltet das Modul auf < disable > !</li><br>
<li>Logfile Erstellung erfolgt automatisch nach dem definieren. | Schema: <code>define FileLog_xs1Bridge FileLog ./log/xs1Bridge-%Y-%m.log &lt;Name&gt;</code><br> <li>Logfile Erstellung erfolgt automatisch nach dem definieren. | Schema: <code>define FileLog_xs1Bridge FileLog ./log/xs1Bridge-%Y-%m.log &lt;Name&gt;</code><br>
Folgende Werte werden im Logfile erfasst: Timer | xs1-Statusinformationen</li> Folgende Werte werden im Logfile erfasst: Timer | xs1-Statusinformationen</li><br>
<li>Sollte das Ger&auml;t nach 5 Verbindungsversuchen ebenfalls keine Verbindung erhalten haben, so schaltet das Modul auf < disable > !</li><br>
</ul> </ul>
</ul> </ul>
=end html_DE =end html_DE

55
FHEM/88_xs1Dev.pm
View File

@ -96,7 +96,7 @@ sub xs1Dev_Define($$) {
$hash->{STATE} = "Defined"; ## Der Status des Modules nach Initialisierung. $hash->{STATE} = "Defined"; ## 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.12"; ## Version $hash->{VERSION} = "1.15"; ## Version
$hash->{xs1_name} = "undefined"; ## Aktor | Sensor Name welcher def. im xs1 $hash->{xs1_name} = "undefined"; ## Aktor | Sensor Name welcher def. im xs1
$hash->{xs1_typ} = "undefined"; ## xs1_Typ switch | hygrometer | temperature ... $hash->{xs1_typ} = "undefined"; ## xs1_Typ switch | hygrometer | temperature ...
@ -168,11 +168,12 @@ sub xs1Dev_Set ($$@)
Debug " -------------- ERROR CHECK - START --------------" if($debug); Debug " -------------- ERROR CHECK - START --------------" if($debug);
$cmdList = $cmdListNew if($xs1_typ eq "switch" || $xs1_typ eq "dimmer" || $xs1_typ eq "shutter"); #### Set cmdList bei switch || dimmer || shutter || timerswitch
$cmdList = $cmdListNew if($xs1_typ eq "switch" || $xs1_typ eq "dimmer" || $xs1_typ eq "shutter" || $xs1_typ eq "timerswitch");
#$cmdList .= "dim:slider,0,6.25,100 dimup dimdown" if ($xs1_typ eq "dimmer"); #$cmdList .= "dim:slider,0,6.25,100 dimup dimdown" if ($xs1_typ eq "dimmer");
my $cmdFound = index($cmdListNew, $cmd); ## check cmd in cmdListNew my $cmdFound = index($cmdListNew, $cmd); ## check cmd in cmdListNew
Debug " $name: Set | SetExtensionsReady=$SetExtensionsReady cmdList=$cmdList" if($debug); Debug " $name: Set | xs1_typ=$xs1_typ SetExtensionsReady=$SetExtensionsReady cmdList=$cmdList" if($debug);
if ($cmdList ne "") { ## Set nur bei definierten Typ if ($cmdList ne "") { ## Set nur bei definierten Typ
if(AttrVal($name,"useSetExtensions",undef) || AttrVal($name,"useSetExtensions","0" && $SetExtensionsReady > 0)) { if(AttrVal($name,"useSetExtensions",undef) || AttrVal($name,"useSetExtensions","0" && $SetExtensionsReady > 0)) {
@ -236,8 +237,8 @@ sub xs1Dev_Set ($$@)
} }
} }
############## Funktion shutter ############## ############## Funktion shutter || timerswitch ##############
elsif ($xs1_typ eq "shutter") { elsif ($xs1_typ eq "shutter" || $xs1_typ eq "timerswitch") {
Debug " $name: Set | xs1_function 1=$xs1_function[0] 2=$xs1_function[1] 3=$xs1_function[2] 4=$xs1_function[3]" if($debug); Debug " $name: Set | xs1_function 1=$xs1_function[0] 2=$xs1_function[1] 3=$xs1_function[2] 4=$xs1_function[3]" if($debug);
if ($cmdFound >= 0) { ## cmdFound in welchem Funktionsplatz xs1 if ($cmdFound >= 0) { ## cmdFound in welchem Funktionsplatz xs1
for my $i (0 .. 3) { for my $i (0 .. 3) {
@ -250,7 +251,7 @@ sub xs1Dev_Set ($$@)
return "Wrong set argument, choose one of $cmdList" if($cmdFound < 0); return "Wrong set argument, choose one of $cmdList" if($cmdFound < 0);
} }
############## alles Andere ############## ############## alles Andere ##############
elsif ($xs1_typ ne "dimmer" && $xs1_typ ne "switch" && $xs1_typ ne "undefined") { elsif ($xs1_typ ne "undefined") {
Log3 $name, 2, "$name: Set | xs1_typ=$xs1_typ are not supported. Please inform me!"; Log3 $name, 2, "$name: Set | xs1_typ=$xs1_typ are not supported. Please inform me!";
return "xs1_typ=$xs1_typ are not supported. Please inform me!"; return "xs1_typ=$xs1_typ are not supported. Please inform me!";
} }
@ -258,11 +259,14 @@ sub xs1Dev_Set ($$@)
} }
if(defined($hash->{IODev}->{NAME})) { if(defined($hash->{IODev}->{NAME})) {
if ($xs1_typ eq "switch" || $xs1_typ eq "dimmer" || $xs1_typ eq "shutter") { if ($xs1_typ eq "switch" || $xs1_typ eq "dimmer" || $xs1_typ eq "shutter" || $xs1_typ eq "timerswitch") {
Debug " $name: Set IOWrite | xs1_ID=$xs1_ID xs1_typ=$xs1_typ cmd=$cmd cmd2=$cmd2" if($debug && $xs1_typ ne "temperature" && $xs1_typ ne "hygrometer"); Debug " $name: Set IOWrite | xs1_ID=$xs1_ID xs1_typ=$xs1_typ cmd=$cmd cmd2=$cmd2" if($debug && $xs1_typ ne "temperature" && $xs1_typ ne "hygrometer");
IOWrite($hash, $xs1_ID, $xs1_typ, $cmd, $cmd2); IOWrite($hash, $xs1_ID, $xs1_typ, $cmd, $cmd2);
readingsSingleUpdate($hash, "state", $cmd , 1); readingsSingleUpdate($hash, "state", $cmd , 1);
} else { Log3 $name, 2, "$name: Device $xs1_typ are not supported for Dispatch"; } }
#else {
#Log3 $name, 2, "$name: Device NOT SUPPORTED for Dispatch. In xs1 disabled.";
#}
} else { } else {
return "no IODev define. Please define xs1Bridge."; return "no IODev define. Please define xs1Bridge.";
} }
@ -311,7 +315,8 @@ sub xs1Dev_Parse($$) ## Input Data from 88_xs1Bridge
$hash->{xs1_function4} = $xs1_f4; $hash->{xs1_function4} = $xs1_f4;
} }
if ($xs1_typ2 eq "switch") { ## switch on | off mod for FHEM Default #### Typ switch | on | off mod for FHEM Default
if ($xs1_typ2 eq "switch") {
if ($xs1_value == 0) { $xs1_value = "off"; } if ($xs1_value == 0) { $xs1_value = "off"; }
elsif ($xs1_value == 100) { $xs1_value = "on"; } elsif ($xs1_value == 100) { $xs1_value = "on"; }
readingsSingleUpdate($hash, "state", $xs1_value ,1); # Aktor | Sensor Update value readingsSingleUpdate($hash, "state", $xs1_value ,1); # Aktor | Sensor Update value
@ -322,21 +327,27 @@ sub xs1Dev_Parse($$) ## Input Data from 88_xs1Bridge
$attr{$name}{devStateIcon} = "dim_up:dimup dim_down:dimdown" if( not defined( $attr{$name}{devStateIcon} ) ); $attr{$name}{devStateIcon} = "dim_up:dimup dim_down:dimdown" if( not defined( $attr{$name}{devStateIcon} ) );
} }
} elsif ($xs1_typ2 eq "temperature") { ## temperature typ }
#### Typ temperature
elsif ($xs1_typ2 eq "temperature") {
my $xs1_value_new = "T: ".$xs1_value; ## temperature mod for FHEM Default my $xs1_value_new = "T: ".$xs1_value; ## temperature mod for FHEM Default
readingsBeginUpdate($hash); readingsBeginUpdate($hash);
readingsBulkUpdate($hash, "state", $xs1_value_new); readingsBulkUpdate($hash, "state", $xs1_value_new);
readingsBulkUpdate($hash, "temperature", $xs1_value); readingsBulkUpdate($hash, "temperature", $xs1_value);
readingsEndUpdate($hash, 1); readingsEndUpdate($hash, 1);
} elsif ($xs1_typ2 eq "hygrometer") { ## hygrometer typ }
#### Typ hygrometer
elsif ($xs1_typ2 eq "hygrometer") {
my $xs1_value_new = "H: ".$xs1_value; ## hygrometer mod for FHEM Default my $xs1_value_new = "H: ".$xs1_value; ## hygrometer mod for FHEM Default
readingsBeginUpdate($hash); readingsBeginUpdate($hash);
readingsBulkUpdate($hash, "state", $xs1_value_new); readingsBulkUpdate($hash, "state", $xs1_value_new);
readingsBulkUpdate($hash, "humidity", $xs1_value); readingsBulkUpdate($hash, "humidity", $xs1_value);
readingsEndUpdate($hash, 1); readingsEndUpdate($hash, 1);
} elsif ($xs1_typ2 eq "dimmer") { ## dimmer }
#### Typ dimmer
elsif ($xs1_typ2 eq "dimmer") {
## RegEx devStateIcon da Symbole nicht durchweg von 0 - 100 | dim_up | dim_down ## RegEx devStateIcon da Symbole nicht durchweg von 0 - 100 | dim_up | dim_down
$attr{$name}{devStateIcon} = "dim0[1-6]\\D%:dim06% dim[7-9]\\D|dim[1][0-2]%:dim12% dim[1][3-8]%:dim18% \n" $attr{$name}{devStateIcon} = "dim0[1-6]\\D%:dim06% dim[7-9]\\D|dim[1][0-2]%:dim12% dim[1][3-8]%:dim18% \n"
@ -353,12 +364,19 @@ sub xs1Dev_Parse($$) ## Input Data from 88_xs1Bridge
} }
readingsSingleUpdate($hash, "state", $xs1_value ,1); readingsSingleUpdate($hash, "state", $xs1_value ,1);
} elsif ($xs1_typ2 eq "shutter") { ## shutter on | off mod for FHEM Default }
#### Typ shutter | on | off mod for FHEM Default
elsif ($xs1_typ2 eq "shutter") {
if ($xs1_value == 0) { $xs1_value = "off"; }
elsif ($xs1_value == 100) { $xs1_value = "on"; }
readingsSingleUpdate($hash, "state", $xs1_value ,1);
}
#### Typ timerswitch | on | off mod for FHEM Default
elsif ($xs1_typ2 eq "timerswitch") {
if ($xs1_value == 0) { $xs1_value = "off"; } if ($xs1_value == 0) { $xs1_value = "off"; }
elsif ($xs1_value == 100) { $xs1_value = "on"; } elsif ($xs1_value == 100) { $xs1_value = "on"; }
readingsSingleUpdate($hash, "state", $xs1_value ,1); readingsSingleUpdate($hash, "state", $xs1_value ,1);
} }
} }
return $name; return $name;
@ -446,7 +464,9 @@ sub xs1Dev_Undef($$)
xs1_function(1-4): defined function in the device<br> xs1_function(1-4): defined function in the device<br>
xs1_name: defined name in the device<br> xs1_name: defined name in the device<br>
xs1_typ: defined type in the device<br> xs1_typ: defined type in the device<br>
</ul> </ul><br>
<li>The following xs1 device types are already integrated: dimmer | shutter | switch | timerswitch</li>
</ul> </ul>
</ul> </ul>
=end html =end html
@ -513,8 +533,11 @@ sub xs1Dev_Undef($$)
xs1_function(1-4): definierte Funktion im Ger&auml;t<br> xs1_function(1-4): definierte Funktion im Ger&auml;t<br>
xs1_name: definierter Name im Ger&auml;t<br> xs1_name: definierter Name im Ger&auml;t<br>
xs1_typ: definierter Typ im Ger&auml;t<br> xs1_typ: definierter Typ im Ger&auml;t<br>
</ul><br>
<li>Folgende xs1-Ger&aumltetypen sind bereits integriert: dimmer | shutter | switch | timerswitch</li>
</ul> </ul>
</ul>
</ul> </ul>
=end html_DE =end html_DE
=cut =cut