FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-22 20:24:36 +00:00
Code Issues Releases Wiki Activity

51_RPI_GPIO: bugfixing restore on bootup, and gpio tool access

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@6945 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
klauswitt 2014-11-10 23:08:09 +00:00
parent cede4c5a89
commit 28fac42d98
1 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
fhem/FHEM/51_RPI_GPIO.pm
View File

@ -103,6 +103,7 @@ sub RPI_GPIO_Define($$) {
} }
unless( $counter ) { #abbrechen wenn export fehlgeschlagen unless( $counter ) { #abbrechen wenn export fehlgeschlagen
Log3 $hash, 1, "$name: failed to export pin gpio$hash->{RPI_pin}"; Log3 $hash, 1, "$name: failed to export pin gpio$hash->{RPI_pin}";
return "$name: failed to export pin gpio$hash->{RPI_pin}";
} }
$hash->{fhem}{interfaces} = "switch"; $hash->{fhem}{interfaces} = "switch";
@ -193,6 +194,12 @@ sub RPI_GPIO_State($$$$) { #reload readings at FHEM start
} }
} elsif ( AttrVal($hash->{NAME},"direction","") eq "input") { } elsif ( AttrVal($hash->{NAME},"direction","") eq "input") {
if ($sname eq "Toggle") { if ($sname eq "Toggle") {
#wenn restoreOnStartup "on" oder "off" und der Wert mit dem im Statefile uebereinstimmt wird der Zeitstempel aus dem Statefile gesetzt
my $rval = AttrVal($hash->{NAME},"restoreOnStartup","last");
$rval = "last" if ( $rval ne "on" && $rval ne "off" );
$tim = gettimeofday() if $rval ne "last" && $rval ne $sval;
$sval = $rval eq "last" ? $sval : $rval;
$hash->{READINGS}{$sname}{VAL} = $sval; $hash->{READINGS}{$sname}{VAL} = $sval;
$hash->{READINGS}{$sname}{TIME} = $tim; $hash->{READINGS}{$sname}{TIME} = $tim;
Log3 $hash, 4, "INPUT $hash->{NAME}: $sname wiederhergestellt auf $sval"; Log3 $hash, 4, "INPUT $hash->{NAME}: $sname wiederhergestellt auf $sval";
@ -207,6 +214,21 @@ sub RPI_GPIO_State($$$$) { #reload readings at FHEM start
$hash->{READINGS}{$sname}{VAL} = $sval; $hash->{READINGS}{$sname}{VAL} = $sval;
$hash->{READINGS}{$sname}{TIME} = $tim; $hash->{READINGS}{$sname}{TIME} = $tim;
Log3 $hash, 4, "INPUT $hash->{NAME}: $sname wiederhergestellt auf $sval"; Log3 $hash, 4, "INPUT $hash->{NAME}: $sname wiederhergestellt auf $sval";
} elsif ( ($sname eq "state") && (AttrVal($hash->{NAME},"toggletostate","") ne "yes") ) {
#my $rval = AttrVal($hash->{NAME},"restoreOnStartup","");
#if ($rval eq "" && (AttrVal($hash->{NAME},"toggletostate","") ne "yes") ) {
Log3 $hash, 4, "INPUT $hash->{NAME}: alter Pinwert war: $sval";
my $val = RPI_GPIO_fileaccess($hash, "value");
$val = $val eq "1" ? "on" :"off";
Log3 $hash, 4, "INPUT $hash->{NAME}: aktueller Pinwert ist: $val";
if ($val ne $sval) {
Log3 $hash, 4, "INPUT $hash->{NAME}: Pinwerte ungleich...Timer gesetzt";
InternalTimer(gettimeofday() + (10), 'RPI_GPIO_Poll', $hash, 0);
} else {
$hash->{READINGS}{$sname}{VAL} = $sval;
$hash->{READINGS}{$sname}{TIME} = $tim;
}
#}
} }
} }
} }
@ -537,6 +559,7 @@ sub RPI_GPIO_exuexpin($$) { #export, unexport and direction Pin via GPIO utili
$dir = ""; $dir = "";
} else { } else {
$sw = "export"; $sw = "export";
$dir = "out" if ( $dir eq "high" || $dir eq "low" ); #auf out zurueck, da gpio tool dies nicht unterstützt
$dir = " ".$dir; $dir = " ".$dir;
} }
if ( defined(my $ret = RPI_GPIO_CHECK_GPIO_UTIL($gpioprg)) ) { if ( defined(my $ret = RPI_GPIO_CHECK_GPIO_UTIL($gpioprg)) ) {