From ade65bc140c5ae2b027f7c4eeae389f3e019c195 Mon Sep 17 00:00:00 2001 From: MarkusF <> Date: Sun, 5 Jan 2020 17:04:22 +0000 Subject: [PATCH] 51_MOBILEALERTS.pm: Added batteryState git-svn-id: https://svn.fhem.de/fhem/trunk@20890 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/CHANGED | 1 + fhem/FHEM/51_MOBILEALERTS.pm | 174 +++++++++++++++++++++++++++++++---- 2 files changed, 159 insertions(+), 16 deletions(-) diff --git a/fhem/CHANGED b/fhem/CHANGED index b25cda272..1205e71a3 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. + - feature: 51_MOBILEALERTS.pm: Added batteryState - bugfix: 93_DbLog: fix change off V4.9.4 in default splitting. Forum:#106992 - bugfix: 88_HMCCU: Do not touch state during device definition - bugfix: 70_VIERA: correction of "Rolling Key" diff --git a/fhem/FHEM/51_MOBILEALERTS.pm b/fhem/FHEM/51_MOBILEALERTS.pm index 9219fb0da..b89c49ef8 100644 --- a/fhem/FHEM/51_MOBILEALERTS.pm +++ b/fhem/FHEM/51_MOBILEALERTS.pm @@ -10,12 +10,13 @@ use constant MA_RAIN_FACTOR => 0.258; sub MOBILEALERTS_Initialize($) { my ($hash) = @_; - $hash->{DefFn} = "MOBILEALERTS_Define"; - $hash->{UndefFn} = "MOBILEALERTS_Undef"; - $hash->{SetFn} = "MOBILEALERTS_Set"; - $hash->{AttrFn} = "MOBILEALERTS_Attr"; - $hash->{ParseFn} = "MOBILEALERTS_Parse"; - $hash->{Match} = "^.*"; + $hash->{DefFn} = "MOBILEALERTS_Define"; + $hash->{UndefFn} = "MOBILEALERTS_Undef"; + $hash->{SetFn} = "MOBILEALERTS_Set"; + $hash->{AttrFn} = "MOBILEALERTS_Attr"; + $hash->{ParseFn} = "MOBILEALERTS_Parse"; + $hash->{RenameFn} = "MOBILEALERTS_Rename"; + $hash->{Match} = "^.*"; $hash->{AttrList} = "actCycle " . "lastMsg:0,1 " @@ -58,8 +59,8 @@ sub MOBILEALERTS_Define($$) { $corrTemp3 =~ s/,/./g; $corrHum3 =~ s/,/./g; return -"Usage: define MOBILEALERTS " - if ( ( $deviceID !~ m/^[0-9a-f]{12}$/ ) +"Usage: define MOBILEALERTS > " + if ( ( $deviceID !~ m/^[0-9a-f]{12}(_[0-9]{2})?$/ ) || ( $corrTempIn !~ m/^-?[0-9]*\.?[0-9]*$/ ) || ( $corrHumIn !~ m/^-?[0-9]*\.?[0-9]*$/ ) || ( $corrTempOut !~ m/^-?[0-9]*\.?[0-9]*$/ ) @@ -69,8 +70,21 @@ sub MOBILEALERTS_Define($$) { || ( $corrTemp3 !~ m/^-?[0-9]*\.?[0-9]*$/ ) || ( $corrHum3 !~ m/^-?[0-9]*\.?[0-9]*$/ ) ); - $modules{MOBILEALERTS}{defptr}{$deviceID} = $hash; - $hash->{DeviceID} = $deviceID; + if ( length($deviceID) == 15 ) { # define a channel + my $parentID = substr( $deviceID, 0, 12 ); + my $chn = substr( $deviceID, 13, 2 ); + my $parentHash = $modules{MOBILEALERTS}{defptr}{$parentID}; + return "please define a device with id:" . $parentID . " first" + if ( !$parentHash ); + my $parentName = $parentHash->{NAME}; + $hash->{device} = $parentName; + $hash->{chanNo} = $chn; + $parentHash->{"channel_$chn"} = $name; + } + else { + $modules{MOBILEALERTS}{defptr}{$deviceID} = $hash; + $hash->{DeviceID} = $deviceID; + } delete $hash->{corrTemperature}; $hash->{corrTemperature} = $corrTempIn + 0 if ( $corrTempIn != 0 ); $hash->{".corrTemperature"} = $corrTempIn + 0; @@ -113,10 +127,38 @@ sub MOBILEALERTS_Define($$) { return undef; } +sub MOBILEALERTS_Rename($$$) { ############################# + my ( $name, $oldName ) = @_; + my $hash = $defs{$name}; + return if ( $hash->{TYPE} ne "MOBILEALERTS" ); + if ( $hash->{chanNo} ) { # we are channel, inform the device + my $devName = $hash->{device}; + my $devHash = $defs{$devName}; + $devHash->{ "channel_" . $hash->{chanNo} } = $name; + } + else { # we are a device - inform channels if exist + foreach ( grep ( /^channel_/, keys %{$hash} ) ) { + next if ( !$_ ); + my $chnHash = $defs{ $hash->{$_} }; + $chnHash->{device} = $name; + } + } +} + sub MOBILEALERTS_Undef($$) { my ( $hash, $name ) = @_; - delete $modules{MOBILEALERTS}{defptr}{ $hash->{DeviceID} }; RemoveInternalTimer( $hash, "MOBILEALERTS_CheckRainSensorTimed" ); + my $chn = $hash->{chanNo}; + if ($chn) { # delete a channel + my $devName = $hash->{device}; + my $devHash = $defs{$devName}; + delete $devHash->{"channel_$chn"} if ($devName); + } + else { # delete a device + CommandDelete( undef, $hash->{$_} ) + foreach ( grep( /^channel_/, keys %{$hash} ) ); + delete $modules{MOBILEALERTS}{defptr}{ $hash->{DeviceID} }; + } return undef; } @@ -193,12 +235,12 @@ sub MOBILEALERTS_Parse ($$) { unpack( "H2NCH12", $message ); my $name = $io_hash->{NAME}; - Log3 $name, 5, "$name MOBILELAERTS: Search for Device ID: $deviceID"; + Log3 $name, 5, "$name MOBILEALERTS: Search for Device ID: $deviceID"; if ( my $hash = $modules{MOBILEALERTS}{defptr}{$deviceID} ) { my $verbose = GetVerbose( $hash->{NAME} ); - Log3 $name, 5, "$name MOBILELAERTS: Found Device: " . $hash->{NAME}; + Log3 $name, 5, "$name MOBILEALERTS: Found Device: " . $hash->{NAME}; Log3 $hash->{NAME}, 5, - "$hash->{NAME} MOBILELAERTS: Message: " . unpack( "H*", $message ) + "$hash->{NAME} MOBILEALERTS: Message: " . unpack( "H*", $message ) if ( $verbose >= 5 ); # Nachricht für $hash verarbeiten @@ -269,6 +311,66 @@ sub MOBILEALERTS_Parse_02_ce ($$) { MOBILEALERTS_Parse_ce( $hash, $message ); } +sub MOBILEALERTS_Parse_15_ce ($$) { + my ( $hash, $message ) = @_; + MOBILEALERTS_readingsBulkUpdateIfChanged( $hash, 0, "deviceType", + "MA10880" ); + my ( $txCounter, $buttonstate ) = unpack( "nC", $message ); + MOBILEALERTS_readingsBulkUpdate( $hash, 0, "txCounter", + MOBILEALERTS_decodeTxCounter($txCounter) ); + MOBILEALERTS_readingsBulkUpdate( $hash, 0, "triggered", + MOBILEALERTS_triggeredTxCounter($txCounter) ); + MOBILEALERTS_readingsBulkUpdate( $hash, 0, "batteryState", + MOBILEALERTS_batteryStateTxCounter($txCounter) ); + my $button = $buttonstate >> 4; + my $state = $buttonstate & 0xF; + my $state_name; + if ( $state == 1 ) { + $state_name = "Short"; + } + elsif ( $state == 2 ) { + $state_name = "DblShort"; + } + elsif ( $state == 3 ) { + $state_name = "Long"; + } + else { + $state_name = "Unknown"; + } + if (($button < 1) || ($button > 4)) { + return; + } + + my $channel = $hash->{ "channel_" . sprintf( "%02d", $button ) }; + if ( !$channel ) { + my $chnName = $hash->{NAME} . "_Btn_" . sprintf( "%02d", $button ); + my $chnId = $hash->{DeviceID} . "_" . sprintf( "%02d", $button ); + Log3 $hash->{NAME}, 3, "Erzeuge nicht vorhandenen Channel " . $chnName; + CommandDefine( undef, $chnName . ' MOBILEALERTS ' . $chnId ); + $channel = $chnName; + } + my $channelHash = $defs{$channel}; + if ( !$channelHash ) { + Log3 $hash->{NAME}, 3, + "Fehler beim Erzeugen des nicht vorhandenen Channel fuer " . $button; + $channel = "Btn" . $button; + } + else { + my $triggerCnt = ReadingsVal( $channel, "trigger_cnt", "0" ); + $triggerCnt += 1; + readingsBeginUpdate($channelHash); + $channelHash->{".updateTimestamp"}=$hash->{".updateTimestamp"}; + $channelHash->{".expertMode"}=$hash->{".expertMode"}; + MOBILEALERTS_readingsBulkUpdate( $channelHash, 0, "state", + $state_name . "_" . $triggerCnt ); + MOBILEALERTS_readingsBulkUpdate( $channelHash, 0, "trigger_cnt", + $triggerCnt ); + readingsEndUpdate( $channelHash, 1 ); + } + MOBILEALERTS_readingsBulkUpdate( $hash, 0, "state", + "$channel $state_name" ); +} + sub MOBILEALERTS_Parse_ce ($$) { my ( $hash, $message ) = @_; my ( $txCounter, $temperature, $prevTemperature ) = @@ -278,6 +380,8 @@ sub MOBILEALERTS_Parse_ce ($$) { MOBILEALERTS_decodeTxCounter($txCounter) ); MOBILEALERTS_readingsBulkUpdate( $hash, 0, "triggered", MOBILEALERTS_triggeredTxCounter($txCounter) ); + MOBILEALERTS_readingsBulkUpdate( $hash, 0, "batteryState", + MOBILEALERTS_batteryStateTxCounter($txCounter) ); $temperature = MOBILEALERTS_decodeTemperature($temperature) + $hash->{".corrTemperature"}; @@ -303,6 +407,8 @@ sub MOBILEALERTS_Parse_0f_d2 ($$) { MOBILEALERTS_decodeTxCounter($txCounter) ); MOBILEALERTS_readingsBulkUpdate( $hash, 0, "triggered", MOBILEALERTS_triggeredTxCounter($txCounter) ); + MOBILEALERTS_readingsBulkUpdate( $hash, 0, "batteryState", + MOBILEALERTS_batteryStateTxCounter($txCounter) ); $temperatureIn = MOBILEALERTS_decodeTemperature($temperatureIn) + $hash->{".corrTemperature"}; @@ -344,6 +450,8 @@ sub MOBILEALERTS_Parse_d2 ($$) { MOBILEALERTS_decodeTxCounter($txCounter) ); MOBILEALERTS_readingsBulkUpdate( $hash, 0, "triggered", MOBILEALERTS_triggeredTxCounter($txCounter) ); + MOBILEALERTS_readingsBulkUpdate( $hash, 0, "batteryState", + MOBILEALERTS_batteryStateTxCounter($txCounter) ); $temperature = MOBILEALERTS_decodeTemperature($temperature) + $hash->{".corrTemperature"}; @@ -383,6 +491,8 @@ sub MOBILEALERTS_Parse_d4 ($$) { MOBILEALERTS_decodeTxCounter($txCounter) ); MOBILEALERTS_readingsBulkUpdate( $hash, 0, "triggered", MOBILEALERTS_triggeredTxCounter($txCounter) ); + MOBILEALERTS_readingsBulkUpdate( $hash, 0, "batteryState", + MOBILEALERTS_batteryStateTxCounter($txCounter) ); $temperature = MOBILEALERTS_decodeTemperature($temperature) + $hash->{".corrTemperature"}; @@ -421,6 +531,8 @@ sub MOBILEALERTS_Parse_05_da ($$) { MOBILEALERTS_decodeTxCounter($txCounter) ); MOBILEALERTS_readingsBulkUpdate( $hash, 0, "triggered", MOBILEALERTS_triggeredTxCounter($txCounter) ); + MOBILEALERTS_readingsBulkUpdate( $hash, 0, "batteryState", + MOBILEALERTS_batteryStateTxCounter($txCounter) ); $temperatureIn = MOBILEALERTS_decodeTemperature($temperatureIn) + $hash->{".corrTemperature"}; @@ -484,6 +596,8 @@ sub MOBILEALERTS_Parse_da ($$) { MOBILEALERTS_decodeTxCounter($txCounter) ); MOBILEALERTS_readingsBulkUpdate( $hash, 0, "triggered", MOBILEALERTS_triggeredTxCounter($txCounter) ); + MOBILEALERTS_readingsBulkUpdate( $hash, 0, "batteryState", + MOBILEALERTS_batteryStateTxCounter($txCounter) ); $temperatureIn = MOBILEALERTS_decodeTemperature($temperatureIn) + $hash->{".corrTemperature"}; @@ -552,6 +666,8 @@ sub MOBILEALERTS_Parse_e1 ($$) { MOBILEALERTS_decodeTxCounter($txCounter) ); MOBILEALERTS_readingsBulkUpdate( $hash, 0, "triggered", MOBILEALERTS_triggeredTxCounter($txCounter) ); + MOBILEALERTS_readingsBulkUpdate( $hash, 0, "batteryState", + MOBILEALERTS_batteryStateTxCounter($txCounter) ); $temperature = MOBILEALERTS_decodeTemperature($temperature) + $hash->{".corrTemperature"}; @@ -606,6 +722,10 @@ sub MOBILEALERTS_Parse_e2 ($$) { MOBILEALERTS_readingsBulkUpdate( $hash, 0, "txCounter", MOBILEALERTS_decodeTxCounter($txCounter) ); + MOBILEALERTS_readingsBulkUpdate( $hash, 0, "triggered", + MOBILEALERTS_triggeredTxCounter($txCounter) ); + MOBILEALERTS_readingsBulkUpdate( $hash, 0, "batteryState", + MOBILEALERTS_batteryStateTxCounter($txCounter) ); MOBILEALERTS_readingsBulkUpdate( $hash, 0, "direction", $dirTable[$dir] ); MOBILEALERTS_readingsBulkUpdate( $hash, 0, "directionInt", $dir ); MOBILEALERTS_readingsBulkUpdate( $hash, 0, "windSpeed", $windSpeed ); @@ -632,6 +752,8 @@ sub MOBILEALERTS_Parse_d8 ($$) { MOBILEALERTS_decodeTxCounter($txCounter) ); MOBILEALERTS_readingsBulkUpdate( $hash, 0, "triggered", MOBILEALERTS_triggeredTxCounter($txCounter) ); + MOBILEALERTS_readingsBulkUpdate( $hash, 0, "batteryState", + MOBILEALERTS_batteryStateTxCounter($txCounter) ); $temperature = MOBILEALERTS_decodeTemperature($temperature) + $hash->{".corrTemperature"}; @@ -720,6 +842,8 @@ sub MOBILEALERTS_Parse_d9 ($$) { MOBILEALERTS_decodeTxCounter($txCounter) ); MOBILEALERTS_readingsBulkUpdate( $hash, 0, "triggered", MOBILEALERTS_triggeredTxCounter($txCounter) ); + MOBILEALERTS_readingsBulkUpdate( $hash, 0, "batteryState", + MOBILEALERTS_batteryStateTxCounter($txCounter) ); $temperature = MOBILEALERTS_decodeTemperature($temperature) + $hash->{".corrTemperature"}; @@ -785,6 +909,8 @@ sub MOBILEALERTS_Parse_d6 ($$) { MOBILEALERTS_decodeTxCounter($txCounter) ); MOBILEALERTS_readingsBulkUpdate( $hash, 0, "triggered", MOBILEALERTS_triggeredTxCounter($txCounter) ); + MOBILEALERTS_readingsBulkUpdate( $hash, 0, "batteryState", + MOBILEALERTS_batteryStateTxCounter($txCounter) ); $temperatureIn = MOBILEALERTS_decodeTemperature($temperatureIn) + $hash->{".corrTemperature"}; @@ -835,6 +961,8 @@ sub MOBILEALERTS_Parse_01_d2 ($$) { MOBILEALERTS_decodeTxCounter($txCounter) ); MOBILEALERTS_readingsBulkUpdate( $hash, 0, "triggered", MOBILEALERTS_triggeredTxCounter($txCounter) ); + MOBILEALERTS_readingsBulkUpdate( $hash, 0, "batteryState", + MOBILEALERTS_batteryStateTxCounter($txCounter) ); $temperatureIn = MOBILEALERTS_decodeTemperature($temperatureIn) + $hash->{".corrTemperature"}; @@ -883,6 +1011,8 @@ sub MOBILEALERTS_Parse_ea ($$) { MOBILEALERTS_decodeTxCounter($txCounter) ); MOBILEALERTS_readingsBulkUpdate( $hash, 0, "triggered", MOBILEALERTS_triggeredTxCounter($txCounter) ); + MOBILEALERTS_readingsBulkUpdate( $hash, 0, "batteryState", + MOBILEALERTS_batteryStateTxCounter($txCounter) ); # Sensor 1 $temperature1 = MOBILEALERTS_decodeTemperature($temperature1) + @@ -1006,6 +1136,14 @@ sub MOBILEALERTS_triggeredTxCounter($) { return 0; } +sub MOBILEALERTS_batteryStateTxCounter($) { + my ($txCounter) = @_; + if ( ( $txCounter & 0x8000 ) == 0x8000 ) { + return "low"; + } + return "ok"; +} + sub MOBILEALERTS_decodeTemperature($) { my ($temperature) = @_; @@ -1318,7 +1456,7 @@ sub MOBILEALERTS_ActionDetector($) { The MOBILEALERTS is a fhem module for the german MobileAlerts devices and TFA WEATHERHUB devices.

The fhem module represents a MobileAlerts device. The connection is provided by the MOBILELAERTSGW module. - Currently supported: MA10100, MA10101, MA10200, MA10230, MA10300, MA10650, MA10320PRO, MA10350, MA10410, MA10450, MA10660, MA10700, TFA 30.3312.02, MA10800, WL2000, TFA30.3060.01.IT, MA10120PRO
+ Currently supported: MA10100, MA10101, MA10200, MA10230, MA10300, MA10650, MA10320PRO, MA10350, MA10410, MA10450, MA10660, MA10700, TFA 30.3312.02, MA10800, WL2000, TFA30.3060.01.IT, MA10120PRO, MA10880
Supported but untested: ./.

@@ -1328,6 +1466,7 @@ sub MOBILEALERTS_ActionDetector($) { define <name> MOBILEALERTS <deviceID> <corrTempIn> <corrHumIn> <corrTempOut> <corrHumOut> <corrTemp2> <corrHum2> <corrTemp3> <corrHum3>

deviceID is the sensorcode on the sensor. + alternative: deviceID_<ChannelNumber>
corrTempIn optional: correction temperature
@@ -1355,6 +1494,7 @@ sub MOBILEALERTS_ActionDetector($) {
  • lastRcv
    Timestamp of last message.
  • actStatus
    Shows 'unknown', 'alive', 'dead', 'switchedOff' depending on attribut actCycle
  • txCounter
    Counter of last message.
    • +
  • batteryState
    State of Battery (low or ok)
  • triggered
    1=last message was triggered by a event.
  • tempertature, prevTemperature, temperatureIn, temperatureOut, prevTemperatureIn, prevTemperatureOut
    Temperature (depending on device and attribut expert).
  • tempertatureString, prevTemperatureString, temperatureInString, temperatureOutString, prevTemperatureInString, prevTemperatureOutString
    Temperature as string (depending on device and attribut expert).
    • @@ -1413,7 +1553,7 @@ sub MOBILEALERTS_ActionDetector($) {

    Dieses FHEM Modul stellt jeweils ein MobileAlerts Gerät dar. Die Verbindung wird durch das MOBILELAERTSGW Modul bereitgestellt.
    - Aktuell werden unterstüzt: MA10100, MA10101, MA10200, MA10230, MA10300, MA10650, MA10320PRO, MA10350, MA10410, MA10450, MA10660, MA10700, TFA 30.3312.02, MA10800, WL2000, TFA30.3060.01.IT, MA10120PRO
    + Aktuell werden unterstüzt: MA10100, MA10101, MA10200, MA10230, MA10300, MA10650, MA10320PRO, MA10350, MA10410, MA10450, MA10660, MA10700, TFA 30.3312.02, MA10800, WL2000, TFA30.3060.01.IT, MA10120PRO, MA10880
    Unterstüzt aber ungetestet: ./.

    @@ -1423,6 +1563,7 @@ sub MOBILEALERTS_ActionDetector($) { define <name> MOBILEALERTS <deviceID> <corrTempIn> <corrHumIn> <corrTempOut> <corrHumOut> <corrTemp2> <corrHum2> <corrTemp3> <corrHum3>

    deviceID ist der Sensorcode auf dem Sensor. + Alternativ: deviceID_<Kanalnummer>
    corrTempIn optional: Korrekturwert für Temperatur (bzw. Temperatur in)
    @@ -1450,6 +1591,7 @@ sub MOBILEALERTS_ActionDetector($) {
  • lastRcv
    Timestamp der letzten Nachricht.
  • actStatus
    Zeigt 'unknown', 'alive', 'dead', 'switchedOff' abhängig vom Attribut actCycle
  • txCounter
    Counter des letzten Nachricht (wird 0 nach Batteriewechsel).
    • +
  • batteryState
    Status der Batterie (low oder ok)
  • triggered
    1=letzte Nachricht wurde von einem Ereignis ausgelöst.
  • tempertature, prevTemperature, temperatureIn, temperatureOut, prevTemperatureIn, prevTemperatureOut
    Temperatur (abhänging vom Gerät und dem Attribut expert).
  • tempertatureString, prevTemperatureString, temperatureInString, temperatureOutString, prevTemperatureInString, prevTemperatureOutString
    Temperatur als Zeichkette.