mirror of
https://github.com/fhem/fhem-mirror.git
synced 2025-01-31 18:59:33 +00:00
11_OWX_CCC.pm: Neue Version 7.08
11_OWX_FRM.pm: Neue Version 7.08 11_OWX_SER.pm: Neue Version 7.08 11_OWX_TCP.pm: Neue Version 7.08 git-svn-id: https://svn.fhem.de/fhem/trunk@16362 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
phenning
parent
a4e790ed4b
commit
440e48a2ed
@ -17,6 +17,9 @@
|
||||
# Alarms
|
||||
# Complex
|
||||
# Discover
|
||||
# Open
|
||||
# Close
|
||||
# Reopen
|
||||
# Init
|
||||
# Read
|
||||
# ReadLow
|
||||
@ -51,7 +54,7 @@ sub new($) {
|
||||
return bless {
|
||||
hash => $hash,
|
||||
#-- module version
|
||||
version => "7.05"
|
||||
version => "7.08"
|
||||
}, $class;
|
||||
}
|
||||
|
||||
@ -81,7 +84,6 @@ sub Define($) {
|
||||
my $dev = $a[2];
|
||||
$hash->{DeviceName} = $dev;
|
||||
|
||||
|
||||
#-- Second step in case of CUNO: See if we can open it
|
||||
my $msg = "OWX_CCC::Define COC/CUNO device $dev";
|
||||
#-- hash des COC/CUNO
|
||||
@ -109,8 +111,6 @@ sub Define($) {
|
||||
#-- reset the 1-Wire system in COC/CUNO
|
||||
main::CUL_SimpleWrite($hwdevice, "Oi");
|
||||
|
||||
#-- module version
|
||||
$hash->{version} = "7.0beta2";
|
||||
main::Log3 $name,1,"OWX_CCC::Define warning: version ".$hash->{version}." not identical to OWX version ".$main::owx_version
|
||||
if( $hash->{version} ne $main::owx_version);
|
||||
|
||||
@ -296,6 +296,39 @@ sub Discover () {
|
||||
}
|
||||
}
|
||||
|
||||
########################################################################################
|
||||
#
|
||||
# Open - Open Device
|
||||
#
|
||||
########################################################################################
|
||||
|
||||
sub Open () {
|
||||
my ($self) = @_;
|
||||
my $hash = $self->{hash};
|
||||
}
|
||||
|
||||
########################################################################################
|
||||
#
|
||||
# Close - Close Device
|
||||
#
|
||||
########################################################################################
|
||||
|
||||
sub Close () {
|
||||
my ($self) = @_;
|
||||
my $hash = $self->{hash};
|
||||
|
||||
}
|
||||
|
||||
########################################################################################
|
||||
#
|
||||
# Reopen - Reopen Device
|
||||
#
|
||||
########################################################################################
|
||||
|
||||
sub Reopen () {
|
||||
main::Log 1,"[OWX_CCC] Warning: ->Reopen currently not defined
|
||||
}
|
||||
|
||||
########################################################################################
|
||||
#
|
||||
# Init - Low Level Init of the 1-wire device
|
||||
@ -598,11 +631,15 @@ sub Write(@) {
|
||||
|
||||
<a name="OWX_CCC"></a>
|
||||
<h3>OWX_CCC</h3>
|
||||
<ul>
|
||||
See <a href="/fhem/docs/commandref.html#OWX">OWX</a>
|
||||
</ul>
|
||||
=end html
|
||||
=begin html_DE
|
||||
|
||||
<a name="OWX_CCC"></a>
|
||||
<h3>OWX_CCC</h3>
|
||||
<ul>
|
||||
<a href="http://fhemwiki.de/wiki/Interfaces_f%C3%BCr_1-Wire">Deutsche Dokumentation im Wiki</a> vorhanden, die englische Version gibt es hier: <a href="/fhem/docs/commandref.html#OWX">OWX</a>
|
||||
</ul>
|
||||
=end html_DE
|
||||
@ -17,6 +17,9 @@
|
||||
# Alarms
|
||||
# Complex
|
||||
# Discover
|
||||
# Open
|
||||
# Close
|
||||
# Reopen
|
||||
# Read
|
||||
# Ready
|
||||
# Verify
|
||||
@ -53,7 +56,9 @@ sub new($) {
|
||||
my ($class,$hash) = @_;
|
||||
|
||||
return bless {
|
||||
hash => $hash
|
||||
hash => $hash,
|
||||
#-- module version
|
||||
version => "7.08";
|
||||
}, $class;
|
||||
}
|
||||
|
||||
@ -98,8 +103,6 @@ sub Define($) {
|
||||
$hash->{PIN} = $pin;
|
||||
$hash->{ASYNCHRONOUS} = 0;
|
||||
|
||||
#-- module version
|
||||
$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);
|
||||
|
||||
@ -175,6 +178,16 @@ sub Alarms() {
|
||||
return 1;
|
||||
}
|
||||
|
||||
########################################################################################
|
||||
#
|
||||
# Reopen - Reopen Device
|
||||
#
|
||||
########################################################################################
|
||||
|
||||
sub Reopen () {
|
||||
main::Log 1,"[OWX_FRM] Warning: ->Reopen currently not defined
|
||||
}
|
||||
|
||||
########################################################################################
|
||||
#
|
||||
# Init - Initialize the 1-wire device
|
||||
@ -370,6 +383,31 @@ sub Discover ($) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
||||
########################################################################################
|
||||
#
|
||||
# Open - Open Device
|
||||
#
|
||||
########################################################################################
|
||||
|
||||
sub Open () {
|
||||
my ($self) = @_;
|
||||
my $hash = $self->{hash};
|
||||
}
|
||||
|
||||
########################################################################################
|
||||
#
|
||||
# Close - Close Device
|
||||
#
|
||||
########################################################################################
|
||||
|
||||
sub Close () {
|
||||
my ($self) = @_;
|
||||
my $hash = $self->{hash};
|
||||
|
||||
}
|
||||
|
||||
|
||||
#######################################################################################
|
||||
#
|
||||
# Read - Implement the Read function
|
||||
|
||||
@ -17,6 +17,9 @@
|
||||
# Alarms
|
||||
# Complex
|
||||
# Discover
|
||||
# Open
|
||||
# Close
|
||||
# Reopen
|
||||
# Init
|
||||
# Read
|
||||
# Ready
|
||||
@ -55,6 +58,8 @@ sub new($) {
|
||||
return bless {
|
||||
#-- OWX device
|
||||
hash => $hash,
|
||||
#-- module version
|
||||
version => "7.08",
|
||||
#-- baud rate serial interface
|
||||
baud => 9600,
|
||||
#-- 16 byte search string
|
||||
@ -91,9 +96,7 @@ sub Define ($) {
|
||||
$hash->{DeviceName} = $dev;
|
||||
$hash->{ASYNCHRONOUS} = 0;
|
||||
|
||||
#-- module version
|
||||
$hash->{version} = "7.05";
|
||||
main::Log3 $hash->{NAME},1,"OWX_SER::Define warning: version ".$hash->{version}." not identical to OWX version ".$main::owx_version
|
||||
main::Log3 $hash->{NAME},1,"OWX_SER::Define warning: version ".$self->{version}." not identical to OWX version ".$main::owx_version
|
||||
if( $hash->{version} ne $main::owx_version);
|
||||
|
||||
#-- call low level init function for the device
|
||||
@ -282,6 +285,47 @@ sub Discover () {
|
||||
return( @{$hash->{DEVS}} == 0);
|
||||
}
|
||||
|
||||
########################################################################################
|
||||
#
|
||||
# Open - Open Device
|
||||
#
|
||||
########################################################################################
|
||||
|
||||
sub Open () {
|
||||
my ($self) = @_;
|
||||
my $hash = $self->{hash};
|
||||
#return main::DevIo_OpenDev($hash,1,"main::OWX_Init")
|
||||
|
||||
return main::DevIo_OpenDev($hash,1,undef)
|
||||
}
|
||||
|
||||
########################################################################################
|
||||
#
|
||||
# Close - Close Device
|
||||
#
|
||||
########################################################################################
|
||||
|
||||
sub Close () {
|
||||
my ($self) = @_;
|
||||
my $hash = $self->{hash};
|
||||
|
||||
return main::DevIo_CloseDev($hash);
|
||||
}
|
||||
|
||||
########################################################################################
|
||||
#
|
||||
# Reopen - Reopen Device
|
||||
#
|
||||
########################################################################################
|
||||
|
||||
sub Reopen () {
|
||||
my ($self) = @_;
|
||||
my $hash = $self->{hash};
|
||||
|
||||
main::DevIo_CloseDev($hash);
|
||||
return main::DevIo_OpenDev($hash,1,undef)
|
||||
}
|
||||
|
||||
########################################################################################
|
||||
#
|
||||
# Init - Initialize the 1-wire device
|
||||
@ -297,12 +341,7 @@ sub Init() {
|
||||
my $name = $hash->{NAME};
|
||||
|
||||
main::Log3 $name,5,"OWX_SER::Init called on device $dev for bus $name, state is ".$hash->{STATE};
|
||||
|
||||
#if($hash->{STATE} ne "opened"){
|
||||
#XXX
|
||||
#main::DevIo_CloseDev($hash);
|
||||
main::DevIo_OpenDev($hash,0,undef);
|
||||
#}
|
||||
main::DevIo_OpenDev($hash,0,undef);
|
||||
my $hwdevice = $hash->{USBDev};
|
||||
|
||||
if( !($hwdevice)){
|
||||
@ -876,11 +915,15 @@ sub SearchLow ($) {
|
||||
|
||||
<a name="OWX_SER"></a>
|
||||
<h3>OWX_SER</h3>
|
||||
<ul>
|
||||
See <a href="/fhem/docs/commandref.html#OWX">OWX</a>
|
||||
</ul>
|
||||
=end html
|
||||
=begin html_DE
|
||||
|
||||
<a name="OWX_SER"></a>
|
||||
<h3>OWX_SER</h3>
|
||||
<ul>
|
||||
<a href="http://fhemwiki.de/wiki/Interfaces_f%C3%BCr_1-Wire">Deutsche Dokumentation im Wiki</a> vorhanden, die englische Version gibt es hier: <a href="/fhem/docs/commandref.html#OWX">OWX</a>
|
||||
</ul>
|
||||
=end html_DE
|
||||
@ -18,6 +18,9 @@
|
||||
# Alarms
|
||||
# Complex
|
||||
# Discover
|
||||
# Open
|
||||
# Close
|
||||
# Reopen
|
||||
# Init
|
||||
# Read
|
||||
# Ready
|
||||
@ -56,6 +59,8 @@ sub new($) {
|
||||
return bless {
|
||||
#-- OWX device
|
||||
hash => $hash,
|
||||
#-- module version
|
||||
version => "7.08",
|
||||
#-- 16 byte search string
|
||||
search => [0,0,0,0 ,0,0,0,0, 0,0,0,0, 0,0,0,0],
|
||||
ROM_ID => [0,0,0,0 ,0,0,0,0],
|
||||
@ -91,8 +96,6 @@ sub Define ($) {
|
||||
$hash->{DeviceName} = $ip.":".$port;
|
||||
$hash->{ASYNCHRONOUS} = 0;
|
||||
|
||||
#-- module version
|
||||
$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 );
|
||||
|
||||
@ -279,6 +282,46 @@ sub Discover () {
|
||||
return( @{$hash->{DEVS}} == 0);
|
||||
}
|
||||
|
||||
########################################################################################
|
||||
#
|
||||
# Open - Open Device
|
||||
#
|
||||
########################################################################################
|
||||
|
||||
sub Open () {
|
||||
my ($self) = @_;
|
||||
my $hash = $self->{hash};
|
||||
|
||||
return main::DevIo_OpenDev($hash,0,undef);
|
||||
}
|
||||
|
||||
########################################################################################
|
||||
#
|
||||
# Close - Close Device
|
||||
#
|
||||
########################################################################################
|
||||
|
||||
sub Close () {
|
||||
my ($self) = @_;
|
||||
my $hash = $self->{hash};
|
||||
|
||||
return main::DevIo_CloseDev($hash);
|
||||
}
|
||||
|
||||
########################################################################################
|
||||
#
|
||||
# Reopen - Reopen Device
|
||||
#
|
||||
########################################################################################
|
||||
|
||||
sub Reopen () {
|
||||
my ($self) = @_;
|
||||
my $hash = $self->{hash};
|
||||
|
||||
main::DevIo_CloseDev($hash);
|
||||
return main::DevIo_OpenDev($hash,0,undef);
|
||||
}
|
||||
|
||||
########################################################################################
|
||||
#
|
||||
# Init - Implement the Init function. Only reopens the device
|
||||
@ -294,7 +337,6 @@ sub Init() {
|
||||
my $name = $hash->{NAME};
|
||||
|
||||
main::Log3 $name, 5,"OWX_TCP::Init called on device $dev for bus $name, state is ".$hash->{STATE};
|
||||
|
||||
main::DevIo_OpenDev($hash,0,undef);
|
||||
|
||||
return undef;
|
||||
@ -843,11 +885,15 @@ sub SearchLow ($) {
|
||||
|
||||
<a name="OWX_TCP"></a>
|
||||
<h3>OWX_TCP</h3>
|
||||
<ul>
|
||||
See <a href="/fhem/docs/commandref.html#OWX">OWX</a>
|
||||
</ul>
|
||||
=end html
|
||||
=begin html_DE
|
||||
|
||||
<a name="OWX_TCP"></a>
|
||||
<h3>OWX_TCP</h3>
|
||||
<ul>
|
||||
<a href="http://fhemwiki.de/wiki/Interfaces_f%C3%BCr_1-Wire">Deutsche Dokumentation im Wiki</a> vorhanden, die englische Version gibt es hier: <a href="/fhem/docs/commandref.html#OWX">OWX</a>
|
||||
</ul>
|
||||
=end html_DE
|
||||
Loading…
Reference in New Issue
Block a user