FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-10 03:06:37 +00:00
Code Issues Releases Wiki Activity

51_MOBILEALERTS: Added MA10120PRO

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@17226 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
MarkusF 2018-08-29 15:23:49 +00:00
parent 35254c7a86
commit 7c877f6985
2 changed files with 45 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fhem/CHANGED
View File

@ -1,6 +1,7 @@
# Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # 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. # 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 - change: 89_FULLY: Set start URL and bug fixes
- bugfix: 49_SSCam: V7.0.1, enable/disable issue - bugfix: 49_SSCam: V7.0.1, enable/disable issue
(forum.fhem.de/index.php/topic,45671.msg830869.html#msg830869) (forum.fhem.de/index.php/topic,45671.msg830869.html#msg830869)

49
fhem/FHEM/51_MOBILEALERTS.pm
View File

@ -823,6 +823,43 @@ sub MOBILEALERTS_Parse_d6 ($$) {
. $temperatureOut ); . $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 ($$) { sub MOBILEALERTS_Parse_11_ea ($$) {
my ( $hash, $message ) = @_; my ( $hash, $message ) = @_;
MOBILEALERTS_readingsBulkUpdateIfChanged( $hash, 0, "deviceType", 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 MOBILEALERTS is a fhem module for the german MobileAlerts devices and TFA WEATHERHUB devices.
<br><br> <br><br>
The fhem module represents a MobileAlerts device. The connection is provided by the <a href="#MOBILEALERTSGW">MOBILELAERTSGW</a> module. 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, TFA30.3060.01.IT<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, MA10120PRO<br>
Supported but untested: ./.<br> Supported but untested: ./.<br>
<br> <br>
@ -1295,13 +1332,13 @@ sub MOBILEALERTS_ActionDetector($) {
<br> <br>
corrHumOut optional: correction humidity out / sensor 1 corrHumOut optional: correction humidity out / sensor 1
<br> <br>
corrTemp3 optional: correction temperature sensor 2 corrTemp2 optional: correction temperature sensor 2
<br> <br>
corrHum3 optional: correction humidity sensor 2 corrHum2 optional: correction humidity sensor 2
<br> <br>
corrTemp4 optional: correction temperature sensor 3 corrTemp3 optional: correction temperature sensor 3
<br> <br>
corrHum4 optional: correction humidity sensor 3 corrHum3 optional: correction humidity sensor 3
</ul> </ul>
<br> <br>
@ -1371,7 +1408,7 @@ sub MOBILEALERTS_ActionDetector($) {
<br><br> <br><br>
Dieses FHEM Modul stellt jeweils ein MobileAlerts Ger&auml;t dar. Die Verbindung wird durch das Dieses FHEM Modul stellt jeweils ein MobileAlerts Ger&auml;t dar. Die Verbindung wird durch das
<a href="#MOBILEALERTSGW">MOBILELAERTSGW</a> Modul bereitgestellt.<br> <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, TFA30.3060.01.IT<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, MA10120PRO<br>
Unterst&uuml;zt aber ungetestet: ./.<br> Unterst&uuml;zt aber ungetestet: ./.<br>
<br> <br>