From d3e169a0d76e010da432c66d770e272491aab9b9 Mon Sep 17 00:00:00 2001 From: ntruchsess <> Date: Mon, 14 Apr 2014 22:20:54 +0000 Subject: [PATCH] OWX_ASYNC: fix commandref git-svn-id: https://svn.fhem.de/fhem/trunk@5528 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/00_OWX_ASYNC.pm | 10 +++++----- fhem/FHEM/{11_OWX_DS2480.pm => OWX_DS2480.pm} | 8 ++++---- fhem/FHEM/{11_OWX_Executor.pm => OWX_Executor.pm} | 0 fhem/FHEM/{11_OWX_FRM.pm => OWX_FRM.pm} | 0 fhem/FHEM/{11_OWX_SER.pm => OWX_SER.pm} | 12 ++++++------ 5 files changed, 15 insertions(+), 15 deletions(-) rename fhem/FHEM/{11_OWX_DS2480.pm => OWX_DS2480.pm} (98%) rename fhem/FHEM/{11_OWX_Executor.pm => OWX_Executor.pm} (100%) rename fhem/FHEM/{11_OWX_FRM.pm => OWX_FRM.pm} (100%) rename fhem/FHEM/{11_OWX_SER.pm => OWX_SER.pm} (97%) diff --git a/fhem/FHEM/00_OWX_ASYNC.pm b/fhem/FHEM/00_OWX_ASYNC.pm index fac19a6f0..5741bf423 100644 --- a/fhem/FHEM/00_OWX_ASYNC.pm +++ b/fhem/FHEM/00_OWX_ASYNC.pm @@ -4,8 +4,8 @@ # # FHEM module to commmunicate with 1-Wire bus devices # * via an active DS2480 bus master interface attached to an USB port -# * via an Arduino running CopnfigurableFirmata attached to USB -# * via an Arduino running CopnfigurableFirmata connecting to FHEM via Ethernet +# * via an Arduino running ConfigurableFirmata attached to USB +# * via an Arduino running ConfigurableFirmata connecting to FHEM via Ethernet # # Norbert Truchsess # Prof. Dr. Peter A. Henning @@ -189,15 +189,15 @@ sub OWX_ASYNC_Define ($$) { #-- First step - different methods #-- check if we have a serial device attached if ( $dev =~ m|$SER_regexp|i){ - require "$main::attr{global}{modpath}/FHEM/11_OWX_SER.pm"; + require "$main::attr{global}{modpath}/FHEM/OWX_SER.pm"; $owx = OWX_SER->new(); #-- check if we have a COC/CUNO interface attached }elsif( (defined $main::defs{$dev} && (defined( $main::defs{$dev}->{VERSION} ) ? $main::defs{$dev}->{VERSION} : "") =~ m/CSM|CUNO/ )){ - require "$main::attr{global}{modpath}/FHEM/11_OWX_CCC.pm"; + require "$main::attr{global}{modpath}/FHEM/OWX_CCC.pm"; $owx = OWX_CCC->new(); #-- check if we are connecting to Arduino (via FRM): } elsif ($dev =~ /^\d{1,2}$/) { - require "$main::attr{global}{modpath}/FHEM/11_OWX_FRM.pm"; + require "$main::attr{global}{modpath}/FHEM/OWX_FRM.pm"; $owx = OWX_FRM->new(); } else { return "OWX: Define failed, unable to identify interface type $dev" diff --git a/fhem/FHEM/11_OWX_DS2480.pm b/fhem/FHEM/OWX_DS2480.pm similarity index 98% rename from fhem/FHEM/11_OWX_DS2480.pm rename to fhem/FHEM/OWX_DS2480.pm index d0203efeb..a77b1cf17 100644 --- a/fhem/FHEM/11_OWX_DS2480.pm +++ b/fhem/FHEM/OWX_DS2480.pm @@ -7,7 +7,7 @@ # Prof. Dr. Peter A. Henning # Norbert Truchsess # -# $Id: 11_OWX_SER.pm 2013-03 - pahenning $ +# $Id: OWX_DS2480.pm 2013-04 - ntruchsess $ # ######################################################################################## # @@ -98,7 +98,7 @@ sub query ($$$) { $hwdevice->baudrate($serial->{baud}); $hwdevice->write_settings; - if( $main::owx_debug > 2){ + if( $main::owx_async_debug > 2){ main::Log3($serial->{name},3, "OWX_DS2480.query sending out: ".unpack ("H*",$cmd)); } @@ -134,10 +134,10 @@ sub read() { $serial->{string_in} .= $string_part; $serial->{retcount} += $count_in; $serial->{num_reads}++; - if( $main::owx_debug > 2){ + if( $main::owx_async_debug > 2){ main::Log3($serial->{name},3, "OWX_DS2480 read: Loop no. $serial->{num_reads}"); } - if( $main::owx_debug > 2){ + if( $main::owx_async_debug > 2){ main::Log3($serial->{name},3, "OWX_DS2480 read: Receiving in loop no. $serial->{num_reads} ".unpack("H*",$string_part)); } return $count_in > 0 ? 1 : undef; diff --git a/fhem/FHEM/11_OWX_Executor.pm b/fhem/FHEM/OWX_Executor.pm similarity index 100% rename from fhem/FHEM/11_OWX_Executor.pm rename to fhem/FHEM/OWX_Executor.pm diff --git a/fhem/FHEM/11_OWX_FRM.pm b/fhem/FHEM/OWX_FRM.pm similarity index 100% rename from fhem/FHEM/11_OWX_FRM.pm rename to fhem/FHEM/OWX_FRM.pm diff --git a/fhem/FHEM/11_OWX_SER.pm b/fhem/FHEM/OWX_SER.pm similarity index 97% rename from fhem/FHEM/11_OWX_SER.pm rename to fhem/FHEM/OWX_SER.pm index 55ff79f2b..d04b1ede5 100644 --- a/fhem/FHEM/11_OWX_SER.pm +++ b/fhem/FHEM/OWX_SER.pm @@ -7,7 +7,7 @@ # Prof. Dr. Peter A. Henning # Norbert Truchsess # -# $Id: 11_OWX_SER.pm 2013-03 - pahenning $ +# $Id: OWX_SER.pm 2013-04 - ntruchsess $ # ######################################################################################## # @@ -43,7 +43,7 @@ no warnings 'deprecated'; sub new() { my $class = shift; - require "$main::attr{global}{modpath}/FHEM/11_OWX_Executor.pm"; + require "$main::attr{global}{modpath}/FHEM/OWX_Executor.pm"; my $self = OWX_Executor->new(); @@ -202,7 +202,7 @@ sub pt_execute($$$$$$$) { } #-- for debugging - if( $main::owx_debug > 1){ + if( $main::owx_async_debug > 1){ main::Log3($self->{name},3,"OWX_SER::Execute: Sending out ".unpack ("H*",$select)); } $self->block($select); @@ -213,7 +213,7 @@ sub pt_execute($$$$$$$) { my $res = $self->{string_in}; #-- for debugging - if( $main::owx_debug > 1){ + if( $main::owx_async_debug > 1){ main::Log3($self->{name},3,"OWX_SER::Execute: Receiving ".unpack ("H*",$res)); } @@ -286,7 +286,7 @@ sub initialize($) { my $interface; - require "$main::attr{global}{modpath}/FHEM/11_OWX_DS2480.pm"; + require "$main::attr{global}{modpath}/FHEM/OWX_DS2480.pm"; my $ds2480 = OWX_DS2480->new($self); #-- timing byte for DS2480 @@ -350,7 +350,7 @@ sub initialize($) { if ($interface eq "DS2480") { return $ds2480; } elsif ($interface eq "DS9097") { - require "$main::attr{global}{modpath}/FHEM/11_OWX_DS9097.pm"; + require "$main::attr{global}{modpath}/FHEM/OWX_DS9097.pm"; return OWX_DS9097->new($self); } else { die $ress;