mirror of
https://github.com/fhem/fhem-mirror.git
synced 2025-04-21 07:56:03 +00:00
55_PIFACE: Now wiringPi V2.46 is supported. Various optimizations
git-svn-id: https://svn.fhem.de/fhem/trunk@19446 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
klaus.schauer
parent
375c35ac2a
commit
366571bb95
@ -74,7 +74,7 @@ sub PIFACE_Initialize($){
|
||||
" watchdog:on,off,silent watchdogInterval";
|
||||
}
|
||||
|
||||
sub PIFACE_Define($$){
|
||||
sub PIFACE_Define($$) {
|
||||
my ($hash, $def) = @_;
|
||||
my $name = $hash->{NAME};
|
||||
$hash->{NOTIFYDEV} = "global";
|
||||
@ -83,14 +83,14 @@ sub PIFACE_Define($$){
|
||||
return;
|
||||
}
|
||||
|
||||
sub PIFACE_Undefine($$){
|
||||
sub PIFACE_Undefine($$) {
|
||||
my($hash, $name) = @_;
|
||||
RemoveInternalTimer($hash);
|
||||
return;
|
||||
}
|
||||
|
||||
sub PIFACE_Set($@) {
|
||||
my ($hash, @a) = @_;
|
||||
my ($hash, @a) = @_;
|
||||
my $name = $hash->{NAME};
|
||||
if (IsDisabled($name)) {
|
||||
Log3 $name, 4, "PIFACE $name set commands disabled.";
|
||||
@ -100,11 +100,11 @@ sub PIFACE_Set($@) {
|
||||
my $val = $a[2];
|
||||
my ($adr, $cmd, $i, $j, $k);
|
||||
my $usage = "Unknown argument $port, choose one of all 0:0,1 1:0,1 2:0,1 3:0,1 4:0,1 5:0,1 6:0,1 7:0,1 ";
|
||||
return $usage if $port eq "?";
|
||||
return $usage if ($port eq "?");
|
||||
if ($port ne "all") {
|
||||
$adr = $base + $port;
|
||||
Log3($name, 3, "PIFACE $name set port $port $val");
|
||||
$cmd = "$gpioCmd -p write $adr $val";
|
||||
$cmd = "$gpioCmd -x mcp23s17:200:0:0 write $adr $val";
|
||||
$cmd = `$cmd`;
|
||||
readingsSingleUpdate($hash, 'out'.$port, $val, 1);
|
||||
} else {
|
||||
@ -116,7 +116,7 @@ sub PIFACE_Set($@) {
|
||||
$k = ($k) ? 1 : 0;
|
||||
Log3($name, 3, "PIFACE $name set port $i $k");
|
||||
$adr = $base + $i;
|
||||
$cmd = "$gpioCmd -p write $adr $k";
|
||||
$cmd = "$gpioCmd -x mcp23s17:200:0:0 write $adr $k";
|
||||
$cmd = `$cmd`;
|
||||
readingsBulkUpdate($hash, 'out'.$i, $k);
|
||||
}
|
||||
@ -125,7 +125,7 @@ sub PIFACE_Set($@) {
|
||||
return;
|
||||
}
|
||||
|
||||
sub PIFACE_Get($@){
|
||||
sub PIFACE_Get($@) {
|
||||
my ($hash, @a) = @_;
|
||||
my $name = $hash->{NAME};
|
||||
my $port = $a[1];
|
||||
@ -137,17 +137,22 @@ sub PIFACE_Get($@){
|
||||
if ($port eq "all") {
|
||||
PIFACE_Read_Inports(1, $hash);
|
||||
PIFACE_Read_Outports(1, $hash);
|
||||
Log3($name, 3, "PIFACE $name get port $port");
|
||||
} elsif ($port eq "in") {
|
||||
PIFACE_Read_Inports(0, $hash);
|
||||
PIFACE_Read_Inports(1, $hash);
|
||||
Log3($name, 3, "PIFACE $name get port $port");
|
||||
} elsif ($port eq "out") {
|
||||
PIFACE_Read_Outports(0, $hash);
|
||||
PIFACE_Read_Outports(1, $hash);
|
||||
Log3($name, 3, "PIFACE $name get port $port");
|
||||
} else {
|
||||
$adr = $base + $port;
|
||||
$cmd = "$gpioCmd -p read $adr";
|
||||
# get state of in port
|
||||
$adr = $base + 8 + $port;
|
||||
$cmd = "$gpioCmd -x mcp23s17:200:0:0 read $adr";
|
||||
$val = `$cmd`;
|
||||
$val =~ s/\n//g;
|
||||
$val =~ s/\r//g;
|
||||
readingsSingleUpdate($hash, 'in'.$port, $val, 1);
|
||||
readingsSingleUpdate($hash, 'in' . $port, $val, 1);
|
||||
Log3($name, 3, "PIFACE $name get port in$port");
|
||||
}
|
||||
return;
|
||||
}
|
||||
@ -155,7 +160,7 @@ sub PIFACE_Get($@){
|
||||
sub PIFACE_Attr(@) {
|
||||
my ($cmd, $name, $attrName, $attrVal) = @_;
|
||||
my $hash = $defs{$name};
|
||||
|
||||
return undef if (!$init_done);
|
||||
if ($attrName eq "pollInterval") {
|
||||
if (!defined $attrVal) {
|
||||
#RemoveInternalTimer($hash);
|
||||
@ -170,25 +175,26 @@ sub PIFACE_Attr(@) {
|
||||
} elsif ($attrName eq "defaultState") {
|
||||
if (!defined $attrVal){
|
||||
|
||||
} elsif ($attrVal !~ m/^(last|off|[01])$/) {
|
||||
} elsif ($attrVal !~ m/^last|off|[01]$/) {
|
||||
Log3($name, 3, "PIFACE $name attribute-value [$attrName] = $attrVal wrong");
|
||||
CommandDeleteAttr(undef, "$name defaultState");
|
||||
}
|
||||
|
||||
} elsif ($attrName =~ m/^portMode/) {
|
||||
my $port = substr($attrName, 8, 1);
|
||||
my $adr = $base + $port;
|
||||
} elsif ($attrName =~ m/^portMode(.)/) {
|
||||
my $port = $1;
|
||||
#my $port = substr($attrName, 8, 1);
|
||||
my $adr = $base + 8 + $port;
|
||||
my $portMode = $attrVal;
|
||||
my $val;
|
||||
$portMode = "tri" if (!defined $attrVal);
|
||||
if ($attrVal !~ m/^(tri|up)$/) {
|
||||
if ($attrVal !~ m/^tri|up$/) {
|
||||
$portMode = "tri" ;
|
||||
Log3($name, 3, "PIFACE $name attribute-value [$attrName] = $attrVal wrong");
|
||||
CommandDeleteAttr(undef, "$name $port");
|
||||
CommandDeleteAttr(undef, "$name portMode$port");
|
||||
}
|
||||
$cmd = "$gpioCmd -p mode $adr $portMode";
|
||||
$cmd = "$gpioCmd -x mcp23s17:200:0:0 mode $adr $portMode";
|
||||
$val = `$cmd`;
|
||||
$cmd = "$gpioCmd -p read $adr";
|
||||
$cmd = "$gpioCmd -x mcp23s17:200:0:0 read $adr";
|
||||
$val = `$cmd`;
|
||||
$val =~ s/\n//g;
|
||||
$val =~ s/\r//g;
|
||||
@ -199,12 +205,13 @@ sub PIFACE_Attr(@) {
|
||||
$attrVal = "off" ;
|
||||
CommandDeleteReading(undef, "$name watchdog");
|
||||
}
|
||||
if ($attrVal !~ m/^(on|off|silent)$/) {
|
||||
if ($attrVal !~ m/^on|off|silent$/) {
|
||||
Log3($name, 3, "PIFACE $name attribute-value [$attrName] = $attrVal wrong");
|
||||
CommandDeleteAttr(undef, "$name watchdog");
|
||||
}
|
||||
if ($attrVal =~ m/^(on|silent)$/) {
|
||||
if ($attrVal =~ m/^on|silent$/) {
|
||||
readingsSingleUpdate($hash, 'watchdog', 'start', 1);
|
||||
$attr{$name}{$attrName} = $attrVal;
|
||||
PIFACE_Watchdog($hash);
|
||||
}
|
||||
|
||||
@ -220,13 +227,14 @@ sub PIFACE_Attr(@) {
|
||||
sub PIFACE_Notify(@) {
|
||||
my ($hash, $dev) = @_;
|
||||
my $name = $hash->{NAME};
|
||||
if ($dev->{NAME} eq "global" && grep (m/^INITIALIZED$/,@{$dev->{CHANGED}})){
|
||||
Log3($name, 3, "PIFACE $name initialized");
|
||||
if ($dev->{NAME} eq "global" && grep (m/^INITIALIZED|REREADCFG$/,@{$dev->{CHANGED}})){
|
||||
PIFACE_Restore_Inports_Mode($hash);
|
||||
PIFACE_Restore_Outports_State($hash);
|
||||
PIFACE_Read_Inports(0, $hash);
|
||||
PIFACE_Read_Outports(0, $hash);
|
||||
#PIFACE_Read_Inports(0, $hash);
|
||||
#PIFACE_Read_Outports(0, $hash);
|
||||
PIFACE_GetUpdate($hash);
|
||||
PIFACE_Watchdog($hash);
|
||||
Log3($name, 3, "PIFACE $name initialized");
|
||||
}
|
||||
return;
|
||||
}
|
||||
@ -237,15 +245,15 @@ sub PIFACE_Read_Outports($$){
|
||||
my ($cmd, $i, $port, $val);
|
||||
readingsBeginUpdate($hash);
|
||||
for($i=0; $i<8; $i++){
|
||||
$port = $base + $i + 8;
|
||||
$cmd = "$gpioCmd -p read $port";
|
||||
$port = $base + $i;
|
||||
$cmd = "$gpioCmd -x mcp23s17:200:0:0 read $port";
|
||||
$val = `$cmd`;
|
||||
$val =~ s/\n//g;
|
||||
$val =~ s/\r//g;
|
||||
if ($updateMode == 1){
|
||||
readingsBulkUpdate($hash, 'out'.$i, $val);
|
||||
} else {
|
||||
readingsBulkUpdate($hash, 'out'.$i, $val) if(ReadingsVal($name, 'out'.$i, '') ne $val);
|
||||
readingsBulkUpdateIfChanged($hash, 'out'.$i, $val);
|
||||
}
|
||||
}
|
||||
readingsEndUpdate($hash, 1);
|
||||
@ -258,15 +266,15 @@ sub PIFACE_Read_Inports($$){
|
||||
my ($cmd, $i, $j, $port, $portMode, $val);
|
||||
readingsBeginUpdate($hash);
|
||||
for($i=0; $i<8; $i++){
|
||||
$port = $base + $i;
|
||||
$cmd = "$gpioCmd -p read $port";
|
||||
$port = $base + 8 + $i;
|
||||
$cmd = "$gpioCmd -x mcp23s17:200:0:0 read $port";
|
||||
$val = `$cmd`;
|
||||
$val =~ s/\n//g;
|
||||
$val =~ s/\r//g;
|
||||
if ($updateMode == 1) {
|
||||
readingsBulkUpdate($hash, 'in'.$i, $val);
|
||||
} else {
|
||||
readingsBulkUpdate($hash, 'in'.$i, $val) if(ReadingsVal($name, 'in'.$i, '') ne $val);
|
||||
readingsBulkUpdateIfChanged($hash, 'in'.$i, $val);
|
||||
}
|
||||
}
|
||||
readingsEndUpdate($hash, 1);
|
||||
@ -295,8 +303,21 @@ sub PIFACE_Restore_Outports_State($) {
|
||||
return;
|
||||
}
|
||||
|
||||
sub
|
||||
PIFACE_GetUpdate($) {
|
||||
sub PIFACE_Restore_Inports_Mode($) {
|
||||
my ($hash) = @_;
|
||||
my $name = $hash->{NAME};
|
||||
my ($cmd, $port, $portMode, $valIn);
|
||||
for (my $i = 0; $i <= 7; $i++) {
|
||||
$port = $base + 8 + $i;
|
||||
$portMode = AttrVal($name, "portMode" . $i, "tri");
|
||||
$cmd = "$gpioCmd -x mcp23s17:200:0:0 mode $port $portMode";
|
||||
$valIn = `$cmd`;
|
||||
}
|
||||
PIFACE_Read_Inports(1, $hash);
|
||||
return;
|
||||
}
|
||||
|
||||
sub PIFACE_GetUpdate($) {
|
||||
my ($hash) = @_;
|
||||
my $name = $hash->{NAME};
|
||||
my $pollInterval = AttrVal($name, "pollInterval", "off");
|
||||
@ -308,8 +329,7 @@ PIFACE_GetUpdate($) {
|
||||
return;
|
||||
}
|
||||
|
||||
sub
|
||||
PIFACE_Watchdog($) {
|
||||
sub PIFACE_Watchdog($) {
|
||||
my ($hash) = @_;
|
||||
my $name = $hash->{NAME};
|
||||
my ($cmd, $port, $portMode, $valIn, $valOut0, $valOut1);
|
||||
@ -320,29 +340,29 @@ PIFACE_Watchdog($) {
|
||||
if (!defined $watchdog) {
|
||||
CommandDeleteReading(undef, "$name watchdog");
|
||||
|
||||
} elsif ($watchdog =~ m/^(on|silent)$/) {
|
||||
} elsif ($watchdog =~ m/^on|silent$/) {
|
||||
InternalTimer(gettimeofday() + $watchdogInterval, "PIFACE_Watchdog", $hash, 1);
|
||||
for (my $i=0; $i<7; $i++) {
|
||||
$port = $base + $i;
|
||||
$port = $base + 8 + $i;
|
||||
$portMode = AttrVal($name, "portMode" . $i, "tri");
|
||||
$cmd = "$gpioCmd -p mode $port $portMode";
|
||||
$cmd = "$gpioCmd -x mcp23s17:200:0:0 mode $port $portMode";
|
||||
$valIn = `$cmd`;
|
||||
}
|
||||
$cmd = "$gpioCmd -p mode 207 up";
|
||||
$cmd = "$gpioCmd -x mcp23s17:200:0:0 mode 215 up";
|
||||
$valIn = `$cmd`;
|
||||
$cmd = "$gpioCmd -p read 207";
|
||||
$cmd = "$gpioCmd -x mcp23s17:200:0:0 read 215";
|
||||
$valIn = `$cmd`;
|
||||
$valIn =~ s/\n//g;
|
||||
$valIn =~ s/\r//g;
|
||||
$cmd = "$gpioCmd -p write 207 0";
|
||||
$cmd = "$gpioCmd -x mcp23s17:200:0:0 write 207 0";
|
||||
$cmd = `$cmd`;
|
||||
$cmd = "$gpioCmd -p read 215";
|
||||
$cmd = "$gpioCmd -x mcp23s17:200:0:0 read 207";
|
||||
$valOut0 = `$cmd`;
|
||||
$valOut0 =~ s/\n//g;
|
||||
$valOut0 =~ s/\r//g;
|
||||
$cmd = "$gpioCmd -p write 207 1";
|
||||
$cmd = "$gpioCmd -x mcp23s17:200:0:0 write 207 1";
|
||||
$cmd = `$cmd`;
|
||||
$cmd = "$gpioCmd -p read 215";
|
||||
$cmd = "$gpioCmd -x mcp23s17:200:0:0 read 207";
|
||||
$valOut1 = `$cmd`;
|
||||
$valOut1 =~ s/\n//g;
|
||||
$valOut1 =~ s/\r//g;
|
||||
@ -434,9 +454,9 @@ PIFACE_Watchdog($) {
|
||||
and set the <code>A5 SPI</code> option to "Yes".
|
||||
</li>
|
||||
<li>The function of the PiFace Digital can be tested at OS command line. For example:<br>
|
||||
<code>gpio -p readall</code><br>
|
||||
<code>gpio -p read 200</code><br>
|
||||
<code>gpio -p write 201 0</code> or <code>gpio -p write 201 1</code><br>
|
||||
<code>gpio -x mcp23s17:200:0:0 readall</code><br>
|
||||
<code>gpio -x mcp23s17:200:0:0 read 200</code><br>
|
||||
<code>gpio -x mcp23s17:200:0:0 write 201 0</code> or <code>gpio -x mcp23s17:200:0:0 write 201 1</code><br>
|
||||
</li>
|
||||
<li>The watchdog function monitors the input port 7 and the output port 7.<br>
|
||||
If the watchdog is enabled, this ports can not be used for other tasks.
|
||||
@ -454,9 +474,9 @@ PIFACE_Watchdog($) {
|
||||
and set the <code>A6 SPI</code> option to "Yes".
|
||||
</li>
|
||||
<li>The function of the PiFace Digital can be tested at OS command line. For example:<br>
|
||||
<code>gpio -p readall</code><br>
|
||||
<code>gpio -p read 200</code><br>
|
||||
<code>gpio -p write 201 0</code> or <code>gpio -p write 201 1</code><br>
|
||||
<code>gpio -x mcp23s17:200:0:0 readall</code><br>
|
||||
<code>gpio -x mcp23s17:200:0:0 read 200</code><br>
|
||||
<code>gpio -x mcp23s17:200:0:0 write 201 0</code> or <code>gpio -x mcp23s17:200:0:0 write 201 1</code><br>
|
||||
</li>
|
||||
<li>The watchdog function monitors the input port 7 and the output port 7.<br>
|
||||
If the watchdog is enabled, this ports can not be used for other tasks.
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user