FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-13 05:06:35 +00:00
Code Issues Releases Wiki Activity

Config-file changes

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@1159 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2011-12-31 13:31:58 +00:00
parent d5dd3e38ce
commit 33672bd88d
6 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fhem/FHEM/92_FileLog.pm
View File

@ -154,7 +154,7 @@ FileLog_Set($@)
# - delta-h / delta-d to get rain/h and rain/d values from continuous data. # - delta-h / delta-d to get rain/h and rain/d values from continuous data.
# #
# It will set the %data values # It will set the %data values
# min<x>, max<x>, avg<x>, cnt<x>, lastd<x>, lastv<x>, sum<x> # min<x>, max<x>, avg<x>, cnt<x>, currdate<x>, currval<x>, sum<x>
# for each requested column, beggining with <x> = 1 # for each requested column, beggining with <x> = 1
sub sub

2
fhem/Makefile
View File

@ -14,7 +14,7 @@ RMANDIR=$(ROOT)$(MANDIR)
RETCDIR=$(ROOT)$(ETCDIR) RETCDIR=$(ROOT)$(ETCDIR)
VERS=5.2 VERS=5.2
DATE=2011-12-29 DATE=2011-12-31
DESTDIR=fhem-$(VERS) DESTDIR=fhem-$(VERS)
all: all:

12
fhem/contrib/FB7390/startfhem
View File

@ -6,6 +6,7 @@ cd $home
trap "" SIGHUP trap "" SIGHUP
modprobe cdc_acm modprobe cdc_acm
modprobe ftdi_sio
sleep 2 sleep 2
ln -sf $home/FHEM/fhemcmd.sh /var/fhemcmd ln -sf $home/FHEM/fhemcmd.sh /var/fhemcmd
@ -16,4 +17,15 @@ export PATH
export LD_LIBRARY_PATH=$home/lib export LD_LIBRARY_PATH=$home/lib
export PERL5LIB=$home/lib/perl5/site_perl/5.12.2/mips-linux:$home/lib/perl5/site_perl/5.12.2:$home/lib/perl5/5.12.2/mips-linux:$home/lib/perl5/5.12.2 export PERL5LIB=$home/lib/perl5/site_perl/5.12.2/mips-linux:$home/lib/perl5/site_perl/5.12.2:$home/lib/perl5/5.12.2/mips-linux:$home/lib/perl5/5.12.2
# let FHEM run as user boxusr80
# add user fhem with uid of boxusr80
id fhem > /dev/null 2>&1
if [ "$?" -ne "0" ]; then
echo "user fhem does not exist. Adding it."
echo "fhem:any:1080:0:fhem:/home-not-used:/bin/sh" >>/var/tmp/passwd
# set files ownership
chown -R boxusr80 ${home}/log
chown -R boxusr80 ${home}/FHEM
fi
perl fhem.pl fhem.cfg perl fhem.pl fhem.cfg

1
fhem/docs/commandref.html
View File

@ -8160,6 +8160,7 @@ isday</pre>
{ OldValue("wz") }<br> { OldValue("wz") }<br>
{ time_str2num(OldTimestamp("wz")) }<br> { time_str2num(OldTimestamp("wz")) }<br>
{ ReadingsVal("wz", "measured-temp", "20")+0 }<br> { ReadingsVal("wz", "measured-temp", "20")+0 }<br>
{ ReadingsTimestamp("wz", "measured-temp", 0)}<br>
{ AttrVal("wz", "room", "none") }<br> { AttrVal("wz", "room", "none") }<br>
</ul> </ul>

6
fhem/examples/sample_pgm2
View File

@ -24,10 +24,12 @@ attr autocreate device_room %TYPE
attr autocreate filelog /tmp/%NAME-%Y.log attr autocreate filelog /tmp/%NAME-%Y.log
attr autocreate weblink attr autocreate weblink
attr autocreate weblink_room Plots attr autocreate weblink_room Plots
# Disable this to avoid looking for new USB devices on startup
define initialUsbCheck notify global:INITIALIZED usb create
# You probably have to enable some of the following lines. # If the above notify did not helped, then you probably have to enable some of
# Verify first that /dev/xxx ist correct. # the following lines. Verify first that /dev/xxx ist correct.
#define FHZ FHZ /dev/USB0 #define FHZ FHZ /dev/USB0
#define CUL CUL /dev/ttyACM0@9600 1234 #define CUL CUL /dev/ttyACM0@9600 1234

14
fhem/fhem.pl
View File

@ -2480,6 +2480,20 @@ ReadingsVal($$$)
return $default; return $default;
} }
sub
ReadingsTimestamp($$$)
{
my ($d,$n,$default) = @_;
if(defined($defs{$d}) &&
defined($defs{$d}{READINGS}) &&
defined($defs{$d}{READINGS}{$n}) &&
defined($defs{$d}{READINGS}{$n}{TIME})) {
return $defs{$d}{READINGS}{$n}{TIME};
}
return $default;
}
sub sub
Value($) Value($)
{ {