mhop/fhem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

merge into: mhop:master
Branches Tags
mhop:master mhop:mhop_wetter mhop:mhopw_231011 mhop:mhopw_211217 mhop:mhopw_201221 mhop:mhopw_251128 mhop:mhopw_251125 mhop:mhop mhop:mhop_251124 mhop:mhopw_240918 mhop:mhop_201221 mhop:mhop_tmp mhop:mhop_201025 mhop:mhop_200731 mhop:mhop_200526 mhop:my_pi mhop:my mhop:my_develop mhop:enocean mhop:eo_mergetest mhop:eo_merged mhop:eo2 mhop:eo2_vdr mhop:eo_roll mhop:eo_baseid
...
pull from: mhop:mhop_wetter
Branches Tags
mhop:mhop_wetter mhop:mhopw_231011 mhop:mhopw_211217 mhop:mhopw_201221 mhop:mhopw_251128 mhop:mhopw_251125 mhop:master mhop:mhop mhop:mhop_251124 mhop:mhopw_240918 mhop:mhop_201221 mhop:mhop_tmp mhop:mhop_201025 mhop:mhop_200731 mhop:mhop_200526 mhop:my_pi mhop:my mhop:my_develop mhop:enocean mhop:eo_mergetest mhop:eo_merged mhop:eo2 mhop:eo2_vdr mhop:eo_roll mhop:eo_baseid

1 Commits
master ... mhop_wette

Author SHA1 Message Date
Marc Hoppe
065de3c5c4 WS3600: readingFnAttributes 2025-11-30 16:42:14 +01:00
1 changed files with 9 additions and 4 deletions
Expand all files Collapse all files

13
fhem/FHEM/70_WS3600.pm
View File

@@ -181,7 +181,8 @@ WS3600_Initialize($)
# Consumer # Consumer
$hash->{DefFn} = "WS3600_Define"; $hash->{DefFn} = "WS3600_Define";
$hash->{AttrList}= "model:WS3600,WS2300,WS1080,WS3080"; $hash->{AttrList}= "model:WS3600,WS2300,WS1080,WS3080 ".
$readingFnAttributes;
# $hash->{ReadFn} = "WS3600_Read"; # $hash->{ReadFn} = "WS3600_Read";
$hash->{UndefFn} = "WS3600_Undef"; $hash->{UndefFn} = "WS3600_Undef";
} }
@@ -267,7 +268,7 @@ WS3600_Read($)
# Log 1-GetLogLevel($name,0), "WS3600(Err): (1) Error"; # Log 1-GetLogLevel($name,0), "WS3600(Err): (1) Error";
# Log3 $name, 4, "WS3600(Dbg): $name Read started using \"$dev\""; # Log3 $name, 4, "WS3600(Dbg): $name Read started using \"$dev\"";
Log3 $name, 3, "WS3600(Msg): $name Read started"; # Log3 $name, 3, "WS3600(Msg): $name Read started";
@lines = `$dev`; # call external program @lines = `$dev`; # call external program
foreach my $inputline ( @lines ) { foreach my $inputline ( @lines ) {
@@ -275,10 +276,14 @@ WS3600_Read($)
my ($rawreading, $val, $val2) = split(/ /, $inputline, 3); my ($rawreading, $val, $val2) = split(/ /, $inputline, 3);
if(defined($rawreading)) { if(defined($rawreading)) {
if(!defined($val2)) { $val2 = ""; } if(!defined($val2)) { $val2 = ""; }
Log3 $name, 4, "WS3600(Dbg): $name read $inputline|$rawreading|$val|$val2"; my $logmsg = "WS3600(Dbg): $name read $inputline|$rawreading|$val";
$logmsg .= "|$val2" if(defined($val2));
# Log3 $name, 4, $logmsg;
# Log3 $name, 4, "WS3600(Dbg): $name read $inputline|$rawreading|$val|$val2";
if(defined($TranslatedCodes{$rawreading})) { if(defined($TranslatedCodes{$rawreading})) {
$reading = $TranslatedCodes{$rawreading}; $reading = $TranslatedCodes{$rawreading};
readingsBulkUpdate($hash,$reading, $val); readingsBulkUpdate($hash,$reading, $val);
Log3 $name, 4, "WS3600(Dbg): $name read $inputline|$rawreading|$reading|$val|$val2";
$AnythingRead = 1; $AnythingRead = 1;
} }
# write Date/Time-Records # write Date/Time-Records
@@ -304,7 +309,7 @@ WS3600_Read($)
. " Ti: " . $defs{$name}{READINGS}{"Temp-inside"}{VAL} . " Ti: " . $defs{$name}{READINGS}{"Temp-inside"}{VAL}
. " Hi: " . $defs{$name}{READINGS}{"rel-Humidity-inside"}{VAL}; . " Hi: " . $defs{$name}{READINGS}{"rel-Humidity-inside"}{VAL};
$hash->{CHANGED}[0] = $hash->{STATE}; # $hash->{CHANGED}[0] = $hash->{STATE};
} }
else { else {
$hash->{STATE} = "no data received"; $hash->{STATE} = "no data received";