diff --git a/fhem/CHANGED b/fhem/CHANGED index 24d3556b4..60f8652e5 100644 --- a/fhem/CHANGED +++ b/fhem/CHANGED @@ -18,6 +18,7 @@ devices and alike. - bugfix: serial port setting on Linux broken if running in the background - feature: IPV6 support, FHEMWEB basicAuth and HTTPS support + - feature: createlog added to the autocreate module - 2010-08-15 (5.0) - **NOTE*: The default installation path is changed to satisfy lintian diff --git a/fhem/FHEM/10_CUL_HM.pm b/fhem/FHEM/10_CUL_HM.pm index 442923c2b..5c7376e73 100755 --- a/fhem/FHEM/10_CUL_HM.pm +++ b/fhem/FHEM/10_CUL_HM.pm @@ -39,7 +39,7 @@ my %culHmModel=( "0004" => "HM-LC-SW1-FM", "0005" => "HM-LC-BL1-FM", "0006" => "HM-LC-BL1-SM", - "0007" => "KS550", + "0007" => "KS550", # Tested "0008" => "HM-RC-4", # cant pair(AES)-> broadcast only "0009" => "HM-LC-SW2-FM", "000A" => "HM-LC-SW2-SM", @@ -82,7 +82,7 @@ my %culHmModel=( "003D" => "HM-WDS10-TH-O", "003E" => "HM-WDS30-T-O", "003F" => "HM-WDS40-TH-I", - "0040" => "HM-WDS100-C6-O", + "0040" => "HM-WDS100-C6-O", # Identical to KS550? "0041" => "HM-WDC7000", "0042" => "HM-SEC-SD", # Tested "0043" => "HM-SEC-TIS", @@ -322,7 +322,7 @@ CUL_HM_Parse($$) $t = hex($t)/10; $t -= 3276.8 if($t > 1638.4); $h = hex($h); - push @event, "state:T:$t H:$h"; + push @event, "state:T: $t H: $h"; push @event, "temperature:$t"; push @event, "humidity:$h"; @@ -335,6 +335,34 @@ CUL_HM_Parse($$) } + } elsif($model eq "KS550") { + + if($cmd eq "8670" && $p =~ m/^(....)(..)(....)(....)(..)(..)(..)/) { + my ( $t, $h, $r, $w, $wd, $s, $b ) = + (hex($1), hex($2), hex($3), hex($4), hex($5), hex($6), hex($7)); + my $tsgn = ($t & 0x4000); # not tested + $t = ($t & 0x3fff)/10; + $t = -$t if($tsgn); + my $ir = $r & 0x8000; + $r = ($r & 0x7fff) * 0.295; + my $wdr = ($w>>14)*22.5; + $w = $w & 0x3fff; + $wd = $wd * 5; + + push @event, + "state:T: $t H: $h W: $w R: $r IR: $ir WD: $wd WDR: $wdr S: $s B: $b"; + push @event, "temperature:$t"; + push @event, "humidity:$h"; + push @event, "windSpeed:$w"; + push @event, "windDirection:$wd"; + push @event, "windDirRange:$wdr"; + push @event, "rain:$r"; + push @event, "isRaining:$ir"; + push @event, "sunshine:$s"; + push @event, "brightness:$b"; + + } + } elsif($st eq "KFM" && $model eq "KFM-Sensor") { if($p =~ m/814(.)0200(..)(..)(..)/) { diff --git a/fhem/TODO b/fhem/TODO index 6f7a36227..4c8144076 100644 --- a/fhem/TODO +++ b/fhem/TODO @@ -1,15 +1,11 @@ FHEM: - fork problem (?) -- autocreate disable / onForSec -- HomeMatic in fhemweb -- HomeMatic autocreate - HomeMatic signing - HomeMatic set log 2 - mergelog - autodetect physical hardware - RFR: Error message for uncomplete last message -- fix autocreate rename anomaly (rename filelog only) - implement wiki decisions Webpgm2 diff --git a/fhem/docs/commandref.html b/fhem/docs/commandref.html index d6d390d5f..ac442633f 100644 --- a/fhem/docs/commandref.html +++ b/fhem/docs/commandref.html @@ -2236,8 +2236,8 @@ A line ending with \ will be concatenated with the next one, so long lines is a separate firmware with HomeMatic support which lacks FHT support.
  • Note: Currently supported device families: remote, switch, dimmer, - blindActuator, smokeDetector, threeStateSensor and THSensor. -
    • + blindActuator, smokeDetector, threeStateSensor, THSensor and the + KS550

    @@ -5752,11 +5752,14 @@ Terminating The autocreate module intercepts the UNDEFINED event generated by each module, creates a device and optionally also FileLog and weblink entries.
    - Note:devices will be created with a unique name, which contains + Note 1: devices will be created with a unique name, which contains the type and a unique id for this type. When renaming the device, the automatically created filelog and weblink devices - will also be renamed. - + will also be renamed.
    + Note 2: you can disable the automatic creation by setting the + disable attribute, in this case only the rename + hook is active, and you can use the createlog + command to add FileLog and weblink to an already defined device.
    @@ -5798,14 +5801,24 @@ Terminating
  • weblink
    - Create a weblinkn associated with the device/filelog.

    • + Create a weblink associated with the device/filelog.
  • weblink_room
    "Put" the newly weblink in this room. The name can contain the wildcards %TYPE and %NAME, see the example above.

    • + +
  • disable

    • + + createlog +