From 891889039ec9b5ac1a62c1a4bc9af028b93bd5f1 Mon Sep 17 00:00:00 2001 From: Udo Date: Sat, 22 Jun 2019 14:31:48 +0200 Subject: [PATCH 1/7] new weather station Auriol AFW 2 A1, IAN: 297514 Decoding sensor for weather station Auriol AFW 2 A1, IAN: 297514, protocol 7, 14_SD_WS07.pm --- CHANGED | 2 ++ FHEM/14_SD_WS07.pm | 5 +++-- FHEM/lib/SD_ProtocolData.pm | 11 +++++++---- README.md | 2 +- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/CHANGED b/CHANGED index e01dce012..5a67d2826 100644 --- a/CHANGED +++ b/CHANGED @@ -1,3 +1,5 @@ +22.06.2019 + 14_SD_WS07.pm: new weather station Auriol AFW 2 A1, IAN: 297514 16.06.2019 00_SIGNALDuino.pm: Support MS signals with multiple syncs as like Firmware 3.3.1-experimental diff --git a/FHEM/14_SD_WS07.pm b/FHEM/14_SD_WS07.pm index 4c5f437df..cbf38a0c3 100644 --- a/FHEM/14_SD_WS07.pm +++ b/FHEM/14_SD_WS07.pm @@ -21,7 +21,7 @@ # flags are 4 bits B 0 C C, where B is the battery status: 1=OK, 0=LOW # and CC is the channel: 0=CH1, 1=CH2, 2=CH3 # temp is 12 bit signed scaled by 10 -# const is always 1111 (0x0F) +# const is always 1111 (0xF) or 1010 (0xA) # humiditiy is 8 bits package main; @@ -38,7 +38,7 @@ SD_WS07_Initialize($) { my ($hash) = @_; - $hash->{Match} = "^P7#[A-Fa-f0-9]{6}F[A-Fa-f0-9]{2}"; ## pos 7 ist aktuell immer 0xF + $hash->{Match} = "^P7#[A-Fa-f0-9]{6}A|F[A-Fa-f0-9]{2}"; ## pos 7 ist aktuell immer 0xF oder 0xA $hash->{DefFn} = "SD_WS07_Define"; $hash->{UndefFn} = "SD_WS07_Undef"; $hash->{ParseFn} = "SD_WS07_Parse"; @@ -112,6 +112,7 @@ SD_WS07_Parse($$) # 1110 1011 1 000 000010111000 1111 00000000 other device from HomeAuto_User SD_WS07_T_EB1 # 1100 0100 1 000 000100100010 1111 00000000 other device from HomeAuto_User SD_WS07_T_C41 # 0110 0100 0 000 000100001110 1111 00101010 hama TS36E from HomeAuto_User - Bat bit identified + # 1011 0001 1 000 000100011010 1010 00101100 Auriol AFW 2 A1, IAN: 297514 # ID Bat CHN TMP ?? HUM # Modelliste diff --git a/FHEM/lib/SD_ProtocolData.pm b/FHEM/lib/SD_ProtocolData.pm index 2c8c0b75d..a1a0bc4c5 100644 --- a/FHEM/lib/SD_ProtocolData.pm +++ b/FHEM/lib/SD_ProtocolData.pm @@ -66,7 +66,7 @@ package lib::SD_ProtocolData; use strict; use warnings; - our $VERSION = '1.04'; + our $VERSION = '1.05'; our %protocols = ( "0" => ## various weather sensors (500 | 9100) # ABS700 | Id:79 T: 3.3 Bat:low MS;P1=-7949;P2=492;P3=-1978;P4=-3970;D=21232423232424242423232323232324242423232323232424;CP=2;SP=1;R=245;O; @@ -328,9 +328,12 @@ package lib::SD_ProtocolData; }, "7" => ## weather sensors like EAS800z # Ch:1 T: 19.8 H: 11 Bat:low MS;P1=-3882;P2=504;P3=-957;P4=-1949;D=21232424232323242423232323232323232424232323242423242424242323232324232424;CP=2;SP=1;R=249;m=2; + # https://forum.fhem.de/index.php/topic,101682.0.html (Auriol AFW 2 A1, IAN: 297514) + # Ch:1 T: 28.2 H: 44 Bat:ok MS;P0=494;P1=-1949;P2=-967;P3=-3901;D=03010201010202020101020202020202010202020101020102010201020202010201010202;CP=0;SP=3;R=37;m0; + # Ch:1 T: 24.4 H: 56 Bat:ok MS;P1=-1940;P2=495;P3=-957;P4=-3878;D=24212321212323232121232323232323232121212123212323212321232323212121232323;CP=2;SP=4;R=20;O;m1; { - name => 'weather', - comment => 'EAS800z, FreeTec NC-7344, HAMA TS34A', + name => 'Weather', + comment => 'EAS800z, FreeTec NC-7344, HAMA TS34A, Auriol AFW 2 A1', id => '7', knownFreqs => '433.92', one => [1,-4], @@ -340,7 +343,7 @@ package lib::SD_ProtocolData; format => 'twostate', preamble => 'P7#', # prepend to converted message clientmodule => 'SD_WS07', - modulematch => '^P7#.{6}F.{2}', + modulematch => '^P7#.{6}A|F.{2}', length_min => '35', length_max => '40', }, diff --git a/README.md b/README.md index 9973170d9..9bb790155 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ Supported Devices / Protocols |Somfy RTS | Shutters from Somfy| |Opus XT300 | Soil moisture sensor | |Oregon NR868 | Motion sensor | -|Auriol IAN 60107, 114324, 275901, 283582 (Lidl) | Weatherstation | +|Auriol IAN 60107, 114324, 275901, 283582, 297514 (Lidl) | Weatherstation | |FreeTec PE-6946 | wireless bell | |Elro DB200, KANGTAI, unitec | wireless bell | |m-e VTX and BASIC | wireless bell | From 887468f6298cdd02901d985d651d243bff3c52c4 Mon Sep 17 00:00:00 2001 From: Udo Date: Sat, 22 Jun 2019 14:37:09 +0200 Subject: [PATCH 2/7] add sensor in device specific help --- FHEM/14_SD_WS07.pm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/FHEM/14_SD_WS07.pm b/FHEM/14_SD_WS07.pm index cbf38a0c3..833dfdf9b 100644 --- a/FHEM/14_SD_WS07.pm +++ b/FHEM/14_SD_WS07.pm @@ -307,6 +307,7 @@ sub SD_WS07_Attr(@)
Known models: @@ -388,6 +389,7 @@ sub SD_WS07_Attr(@)
Unterstützte Modelle: