From d1f2fc42db652657d2e11dd8c4026eef97dcf409 Mon Sep 17 00:00:00 2001 From: rudolfkoenig <> Date: Sat, 14 Apr 2007 08:22:18 +0000 Subject: [PATCH] Preparing the release, last doc changes git-svn-id: https://svn.fhem.de/fhem/trunk@47 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/CHANGED | 5 +- fhem/FHEM/00_FHZ.pm | 6 ++ fhem/contrib/99_PRIV.pm | 35 ++++++++--- fhem/docs/commandref.html | 4 +- fhem/docs/faq.html | 119 +++++++++++++++++++++++++++++++++----- fhem/docs/fhem.html | 57 +++++++++++++----- fhem/fhem.pl | 1 + 7 files changed, 184 insertions(+), 43 deletions(-) diff --git a/fhem/CHANGED b/fhem/CHANGED index 21998b2cf..3d4c22ee8 100644 --- a/fhem/CHANGED +++ b/fhem/CHANGED @@ -319,7 +319,4 @@ - webpgm2 adapted to the new syntax, added device specific attribute and "set" support, gnuplot files are configurable, links to the documentation added. - support. - - - - TODO: bugfix: more thorough serial line initialization + - bugfix: more thorough serial line initialization diff --git a/fhem/FHEM/00_FHZ.pm b/fhem/FHEM/00_FHZ.pm index 74fd29a1e..5af76e7e9 100755 --- a/fhem/FHEM/00_FHZ.pm +++ b/fhem/FHEM/00_FHZ.pm @@ -223,9 +223,15 @@ FHZ_Define($$) $po->stopbits(1); $po->handshake('none'); + # This part is for some Linux kernel versions whih has strange default + # settings. Device::SerialPort is nice: if the flag is not defined for your + # OS then it will be ignored. $po->stty_icanon(0); $po->stty_parmrk(0); $po->stty_icrnl(0); + $po->stty_echoe(0); + $po->stty_echok(0); + $po->stty_echoctl(0); $hash->{PortObj} = $po; $hash->{FD} = $po->FILENO; diff --git a/fhem/contrib/99_PRIV.pm b/fhem/contrib/99_PRIV.pm index 9a9973052..877004778 100755 --- a/fhem/contrib/99_PRIV.pm +++ b/fhem/contrib/99_PRIV.pm @@ -1,8 +1,13 @@ ############################################## -# Example for notifying with perl-code, in a proper file, not inline. -# Add the following line to the configuration file (02_fs20): -# notifyon btn3 {MyFunc("@", "%")} -# and put this file in the /FHEM directory. +# Example perl functions. Put this file into the FHEM directory. +# +# # Activate 2 rollades at once with one button, open them to +# # a different degree. +# define ntfy_1 notifyon btn3 {MyFunc("@", "%")} +# +# # Swith the heater off if all FHT actuators are closed, +# # and on if at least one is open +# define at_1 at +*00:05 { fhem "set heater " . (sumactuator()?"on":"off") }; package main; use strict; @@ -12,7 +17,19 @@ sub PRIV_Initialize($$) { my ($hash, $init) = @_; - $hash->{Category} = "none"; +} + +sub +sumactuator() +{ + my $sum = 0; + foreach my $d (keys %defs) { + next if($defs{$d}{TYPE} ne "FHT"); + my ($act, undef) = split(" ", $defs{$d}{READINGS}{"actuator"}{VAL}); + $act =~ s/%//; + $sum += $act; + } + return $sum; } sub @@ -22,11 +39,11 @@ MyFunc($$) Log 2, "Device $a1 was set to $a2 (type: $defs{$a1}{TYPE})"; if($a2 eq "on") { - fhz "roll1 on-for-timer 10"; - fhz "roll2 on-for-timer 16"); + fhem "set roll1 on-for-timer 10"; + fhem "set roll2 on-for-timer 16"; } else { - fhz "roll1 off"; - fhz "roll2 off"; + fhem "set roll1 off"; + fhem "set roll2 off"; } } diff --git a/fhem/docs/commandref.html b/fhem/docs/commandref.html index e4c6362e2..f2c7de41e 100644 --- a/fhem/docs/commandref.html +++ b/fhem/docs/commandref.html @@ -363,7 +363,7 @@ split in multiple lines

  • KS300: ks300
  • WS300: ws300pc
  • EM1010: em1010pc
    • -
    @@ -393,7 +393,7 @@ split in multiple lines


    Notes:
    - + diff --git a/fhem/docs/faq.html b/fhem/docs/faq.html index 412024e2f..f4a6c58b4 100644 --- a/fhem/docs/faq.html +++ b/fhem/docs/faq.html @@ -10,13 +10,88 @@

    FHEM FAQ

    -I get "undefined" messages in the log after upgrading fhem.pl +1. I am using fhem.pl with an fhz1000.pl config file and fhem.pl +won't start

    + +2. I get "undefined" messages in the log after upgrading +fhem.pl

    + +3. I switched on a FS20 device directly (without the remote), +but the fhem.pl did not noticed it. Is it a bug?

    + +4. I have some FS20/FHT/HMS devices. How do I know their +housecode?

    + +5. I have the code for my devices in the ELV notation, which +contains 1,2,3 and 4, but you require a hex code. How should I convert +it?

    + +6. I replaced my FHZ1X00PC, now the FHT80b's does not work +anymore. Help me!

    + +7. I can specify an optional ml/raincounter for a KS300. Why +do you think that 255 should be the default?

    + +8. The time specification of the builtin at command is not very +flexible. Please add day/month/weekday to it.

    + +9. I defined my FS20STR as an FHT device, but I do not get +any data from it.

    + +10. How to convert the FHT8b code seen in its display to the +hex code needed by fhem.pl?

    + +11. I'd like to use this sunrise/sunset stuff, can you help +me?

    + +
    +
    +
    +
    + + +1. I am using fhem.pl with an fhz1000.pl config file and fhem.pl won't +start + + + + + +2. I get "undefined" messages in the log after upgrading fhem.pl -I switched on a FS20 device directly (without the remote), but + + +3. I switched on a FS20 device directly (without the remote), but the fhem.pl did not noticed it.
    Is it a bug?         -I have some FS20/FHT/HMS devices.
    + + +4. I have some FS20/FHT/HMS devices.
    How do I know their housecode?
    -I have the code for my devices in the ELV notation, which contains 1,2,3 and - 4, but you require a hex code.
    - How should I convert it?     + + +5. I have the code for my devices in the ELV notation, which contains 1,2,3 +and 4, but you require a hex code.
    How should I convert it?     + -I replaced my FHZ1X00PC, now the FHT80b's does not work anymore.
    + + +6. I replaced my FHZ1X00PC, now the FHT80b's does not work anymore.
    Help me!         -I can specify an optional ml/raincounter for a KS300.
    + + +7. I can specify an optional ml/raincounter for a KS300.
    Why do you think that 255 should be the default?         -The time specification of the builtin at command is not very flexible.
    -Please add day/month/weekday to it.     + + +8. The time specification of the builtin at command is not very +flexible.
    Please add day/month/weekday to it.         -I defined my FS20STR as an FHT device, but I do not get any data from it. + +9. I defined my FS20STR as an FHT device, but I do not get any data from +it. -How to convert the FHT8b code seen in its display to the hex code needed by fhem.pl? + + +10. How to convert the FHT8b code seen in its display to the hex code needed +by fhem.pl? + -I'd like to use this sunrise/sunset stuff, can you help me? + + +11. I'd like to use this sunrise/sunset stuff, can you help me?