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

Small EM changes

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@70 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2007-06-04 07:24:31 +00:00
parent 744e907d1e
commit 03e4194248
4 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fhem/FHEM/60_EM.pm
View File

@ -237,7 +237,7 @@ EmGetData($$)
$serport->stopbits(1); $serport->stopbits(1);
$serport->handshake('none'); $serport->handshake('none');
Log 5, "EM: Sending " . unpack('H*', $d) . "\n"; Log 4, "EM: Sending " . unpack('H*', $d) . "\n";
my $rm = "EM timeout reading the answer"; my $rm = "EM timeout reading the answer";
for(my $rep = 0; $rep < 3; $rep++) { for(my $rep = 0; $rep < 3; $rep++) {

1
fhem/FHEM/61_EMWZ.pm
View File

@ -89,6 +89,7 @@ EMWZ_GetStatus($)
} }
$hash->{STATE} = "$cur_power kWh"; $hash->{STATE} = "$cur_power kWh";
Log GetLogLevel($name,4), "EMWZ $name: $cur_power kWh / $vals{energy}";
return $hash->{STATE}; return $hash->{STATE};
} }

2
fhem/FHEM/62_EMEM.pm
View File

@ -65,6 +65,7 @@ EMEM_GetStatus($)
$vals{"alarm_PA"} = w($d,45) . " Watt"; $vals{"alarm_PA"} = w($d,45) . " Watt";
$vals{"price_CF"} = sprintf("%.3f", w($d,47)/10000); $vals{"price_CF"} = sprintf("%.3f", w($d,47)/10000);
my $tn = TimeNow(); my $tn = TimeNow();
my $idx = 0; my $idx = 0;
foreach my $k (keys %vals) { foreach my $k (keys %vals) {
@ -79,6 +80,7 @@ EMEM_GetStatus($)
} }
$hash->{STATE} = "$cur_power kWh"; $hash->{STATE} = "$cur_power kWh";
Log GetLogLevel($name,4), "EMEM $name: $cur_power kWh / $vals{energy} kWh/h";
return $hash->{STATE}; return $hash->{STATE};
} }

3
fhem/HISTORY
View File

@ -107,3 +107,6 @@
- Pest, Mon May 29 00:07:00 MEST 2007 - Pest, Mon May 29 00:07:00 MEST 2007
- check-in changes of 60_EM.pm to make EMEM work. - check-in changes of 60_EM.pm to make EMEM work.
- Mon Jun 4 08:23:43 MEST 2007
- Small changes for EM logging