diff --git a/fhem/CHANGED b/fhem/CHANGED index 7834f943e..be017999f 100644 --- a/fhem/CHANGED +++ b/fhem/CHANGED @@ -1,6 +1,7 @@ # 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 + - feature: 51_MOBILEALERTS: Added MA10120PRO + - feature: 51_MOBILEALERTS: 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) diff --git a/fhem/FHEM/51_MOBILEALERTS.pm b/fhem/FHEM/51_MOBILEALERTS.pm index 1f46bbb0f..d4df7edba 100644 --- a/fhem/FHEM/51_MOBILEALERTS.pm +++ b/fhem/FHEM/51_MOBILEALERTS.pm @@ -823,6 +823,43 @@ sub MOBILEALERTS_Parse_d6 ($$) { . $temperatureOut ); } +sub MOBILEALERTS_Parse_01_d2 ($$) { + my ( $hash, $message ) = @_; + my ( $txCounter, $temperatureIn, $temperatureOut, $prevTemperatureIn, + $prevTemperatureOut ) + = unpack( "nnnnn", $message ); + MOBILEALERTS_readingsBulkUpdateIfChanged( $hash, 0, "deviceType", + "MA10120PRO" ); + + MOBILEALERTS_readingsBulkUpdate( $hash, 0, "txCounter", + MOBILEALERTS_decodeTxCounter($txCounter) ); + MOBILEALERTS_readingsBulkUpdate( $hash, 0, "triggered", + MOBILEALERTS_triggeredTxCounter($txCounter) ); + $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"}; + MOBILEALERTS_readingsBulkUpdate( $hash, 0, "temperatureOut", + $temperatureOut ); + MOBILEALERTS_readingsBulkUpdate( $hash, 0, "temperatureStringOut", + MOBILEALERTS_temperatureToString($temperatureOut) ); + $prevTemperatureIn = MOBILEALERTS_decodeTemperature($prevTemperatureIn) + + $hash->{".corrTemperature"}; + MOBILEALERTS_readingsBulkUpdate( $hash, 1, "prevTemperatureIn", + $prevTemperatureIn ); + $prevTemperatureOut = MOBILEALERTS_decodeTemperature($prevTemperatureOut) + + $hash->{".corrTemperatureOut"}; + MOBILEALERTS_readingsBulkUpdate( $hash, 1, "prevTemperatureOut", + $prevTemperatureOut ); + MOBILEALERTS_readingsBulkUpdate( $hash, 0, "state", + "In T: " . $temperatureIn . " Out T: " . $temperatureOut ); +} + sub MOBILEALERTS_Parse_11_ea ($$) { my ( $hash, $message ) = @_; MOBILEALERTS_readingsBulkUpdateIfChanged( $hash, 0, "deviceType", @@ -1276,7 +1313,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
+ 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
Supported but untested: ./.

@@ -1295,13 +1332,13 @@ sub MOBILEALERTS_ActionDetector($) {
corrHumOut optional: correction humidity out / sensor 1
- corrTemp3 optional: correction temperature sensor 2 + corrTemp2 optional: correction temperature sensor 2
- corrHum3 optional: correction humidity sensor 2 + corrHum2 optional: correction humidity sensor 2
- corrTemp4 optional: correction temperature sensor 3 + corrTemp3 optional: correction temperature sensor 3
- corrHum4 optional: correction humidity sensor 3 + corrHum3 optional: correction humidity sensor 3
@@ -1371,7 +1408,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
+ 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
Unterstüzt aber ungetestet: ./.