FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-17 05:16:02 +00:00
Code Issues Releases Wiki Activity

51_MOBILEALERTSGW: Added TFA30.3060.01.IT

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@17222 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
MarkusF 2018-08-28 15:33:07 +00:00
parent 7df260430e
commit 7e1b1add28
2 changed files with 299 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fhem/CHANGED
View File

@ -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_MOBILEALERTSGW: Added TFA30.3060.01.IT
- change: 89_FULLY: Set start URL and bug fixes
- bugfix: 49_SSCam: V7.0.1, enable/disable issue
(forum.fhem.de/index.php/topic,45671.msg830869.html#msg830869)

362
fhem/FHEM/51_MOBILEALERTS.pm
View File

@ -35,36 +35,67 @@ sub MOBILEALERTS_Initialize($) {
sub MOBILEALERTS_Define($$) {
my ( $hash, $def ) = @_;
my ( $name, $type, $deviceID, $corrTempIn, $corrHumIn, $corrTempOut,
$corrHumOut )
= split( "[ \t]+", $def );
my (
$name, $type, $deviceID, $corrTempIn,
$corrHumIn, $corrTempOut, $corrHumOut, $corrTemp2,
$corrHum2, $corrTemp3, $corrHum3
) = split( "[ \t]+", $def );
Log3 $name, 3, "$name MOBILEALERTS: DeviceID $deviceID";
$corrTempIn = 0 if ( !defined($corrTempIn) );
$corrHumIn = 0 if ( !defined($corrHumIn) );
$corrTempOut = 0 if ( !defined($corrTempOut) );
$corrHumOut = 0 if ( !defined($corrHumOut) );
$corrTemp2 = 0 if ( !defined($corrTemp2) );
$corrHum2 = 0 if ( !defined($corrHum2) );
$corrTemp3 = 0 if ( !defined($corrTemp3) );
$corrHum3 = 0 if ( !defined($corrHum3) );
$corrTempIn =~ s/,/./g;
$corrHumIn =~ s/,/./g;
$corrTempOut =~ s/,/./g;
$corrHumOut =~ s/,/./g;
$corrTemp2 =~ s/,/./g;
$corrHum2 =~ s/,/./g;
$corrTemp3 =~ s/,/./g;
$corrHum3 =~ s/,/./g;
return
"Usage: define <name> MOBILEALERTS <id-12 stellig hex > <opt. corrTempIn> <opt. corrHumIn> <opt. corrTempOut> <opt. corrHumOut>"
"Usage: define <name> MOBILEALERTS <id-12 stellig hex > <opt. corrTempIn> <opt. corrHumIn> <opt. corrTempOut/1> <opt. corrHumOut/1> <opt. corrTemp2> <opt. corrHum2> <opt. corrTemp3> <opt. corrHum3>"
if ( ( $deviceID !~ m/^[0-9a-f]{12}$/ )
|| ( $corrTempIn !~ m/^-?[0-9]*\.?[0-9]*$/ )
|| ( $corrHumIn !~ m/^-?[0-9]*\.?[0-9]*$/ )
|| ( $corrTempOut !~ m/^-?[0-9]*\.?[0-9]*$/ )
|| ( $corrHumOut !~ m/^-?[0-9]*\.?[0-9]*$/ ) );
|| ( $corrHumOut !~ m/^-?[0-9]*\.?[0-9]*$/ )
|| ( $corrTemp2 !~ m/^-?[0-9]*\.?[0-9]*$/ )
|| ( $corrHum2 !~ m/^-?[0-9]*\.?[0-9]*$/ )
|| ( $corrTemp3 !~ m/^-?[0-9]*\.?[0-9]*$/ )
|| ( $corrHum3 !~ m/^-?[0-9]*\.?[0-9]*$/ ) );
$modules{MOBILEALERTS}{defptr}{$deviceID} = $hash;
$hash->{DeviceID} = $deviceID;
$hash->{DeviceID} = $deviceID;
delete $hash->{corrTemperature};
$hash->{corrTemperature} = $corrTempIn + 0 if ( $corrTempIn != 0);
delete $hash->{corrHumidty} ;
$hash->{corrHumidity} = $corrHumIn + 0 if ( $corrHumIn != 0);
$hash->{corrTemperature} = $corrTempIn + 0 if ( $corrTempIn != 0 );
$hash->{".corrTemperature"} = $corrTempIn + 0;
delete $hash->{corrHumidty};
$hash->{corrHumidity} = $corrHumIn + 0 if ( $corrHumIn != 0 );
$hash->{".corrHumidity"} = $corrHumIn + 0;
delete $hash->{corrTemperatureOut};
$hash->{corrTemperatureOut} = $corrTempOut + 0 if ( $corrTempOut != 0);
delete $hash->{corrHumidtyOut} ;
$hash->{corrHumidityOut} = $corrHumOut + 0 if ( $corrHumOut != 0);
$hash->{corrTemperatureOut} = $corrTempOut + 0 if ( $corrTempOut != 0 );
$hash->{".corrTemperatureOut"} = $corrTempOut + 0;
delete $hash->{corrHumidtyOut};
$hash->{corrHumidityOut} = $corrHumOut + 0 if ( $corrHumOut != 0 );
$hash->{".corrHumidityOut"} = $corrHumOut + 0;
delete $hash->{corrTemperature2};
$hash->{corrTemperature2} = $corrTemp2 + 0 if ( $corrTemp2 != 0 );
$hash->{".corrTemperature2"} = $corrTemp2 + 0;
delete $hash->{corrHumidty2};
$hash->{corrHumidity2} = $corrHum2 + 0 if ( $corrHum2 != 0 );
$hash->{".corrHumidity2"} = $corrHum2 + 0;
delete $hash->{corrTemperature3};
$hash->{corrTemperature3} = $corrTemp3 + 0 if ( $corrTemp3 != 0 );
$hash->{".corrTemperature3"} = $corrTemp3 + 0;
delete $hash->{corrHumidty3};
$hash->{corrHumidity3} = $corrHum3 + 0 if ( $corrHum3 != 0 );
$hash->{".corrHumidity3"} = $corrHum3 + 0;
if ( ( exists $modules{MOBILEALERTS}{AutoCreateMessages} )
&& ( exists $modules{MOBILEALERTS}{AutoCreateMessages}{$deviceID} ) )
{
@ -247,11 +278,14 @@ sub MOBILEALERTS_Parse_ce ($$) {
MOBILEALERTS_decodeTxCounter($txCounter) );
MOBILEALERTS_readingsBulkUpdate( $hash, 0, "triggered",
MOBILEALERTS_triggeredTxCounter($txCounter) );
$temperature = MOBILEALERTS_decodeTemperature($temperature) + $hash->{corrTemperature};
$temperature =
MOBILEALERTS_decodeTemperature($temperature) +
$hash->{".corrTemperature"};
MOBILEALERTS_readingsBulkUpdate( $hash, 0, "temperature", $temperature );
MOBILEALERTS_readingsBulkUpdate( $hash, 0, "temperatureString",
MOBILEALERTS_temperatureToString($temperature) );
$prevTemperature = MOBILEALERTS_decodeTemperature($prevTemperature) + $hash->{corrTemperature};
$prevTemperature = MOBILEALERTS_decodeTemperature($prevTemperature) +
$hash->{".corrTemperature"};
MOBILEALERTS_readingsBulkUpdate( $hash, 1, "prevTemperature",
$prevTemperature );
MOBILEALERTS_readingsBulkUpdate( $hash, 0, "state", "T: " . $temperature );
@ -269,20 +303,25 @@ sub MOBILEALERTS_Parse_0f_d2 ($$) {
MOBILEALERTS_decodeTxCounter($txCounter) );
MOBILEALERTS_readingsBulkUpdate( $hash, 0, "triggered",
MOBILEALERTS_triggeredTxCounter($txCounter) );
$temperatureIn = MOBILEALERTS_decodeTemperature($temperatureIn) + $hash->{corrTemperature};
$temperatureIn =
MOBILEALERTS_decodeTemperature($temperatureIn) +
$hash->{".corrTemperature"};
MOBILEALERTS_readingsBulkUpdate( $hash, 0, "temperatureIn",
$temperatureIn );
MOBILEALERTS_readingsBulkUpdate( $hash, 0, "temperatureInString",
MOBILEALERTS_temperatureToString($temperatureIn) );
$temperatureOut = MOBILEALERTS_decodeTemperature($temperatureOut) + $hash->{corrTemperatureOut};
$temperatureOut = MOBILEALERTS_decodeTemperature($temperatureOut) +
$hash->{".corrTemperatureOut"};
MOBILEALERTS_readingsBulkUpdate( $hash, 0, "temperatureOut",
$temperatureOut );
MOBILEALERTS_readingsBulkUpdate( $hash, 0, "temperatureOutString",
MOBILEALERTS_temperatureToString($temperatureOut) );
$prevTemperatureIn = MOBILEALERTS_decodeTemperature($prevTemperatureIn)+ $hash->{corrTemperature};
$prevTemperatureIn = MOBILEALERTS_decodeTemperature($prevTemperatureIn) +
$hash->{".corrTemperature"};
MOBILEALERTS_readingsBulkUpdate( $hash, 1, "prevTemperatureIn",
$prevTemperatureIn );
$prevTemperatureOut = MOBILEALERTS_decodeTemperature($prevTemperatureOut) + $hash->{corrTemperatureOut};
$prevTemperatureOut = MOBILEALERTS_decodeTemperature($prevTemperatureOut) +
$hash->{".corrTemperatureOut"};
MOBILEALERTS_readingsBulkUpdate( $hash, 1, "prevTemperatureOut",
$prevTemperatureOut );
MOBILEALERTS_readingsBulkUpdate( $hash, 0, "state",
@ -305,18 +344,23 @@ sub MOBILEALERTS_Parse_d2 ($$) {
MOBILEALERTS_decodeTxCounter($txCounter) );
MOBILEALERTS_readingsBulkUpdate( $hash, 0, "triggered",
MOBILEALERTS_triggeredTxCounter($txCounter) );
$temperature = MOBILEALERTS_decodeTemperature($temperature) + $hash->{corrTemperature};
$temperature =
MOBILEALERTS_decodeTemperature($temperature) +
$hash->{".corrTemperature"};
MOBILEALERTS_readingsBulkUpdate( $hash, 0, "temperature", $temperature );
MOBILEALERTS_readingsBulkUpdate( $hash, 0, "temperatureString",
MOBILEALERTS_temperatureToString($temperature) );
$humidity = MOBILEALERTS_decodeHumidity($humidity) + $hash->{corrHumidity};
$humidity =
MOBILEALERTS_decodeHumidity($humidity) + $hash->{".corrHumidity"};
MOBILEALERTS_readingsBulkUpdate( $hash, 0, "humidity", $humidity );
MOBILEALERTS_readingsBulkUpdate( $hash, 0, "humidityString",
MOBILEALERTS_humidityToString($humidity) );
$prevTemperature = MOBILEALERTS_decodeTemperature($prevTemperature) + $hash->{corrTemperature};
$prevTemperature = MOBILEALERTS_decodeTemperature($prevTemperature) +
$hash->{".corrTemperature"};
MOBILEALERTS_readingsBulkUpdate( $hash, 1, "prevTemperature",
$prevTemperature );
$prevHumidity = MOBILEALERTS_decodeHumidity($prevHumidity) + $hash->{corrHumidity};
$prevHumidity =
MOBILEALERTS_decodeHumidity($prevHumidity) + $hash->{".corrHumidity"};
MOBILEALERTS_readingsBulkUpdate( $hash, 1, "prevHumidity", $prevHumidity );
MOBILEALERTS_readingsBulkUpdate( $hash, 0, "state",
"T: " . $temperature . " H: " . $humidity );
@ -339,21 +383,26 @@ sub MOBILEALERTS_Parse_d4 ($$) {
MOBILEALERTS_decodeTxCounter($txCounter) );
MOBILEALERTS_readingsBulkUpdate( $hash, 0, "triggered",
MOBILEALERTS_triggeredTxCounter($txCounter) );
$temperature = MOBILEALERTS_decodeTemperature($temperature) + $hash->{corrTemperature};
$temperature =
MOBILEALERTS_decodeTemperature($temperature) +
$hash->{".corrTemperature"};
MOBILEALERTS_readingsBulkUpdate( $hash, 0, "temperature", $temperature );
MOBILEALERTS_readingsBulkUpdate( $hash, 0, "temperatureString",
MOBILEALERTS_temperatureToString($temperature) );
$humidity = MOBILEALERTS_decodeHumidity($humidity) + $hash->{corrHumidity};
$humidity =
MOBILEALERTS_decodeHumidity($humidity) + $hash->{".corrHumidity"};
MOBILEALERTS_readingsBulkUpdate( $hash, 0, "humidity", $humidity );
MOBILEALERTS_readingsBulkUpdate( $hash, 0, "humidityString",
MOBILEALERTS_humidityToString($humidity) );
$wetness = MOBILEALERTS_decodeWetness($wetness);
MOBILEALERTS_readingsBulkUpdate( $hash, 0, "wetness", $wetness );
$prevTemperature = MOBILEALERTS_decodeTemperature($prevTemperature) + $hash->{corrTemperature};
$prevTemperature = MOBILEALERTS_decodeTemperature($prevTemperature) +
$hash->{".corrTemperature"};
MOBILEALERTS_readingsBulkUpdate( $hash, 1, "prevTemperature",
$prevTemperature );
$prevHumidity = MOBILEALERTS_decodeHumidity($prevHumidity) + $hash->{corrHumidity};
$prevWetness = MOBILEALERTS_decodeWetness($prevWetness);
$prevHumidity =
MOBILEALERTS_decodeHumidity($prevHumidity) + $hash->{".corrHumidity"};
$prevWetness = MOBILEALERTS_decodeWetness($prevWetness);
MOBILEALERTS_readingsBulkUpdate( $hash, 1, "prevWetness", $prevWetness );
MOBILEALERTS_readingsBulkUpdate( $hash, 1, "prevHumidity", $prevHumidity );
MOBILEALERTS_readingsBulkUpdate( $hash, 0, "state",
@ -372,17 +421,21 @@ sub MOBILEALERTS_Parse_05_da ($$) {
MOBILEALERTS_decodeTxCounter($txCounter) );
MOBILEALERTS_readingsBulkUpdate( $hash, 0, "triggered",
MOBILEALERTS_triggeredTxCounter($txCounter) );
$temperatureIn = MOBILEALERTS_decodeTemperature($temperatureIn) + $hash->{corrTemperature};
$temperatureIn =
MOBILEALERTS_decodeTemperature($temperatureIn) +
$hash->{".corrTemperature"};
MOBILEALERTS_readingsBulkUpdate( $hash, 0, "temperatureIn",
$temperatureIn );
MOBILEALERTS_readingsBulkUpdate( $hash, 0, "temperatureStringIn",
MOBILEALERTS_temperatureToString($temperatureIn) );
$temperatureOut = MOBILEALERTS_decodeTemperature($temperatureOut) + $hash->{corrTemperatureOut};
$temperatureOut = MOBILEALERTS_decodeTemperature($temperatureOut) +
$hash->{".corrTemperatureOut"};
MOBILEALERTS_readingsBulkUpdate( $hash, 0, "temperatureOut",
$temperatureOut );
MOBILEALERTS_readingsBulkUpdate( $hash, 0, "temperatureStringOut",
MOBILEALERTS_temperatureToString($temperatureOut) );
$humidityIn = MOBILEALERTS_decodeHumidity($humidityIn) + $hash->{corrHumidity};
$humidityIn =
MOBILEALERTS_decodeHumidity($humidityIn) + $hash->{".corrHumidity"};
MOBILEALERTS_readingsBulkUpdate( $hash, 0, "humidity", $humidityIn );
MOBILEALERTS_readingsBulkUpdate( $hash, 0, "humidityString",
MOBILEALERTS_humidityToString($humidityIn) );
@ -390,13 +443,16 @@ sub MOBILEALERTS_Parse_05_da ($$) {
MOBILEALERTS_readingsBulkUpdate( $hash, 0, "co2", $co2 );
MOBILEALERTS_readingsBulkUpdate( $hash, 0, "co2String",
MOBILEALERTS_cO2ToString($co2) );
$prevTemperatureIn = MOBILEALERTS_decodeTemperature($prevTemperatureIn) + $hash->{corrTemperature};
$prevTemperatureIn = MOBILEALERTS_decodeTemperature($prevTemperatureIn) +
$hash->{".corrTemperature"};
MOBILEALERTS_readingsBulkUpdate( $hash, 1, "prevTemperatureIn",
$prevTemperatureIn );
$prevTemperatureOut = MOBILEALERTS_decodeTemperature($prevTemperatureOut) + $hash->{corrTemperatureOut};
$prevTemperatureOut = MOBILEALERTS_decodeTemperature($prevTemperatureOut) +
$hash->{".corrTemperatureOut"};
MOBILEALERTS_readingsBulkUpdate( $hash, 1, "prevTemperatureOut",
$prevTemperatureOut );
$prevHumidityIn = MOBILEALERTS_decodeHumidity($prevHumidityIn) + $hash->{corrHumidity};
$prevHumidityIn =
MOBILEALERTS_decodeHumidity($prevHumidityIn) + $hash->{".corrHumidity"};
MOBILEALERTS_readingsBulkUpdate( $hash, 1, "prevHumidityIn",
$prevHumidityIn );
MOBILEALERTS_readingsBulkUpdate( $hash, 0, "state",
@ -428,21 +484,26 @@ sub MOBILEALERTS_Parse_da ($$) {
MOBILEALERTS_decodeTxCounter($txCounter) );
MOBILEALERTS_readingsBulkUpdate( $hash, 0, "triggered",
MOBILEALERTS_triggeredTxCounter($txCounter) );
$temperatureIn = MOBILEALERTS_decodeTemperature($temperatureIn) + $hash->{corrTemperature};
$temperatureIn =
MOBILEALERTS_decodeTemperature($temperatureIn) +
$hash->{".corrTemperature"};
MOBILEALERTS_readingsBulkUpdate( $hash, 0, "temperatureIn",
$temperatureIn );
MOBILEALERTS_readingsBulkUpdate( $hash, 0, "temperatureInString",
MOBILEALERTS_temperatureToString($temperatureIn) );
$humidityIn = MOBILEALERTS_decodeHumidity($humidityIn) + $hash->{corrHumidity};
$humidityIn =
MOBILEALERTS_decodeHumidity($humidityIn) + $hash->{".corrHumidity"};
MOBILEALERTS_readingsBulkUpdate( $hash, 0, "humidityIn", $humidityIn );
MOBILEALERTS_readingsBulkUpdate( $hash, 0, "humidityInString",
MOBILEALERTS_humidityToString($humidityIn) );
$temperatureOut = MOBILEALERTS_decodeTemperature($temperatureOut) + $hash->{corrTemperatureOut};
$temperatureOut = MOBILEALERTS_decodeTemperature($temperatureOut) +
$hash->{".corrTemperatureOut"};
MOBILEALERTS_readingsBulkUpdate( $hash, 0, "temperatureOut",
$temperatureOut );
MOBILEALERTS_readingsBulkUpdate( $hash, 0, "temperatureOutString",
MOBILEALERTS_temperatureToString($temperatureOut) );
$humidityOut = MOBILEALERTS_decodeHumidity($humidityOut) + $hash->{corrHumidityOut};
$humidityOut =
MOBILEALERTS_decodeHumidity($humidityOut) + $hash->{".corrHumidityOut"};
MOBILEALERTS_readingsBulkUpdate( $hash, 0, "humidityOut", $humidityOut );
MOBILEALERTS_readingsBulkUpdate( $hash, 0, "humidityOutString",
MOBILEALERTS_humidityToString($humidityOut) );
@ -491,7 +552,9 @@ sub MOBILEALERTS_Parse_e1 ($$) {
MOBILEALERTS_decodeTxCounter($txCounter) );
MOBILEALERTS_readingsBulkUpdate( $hash, 0, "triggered",
MOBILEALERTS_triggeredTxCounter($txCounter) );
$temperature = MOBILEALERTS_decodeTemperature($temperature) + $hash->{corrTemperature};
$temperature =
MOBILEALERTS_decodeTemperature($temperature) +
$hash->{".corrTemperature"};
MOBILEALERTS_readingsBulkUpdate( $hash, 0, "temperature", $temperature );
MOBILEALERTS_readingsBulkUpdate( $hash, 0, "temperatureString",
MOBILEALERTS_temperatureToString($temperature) );
@ -569,23 +632,31 @@ sub MOBILEALERTS_Parse_d8 ($$) {
MOBILEALERTS_decodeTxCounter($txCounter) );
MOBILEALERTS_readingsBulkUpdate( $hash, 0, "triggered",
MOBILEALERTS_triggeredTxCounter($txCounter) );
$temperature = MOBILEALERTS_decodeTemperature($temperature) + $hash->{corrTemperature};
$temperature =
MOBILEALERTS_decodeTemperature($temperature) +
$hash->{".corrTemperature"};
MOBILEALERTS_readingsBulkUpdate( $hash, 0, "temperature", $temperature );
MOBILEALERTS_readingsBulkUpdate( $hash, 0, "temperatureString",
MOBILEALERTS_temperatureToString($temperature) );
$humidity = MOBILEALERTS_decodeHumidityDecimal($humidity) + $hash->{corrHumidity};
$humidity =
MOBILEALERTS_decodeHumidityDecimal($humidity) + $hash->{".corrHumidity"};
MOBILEALERTS_readingsBulkUpdate( $hash, 0, "humidity", $humidity );
MOBILEALERTS_readingsBulkUpdate( $hash, 0, "humidityString",
MOBILEALERTS_humidityToString($humidity) );
$prevTemperature = MOBILEALERTS_decodeTemperature($prevTemperature) + $hash->{corrTemperature};
$prevTemperature = MOBILEALERTS_decodeTemperature($prevTemperature) +
$hash->{".corrTemperature"};
MOBILEALERTS_readingsBulkUpdate( $hash, 1, "prevTemperature",
$prevTemperature );
$prevHumidity = MOBILEALERTS_decodeHumidityDecimal($prevHumidity) + $hash->{corrHumidity};
$prevHumidity =
MOBILEALERTS_decodeHumidityDecimal($prevHumidity) +
$hash->{".corrHumidity"};
MOBILEALERTS_readingsBulkUpdate( $hash, 1, "prevHumidity", $prevHumidity );
$prevTemperature2 = MOBILEALERTS_decodeTemperature($prevTemperature2) + $hash->{corrTemperature};
$prevTemperature2 = MOBILEALERTS_decodeTemperature($prevTemperature2) +
$hash->{".corrTemperature"};
MOBILEALERTS_readingsBulkUpdate( $hash, 1, "prevTemperature2",
$prevTemperature2 );
$prevHumidity2 = MOBILEALERTS_decodeHumidityDecimal($prevHumidity2) + $hash->{corrHumidity};
$prevHumidity2 = MOBILEALERTS_decodeHumidityDecimal($prevHumidity2) +
$hash->{".corrHumidity"};
MOBILEALERTS_readingsBulkUpdate( $hash, 1, "prevHumidity2",
$prevHumidity2 );
MOBILEALERTS_readingsBulkUpdate( $hash, 0, "state",
@ -649,27 +720,34 @@ sub MOBILEALERTS_Parse_d9 ($$) {
MOBILEALERTS_decodeTxCounter($txCounter) );
MOBILEALERTS_readingsBulkUpdate( $hash, 0, "triggered",
MOBILEALERTS_triggeredTxCounter($txCounter) );
$temperature = MOBILEALERTS_decodeTemperature($temperature) + $hash->{corrTemperature};
$temperature =
MOBILEALERTS_decodeTemperature($temperature) +
$hash->{".corrTemperature"};
MOBILEALERTS_readingsBulkUpdate( $hash, 0, "temperature", $temperature );
MOBILEALERTS_readingsBulkUpdate( $hash, 0, "temperatureString",
MOBILEALERTS_temperatureToString($temperature) );
$humidity = MOBILEALERTS_decodeHumidity($humidity) + $hash->{corrHumidity};
$humidity =
MOBILEALERTS_decodeHumidity($humidity) + $hash->{".corrHumidity"};
MOBILEALERTS_readingsBulkUpdate( $hash, 0, "humidity", $humidity );
MOBILEALERTS_readingsBulkUpdate( $hash, 0, "humidityString",
MOBILEALERTS_humidityToString($humidity) );
$humidity3h = MOBILEALERTS_decodeHumidity($humidity3h) + $hash->{corrHumidity};
$humidity3h =
MOBILEALERTS_decodeHumidity($humidity3h) + $hash->{".corrHumidity"};
MOBILEALERTS_readingsBulkUpdate( $hash, 0, "humidity3h", $humidity3h );
MOBILEALERTS_readingsBulkUpdate( $hash, 0, "humidity3hString",
MOBILEALERTS_humidityToString($humidity3h) );
$humidity24h = MOBILEALERTS_decodeHumidity($humidity24h) + $hash->{corrHumidity};
$humidity24h =
MOBILEALERTS_decodeHumidity($humidity24h) + $hash->{".corrHumidity"};
MOBILEALERTS_readingsBulkUpdate( $hash, 0, "humidity24h", $humidity3h );
MOBILEALERTS_readingsBulkUpdate( $hash, 0, "humidity24hString",
MOBILEALERTS_humidityToString($humidity24h) );
$humidity7d = MOBILEALERTS_decodeHumidity($humidity7d) + $hash->{corrHumidity};
$humidity7d =
MOBILEALERTS_decodeHumidity($humidity7d) + $hash->{".corrHumidity"};
MOBILEALERTS_readingsBulkUpdate( $hash, 0, "humidity7d", $humidity7d );
MOBILEALERTS_readingsBulkUpdate( $hash, 0, "humidity7dString",
MOBILEALERTS_humidityToString($humidity7d) );
$humidity30d = MOBILEALERTS_decodeHumidity($humidity30d) + $hash->{corrHumidity};
$humidity30d =
MOBILEALERTS_decodeHumidity($humidity30d) + $hash->{".corrHumidity"};
MOBILEALERTS_readingsBulkUpdate( $hash, 0, "humidity30d", $humidity30d );
MOBILEALERTS_readingsBulkUpdate( $hash, 0, "humidity30dString",
MOBILEALERTS_humidityToString($humidity30d) );
@ -707,27 +785,34 @@ sub MOBILEALERTS_Parse_d6 ($$) {
MOBILEALERTS_decodeTxCounter($txCounter) );
MOBILEALERTS_readingsBulkUpdate( $hash, 0, "triggered",
MOBILEALERTS_triggeredTxCounter($txCounter) );
$temperatureIn = MOBILEALERTS_decodeTemperature($temperatureIn) + $hash->{corrTemperature};
$temperatureIn =
MOBILEALERTS_decodeTemperature($temperatureIn) +
$hash->{".corrTemperature"};
MOBILEALERTS_readingsBulkUpdate( $hash, 0, "temperatureIn",
$temperatureIn );
MOBILEALERTS_readingsBulkUpdate( $hash, 0, "temperatureStringIn",
MOBILEALERTS_temperatureToString($temperatureIn) );
$temperatureOut = MOBILEALERTS_decodeTemperature($temperatureOut) + $hash->{corrTemperatureOut};
$temperatureOut = MOBILEALERTS_decodeTemperature($temperatureOut) +
$hash->{".corrTemperatureOut"};
MOBILEALERTS_readingsBulkUpdate( $hash, 0, "temperatureOut",
$temperatureOut );
MOBILEALERTS_readingsBulkUpdate( $hash, 0, "temperatureStringOut",
MOBILEALERTS_temperatureToString($temperatureOut) );
$humidityIn = MOBILEALERTS_decodeHumidity($humidityIn) + $hash->{corrHumidity};
$humidityIn =
MOBILEALERTS_decodeHumidity($humidityIn) + $hash->{".corrHumidity"};
MOBILEALERTS_readingsBulkUpdate( $hash, 0, "humidity", $humidityIn );
MOBILEALERTS_readingsBulkUpdate( $hash, 0, "humidityString",
MOBILEALERTS_humidityToString($humidityIn) );
$prevTemperatureIn = MOBILEALERTS_decodeTemperature($prevTemperatureIn) + $hash->{corrTemperature};
$prevTemperatureIn = MOBILEALERTS_decodeTemperature($prevTemperatureIn) +
$hash->{".corrTemperature"};
MOBILEALERTS_readingsBulkUpdate( $hash, 1, "prevTemperatureIn",
$prevTemperatureIn );
$prevTemperatureOut = MOBILEALERTS_decodeTemperature($prevTemperatureOut) + $hash->{corrTemperatureOut};
$prevTemperatureOut = MOBILEALERTS_decodeTemperature($prevTemperatureOut) +
$hash->{".corrTemperatureOut"};
MOBILEALERTS_readingsBulkUpdate( $hash, 1, "prevTemperatureOut",
$prevTemperatureOut );
$prevHumidityIn = MOBILEALERTS_decodeHumidity($prevHumidityIn) + $hash->{corrHumidity};
$prevHumidityIn =
MOBILEALERTS_decodeHumidity($prevHumidityIn) + $hash->{".corrHumidity"};
MOBILEALERTS_readingsBulkUpdate( $hash, 1, "prevHumidityIn",
$prevHumidityIn );
MOBILEALERTS_readingsBulkUpdate( $hash, 0, "state",
@ -738,6 +823,139 @@ sub MOBILEALERTS_Parse_d6 ($$) {
. $temperatureOut );
}
sub MOBILEALERTS_Parse_11_ea ($$) {
my ( $hash, $message ) = @_;
MOBILEALERTS_readingsBulkUpdateIfChanged( $hash, 0, "deviceType",
"TFA30.3060.01.IT" );
MOBILEALERTS_Parse_ea( $hash, $message );
}
sub MOBILEALERTS_Parse_ea ($$) {
my ( $hash, $message ) = @_;
my (
$txCounter, $temperature1, $humidity1,
$temperature2, $humidity2, $temperature3,
$humidity3, $temperatureIn, $humidityIn,
$prevTemperature1, $prevHumidity1, $prevTemperature2,
$prevHumidity2, $prevTemperature3, $prevHumidity3,
$prevTemperatureIn, $prevHumidityIn
) = unpack( "nnnnnnnnnnnnnnnnn", $message );
# txCounter
MOBILEALERTS_readingsBulkUpdate( $hash, 0, "txCounter",
MOBILEALERTS_decodeTxCounter($txCounter) );
MOBILEALERTS_readingsBulkUpdate( $hash, 0, "triggered",
MOBILEALERTS_triggeredTxCounter($txCounter) );
# Sensor 1
$temperature1 = MOBILEALERTS_decodeTemperature($temperature1) +
$hash->{".corrTemperatureOut"};
MOBILEALERTS_readingsBulkUpdate( $hash, 0, "temperature1", $temperature1 );
MOBILEALERTS_readingsBulkUpdate( $hash, 0, "temperatureString1",
MOBILEALERTS_temperatureToString($temperature1) );
$humidity1 =
MOBILEALERTS_decodeHumidity($humidity1) + $hash->{".corrHumidityOut"};
MOBILEALERTS_readingsBulkUpdate( $hash, 0, "humidity1", $humidity1 );
MOBILEALERTS_readingsBulkUpdate( $hash, 0, "humidityString1",
MOBILEALERTS_humidityToString($humidity1) );
# Sensor 2
$temperature2 = MOBILEALERTS_decodeTemperature($temperature2) +
$hash->{".corrTemperature2"};
MOBILEALERTS_readingsBulkUpdate( $hash, 0, "temperature2", $temperature2 );
MOBILEALERTS_readingsBulkUpdate( $hash, 0, "temperatureString2",
MOBILEALERTS_temperatureToString($temperature2) );
$humidity2 =
MOBILEALERTS_decodeHumidity($humidity2) + $hash->{".corrHumidity2"};
MOBILEALERTS_readingsBulkUpdate( $hash, 0, "humidity2", $humidity2 );
MOBILEALERTS_readingsBulkUpdate( $hash, 0, "humidityString2",
MOBILEALERTS_humidityToString($humidity2) );
# Sensor 3
$temperature3 = MOBILEALERTS_decodeTemperature($temperature3) +
$hash->{".corrTemperature3"};
MOBILEALERTS_readingsBulkUpdate( $hash, 0, "temperature3", $temperature3 );
MOBILEALERTS_readingsBulkUpdate( $hash, 0, "temperatureString3",
MOBILEALERTS_temperatureToString($temperature3) );
$humidity3 =
MOBILEALERTS_decodeHumidity($humidity3) + $hash->{".corrHumidity3"};
MOBILEALERTS_readingsBulkUpdate( $hash, 0, "humidity3", $humidity3 );
MOBILEALERTS_readingsBulkUpdate( $hash, 0, "humidityString3",
MOBILEALERTS_humidityToString($humidity3) );
# Sensor In
$temperatureIn = MOBILEALERTS_decodeTemperature($temperatureIn) +
$hash->{".corrTemperature"};
MOBILEALERTS_readingsBulkUpdate( $hash, 0, "temperatureIn",
$temperatureIn );
MOBILEALERTS_readingsBulkUpdate( $hash, 0, "temperatureStringIn",
MOBILEALERTS_temperatureToString($temperatureIn) );
$humidityIn =
MOBILEALERTS_decodeHumidity($humidityIn) + $hash->{".corrHumidity"};
MOBILEALERTS_readingsBulkUpdate( $hash, 0, "humidityIn", $humidityIn );
MOBILEALERTS_readingsBulkUpdate( $hash, 0, "humidityStringIn",
MOBILEALERTS_humidityToString($humidityIn) );
# Sensor1 prev
$prevTemperature1 = MOBILEALERTS_decodeTemperature($prevTemperature1) +
$hash->{".corrTemperatureOut"};
MOBILEALERTS_readingsBulkUpdate( $hash, 1, "prevTemperature1",
$prevTemperature1 );
$prevHumidity1 =
MOBILEALERTS_decodeHumidity($prevHumidity1) + $hash->{".corrHumidityOut"};
MOBILEALERTS_readingsBulkUpdate( $hash, 1, "prevHumidity1",
$prevHumidity1 );
# Sensor2 prev
$prevTemperature2 = MOBILEALERTS_decodeTemperature($prevTemperature2) +
$hash->{".corrTemperature2"};
MOBILEALERTS_readingsBulkUpdate( $hash, 1, "prevTemperature2",
$prevTemperature2 );
$prevHumidity2 =
MOBILEALERTS_decodeHumidity($prevHumidity2) + $hash->{".corrHumidity2"};
MOBILEALERTS_readingsBulkUpdate( $hash, 1, "prevHumidity2",
$prevHumidity2 );
# Sensor3 prev
$prevTemperature3 = MOBILEALERTS_decodeTemperature($prevTemperature3) +
$hash->{".corrTemperature3"};
MOBILEALERTS_readingsBulkUpdate( $hash, 1, "prevTemperature3",
$prevTemperature3 );
$prevHumidity3 =
MOBILEALERTS_decodeHumidity($prevHumidity3) + $hash->{".corrHumidity3"};
MOBILEALERTS_readingsBulkUpdate( $hash, 1, "prevHumidity3",
$prevHumidity3 );
# Sensor In prev
$prevTemperatureIn = MOBILEALERTS_decodeTemperature($prevTemperatureIn) +
$hash->{".corrTemperature"};
MOBILEALERTS_readingsBulkUpdate( $hash, 1, "prevTemperatureIn",
$prevTemperatureIn );
$prevHumidityIn =
MOBILEALERTS_decodeHumidity($prevHumidityIn) + $hash->{".corrHumidity"};
MOBILEALERTS_readingsBulkUpdate( $hash, 1, "prevHumidityIn",
$prevHumidityIn );
# state
MOBILEALERTS_readingsBulkUpdate( $hash, 0, "state",
"In T: "
. $temperatureIn . " H: "
. $humidityIn
. " 1 T: "
. $temperature1 . " H: "
. $humidity1
. " 2 T: "
. $temperature2 . " H: "
. $humidity2
. " 3 T: "
. $temperature3 . " H: "
. $humidity3 );
}
sub MOBILEALERTS_decodeTxCounter($) {
my ($txCounter) = @_;
return $txCounter & 0x3FFF;
@ -1058,14 +1276,14 @@ sub MOBILEALERTS_ActionDetector($) {
The MOBILEALERTS is a fhem module for the german MobileAlerts devices and TFA WEATHERHUB devices.
<br><br>
The fhem module represents a MobileAlerts device. The connection is provided by the <a href="#MOBILEALERTSGW">MOBILELAERTSGW</a> module.
Currently supported: MA10100, MA10101, MA10200, MA10230, MA10300, MA10650, MA10320PRO, MA10350, MA10410, MA10450, MA10660, MA10700, TFA 30.3312.02, MA10800, WL2000<br>
Currently supported: MA10100, MA10101, MA10200, MA10230, MA10300, MA10650, MA10320PRO, MA10350, MA10410, MA10450, MA10660, MA10700, TFA 30.3312.02, MA10800, WL2000, TFA30.3060.01.IT<br>
Supported but untested: ./.<br>
<br>
<a name="MOBILEALERTSdefine"></a>
<b>Define</b>
<ul>
<code>define &lt;name&gt; MOBILEALERTS &lt;deviceID&gt; &lt;corrTempIn&gt; &lt;corrHumIn&gt; &lt;corrTempOut&gt; &lt;corrHumOut&gt;</code><br>
<code>define &lt;name&gt; MOBILEALERTS &lt;deviceID&gt; &lt;corrTempIn&gt; &lt;corrHumIn&gt; &lt;corrTempOut&gt; &lt;corrHumOut&gt; &lt;corrTemp2&gt; &lt;corrHum2&gt; &lt;corrTemp3&gt; &lt;corrHum3&gt;</code><br>
<br>
deviceID is the sensorcode on the sensor.
<br>
@ -1073,9 +1291,17 @@ sub MOBILEALERTS_ActionDetector($) {
<br>
corrHumIn optional: correction humidity
<br>
corrTempOut optional: correction temperature out
corrTempOut optional: correction temperature out / sensor 1
<br>
corrHumOut optional: correction humidity out
corrHumOut optional: correction humidity out / sensor 1
<br>
corrTemp3 optional: correction temperature sensor 2
<br>
corrHum3 optional: correction humidity sensor 2
<br>
corrTemp4 optional: correction temperature sensor 3
<br>
corrHum4 optional: correction humidity sensor 3
</ul>
<br>
@ -1145,14 +1371,14 @@ sub MOBILEALERTS_ActionDetector($) {
<br><br>
Dieses FHEM Modul stellt jeweils ein MobileAlerts Ger&auml;t dar. Die Verbindung wird durch das
<a href="#MOBILEALERTSGW">MOBILELAERTSGW</a> Modul bereitgestellt.<br>
Aktuell werden unterst&uuml;zt: MA10100, MA10101, MA10200, MA10230, MA10300, MA10650, MA10320PRO, MA10350, MA10410, MA10450, MA10660, MA10700, TFA 30.3312.02, MA10800, WL2000<br>
Aktuell werden unterst&uuml;zt: MA10100, MA10101, MA10200, MA10230, MA10300, MA10650, MA10320PRO, MA10350, MA10410, MA10450, MA10660, MA10700, TFA 30.3312.02, MA10800, WL2000, TFA30.3060.01.IT<br>
Unterst&uuml;zt aber ungetestet: ./.<br>
<br>
<a name="MOBILEALERTSdefine"></a>
<b>Define</b>
<ul>
<code>define &lt;name&gt; MOBILEALERTS &lt;deviceID&gt; &lt;corrTempIn&gt; &lt;corrHumIn&gt; &lt;corrTempOut&gt; &lt;corrHumOut&gt;</code><br>
<code>define &lt;name&gt; MOBILEALERTS &lt;deviceID&gt; &lt;corrTempIn&gt; &lt;corrHumIn&gt; &lt;corrTempOut&gt; &lt;corrHumOut&gt; &lt;corrTemp2&gt; &lt;corrHum2&gt; &lt;corrTemp3&gt; &lt;corrHum3&gt;</code><br>
<br>
deviceID ist der Sensorcode auf dem Sensor.
<br>
@ -1160,9 +1386,17 @@ sub MOBILEALERTS_ActionDetector($) {
<br>
corrHumIn optional: Korrekturwert f&uuml;r die Luftfeuchte
<br>
corrTempOut optional: Korrekturwert f&uuml;r Temperatur Out
corrTempOut optional: Korrekturwert f&uuml;r Temperatur Out / Sensor 1
<br>
corrHumOut optional: Korrekturwert f&uuml;r die Luftfeuchte Out
corrHumOut optional: Korrekturwert f&uuml;r die Luftfeuchte Out / Sensor 1
<br>
corrTemp2 optional: Korrekturwert f&uuml;r Temperatur Sensor 2
<br>
corrHum2 optional: Korrekturwert f&uuml;r die Luftfeuchte Sensor 2
<br>
corrTemp3 optional: Korrekturwert f&uuml;r Temperatur Sensor 3
<br>
corrHum3 optional: Korrekturwert f&uuml;r die Luftfeuchte Sensor 3
</ul>
<br>