FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-01-31 12:49:34 +00:00
Code Issues Releases Wiki Activity

moved firmware from attribute to READING, state conformant to developer guidelines

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@1533 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
oskarfessel 2012-05-04 22:36:36 +00:00
parent 07c0ecae69
commit 050a38f86c
1 changed files with 39 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
fhem/contrib/23_LUXTRONIK2.pm
View File

@ -91,7 +91,9 @@ LUXTRONIK2_GetStatus($)
my $host = $hash->{Host}; my $host = $hash->{Host};
my $sensor = ''; my $sensor = '';
my $state = ''; my $state = '';
my $firmware;
my $serialno;
$cc = 0; #initialize counter $cc = 0; #initialize counter
InternalTimer(gettimeofday() + $hash->{INTERVAL}, "LUXTRONIK2_GetStatus", $hash, 0); InternalTimer(gettimeofday() + $hash->{INTERVAL}, "LUXTRONIK2_GetStatus", $hash, 0);
@ -163,7 +165,7 @@ LUXTRONIK2_GetStatus($)
$socket->recv($result, $count*4+4); $socket->recv($result, $count*4+4);
if(length($result) != $count*4) { if(length($result) != $count*4) {
Log GetLogLevel($name, 3), "LUXTRONIK2_GetStatus parameter settings length check: $name $host " Log 3, "LUXTRONIK2_GetStatus parameter settings length check: $name $host "
. length($result) . " should have been " . $count * 4; . length($result) . " should have been " . $count * 4;
my $loop = 4; # safety net in case of communication problems my $loop = 4; # safety net in case of communication problems
while((length($result) < ($count * 4)) && ($loop-- > 0) ) { while((length($result) < ($count * 4)) && ($loop-- > 0) ) {
@ -171,7 +173,7 @@ LUXTRONIK2_GetStatus($)
my $newcnt = ($count * 4) - length($result); my $newcnt = ($count * 4) - length($result);
$socket->recv($result2, $newcnt); $socket->recv($result2, $newcnt);
$result .= $result2; $result .= $result2;
Log GetLogLevel($name, 3), "LUXTRONIK2_GetStatus read additional " . length($result2) Log 3, "LUXTRONIK2_GetStatus read additional " . length($result2)
. " bytes of expected " . $newcnt . " bytes, total should be " . " bytes of expected " . $newcnt . " bytes, total should be "
. $count * 4 . " buflen=" . length($result); . $count * 4 . " buflen=" . length($result);
} }
@ -221,11 +223,15 @@ LUXTRONIK2_GetStatus($)
# Erst die operativen Stati und Parameterenstellungen # Erst die operativen Stati und Parameterenstellungen
if(AttrVal($hash->{NAME}, "firmware", "none") eq "none") { $sensor = "firmware";
$attr{$hash->{NAME}}{firmware} = chr($heatpump_values[81]); $value = '';
for(my $fi=82; $fi<91; $fi++) { for(my $fi=81; $fi<91; $fi++) {
$attr{$hash->{NAME}}{firmware} .= chr($heatpump_values[$fi]); $value .= chr($heatpump_values[$fi]) if $heatpump_values[$fi];
} }
if($hash->{READINGS}{$sensor}{VAL} ne $value) {
$hash->{READINGS}{$sensor}{TIME} = TimeNow();
$hash->{READINGS}{$sensor}{VAL} = $value;
$hash->{CHANGED}[$cc++] = $sensor.": ".$value;
} }
$sensor = "currentOperatingStatus1"; $sensor = "currentOperatingStatus1";
@ -258,12 +264,10 @@ LUXTRONIK2_GetStatus($)
$hash->{READINGS}{$sensor}{VAL} = $value; $hash->{READINGS}{$sensor}{VAL} = $value;
$hash->{CHANGED}[$cc++] = $sensor.": ".$value; $hash->{CHANGED}[$cc++] = $sensor.": ".$value;
} }
#
# TODO: STATE ändern nach Developer-Wiki.
#
$state = $state." - ".$value;
$hash->{STATE} = $state;
$state = $state." - ".$value;
$hash->{READINGS}{state}{VAL} = $state;
$hash->{READINGS}{state}{TIME} = TimeNow();
$sensor = "hotWaterOperatingMode"; $sensor = "hotWaterOperatingMode";
$switch = $heatpump_parameters[4]; $switch = $heatpump_parameters[4];
@ -319,6 +323,10 @@ LUXTRONIK2_GetStatus($)
# Ruecklauftemperatur am externen Sensor. # Ruecklauftemperatur am externen Sensor.
LUXTRONIK2_TempValueMerken($hash,$heatpump_values[13],"returnTemperatureExtern"); LUXTRONIK2_TempValueMerken($hash,$heatpump_values[13],"returnTemperatureExtern");
# Wärmequellen
LUXTRONIK2_TempValueMerken($hash,$heatpump_values[19],"heatSourceIN");
LUXTRONIK2_TempValueMerken($hash,$heatpump_values[20],"heatSourceOUT");
# Durchfluss Waermemengenzaehler # Durchfluss Waermemengenzaehler
$sensor = "flowRate"; $sensor = "flowRate";
@ -329,6 +337,24 @@ LUXTRONIK2_GetStatus($)
$hash->{READINGS}{$sensor}{UNIT} = "l/h"; $hash->{READINGS}{$sensor}{UNIT} = "l/h";
$hash->{CHANGED}[$cc++] = $sensor.": ".$value; $hash->{CHANGED}[$cc++] = $sensor.": ".$value;
} }
# Waermemengenzaehler
$sensor = "flowCountHeating";
$value = $heatpump_values[151];
if($hash->{READINGS}{$sensor}{VAL} != $value) {
$hash->{READINGS}{$sensor}{TIME} = TimeNow();
$hash->{READINGS}{$sensor}{VAL} = $value;
$hash->{READINGS}{$sensor}{UNIT} = "Wh";
$hash->{CHANGED}[$cc++] = $sensor.": ".$value;
}
# Waermemengenzaehler
$sensor = "flowCountHotWater";
$value = $heatpump_values[152];
if($hash->{READINGS}{$sensor}{VAL} != $value) {
$hash->{READINGS}{$sensor}{TIME} = TimeNow();
$hash->{READINGS}{$sensor}{VAL} = $value;
$hash->{READINGS}{$sensor}{UNIT} = "Wh";
$hash->{CHANGED}[$cc++] = $sensor.": ".$value;
}
if(AttrVal($hash->{NAME}, "statusHTML", "none") ne "none") { if(AttrVal($hash->{NAME}, "statusHTML", "none") ne "none") {
$sensor = "floorplanHTML"; $sensor = "floorplanHTML";