The EMT7110 is a plug with integrated power meter functionality.
It can be integrated into FHEM via a JeeLink as the IODevice.
The EMT7110 sends with 9.579 kbit/s. Therefore it is necessary to set the JeeLink to a mode where it recieves this data rate.
diff --git a/fhem/FHEM/36_EleroDrive.pm b/fhem/FHEM/36_EleroDrive.pm
index a03e3f8da..6c6fc4655 100644
--- a/fhem/FHEM/36_EleroDrive.pm
+++ b/fhem/FHEM/36_EleroDrive.pm
@@ -2,7 +2,6 @@
# ToDo-List
# ---------
-# [ ] Numeric position reading -> percentOpen (0 ... 100)
# [ ] Move to any position, not only top, bottom, intermediate, ...
@@ -77,16 +76,12 @@ sub EleroDrive_Get($@) {
return undef;
}
-
#=======================================================================================
-sub EleroDrive_Set($@) {
- my ( $hash, $name, $cmd, @params ) = @_;
-
- my $channel = $hash->{channel};
- my $iodev = $hash->{IODev}->{NAME};
+sub EleroDrive_ToFixPosition($$) {
+ my ( $hash, $position) = @_;
- my $commands=("stop:noArg moveDown:noArg moveUp:noArg moveIntermediate:noArg moveTilt:noArg refresh:noArg");
- return $commands if( $cmd eq '?' || $cmd eq '');
+ my $channel = $hash->{channel};
+ ###my $iodev = $hash->{IODev}->{NAME};
my $head = 'aa';
my $msgLength = '05';
@@ -97,33 +92,21 @@ sub EleroDrive_Set($@) {
my $secondChannels = '';
my $checksum = '';
my $payload = '';
- my $doRefresh = '0';
- if($cmd eq 'refresh'){
- $payload = '0';
- IOWrite($hash, "refresh", $channel);
- }
- elsif($cmd eq 'moveDown'){
+ if($position eq 'bottom'){
$payload = '40';
- $doRefresh = '1';
}
- elsif($cmd eq 'moveUp'){
+ elsif($position eq 'top'){
$payload = '20';
- $doRefresh = '1';
}
- elsif($cmd eq 'stop'){
+ elsif($position eq 'stop'){
$payload = '10';
}
- elsif($cmd eq 'moveIntermediate'){
+ elsif($position eq 'intermediate'){
$payload = '44';
- $doRefresh = '1';
}
- elsif($cmd eq 'moveTilt'){
+ elsif($position eq 'tilt'){
$payload = '24';
- $doRefresh = '1';
- }
- else {
- return "Unknown argument $cmd, choose one of $commands";
}
if($payload) {
@@ -152,12 +135,67 @@ sub EleroDrive_Set($@) {
###debugLog($name, "EleroDrive_Set->IOWrite: byteMsg=$byteMsg");
IOWrite($hash, "send", $byteMsg);
- # Start a one time timer that refreshes the position for this drive
- my $refreshDelay = AttrVal($name, "TopToBottomTime", 0);
- if($doRefresh && $refreshDelay) {
- InternalTimer(gettimeofday() + $refreshDelay + 2, "EleroDrive_OnRefreshTimer", $hash, 0);
- }
+ }
+
+}
+
+
+#=======================================================================================
+sub EleroDrive_ToAnyPosition($$) {
+ my ( $hash, $position) = @_;
+ my $name = $hash->{NAME};
+
+ ###debugLog($name, "ToAnyPosition: $position");
+}
+
+#=======================================================================================
+sub EleroDrive_Set($@) {
+ my ( $hash, $name, $cmd, @params ) = @_;
+ my $channel = $hash->{channel};
+ my $iodev = $hash->{IODev}->{NAME};
+
+ my $commands=("stop:noArg moveDown:noArg moveUp:noArg moveIntermediate:noArg moveTilt:noArg refresh:noArg moveTo");
+ return $commands if( $cmd eq '?' || $cmd eq '');
+
+ my $doRefresh = '0';
+
+ if($cmd eq 'refresh'){
+ IOWrite($hash, "refresh", $channel);
+ }
+ elsif($cmd eq 'moveDown'){
+ EleroDrive_ToFixPosition($hash, "bottom");
+ $doRefresh = '1';
+ }
+ elsif($cmd eq 'moveUp'){
+ EleroDrive_ToFixPosition($hash, "top");
+ $doRefresh = '1';
+ }
+ elsif($cmd eq 'stop'){
+ EleroDrive_ToFixPosition($hash, "stop");
+ }
+ elsif($cmd eq 'moveIntermediate'){
+ EleroDrive_ToFixPosition($hash, "intermediate");
+ $doRefresh = '1';
+ }
+ elsif($cmd eq 'moveTilt'){
+ EleroDrive_ToFixPosition($hash, "tilt");
+ $doRefresh = '1';
+ }
+ elsif($cmd eq 'moveTo' && scalar @params eq 1){
+ EleroDrive_ToAnyPosition($hash, $params[0]);
+
+ $doRefresh = '1';
+ }
+ else {
+ return "Unknown argument $cmd, choose one of $commands";
+ }
+
+ # Start a one time timer that refreshes the position for this drive
+ my $refreshDelay = AttrVal($name, "TopToBottomTime", 0);
+ if($doRefresh && $refreshDelay) {
+ RemoveInternalTimer($hash);
+ InternalTimer(gettimeofday() + $refreshDelay + 2, "EleroDrive_OnRefreshTimer", $hash, 0);
}
return undef;
@@ -214,8 +252,8 @@ sub EleroDrive_Parse($$) {
);
my %percentDefinitions = ('00' => 50,
- '01' => 100,
- '02' => 0,
+ '01' => 0,
+ '02' => 100,
'03' => 50,
'04' => 50,
'05' => -1,
@@ -226,14 +264,14 @@ sub EleroDrive_Parse($$) {
'0a' => -1,
'0b' => -1,
'0d' => 50,
- '0e' => 100,
- '0f' => 0,
+ '0e' => 0,
+ '0f' => 100,
'10' => -1,
'11' => -1
);
my $newstate = $deviceStati{$statusByte};
- my $percentOpen = $percentDefinitions{$statusByte};
+ my $percentClosed = $percentDefinitions{$statusByte};
my $rhash = $modules{EleroDrive}{defptr}{$channel};
my $rname = $rhash->{NAME};
@@ -244,11 +282,11 @@ sub EleroDrive_Parse($$) {
readingsBeginUpdate($rhash);
readingsBulkUpdate($rhash, "state", $newstate);
readingsBulkUpdate($rhash, "position", $newstate);
- if($percentOpen ne -1) {
- readingsBulkUpdate($rhash, "percentOpen", $percentOpen);
+ if($percentClosed ne -1) {
+ readingsBulkUpdate($rhash, "percentClosed", $percentClosed);
}
readingsEndUpdate($rhash,1);
-
+
my @list;
push(@list, $rname);
return @list;
@@ -288,7 +326,6 @@ sub EleroDrive_OnRefreshTimer($$) {
EleroDrive
-
This mudule implements an Elero drive. It uses EleroStick as IO-Device.
@@ -341,9 +378,9 @@ sub EleroDrive_OnRefreshTimer($$) {
- position
Current position of the drive (top_position, bottom_position, ...)
- - percentOpen
+ - percentClosed
0 ... 100
- 0 is completely closed, 100 is completely open
+ 100 is completely closed, 0 is completely open
diff --git a/fhem/FHEM/36_LaCrosse.pm b/fhem/FHEM/36_LaCrosse.pm
index 73f0279c5..8f4d1ff56 100644
--- a/fhem/FHEM/36_LaCrosse.pm
+++ b/fhem/FHEM/36_LaCrosse.pm
@@ -544,6 +544,7 @@ sub LaCrosse_Parse($$) {
LaCrosse
+
FHEM module for LaCrosse Temperature and Humidity sensors and weather stations like WS 1600 (TX22 sensor).
It can be integrated in to FHEM via a JeeLink as the IODevice.
diff --git a/fhem/FHEM/36_Level.pm b/fhem/FHEM/36_Level.pm
index 13d80666a..10c8cf3b6 100644
--- a/fhem/FHEM/36_Level.pm
+++ b/fhem/FHEM/36_Level.pm
@@ -206,7 +206,6 @@ Level_Attr(@)
Level
-
FHEM module for Level.
It can be integrated in to FHEM via a JeeLink as the IODevice.
diff --git a/fhem/FHEM/98_CustomReadings.pm b/fhem/FHEM/98_CustomReadings.pm
index b4835cc07..bcdf4f789 100644
--- a/fhem/FHEM/98_CustomReadings.pm
+++ b/fhem/FHEM/98_CustomReadings.pm
@@ -141,7 +141,7 @@ sub CustomReadings_GetHTML ($)
my @sortedReadings = sort keys %{$hash->{READINGS}};
foreach my $reading (@sortedReadings) {
$result .= " | ";
- $result .= "| $reading: | " . ReadingsVal($name, $reading, "???") . " | ";
+ $result .= "$reading: | " . ReadingsVal($name, $reading, "???") . " | ";
$result .= " ";
}
$result .= "";
@@ -161,7 +161,6 @@ sub CustomReadings_GetHTML ($)
CustomReadings
-
FHEM module to define own readings.
This module allows to define own readings. The readings can be defined in an attribute so that they can get changed without changing the code of the module.
@@ -189,7 +188,7 @@ fhem_backup_folder_size:qx(du -ch /opt/fhem/backup | grep total | cut -d 't' -f1
define myReadingsDisplay weblink htmlCode {CustomReadings_GetHTML('myReadings')}
attr myReadingsDisplay group Readings
attr myReadingsDisplay room 0-Test
-
+
Resulting readings:
@@ -198,7 +197,7 @@ attr myReadingsDisplay room 0-Test
|
| ac_powersupply_current |
0.236 |
- 2014-08-09 15:40:21 |
+ | 2014-08-09 15:40:21 |
| ac_powersupply_voltage |
@@ -241,7 +240,7 @@ attr myReadingsDisplay room 0-Test
2014-08-09 15:40:21 |
-
+
| |