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

00_OWX.pm: Diverse kleinere Fixes

Browse Source 
11_OWX_SER.pm: Diverse kleinere Fixes
11_OWX_FRM.pm: Diverse kleinere Fixes
11_OWX_TCP.pm: Diverse kleinere Fixes
11_OWX_CCC.pm: Diverse kleinere Fixes

git-svn-id: https://svn.fhem.de/fhem/trunk@15392 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
phenning 2017-11-05 06:46:46 +00:00
parent 4ab926b954
commit 6bdb03cae9
5 changed files with 97 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
fhem/FHEM/00_OWX.pm
View File

@ -81,16 +81,24 @@ use vars qw{%owg_family %gets %sets $owx_version $owx_debug};
%gets = (
"alarms" => "A",
"devices" => "D",
"version" => "V"
"version" => "V",
"qstatus" => "P"
);
#-- These occur in a pulldown menu as settable values for the bus master
%sets = (
"reopen" => "R"
"close" => "c",
"open" => "o",
"closeopen" => "co" ,
"reopen" => "R",
"discover" => "C",
"detect" => "T",
"disconnected" => "D",
"process" => "P"
);
#-- some globals needed for the 1-Wire module
$owx_version="7.04";
$owx_version="7.05";
#-- debugging now verbosity, this is just for backward compatibility
$owx_debug=0;
@ -121,7 +129,7 @@ sub OWX_Initialize ($) {
$hash->{SetFn} = "OWX_Set";
$hash->{AttrFn} = "OWX_Attr";
$hash->{AttrList}= "asynchronous:0,1 dokick:0,1 ".
"interval timeout opendelay ".
"interval timeout opendelay expert:0_def,1_detail ".
$readingFnAttributes;
}
@ -690,9 +698,25 @@ sub OWX_Get($@) {
} elsif( $a[1] eq "version") {
return $owx_version;
#-- expert mode
} elsif( $a[1] eq "qstatus") {
my $qlen = ($hash->{QUEUE} ? scalar(@{$hash->{QUEUE}}) : 0);
my $state = $hash->{STATE};
my $dev = $hash->{DeviceName};
my $busy = ($hash->{BUSY})? "BUSY" : "NOT BUSY";
my $block = ($hash->{BLOCK})? "BLOCKED" : "NOT BLOCKED";
$hash->{BUSY} = 1;
my $res = "OWX: Queue $name: => dev=$dev length=$qlen, state=$state, $busy, $block\n";
foreach my $diapoint (@{$hash->{QUEUE}}) {
$res .= " => ".$diapoint->{owx_dev}." context ".$diapoint->{context}." expecting ".$diapoint->{numread}." bytes, ".$diapoint->{status}."\n";
}
return $res;
} else {
return "OWX_Get with unknown argument $a[1], choose one of ".
join(" ", sort keys %gets);
return "OWX_Get with unknown argument $a[1], choose one of ".
( (AttrVal($name,"expert","") eq "1_detail") ? join(":noArg ", sort keys %gets).":noArg" : "alarms devices version");
}
}
@ -1022,9 +1046,10 @@ sub OWX_Set($@) {
my $res = 0;
#-- for the selector: which values are possible
return join(" ", sort keys %sets)
return ( (AttrVal($name,"expert","") eq "1_detail") ? join(":noArg ", sort keys %sets).":noArg" : "reopen:noArg")
if(!defined($sets{$a[0]}));
return "OWX_Set: With unknown argument $a[0], choose one of " . join(" ", sort keys %sets)
return "OWX_Set: With unknown argument $a[0], choose one of " .
( (AttrVal($name,"expert","") eq "1_detail") ? join(" ", sort keys %sets) : "reopen")
if(!defined($sets{$a[0]}));
#-- Set reopen
@ -1032,6 +1057,51 @@ sub OWX_Set($@) {
DevIo_OpenDev($hash, 1, undef);
$res = 0;
}
#-- expert mode
#-- Set closedev
if( $a[0] eq "close" ){
OWX_WDBGL($name,1,"====> CLOSING DEVICE",main::DevIo_CloseDev($hash));
$res = 0;
}
#-- Set opendev
if( $a[0] eq "open" ){
OWX_WDBGL($name,1,"====> OPENING DEVICE",main::DevIo_OpenDev($hash,0,undef));
$res = 0;
}
#-- Set closeopendev
if( $a[0] eq "closeopen" ){
OWX_WDBGL($name,1,"====> CLOSING DEVICE",main::DevIo_CloseDev($hash));
OWX_WDBGL($name,1," OPENING DEVICE",main::DevIo_OpenDev($hash, 0, undef));
}
#-- Set reopen
if( $a[0] eq "reopen" ){
OWX_WDBGL($name,1,"====> REOPENING DEVICE",main::DevIo_OpenDev($hash, 1, undef));
$res = 0;
}
#-- Set discover
if( $a[0] eq "discover" ){
OWX_Discover($hash);
$res = 0;
}
#-- Set detect
if( $a[0] eq "detect" ){
my $owx = $hash->{OWX};
$owx->Detect();
$res = 0;
}
if( $a[0] eq "process") {
my $res = OWX_PrQueue("queue:$name");
#-- process result
return $res
}
Log3 $name, 3, "OWX_Set $name ".join(" ",@a)." => $res";
}
@ -1590,7 +1660,7 @@ sub OWX_WDBGL($$$$) {
1;
=pod
=item helper
=item device
=item summary to commmunicate with 1-Wire bus devices
=item summary_DE zur Kommunikation mit 1-Wire Geräten
=begin html
@ -1607,22 +1677,19 @@ sub OWX_WDBGL($$$$) {
</ul> Internally these interfaces are vastly different, read the corresponding <a
href="http://fhemwiki.de/wiki/Interfaces_f%C3%BCr_1-Wire"> Wiki pages </a>.
The passive DS9097 interface is no longer suppoorted.
<br />
<br />
<a name="OWXdefine"></a>
<h4>Define</h4>
<p>To define a 1-Wire interface to communicate with a 1-Wire bus, several possibilities exist:
<ul>
<li><code>define &lt;name&gt; OWX &lt;serial-device&gt;</code>, i.e. specify the serial device (e.g. USB port) to which the
1-Wire bus is attached, for example <code>define OWio1 OWX /dev/ttyUSB1</code>.</li>
<li><code>define &lt;name&gt; OWX &lt;tcpip&gt;[:&lt;port&gt;]</code>, i.e. specify the IP address and port to which the 1-Wire bus is attached,
for example <code>define OWio1 OWX 192.168.0.1:23</code>. Attention: no socat program needed. </li>
1-Wire bus is attached, for example<br/><code>define OWio1 OWX /dev/ttyUSB1</code></li>
<li><code>define &lt;name&gt; OWX &lt;tcpip&gt;[:&lt;port&gt;]</code>, i.e. specify the IP address and port to which the 1-Wire bus is attached. Attention: no socat program needed.
Example:<br/><code>define OWio1 OWX 192.168.0.1:23</code></li>
<li><code>define &lt;name&gt; OWX &lt;cuno/coc-device&gt;</code>, i.e. specify the previously defined COC/CUNO to which the 1-Wire bus
is attached, forexample <code>define OWio2 OWX COC</code></li>
is attached, for example<br/><code>define OWio2 OWX COC</code></li>
<li><code>define &lt;name&gt; OWX &lt;firmata-device&gt;:&lt;firmata-pin&gt;</code>, i.e. specify the name and 1-Wire pin of the previously defined <a href="#FRM">FRM</a>
device to which the 1-Wire bus is attached, for example <code>define OWio3 OWX FIRMATA:10</code>.</li>
device to which the 1-Wire bus is attached, for example<br/><code>define OWio3 OWX FIRMATA:10</code></li>
</ul>
<br />
<a name="OWXset"></a>
<h4>Set</h4>
<ul>
@ -1639,7 +1706,7 @@ sub OWX_WDBGL($$$$) {
<li><a name="owx_alarms"></a>
<code>get &lt;name&gt; alarms</code>
<br />performs an "alarm search" for devices on the 1-Wire bus and, if found,
generates an event in the log (not with CUNO). </li>
generates an event in the log (not with all interface types). </li>
<li><a name="owx_devices"></a>
<code>get &lt;name&gt; devices</code>
<br />redicovers all devices on the 1-Wire bus. If a device found has a

6
fhem/FHEM/11_OWX_CCC.pm
View File

@ -51,7 +51,7 @@ sub new($) {
return bless {
hash => $hash,
#-- module version
version => "7.04"
version => "7.05"
}, $class;
}
@ -591,7 +591,7 @@ sub Write(@) {
1;
=pod
=item helper
=item device
=item summary to address an OWX interface device via COC/CUNO
=item summary_DE zur Adressierung eines OWX Interface Device mit COC/CUNO
=begin html
@ -599,7 +599,7 @@ sub Write(@) {
<a name="OWX_CCC"></a>
<h3>OWX_CCC</h3>
See <a href="/fhem/docs/commandref.html#OWX">OWX</a>
end html
=end html
=begin html_DE
<a name="OWX_CCC"></a>

6
fhem/FHEM/11_OWX_FRM.pm
View File

@ -98,7 +98,7 @@ sub Define($) {
$hash->{ASYNCHRONOUS} = 0;
#-- module version
$hash->{version} = "7.04";
$hash->{version} = "7.05";
main::Log3 $hash->{NAME},1,"OWX_FRM::Define warning: version ".$hash->{version}." not identical to OWX version ".$main::owx_version
if( $hash->{version} ne $main::owx_version);
@ -623,7 +623,7 @@ sub firmata_to_device
=pod
=item helper
=item device
=item summary to address an OWX interface device via Arduino Firmata
=item summary_DE zur Adressierung eines OWX Interface Device mit Arduino Firmata
=begin html
@ -631,7 +631,7 @@ sub firmata_to_device
<a name="OWX_FRM"></a>
<h3>OWX_FRM</h3>
See <a href="/fhem/docs/commandref.html#OWX">OWX</a>
end html
=end html
=begin html_DE
<a name="OWX_FRM"></a>

6
fhem/FHEM/11_OWX_SER.pm
View File

@ -92,7 +92,7 @@ sub Define ($) {
$hash->{ASYNCHRONOUS} = 0;
#-- module version
$hash->{version} = "7.04";
$hash->{version} = "7.05";
main::Log3 $hash->{NAME},1,"OWX_SER::Define warning: version ".$hash->{version}." not identical to OWX version ".$main::owx_version
if( $hash->{version} ne $main::owx_version);
@ -869,7 +869,7 @@ sub SearchLow ($) {
=pod
=item helper
=item device
=item summary to address an OWX interface device via USB/Serial Interface
=item summary_DE zur Adressierung eines OWX Interface Device via USB/Serial Interface
=begin html
@ -877,7 +877,7 @@ sub SearchLow ($) {
<a name="OWX_SER"></a>
<h3>OWX_SER</h3>
See <a href="/fhem/docs/commandref.html#OWX">OWX</a>
end html
=end html
=begin html_DE
<a name="OWX_SER"></a>

6
fhem/FHEM/11_OWX_TCP.pm
View File

@ -92,7 +92,7 @@ sub Define ($) {
$hash->{ASYNCHRONOUS} = 0;
#-- module version
$hash->{version} = "7.04";
$hash->{version} = "7.05";
main::Log3 $hash->{NAME},1,"OWX_TCP::Define warning: version ".$hash->{version}." not identical to OWX version "..$main::owx_version
if( $hash->{version} ne $main::owx_version );
@ -836,7 +836,7 @@ sub SearchLow ($) {
1;
=pod
=item helper
=item device
=item summary to address an OWX interface device via TCP/IP
=item summary_DE zur Adressierung eines OWX Interface Device mit TCP/IP
=begin html
@ -844,7 +844,7 @@ sub SearchLow ($) {
<a name="OWX_TCP"></a>
<h3>OWX_TCP</h3>
See <a href="/fhem/docs/commandref.html#OWX">OWX</a>
end html
=end html
=begin html_DE
<a name="OWX_TCP"></a>