mhop/fhem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some reformatting, 60_EM Unix changes

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@193 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig
2008-05-14 06:22:55 +00:00
parent 11c42a5eff
commit 14efef84e7
7 changed files with 71 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
fhem/CHANGED
View File

@@ -390,12 +390,17 @@
- feature: pgm2 installation changes, multiple instances, external css - feature: pgm2 installation changes, multiple instances, external css
- feature: 87_ws2000.pm (thomas 10.05.08) - feature: 87_ws2000.pm (thomas 10.05.08)
- contrib: ws2000_reader.pl Standalone decoder and server (thomas 10.05.08) - contrib: ws2000_reader.pl Standalone decoder and server (thomas 10.05.08)
- doc : update fhem.html and commandline.html reflecting ws2000 and windows installation(thomas 10.05.08) - doc: update fhem.html and commandline.html reflecting ws2000 and
- feature: add ReadyFn to fhem.pl in main loop to have an alternative for select, which is not working on windows (thomas 11.05) windows installation(thomas 10.05.08)
- feature: add ReadyFn to fhem.pl in main loop to have an alternative for
select, which is not working on windows (thomas 11.05)
- feature: set timeout to 0.2s, if HandleTimeout returns undef=forever - feature: set timeout to 0.2s, if HandleTimeout returns undef=forever
- bugfix : WS2000:fixed serial port access on windows by replacing FD with ReadyFn - bugfix : WS2000:fixed serial port access on windows by replacing FD with
ReadyFn
- bugfix : FileLog: dont use FH->sync on windows (not implemented there) - bugfix : FileLog: dont use FH->sync on windows (not implemented there)
- feature: EM, WS300, FHZ:Add Switch for Device::SerialPort and Win32::SerialPort to get it running in Windows (sorry, untestet) - feature: EM, WS300, FHZ:Add Switch for Device::SerialPort and
- bugfix: FileLog undefined $data in FileLog_Get Win32::SerialPort to get it running in Windows (sorry, untested)
- feature: fhem.pl check modules for compiletime errors and do not initialize them - bugfix: FileLog undefined $data in FileLog_Get
-feature: M232 add windows support (thomas 12.05.08) - feature: fhem.pl check modules for compiletime errors and do not initialize
them
- feature: M232 add windows support (thomas 12.05.08)

6
fhem/FHEM/00_FHZ.pm
View File

@@ -237,7 +237,7 @@ FHZ_Define($$)
if ($^O=~/Win/) { if ($^O=~/Win/) {
require Win32::SerialPort; require Win32::SerialPort;
$po = new Win32::SerialPort ($dev); $po = new Win32::SerialPort ($dev);
}else{ } else {
require Device::SerialPort; require Device::SerialPort;
$po = new Device::SerialPort ($dev); $po = new Device::SerialPort ($dev);
} }
@@ -376,9 +376,9 @@ FHZ_ReadAnswer($$)
my ($mfhzdata, $rin) = ("", ''); my ($mfhzdata, $rin) = ("", '');
my $nfound; my $nfound;
for(;;) { for(;;) {
if ($^O eq 'MSWin32') { if($^O eq 'MSWin32') {
$nfound=FHZ_Ready($hash,$def); $nfound=FHZ_Ready($hash,$def);
}else{ } else {
vec($rin, $hash->{FD}, 1) = 1; vec($rin, $hash->{FD}, 1) = 1;
$nfound = select($rin, undef, undef, 3); # 3 seconds timeout $nfound = select($rin, undef, undef, 3); # 3 seconds timeout
if($nfound < 0) { if($nfound < 0) {

29
fhem/FHEM/60_EM.pm
View File

@@ -314,19 +314,22 @@ EmGetData($$)
my $started = 0; my $started = 0;
my $complete = 0; my $complete = 0;
for(;;) { for(;;) {
#select will not work on windows, replaced with status
# if($^O !~ /Win/) {
#my ($rout, $rin) = ('', ''); my ($rout, $rin) = ('', '');
#vec($rin, $serport->FILENO, 1) = 1; vec($rin, $serport->FILENO, 1) = 1;
#my $nfound = select($rout=$rin, undef, undef, 1.0); my $nfound = select($rout=$rin, undef, undef, 1.0);
#
#if($nfound < 0) { if($nfound < 0) {
# $rm = "EM Select error $nfound / $!"; $rm = "EM Select error $nfound / $!";
# goto DONE; goto DONE;
#} }
#last if($nfound == 0); last if($nfound == 0);
my ($BlockingFlags, $InBytes, $OutBytes, $ErrorFlags)=$serport->status; } else {
last if ($InBytes<1); #select will not work on windows, replaced with status
my ($BlockingFlags, $InBytes, $OutBytes, $ErrorFlags)=$serport->status;
last if ($InBytes<1);
}
my $buf = $serport->input(); my $buf = $serport->input();
if(!defined($buf) || length($buf) == 0) { if(!defined($buf) || length($buf) == 0) {

51
fhem/HISTORY
View File

@@ -224,11 +224,13 @@
- Rudi Fri May 9 20:00:00 MEST 2008 - Rudi Fri May 9 20:00:00 MEST 2008
- feature: FHEM modules may live on a filesystem with "ignorant" casing (FAT) - feature: FHEM modules may live on a filesystem with "ignorant" casing (FAT)
If you install FHEM on a USB-Stick (e.g. for the FritzBox) it may happen If you install FHEM on a USB-Stick (e.g. for the FritzBox) it may happen
that the filename casing is different from the function names inside the file. that the filename casing is different from the function names inside the
file.
-> Fhem won't find the <module>_Initialize function. Fixed by searching all -> Fhem won't find the <module>_Initialize function. Fixed by searching all
function-names for a match with "ignore-case" function-names for a match with "ignore-case"
- feature: FileLog function "set reopen" impemented. In case you want to delete some - feature: FileLog function "set reopen" impemented. In case you want to
wrong entries from a current logfile, you must tell fhem to reopen the file again delete some wrong entries from a current logfile, you must tell fhem to
reopen the file again
- feature: multiline commands are supported through the command line - feature: multiline commands are supported through the command line
Up till now multiline commands were supported only by "include". Now they Up till now multiline commands were supported only by "include". Now they
are supprted from the (tcp/ip) connection too, so they can be used by the are supprted from the (tcp/ip) connection too, so they can be used by the
@@ -241,25 +243,38 @@
module directory module directory
- multiline support for notify and at scripts. - multiline support for notify and at scripts.
- feature: FileLog "set reopen" for manual tweaking of logfiles. - feature: FileLog "set reopen" for manual tweaking of logfiles.
- feature: multiline commands are supported through the command line - feature: multiline commands are supported through the command line
- feature: pgm2 installation changes, multiple instances, external css - feature: pgm2 installation changes, multiple instances, external css
-tdressler Sa May 10 23:00:00 MEST 2008 -tdressler Sa May 10 23:00:00 MEST 2008
-feature:add WS2000 Support new modul 87_ws2000.pm and standalone reader/server ws2000_reader.pl - feature:add WS2000 Support new modul 87_ws2000.pm and standalone
-doc: modified fhem.html/commandref.html reflectiing ws2000 device and added windows support reader/server ws2000_reader.pl
(tagged:before tdressler_20080510_1, after tdressler_20080510_2) - doc: modified fhem.html/commandref.html reflectiing ws2000 device and
added windows support (tagged:before tdressler_20080510_1, after
tdressler_20080510_2)
-tdressler So May 11 19:30:00 MEST 2008 -tdressler So May 11 19:30:00 MEST 2008
- feature: add ReadyFn to fhem.pl in main loop to have an alternative for select, which is not working on windows (thomas 11.05) - feature: add ReadyFn to fhem.pl in main loop to have an alternative for
- feature: set timeout to 0.2s, if HandleTimeout returns undef=forever (tagged tdressler_20080511_1/2) select, which is not working on windows (thomas 11.05)
- bugfix : WS2000:fixed serial port access on windows by replacing FD with ReadyFn - feature: set timeout to 0.2s, if HandleTimeout returns undef=forever
(tagged tdressler_20080511_1/2)
- bugfix : WS2000:fixed serial port access on windows by replacing FD with
ReadyFn
- bugfix : FileLog: dont use FH->sync on windows (not implemented there) - bugfix : FileLog: dont use FH->sync on windows (not implemented there)
- feature: EM, WS300, FHZ:Add Switch for Device::SerialPort and Win32::SerialPort to get it running in Windows (sorry, untestet) - feature: EM, WS300, FHZ:Add Switch for Device::SerialPort and
Win32::SerialPort to get it running in Windows (sorry, untestet)
-tdressler So May 11 23:30:00 MEST 2008 -tdressler So May 11 23:30:00 MEST 2008
- bugfix: FileLog undefined $data in FileLog_Get - bugfix: FileLog undefined $data in FileLog_Get
- feature: fhem.pl check modules for compiletime errors and do not initialize them if any - feature: fhem.pl check modules for compiletime errors and do not initialize
-bugfix: EM, WS300, FHZ scope of portobj variable them if any
- bugfix: EM, WS300, FHZ scope of portobj variable
-tdressler Mo May 12 14:00:00 MEST 2008 -tdressler Mo May 12 14:00:00 MEST 2008
bugfix: FHZ with windows, use there ReadyFn if windows; small cosmetic changes - bugfix: FHZ with windows, use there ReadyFn if windows; small cosmetic
doc : add hint to virtual com port driver, modification for FHZ to use default FTDI driver changes
- doc: add hint to virtual com port driver, modification for FHZ to use
default FTDI driver
-tdressler Mo May 12 19:00:00 MEST 2008 -tdressler Mo May 12 19:00:00 MEST 2008
feature : add windows support to M232 - feature : add windows support to M232

2
fhem/README.CVS
View File

@@ -18,7 +18,7 @@ If you wish to contribute to the project, then
- describe your changes in the file HISTORY, and dont forget to mention your - describe your changes in the file HISTORY, and dont forget to mention your
name and the date of change name and the date of change
- it makes sense to do a "cvs diff" before checking in the stuff with - it makes sense to do a "cvs diff" before checking in the stuff with
cvs commit cvs commit
- if you do complex/nontrivial changes affecting more than one file, then - if you do complex/nontrivial changes affecting more than one file, then
please tag the whole software before and after the change with: please tag the whole software before and after the change with:
- before: % cvs tag <berlios-uid>_<date_as_YYYYMMDD>_0 - before: % cvs tag <berlios-uid>_<date_as_YYYYMMDD>_0

9
fhem/docs/commandref.html
View File

@@ -898,16 +898,15 @@ make editing of multiline commands transparent.<br><br>
Define a WS2000 series raw receiver device sold by ELV. Details see <a Define a WS2000 series raw receiver device sold by ELV. Details see <a
href="http://www.elv.de/output/controller.aspx?cid=74&detail=10&detail2=6724">here</a>. href="http://www.elv.de/output/controller.aspx?cid=74&detail=10&detail2=6724">here</a>.
Unlike 86_FS10.pm it will handle the comple device communication itself and doesnt require an external program. Unlike 86_FS10.pm it will handle the complete device communication itself and
doesnt require an external program.
For this reason you can now use this also on windows. For this reason you can now use this also on windows.
<br> <br>
This Device will be usually connect to a serial port, but you can also define a raw network This Device will be usually connect to a serial port, but you can also
redirector like lantronix XPORT(TM). define a raw network redirector like lantronix XPORT(TM).
<br>Note: Currently this device does not support a "set" function <br>Note: Currently this device does not support a "set" function
<br><br> <br><br>
Attributes: Attributes:
<ul> <ul>
<li><code>rain</code>: factor for calculating amount of rain in ml/count</li> <li><code>rain</code>: factor for calculating amount of rain in ml/count</li>

4
fhem/docs/fhem.html
View File

@@ -179,8 +179,8 @@ description and <a href="faq.html">faq.html</a> for the F.A.Q.
<h3>Server installation on Windows</h3> <h3>Server installation on Windows</h3>
( if you are using cygwin for your perl installation you can follow the guidelines for Unix) ( if you are using cygwin for your perl installation you can follow the guidelines for Unix)
<ul> <ul>
<li> be sure you have perl.exe in your path (%PATH%)</li> <li>be sure you have perl.exe in your path (%PATH%)</li>
<li> unpack distribution in a directory of your choise </li> <li>unpack distribution in a directory of your choice </li>
<li>Copy additional modules from the contrib directory <li>Copy additional modules from the contrib directory
(like 99_SUNRISE_EL.pm)</li> (like 99_SUNRISE_EL.pm)</li>
<li>Make sure that you can access the serial USB <li>Make sure that you can access the serial USB