diff --git a/fhem/CHANGED b/fhem/CHANGED
index aff6a4272..af8f045da 100644
--- a/fhem/CHANGED
+++ b/fhem/CHANGED
@@ -1,5 +1,6 @@
# 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.
+ - feature: 44_S7: new attribute receiveTimeoutMs
- feature: 38_CO20: introduced state reading
- change: 73_NUKIBridge,74_NUKIDevice: fix Perlwarnings
- bugfix: 38_CO20: fixed definition with serial number
diff --git a/fhem/FHEM/44_S7.pm b/fhem/FHEM/44_S7.pm
index 4270c2399..0e863c165 100644
--- a/fhem/FHEM/44_S7.pm
+++ b/fhem/FHEM/44_S7.pm
@@ -57,7 +57,7 @@ sub S7_Initialize($) { #S5_OK
$hash->{SetFn} = "S7_Set";
$hash->{AttrFn} = "S7_Attr";
- $hash->{AttrList} = "MaxMessageLength Intervall " . $readingFnAttributes;
+ $hash->{AttrList} = "MaxMessageLength Intervall receiveTimeoutMs " . $readingFnAttributes;
# $hash->{AttrList} = join( " ", @areasconfig )." PLCTime";
}
@@ -157,6 +157,8 @@ sub S7_reconnect($) { #S5 OK
my $hash = shift @_;
S7_disconnect($hash) if ( defined( $hash->{S7PLCClient} ) );
+
+
if ( $hash->{S7TYPE} eq "S5" ) {
$hash->{S7PLCClient} = S5Client->new();
}
@@ -239,7 +241,7 @@ sub S7_Define($$) { # S5 OK
$hash->{LocalTSAP} = $LocalTSAP;
$hash->{RemoteTSAP} = $RemoteTSAP;
$hash->{maxPDUlength} = $PDUlength; #initial PDU length
-
+ $hash->{receiveTimeoutMs} = 500; #default receiving timeout = 500ms
Log3 $name, 4,
"S7: define $name PLC_address=$PLC_address,LocalTSAP=$LocalTSAP, RemoteTSAP=$RemoteTSAP ";
@@ -325,7 +327,21 @@ sub S7_Attr(@) {
Log3( $name, 3, "$name S7_Attr: setting Intervall= $aVal" );
}
+ } elsif ($aName eq "receiveTimeoutMs") {
+ if ( $aVal > 100 && $aVal < 10000) {
+
+ $hash->{receiveTimeoutMs} = $aVal;
+
+ Log3( $name, 3, "$name S7_Attr: setting receiveTimeoutMs= $aVal" );
+
+ #reconnect with the new receiving timeout
+
+ $hash->{S7PLCClient}->setRecvTimeout($hash->{receiveTimeoutMs}) if ( defined( $hash->{S7PLCClient} ) );
+ }
+
}
+
+
###########
if ( $aName eq "WriteInputs-Config"
@@ -1101,158 +1117,218 @@ sub S7_readFromPLC($) { #S5 OK
1;
+
=pod
=item summary basic interface to a SIEMENS S7 / S5
=item summary_DE Schnittstelle zu einer Siemens S7 / S5
=begin html
-
+
S7
-This module connects a SIEMENS PLC (Note: also SIEMENS Logo is supported).
-The TCP communication module is based on settimino (http://settimino.sourceforge.net)
-
-You can found a german wiki here: httl://www.fhemwiki.de/wiki/S7
-
-
-For the communication the following modules have been implemented:
-- S7 … sets up the communication channel to the PLC
-- S7_ARead … Is used for reading integer Values from the PLC
-- S7_AWrite … Is used for write integer Values to the PLC
-- S7_DRead … Is used for read bits
-- S7_DWrite … Is used for writing bits.
+This module connects a SIEMENS PLC (S7,S5,SIEMENS Logo!). The TCP communication (S7, Siemens LOGO!) module is based on settimino (http://settimino.sourceforge.net). The serial Communication is based on a libnodave portation.
-
-
-Reading work flow:
-
-
-
-The S7 module reads periodically the configured DB areas from the PLC and stores the data in an internal buffer. Then all reading client modules are informed. Each client module extracts his data and the corresponding readings are set.
-
-
-Writing work flow:
-
-
-At the S7 module you need to configure the PLC writing target. Also the S7 module holds a writing buffer. Which contains a master copy of the data needs to send.
-
-(Note: after configuration of the writing area a copy from the PLC is read and used as initial fill-up of the writing buffer)
-
-Note: The S7 module will send always the whole data block to the PLC.
-When data on the clients modules is set then the client module updates the internal writing buffer on the S7 module and triggers the writing to the PLC.
-
-
-
-
-Define
+
+
-define <name> S7 <PLC_address> <rack> <slot> [<Interval>]
-
-define logo S7 10.0.0.241 2 0
-
+You can found a german wiki here: httl://www.fhemwiki.de/wiki/S7
+
+
-- PLC_address … IP address of the S7 PLC (For S5 see below)
-- rack … rack of the PLC
-- slot … slot of the PLC
-- Interval … Intervall how often the modul should check if a reading is required
-
+For the communication the following modules have been implemented:
+
+- S7 … sets up the communication channel to the PLC
+- S7_ARead … Is used for reading integer Values from the PLC
+- S7_AWrite … Is used for write integer Values to the PLC
+- S7_DRead … Is used for read bits
+- S7_DWrite … Is used for writing bits.
-Note: For Siemens logo you should use a alternative (more simply configuration method):
-define logo S7 LOGO7 10.0.0.241
-
-Note: For Siemens S5 you must use a alternative (more simply configuration method):
-define logo S7 S5 /dev/tty1
-
-in this case the PLC_address is the serial port number
-
-
-Attr
-The following attributes are supported:
+
+
+
+
+
+The S7 module reads periodically the configured DB areas from the PLC and stores the data in an internal buffer. Then all reading client modules are informed. Each client module extracts his data and the corresponding readings are set. Writing work flow:
+
+
+
+At the S7 module you need to configure the PLC writing target. Also the S7 module holds a writing buffer. Which contains a master copy of the data needs to send.
+
+
+
+(Note: after configuration of the writing area a copy from the PLC is read and used as initial fill-up of the writing buffer)
+
+
+
+Note: The S7 module will send always the whole data block to the PLC. When data on the clients modules is set then the client module updates the internal writing buffer on the S7 module and triggers the writing to the PLC.
+
+
Definedefine <name> S7 <PLC_address> <rack> <slot> [<Interval>]
define logo S7 10.0.0.241 2 0
+
+
+
+
+- PLC_address … IP address of the S7 PLC (For S5 see below)
+- rack … rack of the PLC
+- slot … slot of the PLC
+- Interval … Intervall how often the modul should check if a reading is required
+
+
+
+
+
+
+
+Note: For Siemens logo you should use a alternative (more simply configuration method):
+
+
+
+
+
+define logo S7 LOGO7 10.0.0.241
+
+
+
+
+
+Note: For Siemens S5 you must use a alternative (more simply configuration method):
+
+
+
+
+
+define logo S7 S5 /dev/tty1 in this case the PLC_address is the serial port number
+
+
+
Attr
+
+The following attributes are supported:
+
+
+
+
- MaxMessageLength
-
-MaxMessageLength ... restricts the packet length if lower than the negioated PDULength. This could be used to increate the processing speed. 2 small packages may be smaler than one large package
+- receiveTimeoutMs
+- Intervall
+
+
+
+MaxMessageLength ... restricts the packet length if lower than the negioated PDULength. This could be used to increate the processing speed. 2 small packages may be smaler than one large package
+receiveTimeoutMs ... timeout in ms for TCP receiving packages. Default Value 500ms.
+Intervall ... polling intervall in s
+
=end html
=begin html_DE
-
+
S7
-This module connects a SIEMENS PLC (Note: also SIEMENS Logo is supported).
-The TCP communication module is based on settimino (http://settimino.sourceforge.net)
-
-You can found a german wiki here: httl://www.fhemwiki.de/wiki/S7
-
-
-For the communication the following modules have been implemented:
-- S7 … sets up the communication channel to the PLC
-- S7_ARead … Is used for reading integer Values from the PLC
-- S7_AWrite … Is used for write integer Values to the PLC
-- S7_DRead … Is used for read bits
-- S7_DWrite … Is used for writing bits.
+This module connects a SIEMENS PLC (S7,S5,SIEMENS Logo!). The TCP communication (S7, Siemens LOGO!) module is based on settimino (http://settimino.sourceforge.net). The serial Communication is based on a libnodave portation.
-
-
-Reading work flow:
-
-
-
-The S7 module reads periodically the configured DB areas from the PLC and stores the data in an internal buffer. Then all reading client modules are informed. Each client module extracts his data and the corresponding readings are set.
-
-
-Writing work flow:
-
-
-At the S7 module you need to configure the PLC writing target. Also the S7 module holds a writing buffer. Which contains a master copy of the data needs to send.
-
-(Note: after configuration of the writing area a copy from the PLC is read and used as initial fill-up of the writing buffer)
-
-Note: The S7 module will send always the whole data block to the PLC.
-When data on the clients modules is set then the client module updates the internal writing buffer on the S7 module and triggers the writing to the PLC.
-
-
-
-
-Define
+
+
-define <name> S7 <PLC_address> <rack> <slot> [<Interval>]
-
-define logo S7 10.0.0.241 2 0
-
+You can found a german wiki here: httl://www.fhemwiki.de/wiki/S7
+
+
-- PLC_address … IP address of the S7 PLC (For S5 see below)
-- rack … rack of the PLC
-- slot … slot of the PLC
-- Interval … Intervall how often the modul should check if a reading is required
-
+For the communication the following modules have been implemented:
+
+- S7 … sets up the communication channel to the PLC
+- S7_ARead … Is used for reading integer Values from the PLC
+- S7_AWrite … Is used for write integer Values to the PLC
+- S7_DRead … Is used for read bits
+- S7_DWrite … Is used for writing bits.
-Note: For Siemens logo you should use a alternative (more simply configuration method):
-define logo S7 LOGO7 10.0.0.241
-
-Note: For Siemens S5 you must use a alternative (more simply configuration method):
-define logo S7 S5 /dev/tty1
-
-in this case the PLC_address is the serial port number
-
-
-Attr
-The following attributes are supported:
+
+
+
+
+
+The S7 module reads periodically the configured DB areas from the PLC and stores the data in an internal buffer. Then all reading client modules are informed. Each client module extracts his data and the corresponding readings are set. Writing work flow:
+
+
+
+At the S7 module you need to configure the PLC writing target. Also the S7 module holds a writing buffer. Which contains a master copy of the data needs to send.
+
+
+
+(Note: after configuration of the writing area a copy from the PLC is read and used as initial fill-up of the writing buffer)
+
+
+
+Note: The S7 module will send always the whole data block to the PLC. When data on the clients modules is set then the client module updates the internal writing buffer on the S7 module and triggers the writing to the PLC.
+
+
Definedefine <name> S7 <PLC_address> <rack> <slot> [<Interval>]
define logo S7 10.0.0.241 2 0
+
+
+
+
+- PLC_address … IP address of the S7 PLC (For S5 see below)
+- rack … rack of the PLC
+- slot … slot of the PLC
+- Interval … Intervall how often the modul should check if a reading is required
+
+
+
+
+
+
+
+Note: For Siemens logo you should use a alternative (more simply configuration method):
+
+
+
+
+
+define logo S7 LOGO7 10.0.0.241
+
+
+
+
+
+Note: For Siemens S5 you must use a alternative (more simply configuration method):
+
+
+
+
+
+define logo S7 S5 /dev/tty1 in this case the PLC_address is the serial port number
+
+
+
Attr
+
+The following attributes are supported:
+
+
+
+
- MaxMessageLength
-
-MaxMessageLength ... restricts the packet length if lower than the negioated PDULength. This could be used to increate the processing speed. 2 small packages may be smaler than one large package
+- receiveTimeoutMs
+- Intervall
-
+
+
+
+MaxMessageLength ... restricts the packet length if lower than the negioated PDULength. This could be used to increate the processing speed. 2 small packages may be smaler than one large package
+receiveTimeoutMs ... timeout in ms for TCP receiving packages. Default Value 500ms.
+Intervall ... polling intervall in s
+
=end html_DE
=cut
diff --git a/fhem/FHEM/44_S7_Client.pm b/fhem/FHEM/44_S7_Client.pm
index cf6a3a4e0..df5b75a92 100644
--- a/fhem/FHEM/44_S7_Client.pm
+++ b/fhem/FHEM/44_S7_Client.pm
@@ -419,6 +419,14 @@ sub PutFloatAt {
return $self->setFloatAt( $Buffer, $index, $value );
}
+
+#-----------------------------------------------------------------------------
+sub setRecvTimeout {
+
+ my ( $self, $newRecvTimeout ) = @_;
+
+ $self->{RecvTimeout} = $newRecvTimeout;
+}
#-----------------------------------------------------------------------------
sub version {
@@ -427,6 +435,8 @@ sub version {
#-----------------------------------------------------------------------------
+
+
sub getErrorStr {
}
@@ -453,4 +463,4 @@ sub getErrorStr {
=end html_DE
-=cut
\ No newline at end of file
+=cut