diff --git a/fhem/CHANGED b/fhem/CHANGED index 6b52b2313..007a1455b 100644 --- a/fhem/CHANGED +++ b/fhem/CHANGED @@ -1,5 +1,6 @@ # Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # Do not insert empty lines here, update check depends on it. + - change: 30_MilightBridge: Use new RemoveInternalTimer function - new: 52_I2C_EMC1001.pm: initial check in - feature: 30_HUEBridge, 31_HUEDevice: added createGroupReadings attribute - feature: f18: implement dragging / dashboard diff --git a/fhem/FHEM/30_MilightBridge.pm b/fhem/FHEM/30_MilightBridge.pm index 3ad73d2cb..cadd618bb 100644 --- a/fhem/FHEM/30_MilightBridge.pm +++ b/fhem/FHEM/30_MilightBridge.pm @@ -63,13 +63,13 @@ sub MilightBridge_Define($$) return "Usage: define MilightBridge " if(@args < 3); - my ($name, $type, $host) = @args; + my ($name, $type, $hostandport) = @args; $hash->{Clients} = ":MilightDevice:"; my %matchList = ( "1:MilightDevice" => ".*" ); $hash->{MatchList} = \%matchList; - my ($host, $port) = split(":", $host); + my ($host, $port) = split(":", $hostandport); # Parameters $hash->{HOST} = $host; # Set Port (Default 8899, old bridge (V2) uses 50000 @@ -415,14 +415,7 @@ sub MilightBridge_CmdQueue_Send(@) #Log3 ($hash, 5, "$hash->{NAME}_cmdQueue_Send: cmdLastSent: $hash->{cmdLastSent}; Next: ".(gettimeofday()+($hash->{INTERVAL}/1000))); # Remove any existing timers and trigger a new one - foreach my $args (keys %intAt) - { - if (($intAt{$args}{ARG} eq $hash) && ($intAt{$args}{FN} eq 'MilightBridge_CmdQueue_Send')) - { - Log3 ($hash, 5, "$hash->{NAME}_CmdQueue_Send: Remove timer at: ".$intAt{$args}{TRIGGERTIME}); - delete($intAt{$args}); - } - } + RemoveInternalTimer($hash, 'MilightBridge_CmdQueue_Send'); InternalTimer(gettimeofday()+($hash->{INTERVAL}/1000), "MilightBridge_CmdQueue_Send", $hash, 0); } @@ -433,6 +426,8 @@ sub MilightBridge_CmdQueue_Send(@) 1; =pod +=item device +=item summary Interface to a Milight Bridge connected to the network using a Wifi connection =begin html diff --git a/fhem/FHEM/31_MilightDevice.pm b/fhem/FHEM/31_MilightDevice.pm index 111db295c..527602b50 100644 --- a/fhem/FHEM/31_MilightDevice.pm +++ b/fhem/FHEM/31_MilightDevice.pm @@ -2354,6 +2354,8 @@ sub MilightDevice_roundfunc($) { 1; =pod +=item device +=item summary This module represents a Milight LED Bulb or LED strip controller =begin html