FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-21 20:06:18 +00:00
Code Issues Releases Wiki Activity

30_DUOFERN: window contact to HSA added

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@23133 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
Telekatz 2020-11-10 17:26:01 +00:00
parent 6a42f6b419
commit 8a717a68f7
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
fhem/FHEM/30_DUOFERN.pm
View File

@ -369,6 +369,7 @@ my %commandsHSA = (
"timeAutomatic" => {"bitFrom" => 9, "changeFlag" => 11},
"sendingInterval" => {"bitFrom" => 0, "changeFlag" => 7, "min" => 0, "max" => 60, "step" => 1},
"desired-temp" => {"bitFrom" => 17, "changeFlag" => 23, "min" => 4, "max" => 28, "step" => 0.5},
"windowContact" => {"bitFrom" => 12, "changeFlag" => 13},
);
my @readingsBlindMode = ( "tiltInSunPos",
@ -559,6 +560,7 @@ my %setsThermostat = (
my %setsHSA = (
"manualMode:on,off" => "",
"timeAutomatic:on,off" => "",
"windowContact:on,off" => "",
"sendingInterval:slider,1,1,60" => "",
"desired-temp:$tempSetList" => "",
);
@ -707,7 +709,7 @@ DUOFERN_Set($@)
if(!exists $hash->{helper}{HSAold}{$cmd}) {
$hash->{helper}{HSAold}{$cmd} = ReadingsVal($name, $cmd, 0);
}
if($cmd eq "desired-temp") {
if($arg2 && ($arg2 eq "timer")) {
$hash->{helper}{HSAtimer} = 1;
@ -996,12 +998,11 @@ DUOFERN_Define($$)
} else {
$hash->{SUBTYPE} = "unknown";
}
readingsSingleUpdate($hash, "state", "Initialized", 1);
return undef if (AttrVal($name,"ignore",0) != 0);
if ($hash->{CODE} =~ m/^(40|41|42|43|46|47|48|49|4A|4B|4C|4E|61|62|65|69|70|71|73|74)....$/) {
readingsSingleUpdate($hash, "state", "Initialized", 1);
$hash->{helper}{timeout}{t} = 30;
InternalTimer(gettimeofday()+$hash->{helper}{timeout}{t}, "DUOFERN_StatusTimeout", $hash, 0);
$hash->{helper}{timeout}{count} = 2;
@ -1205,7 +1206,7 @@ DUOFERN_Parse($$)
delete($hash->{helper}{HSAold}{$key});
if($oldValue eq $isValue) {
if(($oldValue eq $isValue) || ($key eq "windowContact")) {
$statusValue{$key} = $newValue;
$changeFlag = 1;
}
@ -1276,7 +1277,7 @@ DUOFERN_Parse($$)
}
} else {
Log3 $hash, 3, "DUOFERN unknown msg: $msg";
Log3 $hash, 4, "DUOFERN unknown msg: $msg";
}
#Wandtaster, Funksender UP, Handsender, Sensoren
@ -1284,7 +1285,7 @@ DUOFERN_Parse($$)
my $id = substr($msg, 4, 4);
if (!(exists $sensorMsg{$id})) {
Log3 $hash, 3, "DUOFERN unknown msg: $msg";
Log3 $hash, 4, "DUOFERN unknown msg: $msg";
} else {
my $chan = substr($msg, $sensorMsg{$id}{chan}*2 + 2 , 2);
@ -1372,8 +1373,8 @@ DUOFERN_Parse($$)
readingsBulkUpdate($hash, "wind", $wind, 1);
readingsEndUpdate($hash, 1); # Notify is done by Dispatch
#Umweltsensor Zeit
} elsif ($msg =~ m/0FFF1020.{36}/) {
#Umweltsensor/Handzentrale Zeit
} elsif ($msg =~ m/0F..1020.{36}/) {
$def01 = $modules{DUOFERN}{defptr}{$code."00"};
if(!$def01) {
DoTrigger("global","UNDEFINED DUOFERN_$code"."_sensor DUOFERN $code"."00");
@ -1450,7 +1451,7 @@ DUOFERN_Parse($$)
Log3 $hash, 3, "DUOFERN error: $name NOT INITIALIZED; reopen DUOFERNSTICK";
} else {
Log3 $hash, 3, "DUOFERN unknown msg: $msg";
Log3 $hash, 4, "DUOFERN unknown msg: $msg";
}
push (@retval, $def01->{NAME}) if ($def01);