From 8226fb364f9d02e0f2c157eaa0a636f129e334b5 Mon Sep 17 00:00:00 2001 From: rudolfkoenig <> Date: Thu, 3 Jan 2013 13:05:04 +0000 Subject: [PATCH] Adding missing in the documentation git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@2411 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- FHEM/00_CUL.pm | 25 ++++----- FHEM/00_KM271.pm | 121 +++++++++++++++++++++--------------------- FHEM/00_TCM.pm | 23 ++++---- FHEM/00_ZWDongle.pm | 27 ++++++---- FHEM/16_CUL_RFR.pm | 8 +-- FHEM/61_EMWZ.pm | 6 +-- FHEM/63_EMGZ.pm | 2 +- FHEM/91_notify.pm | 14 ++--- FHEM/91_watchdog.pm | 2 +- FHEM/98_average.pm | 12 ++--- FHEM/98_telnet.pm | 8 +-- FHEM/98_weblink.pm | 2 +- FHEM/99_SUNRISE_EL.pm | 8 +-- 13 files changed, 132 insertions(+), 126 deletions(-) diff --git a/FHEM/00_CUL.pm b/FHEM/00_CUL.pm index 56bc58e99..77914a7f0 100755 --- a/FHEM/00_CUL.pm +++ b/FHEM/00_CUL.pm @@ -1122,8 +1122,8 @@ CUL_Attr(@) Issue a CUL firmware command. See the this document for details on CUL commands. -
+
  • freq / bWidth / rAmpl / sens
    SlowRF mode only.
    Set the CUL frequency / bandwidth / receiver-amplitude / sensitivity
    @@ -1135,16 +1135,17 @@ CUL_Attr(@)
  • freq sets both the reception and transmission frequency. Note: although the CC1101 can be set to frequencies between 315 and 915 MHz, the antenna interface and the antenna of the CUL is tuned for - exactly one frequency. Default is 868.3MHz (or 433MHz) + exactly one frequency. Default is 868.3MHz (or 433MHz)
  • bWidth can be set to values between 58kHz and 812kHz. Large values are susceptible to interference, but make possible to receive inaccurate or multiple transmitters. It affects tranmission too. - Default is 325kHz. + Default is 325kHz.
  • rAmpl is receiver amplification, with values between 24 and 42 dB. Bigger values allow reception of weak signals. Default is 42. +
  • sens is the decision boundery between the on and off values, and it is 4, 8, 12 or 16 dB. Smaller values allow reception of less clear - signals. Default is 4dB. + signals. Default is 4dB.

    • @@ -1209,11 +1210,11 @@ CUL_Attr(@) Attributes -
  • hk2_betriebsart [automatik|nacht|tag]
    sets the working mode for heating circuit 2
    (see above)
    • @@ -961,66 +960,66 @@ KM271_SetReading($$$$$) Generated events:
    As I cannot explain all the values, I logged data for a period and plotted diff --git a/FHEM/00_TCM.pm b/FHEM/00_TCM.pm index 9eacd2923..35c7b70cc 100755 --- a/FHEM/00_TCM.pm +++ b/FHEM/00_TCM.pm @@ -710,17 +710,18 @@ TCM_Undef($$) @@ -729,9 +730,9 @@ TCM_Undef($$)
  • idbase
    Get the ID base. You need this command in order to control EnOcean devices, see the EnOcean - paragraph.

    -
  • modem_status
    -
  • sensitivity
    + paragraph.
    • >
    +
  • modem_status

    • +
  • sensitivity

  • sw_ver
    for details see the datasheet available from www.enocean.com

    • diff --git a/FHEM/00_ZWDongle.pm b/FHEM/00_ZWDongle.pm index 27ccdd011..58351efb9 100755 --- a/FHEM/00_ZWDongle.pm +++ b/FHEM/00_ZWDongle.pm @@ -167,7 +167,7 @@ ZWDongle_Define($$) my @a = split("[ \t][ \t]*", $def); if(@a != 3) { - my $msg = "wrong syntax: define ZWDongle {none | ". + my $msg = "wrong syntax: define ZWDongle {none[:homeId] | ". "devicename[\@baudrate] | ". "devicename\@directio | ". "hostname:port}"; @@ -183,8 +183,9 @@ ZWDongle_Define($$) my %matchList = ( "1:ZWave" => ".*" ); $hash->{MatchList} = \%matchList; - if($dev eq "none") { - Log 1, "$name device is none, commands will be echoed only"; + if($dev =~ m/none:(.*)/) { + $hash->{homeId} = $1; + Log 1, "$name device is none (homeId:$1), commands will be echoed only"; $attr{$name}{dummy} = 1; return undef; @@ -575,16 +576,16 @@ ZWDongle_Ready($) mode. After activating inclusion mode usually you have to press a switch three times within 1.5 seconds on the node to be included into the network of the controller. If autocreate is active, a fhem device will be created - after inclusion. + after inclusion.
  • removeNode [on|off]
    Activate (or deactivate) exclusion mode. Note: the corresponding fhem - device have to be deleted manually. + device have to be deleted manually.
  • createNode id
    Request the class information for the specified node, and create a fhem device upon reception of the answer. Used for previously included nodes, - see the nodeList get command below. + see the nodeList get command below.

    • @@ -594,20 +595,21 @@ ZWDongle_Ready($)
    @@ -625,8 +627,11 @@ ZWDongle_Ready($) Generated events: diff --git a/FHEM/16_CUL_RFR.pm b/FHEM/16_CUL_RFR.pm index 7a8352347..8fa889be5 100755 --- a/FHEM/16_CUL_RFR.pm +++ b/FHEM/16_CUL_RFR.pm @@ -162,15 +162,15 @@ CUL_RFR_AddPrefix($$)
  • First give your base CUL (which remains connected to the PC) an RFR ID by issuing the fhem command "set MyCUL raw ui0100". With this command the base CUL will get the ID 01, and it will not relay messages to other - CUL's (as the second number is 00). + CUL's (as the second number is 00).
  • Now replace the base CUL with the RFR CUL, and set its id by issuing the fhem command "set MyCUL raw ui0201". Now remove this CUL and attach the original, base CUL again. The RFR CUL got the id 02, and will relay every - message to the base CUL with id 01. + message to the base CUL with id 01.
  • Take the RFR CUL, and attach it to an USB power supply, as seen on the image. As the configured base id is not 00, it will activate RF - reception on boot, and will start sending messages to the base CUL. -
  • Now you have to define this RFR cul as a fhem device: + reception on boot, and will start sending messages to the base CUL.
    • +
  • Now you have to define this RFR cul as a fhem device:
    • diff --git a/FHEM/61_EMWZ.pm b/FHEM/61_EMWZ.pm index 50dde13c2..7a745ef74 100755 --- a/FHEM/61_EMWZ.pm +++ b/FHEM/61_EMWZ.pm @@ -217,15 +217,15 @@ EMWZ_Define($$)
  • rperkw
    Number of rotations for a KiloWatt of the EM1000WZ device (actually of the device where the EM1000WZ is attached to). Without setting - this correctly, all other readings will be incorrect. + this correctly, all other readings will be incorrect.
  • alarm
    Alarm in WATT. if you forget to set it, the default value is rediculously low (random), and if a value above this threshold is received, the EM1010PC will start beeping once every minute. It can - be very annoying. + be very annoying.
  • price
    The price of one KW in EURO (use e.g. 0.20 for 20 Cents). It is used - only on the EM1010PC display, it is of no interest for FHEM. + only on the EM1010PC display, it is of no interest for FHEM.

    • diff --git a/FHEM/63_EMGZ.pm b/FHEM/63_EMGZ.pm index c56a31e0e..b7fd6f2a8 100644 --- a/FHEM/63_EMGZ.pm +++ b/FHEM/63_EMGZ.pm @@ -203,7 +203,7 @@ EMGZ_Define($$)
    diff --git a/FHEM/91_notify.pm b/FHEM/91_notify.pm index b86c1875f..c4c099238 100755 --- a/FHEM/91_notify.pm +++ b/FHEM/91_notify.pm @@ -171,20 +171,20 @@ notify_Attr(@)
  • Following special events will be generated for the device "global"
      -
    • INITIALIZED after initialization is finished. -
    • DEFINED <devname> after a device is defined. -
    • DELETED <devname> after a device was deleted. -
    • RENAMED <old> <new> after a device was renamed. +
    • INITIALIZED after initialization is finished.
      • +
    • DEFINED <devname> after a device is defined.
      • +
    • DELETED <devname> after a device was deleted.
      • +
    • RENAMED <old> <new> after a device was renamed.
    • UNDEFINED <defspec> upon reception of a message for an - undefined device. -
    + undefined device.
    • +
  • Notify can be used to store macros for manual execution. Use the trigger command to execute the macro. E.g.
    fhem> define MyMacro notify MyMacro { Log 1, "Hello"}
    fhem> trigger MyMacro
    - +
    • diff --git a/FHEM/91_watchdog.pm b/FHEM/91_watchdog.pm index dbc171259..7d6a0c21c 100755 --- a/FHEM/91_watchdog.pm +++ b/FHEM/91_watchdog.pm @@ -195,7 +195,7 @@ watchdog_Undef($$) definition time. Else it will be activated when the first matching event is received.
  • <regexp1> resets the timer of a running watchdog, to avoid it - use the regexp1WontReactivate attribute. + use the regexp1WontReactivate attribute.
  • if <regexp2> is SAME, then it will be the same as the first regexp, and it will be reactivated, when it is received.
    • diff --git a/FHEM/98_average.pm b/FHEM/98_average.pm index 50e8de4f7..fe745bf5d 100644 --- a/FHEM/98_average.pm +++ b/FHEM/98_average.pm @@ -236,12 +236,12 @@ average_Notify($$) Generated events: diff --git a/FHEM/98_telnet.pm b/FHEM/98_telnet.pm index d649d385d..9435763cf 100644 --- a/FHEM/98_telnet.pm +++ b/FHEM/98_telnet.pm @@ -265,13 +265,13 @@ telnet_Undef($$) attr tPort password secret
    attr tPort password {use FritzBoxUtils;;FB_checkPw("localhost","$password") } -

    +
  • globalpassword
    Just like the attribute password, but a password will only required for non-local connections. -

    +

  • SSL
    @@ -283,13 +283,13 @@ telnet_Undef($$) ncat --ssl fhemhost fhemport
    openssl s_client -connect fhemhost:fhemport
    -

    +

  • allowfrom
    Regexp of allowed ip-addresses or hostnames. If set, only connections from these addresses are allowed. -

    +

    • diff --git a/FHEM/98_weblink.pm b/FHEM/98_weblink.pm index e82c9c84e..037713a04 100755 --- a/FHEM/98_weblink.pm +++ b/FHEM/98_weblink.pm @@ -125,7 +125,7 @@ weblink_Define($$)
  • Fhem config:
    attr wl_1 label "Max $data{max1}, Current $data{currval1}"
  • .gplot file entry:
    - set title <L1>
    + set title <L1>
    • diff --git a/FHEM/99_SUNRISE_EL.pm b/FHEM/99_SUNRISE_EL.pm index 7dcf9c577..e7b6a9c86 100755 --- a/FHEM/99_SUNRISE_EL.pm +++ b/FHEM/99_SUNRISE_EL.pm @@ -413,8 +413,8 @@ isday All functions take up to three arguments:

    isday() can be used in some notify or at commands to check if the sun is up or @@ -454,13 +454,13 @@ isday If set, this latitude is used to calculate sunset/sunrise
    Notation need to be in decimal format (for example Berlin = 52.666) As default Frankfurt/Main, Germany (50.112) is used. -
    +
  • longitude
    If set, this longitude is used to calculate sunset/sunrise
    Notation need to be in decimal format (for example Berlin = 13.400) As default Frankfurt/Main, Germany (8.686) is used. -

    • +
    Note: these are global attributes, e.g.