OWAD.pm: Neue Version 6.0, eingerichtet für asynchrones OWX
OWCOUNT.pm: Neue Version 6.0, eingerichtet für asynchrones OWX OWID.pm: Neue Version 6.0, eingerichtet für asynchrones OWX OWLCD.pm: Neue Version 6.0, eingerichtet für asynchrones OWX OWMULTI.pm: Neue Version 6.0, eingerichtet für asynchrones OWX OWSWITCH.pm: Neue Version 6.0, eingerichtet für asynchrones OWX OWTHERM.pm: Neue Version 6.0, eingerichtet für asynchrones OWX git-svn-id: https://svn.fhem.de/fhem/trunk@11130 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
pahenning
@@ -16,7 +16,7 @@
|
||||
# where <name> may be replaced by any name string
|
||||
#
|
||||
# <model> is a 1-Wire device type. If omitted, we assume this to be an
|
||||
# DS2413. Allowed values are DS2413, DS2406
|
||||
# DS2413. Allowed values are DS2413, DS2406, DS2408
|
||||
# <fam> is a 1-Wire family id, currently allowed values are 12, 29, 3A
|
||||
# <ROM_ID> is a 12 character (6 byte) 1-Wire ROM ID
|
||||
# without Family ID, e.g. A2D90D000800
|
||||
@@ -45,10 +45,8 @@
|
||||
# Additional attributes are defined in fhem.cfg, in some cases per channel, where <channel>=A,B
|
||||
# Note: attributes are read only during initialization procedure - later changes are not used.
|
||||
#
|
||||
# attr <name> stateS <string> = character string denoting external shortening condition, default is (ext)
|
||||
# overwritten by an attribute setting "red angled arrow downward"
|
||||
#
|
||||
# attr <name> <channel>Name <string>|<string> = name for the channel [|name used in state reading]
|
||||
# attr <name> stateS <string> = character string denoting external shortening condition, default is X
|
||||
# attr <name> <channel>Name <string>|<string> = name for the channel [|short name used in state reading]
|
||||
# attr <name> <channel>Unit <string>|<string> = values to display in state variable for on|off condition
|
||||
#
|
||||
########################################################################################
|
||||
@@ -89,7 +87,7 @@ no warnings 'deprecated';
|
||||
|
||||
sub Log($$);
|
||||
|
||||
my $owx_version="5.24";
|
||||
my $owx_version="6.0";
|
||||
#-- fixed raw channel name, flexible channel name
|
||||
my @owg_fixed = ("A","B","C","D","E","F","G","H");
|
||||
my @owg_channel = ("A","B","C","D","E","F","G","H");
|
||||
@@ -131,8 +129,6 @@ my %cnumber = (
|
||||
#
|
||||
# OWSWITCH_Initialize
|
||||
#
|
||||
# CalledBy: FHEM
|
||||
# Calling: --
|
||||
# Parameter: hash = hash of device addressed
|
||||
#
|
||||
########################################################################################
|
||||
@@ -148,7 +144,7 @@ sub OWSWITCH_Initialize ($) {
|
||||
$hash->{InitFn} = "OWSWITCH_Init";
|
||||
$hash->{AttrFn} = "OWSWITCH_Attr";
|
||||
|
||||
my $attlist = "IODev do_not_notify:0,1 showtime:0,1 model:DS2413,DS2406,DS2408 loglevel:0,1,2,3,4,5 ".
|
||||
my $attlist = "IODev do_not_notify:0,1 showtime:0,1 model:DS2413,DS2406,DS2408 ".
|
||||
"stateS interval ".
|
||||
$readingFnAttributes;
|
||||
|
||||
@@ -172,8 +168,6 @@ sub OWSWITCH_Initialize ($) {
|
||||
#
|
||||
# OWSWITCH_Define - Implements DefFn function
|
||||
#
|
||||
# CalledBy: FHEM
|
||||
# Calling: --
|
||||
# Parameter: hash = hash of device addressed, def = definition string
|
||||
#
|
||||
#########################################################################################
|
||||
@@ -280,8 +274,6 @@ sub OWSWITCH_Define ($$) {
|
||||
#
|
||||
# OWSWITCH_Notify - Implements Notify function
|
||||
#
|
||||
# CalledBy: FHEM
|
||||
# Calling: --
|
||||
# Parameter: hash = hash of device addressed, def = definition string
|
||||
#
|
||||
#########################################################################################
|
||||
@@ -298,8 +290,6 @@ sub OWSWITCH_Notify ($$) {
|
||||
#
|
||||
# OWSWITCH_Init - Implements Init function
|
||||
#
|
||||
# CalledBy: FHEM
|
||||
# Calling: --
|
||||
# Parameter: hash = hash of device addressed, def = definition string
|
||||
#
|
||||
#########################################################################################
|
||||
@@ -316,8 +306,6 @@ sub OWSWITCH_Init ($) {
|
||||
#
|
||||
# OWSWITCH_Attr - Set one attribute value for device
|
||||
#
|
||||
# CalledBy: FHEM
|
||||
# Calling: --
|
||||
# Parameter: hash = hash of device addressed
|
||||
# a = argument array
|
||||
#
|
||||
@@ -362,8 +350,6 @@ sub OWSWITCH_Attr(@) {
|
||||
#
|
||||
# OWSWITCH_ChannelNames - find the real channel names
|
||||
#
|
||||
# CalledBy: OWSWITCH_FormatValues, OWSWITCH_Get, OWSWITCH_Set
|
||||
# Calling: --
|
||||
# Parameter: hash = hash of device addressed
|
||||
#
|
||||
########################################################################################
|
||||
@@ -378,7 +364,7 @@ sub OWSWITCH_ChannelNames($) {
|
||||
|
||||
for (my $i=0;$i<$cnumber{$attr{$name}{"model"}};$i++){
|
||||
#-- name
|
||||
$cname = defined($attr{$name}{$owg_fixed[$i]."Name"}) ? $attr{$name}{$owg_fixed[$i]."Name"} : $owg_fixed[$i];
|
||||
$cname = defined($attr{$name}{$owg_fixed[$i]."Name"}) ? $attr{$name}{$owg_fixed[$i]."Name"} : "$owg_fixed[$i]";
|
||||
@cnama = split(/\|/,$cname);
|
||||
if( int(@cnama)!=2){
|
||||
push(@cnama,$cnama[0]);
|
||||
@@ -398,7 +384,6 @@ sub OWSWITCH_ChannelNames($) {
|
||||
|
||||
#-- put into readings
|
||||
$hash->{READINGS}{$owg_channel[$i]}{UNIT} = $unit;
|
||||
$hash->{READINGS}{$owg_channel[$i]}{UNITABBR} = $unit;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -406,8 +391,6 @@ sub OWSWITCH_ChannelNames($) {
|
||||
#
|
||||
# OWSWITCH_FormatValues - put together various format strings
|
||||
#
|
||||
# CalledBy: OWSWITCH_Get, OWSWITCH_Set
|
||||
# Calling: --
|
||||
# Parameter; hash = hash of device addressed, fs = format string
|
||||
#
|
||||
########################################################################################
|
||||
@@ -420,7 +403,9 @@ sub OWSWITCH_FormatValues($) {
|
||||
my $svalue = "";
|
||||
|
||||
#-- external shortening signature
|
||||
my $sname = defined($attr{$name}{"stateS"}) ? $attr{$name}{"stateS"} : "☇";
|
||||
my $sname = defined($attr{$name}{"stateS"}) ? $attr{$name}{"stateS"} : "X";
|
||||
$sname = ""
|
||||
if($sname eq "none");
|
||||
|
||||
#-- obtain channel names
|
||||
OWSWITCH_ChannelNames($hash);
|
||||
@@ -466,10 +451,6 @@ sub OWSWITCH_FormatValues($) {
|
||||
#
|
||||
# OWSWITCH_Get - Implements GetFn function
|
||||
#
|
||||
# CalledBy: FHEM
|
||||
# Calling: OWSWITCH_ChannelNames,OWSWITCH_FormatValues,
|
||||
# OWFSSWITCH_GetState,OWXSWITCH_GetState,
|
||||
# OWX_Verify
|
||||
# Parameter: hash = hash of device addressed, a = argument array
|
||||
#
|
||||
########################################################################################
|
||||
@@ -480,6 +461,7 @@ sub OWSWITCH_Get($@) {
|
||||
my $reading = $a[1];
|
||||
my $name = $hash->{NAME};
|
||||
my $model = $hash->{OW_MODEL};
|
||||
|
||||
my ($value,$value2,$value3) = (undef,undef,undef);
|
||||
my $ret = "";
|
||||
my ($offset,$factor,$page,$cname,@cnama,@channel);
|
||||
@@ -550,7 +532,7 @@ sub OWSWITCH_Get($@) {
|
||||
|
||||
#-- OWX interface
|
||||
if( $interface eq "OWX" ){
|
||||
$ret = OWXSWITCH_GetState($hash);
|
||||
OWXSWITCH_GetModState($hash,undef,undef);
|
||||
}elsif( $interface eq "OWX_ASYNC") {
|
||||
eval {
|
||||
$ret = OWX_ASYNC_RunToCompletion($hash,OWXSWITCH_PT_GetState($hash));
|
||||
@@ -563,8 +545,12 @@ sub OWSWITCH_Get($@) {
|
||||
}else{
|
||||
return "OWSWITCH: Get with wrong IODev type $interface";
|
||||
}
|
||||
#-- process results
|
||||
return $name.".".$a[2]." => ".$hash->{READINGS}{$owg_channel[$fnd]}{VAL};
|
||||
#-- process result
|
||||
if( ($master->{ASYNCHRONOUS}) && ($interface ne "OWFS") ){
|
||||
return "OWSWITCH: $name getting input, please wait for completion";
|
||||
}else{
|
||||
return $name.".".$a[2]." => ".$hash->{READINGS}{$owg_channel[$fnd]}{VAL};
|
||||
}
|
||||
|
||||
#-- get all states
|
||||
}elsif( $reading eq "gpio" ){
|
||||
@@ -572,7 +558,7 @@ sub OWSWITCH_Get($@) {
|
||||
if( int(@a)==1 );
|
||||
|
||||
if( $interface eq "OWX" ){
|
||||
$ret = OWXSWITCH_GetState($hash);
|
||||
$ret = OWXSWITCH_GetModState($hash,undef,undef);
|
||||
}elsif( $interface eq "OWX_ASYNC" ){
|
||||
eval {
|
||||
$ret = OWX_ASYNC_RunToCompletion($hash,OWXSWITCH_PT_GetState($hash));
|
||||
@@ -584,10 +570,14 @@ sub OWSWITCH_Get($@) {
|
||||
return "OWSWITCH: Get with wrong IODev type $interface";
|
||||
}
|
||||
#-- process results
|
||||
if( defined($ret) ){
|
||||
return "OWSWITCH: Could not get values from device $name, reason $ret";
|
||||
if( $master->{ASYNCHRONOUS} ){
|
||||
return "OWSWITCH: $name getting gpio, please wait for completion";
|
||||
}else{
|
||||
if( defined($ret) ){
|
||||
return "OWSWITCH: Could not get values from device $name, reason $ret";
|
||||
}
|
||||
return "OWSWITCH: $name.$reading => ".$hash->{READINGS}{"state"}{VAL};
|
||||
}
|
||||
return "OWSWITCH: $name.$reading => ".$hash->{READINGS}{"state"}{VAL};
|
||||
}
|
||||
}
|
||||
|
||||
@@ -620,7 +610,7 @@ sub OWSWITCH_GetValues($) {
|
||||
if( $interface eq "OWX" ){
|
||||
#-- max 3 tries
|
||||
for(my $try=0; $try<3; $try++){
|
||||
$ret = OWXSWITCH_GetState($hash);
|
||||
$ret = OWXSWITCH_GetModState($hash,undef,undef);
|
||||
return if( !defined($ret) );
|
||||
}
|
||||
}elsif( $interface eq "OWX_ASYNC" ){
|
||||
@@ -652,6 +642,7 @@ sub OWSWITCH_GetValues($) {
|
||||
########################################################################################
|
||||
#
|
||||
# OWSWITCH_InitializeDevice - initial readings
|
||||
#
|
||||
# Parameter hash = hash of device addressed
|
||||
#
|
||||
########################################################################################
|
||||
@@ -738,24 +729,24 @@ sub OWSWITCH_Set($@) {
|
||||
return "OWSWITCH: Set needs parameter when writing output: <channel>"
|
||||
if( int(@a)<2 );
|
||||
#-- find out which channel we have
|
||||
my $fnd=undef;
|
||||
my $outfnd=undef;
|
||||
for (my $i=0;$i<$cnumber{$attr{$name}{"model"}};$i++){
|
||||
if( ($a[2] eq $owg_channel[$i]) || ($a[2] eq $owg_fixed[$i]) ){
|
||||
$fnd=$i;
|
||||
$outfnd=$i;
|
||||
last;
|
||||
}
|
||||
}
|
||||
return "OWSWITCH: Invalid output address, must be A,B,... or defined channel name"
|
||||
if( !defined($fnd) );
|
||||
if( !defined($outfnd) );
|
||||
|
||||
#-- prepare gpio value
|
||||
my $nval;
|
||||
my $outval;
|
||||
my $ntim;
|
||||
my $nstr="";
|
||||
if( lc($a[3]) eq "on" ){
|
||||
$nval = 0;
|
||||
$outval = 0;
|
||||
}elsif( lc($a[3]) eq "off" ){
|
||||
$nval = 1;
|
||||
$outval = 1;
|
||||
}elsif( lc($a[3]) =~ m/for-timer/ ){
|
||||
if( !($a[4] =~ m/\d\d\:\d\d\:\d\d/) ){
|
||||
if( !($a[4] =~ m/\d{1,4}/ )){
|
||||
@@ -767,10 +758,10 @@ sub OWSWITCH_Set($@) {
|
||||
$ntim= $a[4];
|
||||
}
|
||||
if( lc($a[3]) eq "on-for-timer" ){
|
||||
$nval = 0;
|
||||
$outval = 0;
|
||||
$nstr = "$a[0] $a[1] $a[2] off";
|
||||
}elsif( lc($a[3]) eq "off-for-timer" ){
|
||||
$nval = 1;
|
||||
$outval = 1;
|
||||
$nstr = "$a[0] $a[1] $a[2] on";
|
||||
}
|
||||
}else{
|
||||
@@ -778,36 +769,31 @@ sub OWSWITCH_Set($@) {
|
||||
}
|
||||
|
||||
if ($nstr ne ""){
|
||||
fhem("define ".$a[0].".".$owg_fixed[$fnd]."Timer at +".$ntim." set ".$nstr);
|
||||
fhem("define ".$a[0].".".$owg_fixed[$outfnd]."Timer at +".$ntim." set ".$nstr);
|
||||
}
|
||||
|
||||
#-- OWX interface
|
||||
if( $interface eq "OWX" ){
|
||||
$ret1 = OWXSWITCH_GetState($hash);
|
||||
$value = 0;
|
||||
#-- vax or val ?
|
||||
for (my $i=0;$i<$cnumber{$attr{$name}{"model"}};$i++){
|
||||
$value += ($hash->{owg_vax}->[$i]<<$i)
|
||||
if( $i != $fnd );
|
||||
$value += ($nval<<$i)
|
||||
if( $i == $fnd );
|
||||
}
|
||||
$ret2 = OWXSWITCH_SetState($hash,$value);
|
||||
$ret1 = OWXSWITCH_GetModState($hash,$outfnd,$outval);
|
||||
}elsif( $interface eq "OWX_ASYNC"){
|
||||
eval {
|
||||
OWX_ASYNC_Schedule( $hash, OWXSWITCH_PT_SetOutput($hash,$fnd,$nval) );
|
||||
OWX_ASYNC_Schedule( $hash, OWXSWITCH_PT_SetOutput($hash,$outfnd,$outval) );
|
||||
};
|
||||
$ret2 = GP_Catch($@) if $@;
|
||||
#-- OWFS interface
|
||||
}elsif( $interface eq "OWServer" ){
|
||||
$ret1 = OWFSSWITCH_GetState($hash);
|
||||
$value = 0;
|
||||
#-- vax or val ?
|
||||
my $gpio = 0;
|
||||
#--
|
||||
for (my $i=0;$i<$cnumber{$attr{$name}{"model"}};$i++){
|
||||
$value += ($hash->{owg_vax}->[$i]<<$i)
|
||||
if( $i != $fnd );
|
||||
$value += ($nval<<$i)
|
||||
if( $i == $fnd );
|
||||
if( $outval==0 ){
|
||||
$gpio += ($hash->{owg_vax}->[$i]<<$i)
|
||||
if( $i != $outfnd );
|
||||
}else{
|
||||
$gpio += ($hash->{owg_vax}->[$i]<<$i);
|
||||
$gpio += (1<<$i)
|
||||
if( $i == $outfnd );
|
||||
}
|
||||
}
|
||||
$ret2 = OWFSSWITCH_SetState($hash,$value);
|
||||
#-- Unknown interface
|
||||
@@ -848,7 +834,7 @@ sub OWSWITCH_Set($@) {
|
||||
}
|
||||
|
||||
#-- process results - we have to reread the device
|
||||
OWSWITCH_GetValues($hash);
|
||||
#OWSWITCH_GetValues($hash);
|
||||
Log 4, "OWSWITCH: Set $hash->{NAME} $key $value";
|
||||
return undef;
|
||||
}
|
||||
@@ -1009,124 +995,216 @@ sub OWFSSWITCH_SetState($$) {
|
||||
#
|
||||
########################################################################################
|
||||
#
|
||||
# OWXSWITCH_BinValues - Binary readings into clear values
|
||||
# OWXSWITCH_BinValues - Process reading from one device - translate binary into raw
|
||||
#
|
||||
# Parameter hash = hash of device addressed
|
||||
# context = mode for evaluating the binary data
|
||||
# proc = processing instruction, also passed to OWX_Read.
|
||||
# bitwise interpretation !!
|
||||
# if 0, nothing special
|
||||
# if 1 = bit 0, a reset will be performed not only before, but also after
|
||||
# the last operation in OWX_Read
|
||||
# if 2 = bit 1, the initial reset of the bus will be suppressed
|
||||
# if 8 = bit 3, the fillup of the data with 0xff will be suppressed
|
||||
# if 16= bit 4, the insertion will be at the top of the queue
|
||||
# owx_dev = ROM ID of slave device
|
||||
# crcpart = part of the data that needs to be part of the CRC check
|
||||
# numread = number of bytes to receive
|
||||
# res = result string
|
||||
#
|
||||
#
|
||||
########################################################################################
|
||||
|
||||
sub OWXSWITCH_BinValues($$$$$$$$) {
|
||||
my ($hash, $context, $success, $reset, $owx_dev, $command, $numread, $res) = @_;
|
||||
|
||||
#-- always check for success, unused are reset, numread
|
||||
return unless ($success and $context);
|
||||
#Log 1,"OWXSWITCH_BinValues context = $context";
|
||||
sub OWXSWITCH_BinValues($$$$$$$) {
|
||||
my ($hash, $context, $reset, $owx_dev, $crcpart, $numread, $res) = @_;
|
||||
|
||||
my @data=[];
|
||||
my $value;
|
||||
#-- hash of the busmaster
|
||||
my $master = $hash->{IODev};
|
||||
my $name = $hash->{NAME};
|
||||
my @data=[];
|
||||
my $value;
|
||||
my $msg;
|
||||
my $cmd;
|
||||
my $chip;
|
||||
my $outfnd;
|
||||
my $outval;
|
||||
|
||||
OWX_WDBG($name,"OWXSWITCH_BinValues called for device $name in context $context with data ",$res)
|
||||
if( $main::owx_debug>2 );
|
||||
|
||||
#-- note: value 1 corresponds to OFF, 0 to ON normally
|
||||
# val = input value, vax = output value
|
||||
#-- Outer if - check get or set
|
||||
if ( $context =~ /.*getstate.*/ ){
|
||||
if ( $context =~ /^(......)\.(get|mod)state\.?(\d)?\.?(\d)?/){
|
||||
$cmd = $2;
|
||||
$chip = $1;
|
||||
$outfnd = $3;
|
||||
$outval = $4;
|
||||
#-- family = 12 => DS2406 -------------------------------------------------------
|
||||
if( ($context eq "getstate.ds2406") or ($context eq "ds2406.getstate") ) {
|
||||
if( $chip eq "ds2406" ) {
|
||||
@data=split(//,$res);
|
||||
return "invalid data length, ".int(@data)." instead of 4 bytes"
|
||||
if (@data != 4);
|
||||
return "invalid CRC"
|
||||
if ( OWX_CRC16($command.substr($res,0,2),$data[2],$data[3]) == 0);
|
||||
$hash->{owg_val}->[0] = (ord($data[0])>>2) & 1;
|
||||
$hash->{owg_vax}->[0] = ord($data[0]) & 1;
|
||||
$hash->{owg_val}->[1] = (ord($data[0])>>3) & 1;
|
||||
$hash->{owg_vax}->[1] = (ord($data[0])>>1) & 1;
|
||||
|
||||
if (@data != 4){
|
||||
$msg="Error - $name returns invalid data length, ".int(@data)." instead of 4 bytes, ";
|
||||
}elsif(OWX_CRC16($crcpart.substr($res,0,2),$data[2],$data[3]) == 0){
|
||||
$msg="Error - state could not be set for device $name, invalid CRC, ";
|
||||
}else{
|
||||
$msg="No error, ";
|
||||
$value=ord($data[0]);
|
||||
$hash->{owg_val}->[0] = ($value>>2) & 1;
|
||||
$hash->{owg_vax}->[0] = $value & 1;
|
||||
$hash->{owg_val}->[1] = ($value>>3) & 1;
|
||||
$hash->{owg_vax}->[1] = ($value>>1) & 1;
|
||||
|
||||
}
|
||||
OWX_WDBG($name,"OWXSWITCH_BinValues: ".$msg,$res)
|
||||
if( $main::owx_debug>2 );
|
||||
|
||||
#-- family = 29 => DS2408 -------------------------------------------------------
|
||||
}elsif( ($context eq "getstate.ds2408") or ($context eq "ds2408.getstate") ) {
|
||||
}elsif( $chip eq "ds2408" ) {
|
||||
@data=split(//,$res);
|
||||
return "invalid data length, ".int(@data)." instead of 10 bytes"
|
||||
if (@data != 10);
|
||||
return "invalid data"
|
||||
if (ord($data[6])!=255);
|
||||
return "invalid CRC"
|
||||
if( OWX_CRC16($command.substr($res,0,8),$data[8],$data[9]) == 0);
|
||||
for(my $i=0;$i<8;$i++){
|
||||
$hash->{owg_val}->[$i] = (ord($data[0])>>$i) & 1;
|
||||
$hash->{owg_vax}->[$i] = (ord($data[1])>>$i) & 1;
|
||||
};
|
||||
if (@data != 10){
|
||||
$msg="Error - $name returns invalid data length, ".int(@data)." instead of 10 bytes, ";
|
||||
}elsif(ord($data[6])!=255){
|
||||
$msg="Error - $name returns invalid data, ";
|
||||
}elsif(OWX_CRC16($crcpart.substr($res,0,8),$data[8],$data[9]) == 0){
|
||||
$msg="Error - state could not be set for device $name, invalid CRC, ";
|
||||
}else{
|
||||
$msg="No error, ";
|
||||
for(my $i=0;$i<8;$i++){
|
||||
$hash->{owg_val}->[$i] = (ord($data[0])>>$i) & 1;
|
||||
$hash->{owg_vax}->[$i] = (ord($data[1])>>$i) & 1;
|
||||
};
|
||||
}
|
||||
OWX_WDBG($name,"OWXSWITCH_BinValues: ".$msg,$res)
|
||||
if( $main::owx_debug>2 );
|
||||
|
||||
#-- family = 3A => DS2413 -------------------------------------------------------
|
||||
}elsif( ($context eq "getstate.ds2413") or ($context eq "ds2413.getstate") ){
|
||||
}elsif( $chip eq "ds2413" ){
|
||||
@data=split(//,$res);
|
||||
return "invalid data length, ".int(@data)." instead of 2 bytes"
|
||||
if (@data != 2);
|
||||
return "invalid data"
|
||||
if ( (15- (ord($data[0])>>4)) != (ord($data[0]) & 15) );
|
||||
$hash->{owg_val}->[0] = ord($data[0]) & 1;
|
||||
$hash->{owg_vax}->[0] = (ord($data[0])>>1) & 1;
|
||||
$hash->{owg_val}->[1] = (ord($data[0])>>2) & 1;
|
||||
$hash->{owg_vax}->[1] = (ord($data[0])>>3) & 1;
|
||||
if (@data != 2){
|
||||
$msg="Error - $name returns invalid data length, ".int(@data)." instead of 2 bytes, ";
|
||||
}elsif((15- (ord($data[0])>>4)) != (ord($data[0]) & 15)){
|
||||
$msg="Error - $name returns invalid data, ";
|
||||
}else{
|
||||
$msg="No error, ";
|
||||
$hash->{owg_val}->[0] = ord($data[0]) & 1;
|
||||
$hash->{owg_vax}->[0] = (ord($data[0])>>1) & 1;
|
||||
$hash->{owg_val}->[1] = (ord($data[0])>>2) & 1;
|
||||
$hash->{owg_vax}->[1] = (ord($data[0])>>3) & 1;
|
||||
}
|
||||
OWX_WDBG($name,"OWXSWITCH_BinValues: ".$msg,$res)
|
||||
if( $main::owx_debug>2 );
|
||||
|
||||
#--
|
||||
}else{
|
||||
return "unknown device family $hash->{OW_FAMILY} in OWXSWITCH_BinValues getstate\n";
|
||||
die "OWSWITCH: $name has unknown device family $hash->{OW_FAMILY} in OWXSWITCH_BinValues getstate\n";
|
||||
};
|
||||
#-- now only if data has to be overwritten
|
||||
if( $cmd eq "mod" ){
|
||||
my $gpio = 0;
|
||||
#--
|
||||
for (my $i=0;$i<$cnumber{$attr{$name}{"model"}};$i++){
|
||||
if( $outval==0 ){
|
||||
$gpio += ($hash->{owg_vax}->[$i]<<$i)
|
||||
if( $i != $outfnd );
|
||||
}else{
|
||||
$gpio += ($hash->{owg_vax}->[$i]<<$i);
|
||||
$gpio += (1<<$i)
|
||||
if( $i == $outfnd );
|
||||
}
|
||||
}
|
||||
#-- re-set the state
|
||||
OWXSWITCH_SetState($hash,$gpio);
|
||||
}
|
||||
#-- Now for context setstate
|
||||
}elsif ( $context =~ /.*setstate.*/){
|
||||
}elsif ( $context =~ /^(......)\.setstate\.?(\d+)?\.?(\d+)?/){
|
||||
$chip = $1;
|
||||
$value = $2;
|
||||
#-- family = 12 => DS2406 -------------------------------------------------------
|
||||
if( ($context =~ /setstate\.ds2406\..*/) or ($context =~ /ds2406\.setstate\..*/) ) {
|
||||
$value = substr($context,-1);
|
||||
if( $chip eq "ds2406" ) {
|
||||
@data=split(//,$res);
|
||||
return "state could not be set for device $owx_dev"
|
||||
if( int(@data) != 2);
|
||||
return "invalid CRC"
|
||||
if (OWX_CRC16($command,$data[0],$data[1]) == 0);
|
||||
#-- put into local buffer]";
|
||||
$hash->{owg_val}->[0] = $value % 2;
|
||||
$hash->{owg_vax}->[0] = $value % 2;
|
||||
$hash->{owg_val}->[1] = int($value / 2);
|
||||
$hash->{owg_vax}->[1] = int($value / 2);
|
||||
|
||||
if (@data != 2){
|
||||
$msg="Error - $name returns invalid data length, ".int(@data)." instead of 2 bytes, ";
|
||||
}elsif(OWX_CRC16($crcpart,$data[0],$data[1]) == 0){
|
||||
$msg="Error - state could not be set for device $name, invalid CRC, ";
|
||||
}else{
|
||||
$msg="No error, ";
|
||||
$outval = $value % 2;
|
||||
$hash->{owg_vax}->[0] = $outval;
|
||||
$hash->{owg_val}->[0] = 0
|
||||
if( $outval ==0);
|
||||
$outval = int($value / 2);
|
||||
$hash->{owg_vax}->[1] = $outval;
|
||||
$hash->{owg_val}->[1] = 0
|
||||
if( $outval ==0);
|
||||
}
|
||||
OWX_WDBG($name,"OWXSWITCH_BinValues: ".$msg,$res)
|
||||
if( $main::owx_debug>2 );
|
||||
|
||||
#-- family = 29 => DS2408 -------------------------------------------------------
|
||||
}elsif( ($context eq "setstate.ds2408") or ($context eq "ds2408.setstate") ) {
|
||||
@data=split(//,$res);
|
||||
return "invalid data length, ".int(@data)." instead of 1 bytes"
|
||||
if (@data != 1);
|
||||
return "state could not be set for device $owx_dev"
|
||||
if( $data[0] ne "\xAA");
|
||||
}elsif( $chip eq "ds2408" ) {
|
||||
if (length($res)!=1){
|
||||
$msg="Error - $name returns invalid data length, ".length($res)." instead of 1 bytes, ";
|
||||
}elsif($res ne "\xAA"){
|
||||
$msg="Error - state could not be set for device $name, ";
|
||||
}else{
|
||||
$msg="No error, ";
|
||||
for(my $i=0;$i<8;$i++){
|
||||
$outval = ($value >>$i) & 1;
|
||||
$hash->{owg_vax}->[$i] = $outval;
|
||||
$hash->{owg_val}->[$i] = 0
|
||||
if( $outval ==0);
|
||||
};
|
||||
}
|
||||
OWX_WDBG($name,"OWXSWITCH_BinValues: ".$msg,$res)
|
||||
if( $main::owx_debug>2 );
|
||||
|
||||
#-- family = 3A => DS2413 -------------------------------------------------------
|
||||
}elsif( ($context eq "setstate.ds2413") or ($context eq "ds2413.setstate") ){
|
||||
}elsif( $chip eq "ds2413" ){
|
||||
@data=split(//,$res);
|
||||
return "invalid data length, ".int(@data)." instead of 1 bytes"
|
||||
if (@data != 1);
|
||||
return "state could not be set for device $owx_dev"
|
||||
if( $data[0] ne "\xAA");
|
||||
if (@data != 2){
|
||||
$msg="Error - $name returns invalid data length, ".int(@data)." instead of 2 bytes, ";
|
||||
}elsif( $data[0] ne "\xAA"){
|
||||
$msg="Error - state could not be set for device $name, ";
|
||||
}else{
|
||||
$msg="No error, ";
|
||||
$outval = (ord($data[1])>>1) & 1;
|
||||
$hash->{owg_vax}->[0] = $outval;
|
||||
$hash->{owg_val}->[0] = 0
|
||||
if( $outval ==0);
|
||||
$outval = (ord($data[1])>>3) & 1;
|
||||
$hash->{owg_vax}->[1] = $outval;
|
||||
$hash->{owg_val}->[1] = 0
|
||||
if( $outval ==0);
|
||||
}
|
||||
OWX_WDBG($name,"OWXSWITCH_BinValues: ".$msg,$res)
|
||||
if( $main::owx_debug>2 );
|
||||
#--
|
||||
}else{
|
||||
return "unknown device family $hash->{OW_FAMILY} in OWXSWITCH_BinValues setstate\n";
|
||||
die "OWSWITCH: $name has unknown device family $hash->{OW_FAMILY} in OWXSWITCH_BinValues setstate\n";
|
||||
};
|
||||
OWXSWITCH_GetModState($hash,undef,undef);
|
||||
}else{
|
||||
return "unknown context in OWXSWITCH_BinValues";
|
||||
die "OWSWITCH: unknown context $context in OWXSWITCH_BinValues";
|
||||
}
|
||||
|
||||
#-- and now from raw to formatted values
|
||||
$hash->{PRESENT} = 1;
|
||||
$value = OWSWITCH_FormatValues($hash);
|
||||
Log 5, $value;
|
||||
return undef;
|
||||
}
|
||||
|
||||
########################################################################################
|
||||
#
|
||||
# OWXSWITCH_GetState - Get gpio ports from device
|
||||
# OWXSWITCH_GetModState - Get gpio ports from device and overwrite
|
||||
#
|
||||
# Parameter hash = hash of device addressed
|
||||
# mod = if 1, overwrite state with new data
|
||||
#
|
||||
########################################################################################
|
||||
|
||||
sub OWXSWITCH_GetState($@) {
|
||||
my ($hash,$sync) = @_;
|
||||
sub OWXSWITCH_GetModState($$$) {
|
||||
my ($hash,$outfnd,$outval) = @_;
|
||||
|
||||
my ($select, $res, @data);
|
||||
|
||||
@@ -1137,12 +1215,24 @@ sub OWXSWITCH_GetState($@) {
|
||||
|
||||
#-- hash of the busmaster
|
||||
my $master = $hash->{IODev};
|
||||
my $name = $hash->{NAME};
|
||||
|
||||
#-- reset presence
|
||||
$hash->{PRESENT} = 0;
|
||||
|
||||
my ($i,$j,$k);
|
||||
|
||||
#-- what do we have to do
|
||||
my $context;
|
||||
my $proc;
|
||||
if( !defined($outfnd) ){
|
||||
$context = "getstate";
|
||||
#-- take your time
|
||||
$proc = 0;
|
||||
}else{
|
||||
$context = "modstate.$outfnd.$outval";
|
||||
#-- faster !
|
||||
$proc = 16;
|
||||
}
|
||||
|
||||
#-- family = 12 => DS2406
|
||||
if( $hash->{OW_FAMILY} eq "12" ) {
|
||||
#=============== get gpio values ===============================
|
||||
@@ -1150,45 +1240,78 @@ sub OWXSWITCH_GetState($@) {
|
||||
# \xF5 plus the two byte channel control and the value
|
||||
#-- reading 9 + 3 + 2 data bytes + 2 CRC bytes = 16 bytes
|
||||
$select=sprintf("\xF5\xDD\xFF");
|
||||
OWX_Reset($master);
|
||||
$res=OWX_Complex($master,$owx_dev,$select,4);
|
||||
return "$owx_dev not accessible in reading"
|
||||
if( $res eq 0 );
|
||||
return "$owx_dev has returned invalid data"
|
||||
if( length($res)!=16);
|
||||
OWX_Reset($master);
|
||||
return OWXSWITCH_BinValues($hash,"ds2406.getstate",1,undef,$owx_dev,substr($res,9,3),undef,substr($res,12));
|
||||
#-- OLD OWX interface
|
||||
if( !$master->{ASYNCHRONOUS} ){
|
||||
OWX_Reset($master);
|
||||
$res=OWX_Complex($master,$owx_dev,$select,4);
|
||||
return "OWSWITCH: $name not accessible in reading"
|
||||
if( $res eq 0 );
|
||||
return "OWSWITCH: $name has returned invalid data"
|
||||
if( length($res)!=16);
|
||||
#OWX_Reset($master);
|
||||
eval {
|
||||
OWXSWITCH_BinValues($hash,"ds2406.$context",undef,$owx_dev,$select,4,substr($res,12));
|
||||
};
|
||||
return $@ ? $@ : undef;
|
||||
#-- NEW OWX interface
|
||||
}else{
|
||||
#### master slave context proc owx_dev data crcpart numread startread callback delay
|
||||
OWX_Qomplex($master, $hash, "ds2406.$context", $proc, $owx_dev, $select, $select, 4, 12, \&OWXSWITCH_BinValues, 0);
|
||||
return undef;
|
||||
}
|
||||
#-- family = 29 => DS2408
|
||||
}elsif( $hash->{OW_FAMILY} eq "29" ) {
|
||||
#=============== get gpio values ===============================
|
||||
#-- issue the match ROM command \x55 and the read PIO rtegisters command
|
||||
#-- issue the match ROM command \x55 and the read PIO registers command
|
||||
# \xF5 plus the two byte channel target address
|
||||
#-- reading 9 + 3 + 8 data bytes + 2 CRC bytes = 22 bytes
|
||||
$select=sprintf("\xF0\x88\x00");
|
||||
OWX_Reset($master);
|
||||
$res=OWX_Complex($master,$owx_dev,$select,10);
|
||||
return "$owx_dev not accessible in reading"
|
||||
if( $res eq 0 );
|
||||
return "$owx_dev has returned invalid data"
|
||||
if( length($res)!=22);
|
||||
OWX_Reset($master);
|
||||
return OWXSWITCH_BinValues($hash,"ds2408.getstate",1,undef,$owx_dev,substr($res,9,3),undef,substr($res,12));
|
||||
$select=sprintf("\xF0\x88\x00");
|
||||
#-- OLD OWX interface
|
||||
if( !$master->{ASYNCHRONOUS} ){
|
||||
OWX_Reset($master);
|
||||
$res=OWX_Complex($master,$owx_dev,$select,10);
|
||||
return "OWSWITCH: $name not accessible in reading"
|
||||
if( $res eq 0 );
|
||||
return "OWSWITCH: $name has returned invalid data"
|
||||
if( length($res)!=22);
|
||||
#OWX_Reset($master);
|
||||
eval {
|
||||
OWXSWITCH_BinValues($hash,"ds2408.$context",0,$owx_dev,$select,4,substr($res,12));
|
||||
};
|
||||
return $@ ? $@ : undef;
|
||||
#-- NEW OWX interface
|
||||
}else{
|
||||
#### master slave context proc owx_dev data crcpart numread startread callback delay
|
||||
OWX_Qomplex($master, $hash, "ds2408.$context", $proc, $owx_dev, $select, $select,10, 12, \&OWXSWITCH_BinValues, 0);
|
||||
return undef;
|
||||
}
|
||||
#-- family = 3A => DS2413
|
||||
}elsif( $hash->{OW_FAMILY} eq "3A" ) {
|
||||
#=============== get gpio values ===============================
|
||||
#-- issue the match ROM command \x55 and the read gpio command
|
||||
# \xF5 plus 2 empty bytes
|
||||
#-- reading 9 + 1 + 2 data bytes = 12 bytes
|
||||
OWX_Reset($master);
|
||||
$res=OWX_Complex($master,$owx_dev,"\xF5",2);
|
||||
return "$owx_dev not accessible in reading"
|
||||
if( $res eq 0 );
|
||||
return "$owx_dev has returned invalid data"
|
||||
if( length($res)!=12);
|
||||
#OWX_Reset($master);
|
||||
return OWXSWITCH_BinValues($hash,"ds2413.getstate",1,undef,$owx_dev,substr($res,9,1),undef,substr($res,10));
|
||||
#-- OLD OWX interface
|
||||
if( !$master->{ASYNCHRONOUS} ){
|
||||
OWX_Reset($master);
|
||||
$res=OWX_Complex($master,$owx_dev,"\xF5",2);
|
||||
return "OWSWITCH: $name not accessible in reading"
|
||||
if( $res eq 0 );
|
||||
return "OWSWITCH: $name has returned invalid data"
|
||||
if( length($res)!=12);
|
||||
#OWX_Reset($master);
|
||||
eval {
|
||||
OWXSWITCH_BinValues($hash,"ds2413.$context",0,$owx_dev,substr($res,9,1),2,substr($res,10));
|
||||
};
|
||||
return $@ ? $@ : undef;
|
||||
#-- NEW OWX interface
|
||||
}else{
|
||||
#### master slave context proc owx_dev data crcpart numread startread callback delay
|
||||
OWX_Qomplex($master, $hash, "ds2413.$context", $proc, $owx_dev, "\xF5", "\xF5", 2, 10, \&OWXSWITCH_BinValues, 0);
|
||||
return undef;
|
||||
}
|
||||
} else {
|
||||
return "unknown device family $hash->{OW_FAMILY}\n";
|
||||
return "OWSWITCH: $name has unknown device family $hash->{OW_FAMILY}\n";
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1197,7 +1320,7 @@ sub OWXSWITCH_GetState($@) {
|
||||
# OWXSWITCH_SetState - Set gpio ports of device
|
||||
#
|
||||
# Parameter hash = hash of device addressed
|
||||
# value = integer value for device outputs
|
||||
# value = integer value for device gpio output
|
||||
#
|
||||
########################################################################################
|
||||
|
||||
@@ -1205,7 +1328,6 @@ sub OWXSWITCH_SetState($$) {
|
||||
|
||||
my ($hash,$value) = @_;
|
||||
|
||||
|
||||
my ($select, $res, $res2, @data);
|
||||
|
||||
#-- ID of the device
|
||||
@@ -1215,8 +1337,6 @@ sub OWXSWITCH_SetState($$) {
|
||||
|
||||
#-- hash of the busmaster
|
||||
my $master = $hash->{IODev};
|
||||
|
||||
my ($i,$j,$k);
|
||||
|
||||
#-- family = 12 => DS2406
|
||||
if( $hash->{OW_FAMILY} eq "12" ) {
|
||||
@@ -1240,42 +1360,66 @@ sub OWXSWITCH_SetState($$) {
|
||||
# \x55 at address TA1 = \x07 TA2 = \x00
|
||||
#-- reading 9 + 4 + 2 data bytes = 15 bytes
|
||||
$select=sprintf("\x55\x07\x00%c",$statneu);
|
||||
OWX_Reset($master);
|
||||
$res=OWX_Complex($master,$owx_dev,$select,2);
|
||||
if( $res eq 0 ){
|
||||
return "device $owx_dev not accessible in writing";
|
||||
#-- OLD OWX interface
|
||||
if( !$master->{ASYNCHRONOUS} ){
|
||||
OWX_Reset($master);
|
||||
$res=OWX_Complex($master,$owx_dev,$select,2);
|
||||
if( $res eq 0 ){
|
||||
return "device $owx_dev not accessible in writing";
|
||||
}
|
||||
#OWX_Reset($master);
|
||||
return OWXSWITCH_BinValues($hash,"ds2406.setstate.$value",0,$owx_dev,$select,2,substr($res,13));
|
||||
#-- NEW OWX interface
|
||||
}else{
|
||||
#### master slave context proc owx_dev data crcpart numread startread callback delay
|
||||
# 16 pushes this to the top of the queue
|
||||
OWX_Qomplex($master, $hash, "ds2406.setstate.$value", 16, $owx_dev, $select, $select, 2, 13, \&OWXSWITCH_BinValues, 0);
|
||||
return undef;
|
||||
}
|
||||
OWX_Reset($master);
|
||||
return OWXSWITCH_BinValues($hash,"ds2406.setstate.$value",1,undef,$owx_dev,substr($res,9,4),undef,substr($res,13));
|
||||
return;
|
||||
#-- family = 29 => DS2408
|
||||
} elsif( $hash->{OW_FAMILY} eq "29" ) {
|
||||
#=============== set gpio values ===============================
|
||||
#-- issue the match ROM command \x55 and the write gpio command
|
||||
# \x5A plus the value byte and its complement
|
||||
$select=sprintf("\x5A%c%c",$value,255-$value);
|
||||
OWX_Reset($master);
|
||||
$res=OWX_Complex($master,$owx_dev,$select,1);
|
||||
if( $res eq 0 ){
|
||||
return "device $owx_dev not accessible in writing";
|
||||
#-- OLD OWX interface
|
||||
if( !$master->{ASYNCHRONOUS} ){
|
||||
OWX_Reset($master);
|
||||
$res=OWX_Complex($master,$owx_dev,$select,1);
|
||||
if( $res eq 0 ){
|
||||
return "device $owx_dev not accessible in writing";
|
||||
}
|
||||
OWX_Reset($master);
|
||||
return OWXSWITCH_BinValues($hash,"ds2408.setstate.$value",0,$owx_dev,0,1,substr($res,12));
|
||||
#-- NEW OWX interface
|
||||
}else{
|
||||
#### master slave context proc owx_dev data crcpart numread startread callback delay
|
||||
# 16 pushes this to the top of the queue
|
||||
OWX_Qomplex($master, $hash, "ds2408.setstate.$value", 16, $owx_dev, $select, 0, 1, 12, \&OWXSWITCH_BinValues, 0);
|
||||
return undef;
|
||||
}
|
||||
OWX_Reset($master);
|
||||
return OWXSWITCH_BinValues($hash,"ds2408.setstate",1,undef,$owx_dev,undef,undef,substr($res,12));
|
||||
return;
|
||||
#-- family = 3A => DS2413
|
||||
} elsif( $hash->{OW_FAMILY} eq "3A" ) {
|
||||
#=============== set gpio values ===============================
|
||||
#-- issue the match ROM command \x55 and the write gpio command
|
||||
# \x5A plus the value byte and its complement
|
||||
$select=sprintf("\x5A%c%c",252+$value,3-$value);
|
||||
OWX_Reset($master);
|
||||
$res=OWX_Complex($master,$owx_dev,$select,1);
|
||||
if( $res eq 0 ){
|
||||
return "device $owx_dev not accessible in writing";
|
||||
#-- OLD OWX interface
|
||||
if( !$master->{ASYNCHRONOUS} ){
|
||||
OWX_Reset($master);
|
||||
$res=OWX_Complex($master,$owx_dev,$select,1);
|
||||
if( $res eq 0 ){
|
||||
return "device $owx_dev not accessible in writing";
|
||||
}
|
||||
OWX_Reset($master);
|
||||
return OWXSWITCH_BinValues($hash,"ds2413.setstate",0,$owx_dev,0,2,substr($res,12));
|
||||
#-- NEW OWX interface
|
||||
}else{
|
||||
#### master slave context proc owx_dev data cmd numread startread callback delay
|
||||
# 16 pushes this to the top of the queue
|
||||
OWX_Qomplex($master, $hash, "ds2413.setstate", 16, $owx_dev, $select, 0, 2, 12, \&OWXSWITCH_BinValues, 0);
|
||||
return undef;
|
||||
}
|
||||
OWX_Reset($master);
|
||||
return OWXSWITCH_BinValues($hash,"ds2413.setstate",1,undef,$owx_dev,undef,undef,substr($res,12));
|
||||
return;
|
||||
}else {
|
||||
return "unknown device family $hash->{OW_FAMILY}\n";
|
||||
}
|
||||
@@ -1322,7 +1466,7 @@ sub OWXSWITCH_PT_GetState($) {
|
||||
unless (length($response) == 4) {
|
||||
PT_EXIT("$owx_dev has returned invalid data");
|
||||
}
|
||||
$ret = OWXSWITCH_BinValues($hash,"ds2406.getstate",1,1,$owx_dev,$thread->{'select'},4,$response);
|
||||
$ret = OWXSWITCH_BinValues($hash,"ds2406.getstate",1,$owx_dev,$thread->{'select'},4,$response);
|
||||
if (defined $ret) {
|
||||
PT_EXIT($ret);
|
||||
}
|
||||
@@ -1340,7 +1484,7 @@ sub OWXSWITCH_PT_GetState($) {
|
||||
unless (length($response) == 10) {
|
||||
PT_EXIT("$owx_dev has returned invalid data")
|
||||
};
|
||||
$ret = OWXSWITCH_BinValues($hash,"ds2408.getstate",1,1,$owx_dev,$thread->{'select'},10,$response);
|
||||
$ret = OWXSWITCH_BinValues($hash,"ds2408.getstate",1,$owx_dev,$thread->{'select'},10,$response);
|
||||
if (defined $ret) {
|
||||
PT_EXIT($ret);
|
||||
}
|
||||
@@ -1358,7 +1502,7 @@ sub OWXSWITCH_PT_GetState($) {
|
||||
unless (length($response) == 2) {
|
||||
PT_EXIT("$owx_dev has returned invalid data");
|
||||
}
|
||||
$ret = OWXSWITCH_BinValues($hash,"ds2413.getstate",1,1,$owx_dev,$thread->{'select'},2,$response);
|
||||
$ret = OWXSWITCH_BinValues($hash,"ds2413.getstate",1,$owx_dev,$thread->{'select'},2,$response);
|
||||
if (defined $ret) {
|
||||
PT_EXIT($ret);
|
||||
}
|
||||
@@ -1534,7 +1678,7 @@ sub OWXSWITCH_PT_SetOutput($$$) {
|
||||
<p>
|
||||
<code>define OWX_S OWSWITCH DS2413 B5D502000000 60</code>
|
||||
<br />
|
||||
<code>attr OWX_S AName Lampe|light</code>
|
||||
<code>attr OWX_S AName light-a|la</code>
|
||||
<br />
|
||||
<code>attr OWX_S AUnit AN|AUS</code>
|
||||
</p>
|
||||
@@ -1597,7 +1741,7 @@ sub OWXSWITCH_PT_SetOutput($$$) {
|
||||
</a>
|
||||
<br /> Returns 1 if this 1-Wire device is present, otherwise 0. </li>
|
||||
<li><a name="owswitch_interval2">
|
||||
<code>get <name> interval</code></a><br />Returns measurement interval in
|
||||
<code>get <name> interval</code></a><br />Measurement interval in
|
||||
seconds. </li>
|
||||
<li><a name="owswitch_input">
|
||||
<code>get <name> input <channel-name></code></a><br /> state for
|
||||
@@ -1605,7 +1749,7 @@ sub OWXSWITCH_PT_SetOutput($$$) {
|
||||
not necessarily the one set as output state, because the output transistors are open
|
||||
collector switches. A measured state of 1 = OFF therefore corresponds to an output
|
||||
state of 1 = OFF, but a measured state of 0 = ON can also be due to an external
|
||||
shortening of the output.</li>
|
||||
shortening of the output, it will be signaled by appending the value of the attribute stateS to the reading.</li>
|
||||
<li><a name="owswitch_gpio">
|
||||
<code>get <name> gpio</code></a><br />Obtain state of all channels</li>
|
||||
</ul>
|
||||
@@ -1613,19 +1757,14 @@ sub OWXSWITCH_PT_SetOutput($$$) {
|
||||
<h4>Attributes</h4> For each of the following attributes, the channel identification A,B,...
|
||||
may be used. <ul>
|
||||
<li><a name="owswitch_states"><code><name> stateS <string></code></a>
|
||||
<br/> character string denoting external shortening condition, default is "red angled arrow downward"</li>
|
||||
<br/> character string denoting external shortening condition (default is X, set to "none" for empty).</li>
|
||||
<li><a name="owswitch_cname"><code>attr <name> <channel>Name
|
||||
<string>[|<string>]</code></a>
|
||||
<br />name for the channel [|name used in state reading] </li>
|
||||
<br />name for the channel [|short name used in state reading] </li>
|
||||
<li><a name="owswitch_cunit"><code>attr <name> <channel>Unit
|
||||
<string>|<string></code></a>
|
||||
<br />display for on | off condition </li>
|
||||
<li>Standard attributes <a href="#alias">alias</a>, <a href="#comment">comment</a>, <a
|
||||
href="#event-on-update-reading">event-on-update-reading</a>, <a
|
||||
href="#event-on-change-reading">event-on-change-reading</a>, <a
|
||||
href="#stateFormat">stateFormat</a>, <a href="#room"
|
||||
>room</a>, <a href="#eventMap">eventMap</a>, <a href="#loglevel">loglevel</a>,
|
||||
<a href="#webCmd">webCmd</a></li>
|
||||
<li><a href="#readingFnAttributes">readingFnAttributes</a></li>
|
||||
</ul>
|
||||
|
||||
=end html
|
||||
|
||||
Reference in New Issue
Block a user