From 47c97e82313d1922fc36c36aa2ec6f4d0d8906dc Mon Sep 17 00:00:00 2001 From: Udo Date: Wed, 28 Jul 2021 20:53:46 +0200 Subject: [PATCH 1/7] Renaming Readings wind. * MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 14_SD_WS.pm - Rename readings windDirection, windDirectionText, windGust and windSpeed SD_ProtocolData.pm - change register 0x03, Design Note DN009 - FIFOTHR.ADC_RETENTION - CC1101 will wake up with optimal ADC settings for low data rate (≤ 100 kbps) --- FHEM/14_SD_WS.pm | 26 +++++++++++++------------- FHEM/lib/SD_ProtocolData.pm | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/FHEM/14_SD_WS.pm b/FHEM/14_SD_WS.pm index 6609d0980..3df889ad9 100644 --- a/FHEM/14_SD_WS.pm +++ b/FHEM/14_SD_WS.pm @@ -1297,10 +1297,10 @@ sub SD_WS_Parse($$) readingsBulkUpdate($hash, "state", $state); readingsBulkUpdate($hash, "temperature", $temp) if (defined($temp) && (($temp > -60 && $temp < 70 ) || $protocol eq '106')); readingsBulkUpdate($hash, "humidity", $hum) if (defined($hum) && ($hum > 0 && $hum < 100 )) ; - readingsBulkUpdate($hash, 'windspeed', $windspeed) if (defined($windspeed)) ; - readingsBulkUpdate($hash, 'winddir', $winddir) if (defined($winddir)) ; - readingsBulkUpdate($hash, 'winddirtxt', $winddirtxt) if (defined($winddirtxt)) ; - readingsBulkUpdate($hash, 'windgust', $windgust) if (defined($windgust)) ; + readingsBulkUpdate($hash, 'windSpeed', $windspeed) if (defined($windspeed)) ; + readingsBulkUpdate($hash, 'windDirection', $winddir) if (defined($winddir)) ; + readingsBulkUpdate($hash, 'windDirectionText', $winddirtxt) if (defined($winddirtxt)) ; + readingsBulkUpdate($hash, 'windGust', $windgust) if (defined($windgust)) ; readingsBulkUpdate($hash, "batteryState", $bat) if (defined($bat) && length($bat) > 0) ; readingsBulkUpdate($hash, "batteryChanged", $batChange) if (defined($batChange) && length($batChange) > 0 && $batChange eq "1") ; readingsBulkUpdate($hash, "channel", $channel, 0) if (defined($channel)&& length($channel) > 0); @@ -1415,7 +1415,7 @@ sub SD_WS_WH2SHIFT($){
  • Opus XT300
  • PV-8644 infactory Poolthermometer
  • Renkforce E0001PA
    • -
  • Regenmesser DROP TFA 47.3005.01 mit Regensensor TFA 30.3233.01
    • +
  • Rain gauge DROP TFA 47.3005.01 with rain sensor TFA 30.3233.01
  • TECVANCE TV-4848
  • Thermometer TFA 30.3228.02, TFA 30.3229.02, FT007T, FT007TP, F007T, F007TP
  • Thermo-Hygrometer TFA 30.3208.02, FT007TH, F007TH
    • @@ -1460,10 +1460,10 @@ sub SD_WS_WH2SHIFT($){
  • temperature (°C)
  • temperatureTrend (consistent, rising, falling)
  • type (type of sensor)
    • -
  • winddir (Wind direction, 0-337,5°, in Schritten von 22,5°)
    • -
  • winddirtxt (Wind direction, N, NNE, NE, ENE, E, ESE, SE, SSE, S, SSW, SW, WSW, W, WNW, NW, NNW)
    • -
  • windgust (Gust of wind, m/s)
    • -
  • windspeed (Wind speed, m/s)
    • +
  • windDirection (Wind direction, 0-337,5°, in Schritten von 22,5°)
    • +
  • windDirectionText (Wind direction, N, NNE, NE, ENE, E, ESE, SE, SSE, S, SSW, SW, WSW, W, WNW, NW, NNW)
    • +
  • windGust (Gust of wind, m/s)
    • +
  • windSpeed (Wind speed, m/s)


    • @@ -1577,10 +1577,10 @@ sub SD_WS_WH2SHIFT($){
  • temperature (Temperatur °C)
  • temperatureTrend (Trend Temperatur gleichbleibend, steigend, fallend)
  • type (Sensortypen)
    • -
  • winddir (Windrichtung, 0-337,5°, in Schritten von 22,5°)
    • -
  • winddirtxt (Windrichtung, N, NNE, NE, ENE, E, ESE, SE, SSE, S, SSW, SW, WSW, W, WNW, NW, NNW)
    • -
  • windgust (Windboe, m/s)
    • -
  • windspeed (Windgeschwindigkeit, m/s)
    • +
  • windDirection (Windrichtung, 0-337,5°, in Schritten von 22,5°)
    • +
  • windDirectionText (Windrichtung, N, NNE, NE, ENE, E, ESE, SE, SSE, S, SSW, SW, WSW, W, WNW, NW, NNW)
    • +
  • windGust (Windboe, m/s)
    • +
  • windSpeed (Windgeschwindigkeit, m/s)


    • diff --git a/FHEM/lib/SD_ProtocolData.pm b/FHEM/lib/SD_ProtocolData.pm index 30cae97ab..16feeaa50 100644 --- a/FHEM/lib/SD_ProtocolData.pm +++ b/FHEM/lib/SD_ProtocolData.pm @@ -2856,7 +2856,7 @@ package lib::SD_ProtocolData; sync => '2DD4', modulation => '2-FSK', rfmode => 'Bresser_5in1', - register => ['0001','0246','0306','042D','05D4','06FF','07C0','0802','0D21','0E65','0FE8','1088','114C','1202','1322','14F8','1551','1916','1B43','1C68'], + register => ['0001','0246','0346','042D','05D4','06FF','07C0','0802','0D21','0E65','0FE8','1088','114C','1202','1322','14F8','1551','1916','1B43','1C68'], preamble => 'W108#', clientmodule => 'SD_WS', length_min => '52', From 1d82edca564fc9d18d34c7c31a26d9850ff8b3b6 Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Wed, 28 Jul 2021 18:54:11 +0000 Subject: [PATCH 2/7] Automatic updated controls and CHANGED --- CHANGED | 4 ++++ controls_signalduino.txt | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGED b/CHANGED index 2e8ecc3d0..14ba1f5d9 100644 --- a/CHANGED +++ b/CHANGED @@ -1,3 +1,7 @@ +2021-07-28 - Renaming Readings wind. * + +14_SD_WS.pm - Rename readings windDirection, windDirectionText, windGust and windSpeed +SD_ProtocolData.pm - change register 0x03, Design Note DN009 - FIFOTHR.ADC_RETENTION - CC1101 will wake up with optimal ADC settings for low data rate (≤ 100 kbps) 2021-07-13 - AVANTEK - small fix send data (#991) * Update 14_SD_BELL.pm diff --git a/controls_signalduino.txt b/controls_signalduino.txt index ab0123602..b01bc005d 100644 --- a/controls_signalduino.txt +++ b/controls_signalduino.txt @@ -8,11 +8,11 @@ UPD 2020-10-03_11:48:15 11170 FHEM/14_SD_AS.pm UPD 2021-07-13_20:29:34 29223 FHEM/14_SD_BELL.pm UPD 2019-11-16_19:42:18 12593 FHEM/14_SD_RSL.pm UPD 2021-01-28_20:20:20 163235 FHEM/14_SD_UT.pm -UPD 2021-06-30_20:53:09 88368 FHEM/14_SD_WS.pm +UPD 2021-07-28_20:53:46 88407 FHEM/14_SD_WS.pm UPD 2020-04-13_23:15:56 18426 FHEM/14_SD_WS07.pm UPD 2020-04-15_23:37:36 35356 FHEM/14_SD_WS09.pm UPD 2020-04-13_23:15:56 14325 FHEM/14_SD_WS_Maverick.pm UPD 2018-07-04_21:56:16 37910 FHEM/41_OREGON.pm UPD 2020-12-17_23:16:30 15582 FHEM/90_SIGNALduino_un.pm -UPD 2021-07-09_10:32:59 212355 FHEM/lib/SD_ProtocolData.pm +UPD 2021-07-28_20:53:46 212355 FHEM/lib/SD_ProtocolData.pm UPD 2021-06-02_05:49:05 71700 FHEM/lib/SD_Protocols.pm From b988ceed2d3f2fc050fa633c189e4c07d28eff9a Mon Sep 17 00:00:00 2001 From: HomeAutoUser Date: Thu, 29 Jul 2021 14:47:55 +0200 Subject: [PATCH 3/7] Update 09_parseDatat.t * revised test for right values --- t/FHEM/14_SD_WS/09_parseDatat.t | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/t/FHEM/14_SD_WS/09_parseDatat.t b/t/FHEM/14_SD_WS/09_parseDatat.t index db49e4190..ccc69dab9 100644 --- a/t/FHEM/14_SD_WS/09_parseDatat.t +++ b/t/FHEM/14_SD_WS/09_parseDatat.t @@ -101,7 +101,12 @@ InternalTimer(time()+1, sub { plan(3); # one for readings and one for internals and one for defmod note("device will be defined temporary"); is(CommandDefMod(undef,"-temporary $tData->{internals}{NAME} $testSet->{module} $tData->{internals}{DEF}"),U(),"Verify device defmod",$tData); - + + if ($tData->{attributes}{model}) { + note("device attribute model $tData->{attributes}{model} set for right result"); + CommandAttr(undef,"$tData->{internals}{NAME} model $tData->{attributes}{model}"); # set attribute + } + no strict "refs"; &{$modules{$testSet->{module}}{ParseFn}}($ioHash,$tData->{dmsg}); use strict "refs"; From 94a630212fc3c7dc4c7a9fd1877e8950ed969348 Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Thu, 29 Jul 2021 20:40:01 +0000 Subject: [PATCH 4/7] Update Versiondate --- FHEM/14_SD_WS.pm | 2 +- FHEM/lib/SD_ProtocolData.pm | 2 +- controls_signalduino.txt | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/FHEM/14_SD_WS.pm b/FHEM/14_SD_WS.pm index 3df889ad9..4fd9b585b 100644 --- a/FHEM/14_SD_WS.pm +++ b/FHEM/14_SD_WS.pm @@ -1,4 +1,4 @@ -# $Id: 14_SD_WS.pm 21666 2021-06-03 16:00:53Z Sidey $ +# $Id: 14_SD_WS.pm 21666 2021-07-29 20:39:27Z elektron-bbs $ # # The purpose of this module is to support serval # weather sensors which use various protocol diff --git a/FHEM/lib/SD_ProtocolData.pm b/FHEM/lib/SD_ProtocolData.pm index 16feeaa50..dd6da20f5 100644 --- a/FHEM/lib/SD_ProtocolData.pm +++ b/FHEM/lib/SD_ProtocolData.pm @@ -1,5 +1,5 @@ ########################################################################################################################################### -# $Id: SD_ProtocolData.pm 3.4.4 2020-07-16 20:04:45Z Sidey $ +# $Id: SD_ProtocolData.pm 3.4.4 2021-07-29 20:39:27Z elektron-bbs $ # # The file is part of the SIGNALduino project. # All protocol definitions are contained in this file. diff --git a/controls_signalduino.txt b/controls_signalduino.txt index a2dbde95d..ad0faba9f 100644 --- a/controls_signalduino.txt +++ b/controls_signalduino.txt @@ -1,4 +1,4 @@ -UPD 2021-07-14_19:31:45 223871 FHEM/00_SIGNALduino.pm +UPD 2021-07-29_22:06:25 223871 FHEM/00_SIGNALduino.pm UPD 2020-06-15_17:41:39 17876 FHEM/10_FS10.pm UPD 2020-05-26_11:51:12 20465 FHEM/10_SD_GT.pm UPD 2016-09-18_21:22:06 10111 FHEM/14_BresserTemeo.pm @@ -8,11 +8,11 @@ UPD 2020-10-03_11:48:15 11170 FHEM/14_SD_AS.pm UPD 2021-07-13_20:29:34 29223 FHEM/14_SD_BELL.pm UPD 2019-11-16_19:42:18 12593 FHEM/14_SD_RSL.pm UPD 2021-01-28_20:20:20 163235 FHEM/14_SD_UT.pm -UPD 2021-07-28_20:53:46 88407 FHEM/14_SD_WS.pm +UPD 2021-07-28_20:53:46 88414 FHEM/14_SD_WS.pm UPD 2020-04-13_23:15:56 18426 FHEM/14_SD_WS07.pm UPD 2020-04-15_23:37:36 35356 FHEM/14_SD_WS09.pm UPD 2020-04-13_23:15:56 14325 FHEM/14_SD_WS_Maverick.pm UPD 2018-07-04_21:56:16 37910 FHEM/41_OREGON.pm UPD 2020-12-17_23:16:30 15582 FHEM/90_SIGNALduino_un.pm -UPD 2021-07-28_20:53:46 212355 FHEM/lib/SD_ProtocolData.pm +UPD 2021-07-28_20:53:46 212362 FHEM/lib/SD_ProtocolData.pm UPD 2021-06-02_05:49:05 71700 FHEM/lib/SD_Protocols.pm From b00f0e0e7d346752836195d35dee784b144f645a Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Thu, 29 Jul 2021 20:55:33 +0000 Subject: [PATCH 5/7] Update Versiondate --- controls_signalduino.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/controls_signalduino.txt b/controls_signalduino.txt index ad0faba9f..853cd41b9 100644 --- a/controls_signalduino.txt +++ b/controls_signalduino.txt @@ -8,11 +8,11 @@ UPD 2020-10-03_11:48:15 11170 FHEM/14_SD_AS.pm UPD 2021-07-13_20:29:34 29223 FHEM/14_SD_BELL.pm UPD 2019-11-16_19:42:18 12593 FHEM/14_SD_RSL.pm UPD 2021-01-28_20:20:20 163235 FHEM/14_SD_UT.pm -UPD 2021-07-28_20:53:46 88414 FHEM/14_SD_WS.pm +UPD 2021-07-29_20:40:01 88414 FHEM/14_SD_WS.pm UPD 2020-04-13_23:15:56 18426 FHEM/14_SD_WS07.pm UPD 2020-04-15_23:37:36 35356 FHEM/14_SD_WS09.pm UPD 2020-04-13_23:15:56 14325 FHEM/14_SD_WS_Maverick.pm UPD 2018-07-04_21:56:16 37910 FHEM/41_OREGON.pm UPD 2020-12-17_23:16:30 15582 FHEM/90_SIGNALduino_un.pm -UPD 2021-07-28_20:53:46 212362 FHEM/lib/SD_ProtocolData.pm +UPD 2021-07-29_20:40:01 212362 FHEM/lib/SD_ProtocolData.pm UPD 2021-06-02_05:49:05 71700 FHEM/lib/SD_Protocols.pm From 1598646f6febe9813699960770c15362e983db8f Mon Sep 17 00:00:00 2001 From: Udo Date: Fri, 30 Jul 2021 16:11:53 +0200 Subject: [PATCH 6/7] Update 14_SD_WS.pm change reading windDirection in windDirectionDegree --- FHEM/14_SD_WS.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/FHEM/14_SD_WS.pm b/FHEM/14_SD_WS.pm index 4fd9b585b..16e74fbd1 100644 --- a/FHEM/14_SD_WS.pm +++ b/FHEM/14_SD_WS.pm @@ -1298,7 +1298,7 @@ sub SD_WS_Parse($$) readingsBulkUpdate($hash, "temperature", $temp) if (defined($temp) && (($temp > -60 && $temp < 70 ) || $protocol eq '106')); readingsBulkUpdate($hash, "humidity", $hum) if (defined($hum) && ($hum > 0 && $hum < 100 )) ; readingsBulkUpdate($hash, 'windSpeed', $windspeed) if (defined($windspeed)) ; - readingsBulkUpdate($hash, 'windDirection', $winddir) if (defined($winddir)) ; + readingsBulkUpdate($hash, 'windDirectionDegree', $winddir) if (defined($winddir)) ; readingsBulkUpdate($hash, 'windDirectionText', $winddirtxt) if (defined($winddirtxt)) ; readingsBulkUpdate($hash, 'windGust', $windgust) if (defined($windgust)) ; readingsBulkUpdate($hash, "batteryState", $bat) if (defined($bat) && length($bat) > 0) ; @@ -1460,7 +1460,7 @@ sub SD_WS_WH2SHIFT($){
  • temperature (°C)
  • temperatureTrend (consistent, rising, falling)
  • type (type of sensor)
    • -
  • windDirection (Wind direction, 0-337,5°, in Schritten von 22,5°)
    • +
  • windDirectionDegree (Wind direction, 0-337,5°, in steps of 22,5°)
  • windDirectionText (Wind direction, N, NNE, NE, ENE, E, ESE, SE, SSE, S, SSW, SW, WSW, W, WNW, NW, NNW)
  • windGust (Gust of wind, m/s)
  • windSpeed (Wind speed, m/s)
    • @@ -1577,7 +1577,7 @@ sub SD_WS_WH2SHIFT($){
  • temperature (Temperatur °C)
  • temperatureTrend (Trend Temperatur gleichbleibend, steigend, fallend)
  • type (Sensortypen)
    • -
  • windDirection (Windrichtung, 0-337,5°, in Schritten von 22,5°)
    • +
  • windDirectionDegree (Windrichtung, 0-337,5°, in Schritten von 22,5°)
  • windDirectionText (Windrichtung, N, NNE, NE, ENE, E, ESE, SE, SSE, S, SSW, SW, WSW, W, WNW, NW, NNW)
  • windGust (Windboe, m/s)
  • windSpeed (Windgeschwindigkeit, m/s)
    • From 91dfbf4f806bdf979cb8fb7f570830b0882205f2 Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Fri, 30 Jul 2021 14:13:50 +0000 Subject: [PATCH 7/7] Update Versiondate --- controls_signalduino.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/controls_signalduino.txt b/controls_signalduino.txt index 853cd41b9..1c8b7482e 100644 --- a/controls_signalduino.txt +++ b/controls_signalduino.txt @@ -8,7 +8,7 @@ UPD 2020-10-03_11:48:15 11170 FHEM/14_SD_AS.pm UPD 2021-07-13_20:29:34 29223 FHEM/14_SD_BELL.pm UPD 2019-11-16_19:42:18 12593 FHEM/14_SD_RSL.pm UPD 2021-01-28_20:20:20 163235 FHEM/14_SD_UT.pm -UPD 2021-07-29_20:40:01 88414 FHEM/14_SD_WS.pm +UPD 2021-07-30_16:11:53 88427 FHEM/14_SD_WS.pm UPD 2020-04-13_23:15:56 18426 FHEM/14_SD_WS07.pm UPD 2020-04-15_23:37:36 35356 FHEM/14_SD_WS09.pm UPD 2020-04-13_23:15:56 14325 FHEM/14_SD_WS_Maverick.pm