FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-10 03:06:37 +00:00
Code Issues Releases Wiki Activity

66_EseraOneWire: support Esera 11233 dual digital output with push buttons

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@21540 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
pizmus 2020-03-30 05:50:26 +00:00
parent c833eff5c4
commit 0302ac4f53
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fhem/CHANGED
View File

@ -1,5 +1,6 @@
# Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # Add changes at the top of the list. Keep it in ASCII, and 80-char wide.
# Do not insert empty lines here, update check depends on it. # Do not insert empty lines here, update check depends on it.
- feature: 66_EseraOneWire: add support for Esera 11233, dual output
- bugfix: 71_YAMAHA_AVR: use correct dsp command for RX-V2065 model - bugfix: 71_YAMAHA_AVR: use correct dsp command for RX-V2065 model
- change: 57_Calendar: treatment of cutoffOlderThan amended for series - change: 57_Calendar: treatment of cutoffOlderThan amended for series
end dates without time specification end dates without time specification

9
fhem/FHEM/66_EseraDigitalInOut.pm
View File

@ -33,7 +33,7 @@ use strict;
use warnings; use warnings;
use SetExtensions; use SetExtensions;
my %deviceSpecs = ("DS2408" => 8, "11220" => 8, "11228" => 8, "11229" => 8, "11216" => 8, "SYS1" => 4, "SYS2" => 5); my %deviceSpecs = ("DS2408" => 8, "11220" => 8, "11228" => 8, "11229" => 8, "11216" => 8, "11233" => 2, "SYS1" => 4, "SYS2" => 5);
sub sub
EseraDigitalInOut_Initialize($) EseraDigitalInOut_Initialize($)
@ -331,6 +331,7 @@ EseraDigitalInOut_setOutput($$$$)
if (($hash->{DEVICE_TYPE} eq "DS2408") || if (($hash->{DEVICE_TYPE} eq "DS2408") ||
($hash->{DEVICE_TYPE} eq "11220") || ($hash->{DEVICE_TYPE} eq "11220") ||
($hash->{DEVICE_TYPE} eq "11233") ||
($hash->{DEVICE_TYPE} eq "11228") || ($hash->{DEVICE_TYPE} eq "11228") ||
($hash->{DEVICE_TYPE} eq "11229")) ($hash->{DEVICE_TYPE} eq "11229"))
{ {
@ -503,7 +504,8 @@ EseraDigitalInOut_ParseForOneDevice($$$$$$)
readingsSingleUpdate($rhash, $nameOfReading, $readingValue, 1); readingsSingleUpdate($rhash, $nameOfReading, $readingValue, 1);
} }
} }
elsif (($deviceType eq "11220") || ($deviceType eq "11228")) # 8 channel digital output with push buttons elsif (($deviceType eq "11220") || ($deviceType eq "11228") || ($deviceType eq "11233"))
# 8 channel / 2 channel digital output with push buttons
{ {
if ($readingId == 2) if ($readingId == 2)
{ {
@ -611,7 +613,7 @@ EseraDigitalInOut_Parse($$)
return @list; return @list;
} }
elsif (($deviceType eq "DS2408") or ($deviceType eq "11216") or elsif (($deviceType eq "DS2408") or ($deviceType eq "11216") or
($deviceType eq "11220") or ($deviceType eq "11220") or ($deviceType eq "11233") or
($deviceType eq "11228") or ($deviceType eq "11229") or ($deviceType eq "11228") or ($deviceType eq "11229") or
($deviceType eq "SYS1") or ($deviceType eq "SYS2")) ($deviceType eq "SYS1") or ($deviceType eq "SYS2"))
{ {
@ -654,6 +656,7 @@ EseraDigitalInOut_Attr(@)
<ul> <ul>
<li>DS2408</li> <li>DS2408</li>
<li>11220/11228 (Esera "Digital Out 8-Channel with push-button interface")</li> <li>11220/11228 (Esera "Digital Out 8-Channel with push-button interface")</li>
<li>11233 (Esera "Digital Out 2-Channel with push-button interface")</li>
<li>11229 (Esera "Digital Out 8-Channel")</li> <li>11229 (Esera "Digital Out 8-Channel")</li>
<li>11216 (Esera "8-Channel Digital Input DC")</li> <li>11216 (Esera "8-Channel Digital Input DC")</li>
<li>SYS1 (Esera Controller 2, digital input, not listed by "get devices")</li> <li>SYS1 (Esera Controller 2, digital input, not listed by "get devices")</li>

2
fhem/FHEM/66_EseraOneWire.pm
View File

@ -84,7 +84,7 @@ EseraOneWire_Initialize($)
$hash->{Clients} = ":EseraDigitalInOut:EseraTemp:EseraMulti:EseraAnalogInOut:EseraIButton:EseraCount:EseraShutter:"; $hash->{Clients} = ":EseraDigitalInOut:EseraTemp:EseraMulti:EseraAnalogInOut:EseraIButton:EseraCount:EseraShutter:";
$hash->{MatchList} = { "1:EseraDigitalInOut" => "^DS2408|^11220|^11228|^11229|^11216|^SYS1|^SYS2", $hash->{MatchList} = { "1:EseraDigitalInOut" => "^DS2408|^11220|^11233|^11228|^11229|^11216|^SYS1|^SYS2",
"2:EseraTemp" => "^DS1820", "2:EseraTemp" => "^DS1820",
"3:EseraMulti" => "^DS2438|^11121|^11134|^11135", "3:EseraMulti" => "^DS2438|^11121|^11134|^11135",
"4:EseraAnalogInOut" => "^SYS3", "4:EseraAnalogInOut" => "^SYS3",