FHEM/mod-Weather
1
0
Fork 0
Code Issues Pull Requests Releases 5 Wiki Activity

testing #29

Merged
marko merged 73 commits from testing into main 2023-01-07 12:49:01 +00:00
Conversation 0 Commits 73 Files Changed 12 +645 -52
8 changed files with 645 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 363e862244 - Show all commits

483
CHANGELOG.md Normal file
View File

@@ -0,0 +1,483 @@
### style: change version (HEAD -> dev)
>Sat, 7 Jan 2023 13:33:17 +0100
>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net)
change version numbers
### docs: change commandref
>Sat, 7 Jan 2023 13:21:27 +0100
>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net)
change commandref with id tags
### fix uninitialized value in multiplication
>Thu, 5 Jan 2023 19:40:21 +0100
>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net)
when wind_guest not given
### change old snow and rain value to zero
>Thu, 5 Jan 2023 17:02:46 +0100
>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net)
### add hook example add support for onecall endpoint with api version 2.5
>Thu, 5 Jan 2023 08:18:05 +0100
>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net)
### fix regex for sun and moon set and rise
>Mon, 2 Jan 2023 09:27:41 +0100
>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net)
### fix Undefined subroutine
>Fri, 30 Dec 2022 13:17:40 +0100
>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net)
Undefined subroutine &FHEM::APIs::Weather::wundergroundAPI::strftimeWrapper
### fix
>Fri, 30 Dec 2022 12:17:37 +0100
>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net)
### fix sub
>Fri, 30 Dec 2022 12:14:33 +0100
>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net)
### fix undefined value as an ARRAY reference
>Fri, 30 Dec 2022 12:11:19 +0100
>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net)
### fix some regex formating
>Thu, 29 Dec 2022 04:41:10 +0100
>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net)
### change versions and add control file
>Wed, 28 Dec 2022 09:24:12 +0100
>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net)
### remove celvin substration
>Wed, 28 Dec 2022 09:10:14 +0100
>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net)
### fix "PERL WARNING: Use of uninitialized value"
>Sun, 25 Dec 2022 09:20:58 +0100
>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net)
no {wind}->{gust} field in $data
### fix undefined value
>Sat, 24 Dec 2022 12:57:41 +0100
>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net)
Can't use an undefined value as an ARRAY reference at ./FHEM/59_Weather.pm line 589
### change versions
>Sat, 24 Dec 2022 10:20:09 +0100
>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net)
### move and rename API.de API description
>Sat, 24 Dec 2022 04:48:42 +0100
>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net)
change README.m API.de description
### add directory structure move API files remove YahooWeatherAPI
>Sat, 24 Dec 2022 04:39:45 +0100
>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net)
### move API files to lib/FHEM/APIs/Weather
>Thu, 22 Dec 2022 18:45:07 +0100
>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net)
### fix forecast number for weblink
>Wed, 21 Dec 2022 09:06:54 +0100
>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net)
### expand notify fn grep syntax
>Tue, 20 Dec 2022 18:42:36 +0100
>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net)
### change code for better def modify
>Tue, 20 Dec 2022 18:04:45 +0100
>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net)
### fix IsDisabled
>Tue, 20 Dec 2022 15:29:49 +0100
>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net)
change condition for is disabled in GetUpdate fn
### change versions of API modules add Copyright year range
>Tue, 20 Dec 2022 14:43:12 +0100
>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net)
### fix remove old data
>Tue, 20 Dec 2022 13:24:15 +0100
>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net)
### fix Weather_CheckOptions func
>Tue, 20 Dec 2022 12:53:44 +0100
>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net)
### add warnCount reading
>Mon, 19 Dec 2022 15:29:06 +0100
>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net)
### fix negativ integer value round fix alerts integration
>Mon, 19 Dec 2022 11:24:27 +0100
>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net)
### fix onecall update, remove weather endpoint
>Sun, 18 Dec 2022 10:58:24 +0100
>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net)
### change wind_chill to decimal
>Wed, 14 Dec 2022 21:35:21 +0100
>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net)
### change pressure value to decimal
>Wed, 14 Dec 2022 20:42:07 +0100
>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net)
### fix integer declaration for temperature values
>Wed, 14 Dec 2022 20:10:58 +0100
>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net)
### Subject line (try to keep under 50 characters)
>Wed, 14 Dec 2022 19:51:18 +0100
>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net)
Multi-line description of commit,
feel free to be detailed.
[Ticket: X]
### fix older entrys
>Wed, 14 Dec 2022 19:24:14 +0100
>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net)
### add numericPrecision=decimal option
>Wed, 14 Dec 2022 16:21:14 +0100
>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net)
### fix delete Readings
>Wed, 14 Dec 2022 11:26:32 +0100
>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net)
### fix delete Reading Counter
>Wed, 14 Dec 2022 11:08:36 +0100
>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net)
### fix forecast exclude and change commandref
>Wed, 14 Dec 2022 10:38:04 +0100
>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net)
### fix empty deklaration
>Tue, 13 Dec 2022 19:04:01 +0100
>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net)
### fix litte bugs in API modul
>Tue, 13 Dec 2022 14:00:46 +0100
>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net)
add first code for daily and hourly forcast delete count
### better formart
>Sat, 26 Nov 2022 06:43:20 +0100
>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net)
### remove double dewpoint reading
>Fri, 25 Nov 2022 20:02:39 +0100
>Author: Marko Oldenburg (oldenburg@b1-systems.de)
>Commiter: Marko Oldenburg (oldenburg@b1-systems.de)
### full api support weather and onecall
>Fri, 25 Nov 2022 14:09:45 +0100
>Author: Marko Oldenburg (oldenburg@b1-systems.de)
>Commiter: Marko Oldenburg (oldenburg@b1-systems.de)
### change OpenWeatherMapAPI Code and extend 59_Weather.pm Modul
>Thu, 24 Nov 2022 19:22:40 +0100
>Author: Marko Oldenburg (oldenburg@b1-systems.de)
>Commiter: Marko Oldenburg (oldenburg@b1-systems.de)
### new OpenWeatherMapAPI onecall v3 Support
>Sun, 20 Nov 2022 21:10:22 +0100
>Author: Marko Oldenburg (oldenburg@b1-systems.de)
>Commiter: Marko Oldenburg (oldenburg@b1-systems.de)
### new API Call and Data
>Thu, 17 Nov 2022 19:58:56 +0100
>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net)
### add Onecall to Endpoint
>Sat, 12 Feb 2022 12:56:04 +0100
>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net)
for daily output
[Ticket: no]

140
FHEM/59_Weather.pm
View File

@@ -1132,7 +1132,7 @@ sub Weather_CheckOptions {
=item summary_DE stellt Wetterbericht und -vorhersage bereit =item summary_DE stellt Wetterbericht und -vorhersage bereit
=begin html =begin html
<a name="Weather"></a> <a id="Weather"></a>
<h3>Weather</h3> <h3>Weather</h3>
<ul> <ul>
Note: you need the JSON perl module. Use <code>apt-get install Note: you need the JSON perl module. Use <code>apt-get install
@@ -1148,8 +1148,8 @@ sub Weather_CheckOptions {
Such a virtual Weather device periodically gathers current and forecast Such a virtual Weather device periodically gathers current and forecast
weather conditions from the chosen weather API.<br><br> weather conditions from the chosen weather API.<br><br>
<a name="Weatherdefine"></a> <a id="Weather-define"></a>
<b>Define</b><br><br> <h4>Define</h4><br><br>
<ul> <ul>
<code>define &lt;name&gt; Weather [API=&lt;API&gt;[,&lt;apioptions&gt;]] [apikey=&lt;apikey&gt;] <code>define &lt;name&gt; Weather [API=&lt;API&gt;[,&lt;apioptions&gt;]] [apikey=&lt;apikey&gt;]
[location=&lt;location&gt;] [interval=&lt;interval&gt;] [lang=&lt;lang&gt;]</code><br><br> [location=&lt;location&gt;] [interval=&lt;interval&gt;] [lang=&lt;lang&gt;]</code><br><br>
@@ -1184,7 +1184,7 @@ sub Weather_CheckOptions {
API-specific documentation follows.<p> API-specific documentation follows.<p>
<b>Dark Sky</b><p> <h4>Dark Sky</h4><p>
<table> <table>
<tr><td>API</td><td><code>DarkSkyAPI</code></td></tr> <tr><td>API</td><td><code>DarkSkyAPI</code></td></tr>
@@ -1197,7 +1197,7 @@ sub Weather_CheckOptions {
</table> </table>
<p><p> <p><p>
<b>OpenWeatherMap</b><p> <h4>OpenWeatherMap</h4><p>
<table> <table>
<tr><td>API</td><td><code>OpenWeatherMapAPI</code></td></tr> <tr><td>API</td><td><code>OpenWeatherMapAPI</code></td></tr>
@@ -1215,7 +1215,7 @@ sub Weather_CheckOptions {
</table> </table>
<p><p> <p><p>
<b>Wunderground</b><p> <h4>Wunderground</h4><p>
<table> <table>
<tr><td>API</td><td><code>wundergroundAPI</code></td></tr> <tr><td>API</td><td><code>wundergroundAPI</code></td></tr>
@@ -1247,17 +1247,19 @@ sub Weather_CheckOptions {
</ul> </ul>
<br> <br>
<a name="Weatherset"></a> <a id="Weather-set"></a>
<b>Set </b> <h4>Set</h4>
<ul> <ul>
<a id="Weather-set-update"></a>
<li> <li>
<code>set &lt;name&gt; update</code><br><br> <i>set &lt;name&gt; update</i><br><br>
Forces the retrieval of the weather data. The next automatic retrieval is scheduled to occur Forces the retrieval of the weather data. The next automatic retrieval is scheduled to occur
<code>interval</code> seconds later. <code>interval</code> seconds later.
</li> </li>
<a id="Weather-set-newLocation"></a>
<li> <li>
<code>set &lt;name&gt; newLocation latitude,longitude</code><br><br> <i>set &lt;name&gt; newLocation latitude,longitude</i><br><br>
set a new temporary location. set a new temporary location.
the value pair Latitude Longitude is separated by a comma. the value pair Latitude Longitude is separated by a comma.
@@ -1266,39 +1268,65 @@ sub Weather_CheckOptions {
</ul> </ul>
<br> <br>
<a name="Weatherget"></a> <a id="Weather-get"></a>
<b>Get</b> <h4>Get</h4>
<ul> <ul>
<code>get &lt;name&gt; &lt;reading&gt;</code><br><br> <code>get &lt;name&gt; &lt;reading&gt;</code><br><br>
Valid readings and their meaning (? can be one of 1, 2, 3, 4, 5 and stands Valid readings and their meaning (? can be one of 1, 2, 3, 4, 5 and stands
for today, tomorrow, etc.):<br> for today, tomorrow, etc.):<br>
<table> <table>
<a id="Weather-get-.license"></a>
<tr><td>.license</td><td>license of the API provider, if available</td></tr> <tr><td>.license</td><td>license of the API provider, if available</td></tr>
<a id="Weather-get-city"></a>
<tr><td>city</td><td>name of town returned for location</td></tr> <tr><td>city</td><td>name of town returned for location</td></tr>
<a id="Weather-get-code"></a>
<tr><td>code</td><td>current condition code</td></tr> <tr><td>code</td><td>current condition code</td></tr>
<a id="Weather-get-condition"></a>
<tr><td>condition</td><td>current condition</td></tr> <tr><td>condition</td><td>current condition</td></tr>
<a id="Weather-get-current_date_time"></a>
<tr><td>current_date_time</td><td>last update of forecast on server</td></tr> <tr><td>current_date_time</td><td>last update of forecast on server</td></tr>
<a id="Weather-get-fc?_code"></a>
<tr><td>fc?_code</td><td>forecast condition code</td></tr> <tr><td>fc?_code</td><td>forecast condition code</td></tr>
<a id="Weather-get-fc?_condition"></a>
<tr><td>fc?_condition</td><td>forecast condition</td></tr> <tr><td>fc?_condition</td><td>forecast condition</td></tr>
<a id="Weather-get-fc?_day_of_week"></a>
<tr><td>fc?_day_of_week</td><td>day of week for day +?</td></tr> <tr><td>fc?_day_of_week</td><td>day of week for day +?</td></tr>
<a id="Weather-get-fc?_high_c"></a>
<tr><td>fc?_high_c</td><td>forecasted daily high in degrees centigrade</td></tr> <tr><td>fc?_high_c</td><td>forecasted daily high in degrees centigrade</td></tr>
<a id="Weather-get-fc?_icon"></a>
<tr><td>fc?_icon</td><td>forecast icon</td></tr> <tr><td>fc?_icon</td><td>forecast icon</td></tr>
<a id="Weather-get-fc?_low_c"></a>
<tr><td>fc?_low_c</td><td>forecasted daily low in degrees centigrade</td></tr> <tr><td>fc?_low_c</td><td>forecasted daily low in degrees centigrade</td></tr>
<a id="Weather-get-humidity"></a>
<tr><td>humidity</td><td>current humidity in %</td></tr> <tr><td>humidity</td><td>current humidity in %</td></tr>
<a id="Weather-get-icon"></a>
<tr><td>icon</td><td>relative path for current icon</td></tr> <tr><td>icon</td><td>relative path for current icon</td></tr>
<a id="Weather-get-pressure"></a>
<tr><td>pressure</td><td>air pressure in hPa</td></tr> <tr><td>pressure</td><td>air pressure in hPa</td></tr>
<a id="Weather-get-pressure_trend"></a>
<tr><td>pressure_trend</td><td>air pressure trend (0= steady, 1= rising, 2= falling)</td></tr> <tr><td>pressure_trend</td><td>air pressure trend (0= steady, 1= rising, 2= falling)</td></tr>
<a id="Weather-get-pressure_trend_txt"></a>
<tr><td>pressure_trend_txt</td><td>textual representation of air pressure trend</td></tr> <tr><td>pressure_trend_txt</td><td>textual representation of air pressure trend</td></tr>
<a id="Weather-get-pressure_trend_sym"></a>
<tr><td>pressure_trend_sym</td><td>symbolic representation of air pressure trend</td></tr> <tr><td>pressure_trend_sym</td><td>symbolic representation of air pressure trend</td></tr>
<a id="Weather-get-temperature"></a>
<tr><td>temperature</td><td>current temperature in degrees centigrade</td></tr> <tr><td>temperature</td><td>current temperature in degrees centigrade</td></tr>
<a id="Weather-get-temp_c"></a>
<tr><td>temp_c</td><td>current temperature in degrees centigrade</td></tr> <tr><td>temp_c</td><td>current temperature in degrees centigrade</td></tr>
<a id="Weather-get-temp_f"></a>
<tr><td>temp_f</td><td>current temperature in degrees Fahrenheit</td></tr> <tr><td>temp_f</td><td>current temperature in degrees Fahrenheit</td></tr>
<a id="Weather-get-visibility"></a>
<tr><td>visibility</td><td>visibility in km</td></tr> <tr><td>visibility</td><td>visibility in km</td></tr>
<a id="Weather-get-wind"></a>
<tr><td>wind</td><td>wind speed in km/h</td></tr> <tr><td>wind</td><td>wind speed in km/h</td></tr>
<a id="Weather-get-wind_chill"></a>
<tr><td>wind_chill</td><td>wind chill in degrees centigrade</td></tr> <tr><td>wind_chill</td><td>wind chill in degrees centigrade</td></tr>
<a id="Weather-get-wind_condition"></a>
<tr><td>wind_condition</td><td>wind direction and speed</td></tr> <tr><td>wind_condition</td><td>wind direction and speed</td></tr>
<a id="Weather-get-wind_direction"></a>
<tr><td>wind_direction</td><td>direction wind comes from in degrees (0 = north wind)</td></tr> <tr><td>wind_direction</td><td>direction wind comes from in degrees (0 = north wind)</td></tr>
<a id="Weather-get-wind_speed"></a>
<tr><td>wind_speed</td><td>same as wind</td></tr> <tr><td>wind_speed</td><td>same as wind</td></tr>
</table> </table>
<br> <br>
@@ -1311,15 +1339,19 @@ sub Weather_CheckOptions {
</ul> </ul>
<br> <br>
<a name="Weatherattr"></a> <a id="Weather-attr"></a>
<b>Attributes</b> <h4>Attributes</h4>
<ul> <ul>
<li>disable: disables the retrieval of weather data - the timer runs according to schedule, <a id="Weather-attr-disable"></a>
<li><i>disable</i> - disables the retrieval of weather data - the timer runs according to schedule,
though no data is requested from the API.</li> though no data is requested from the API.</li>
<li><a href="#readingFnAttributes">readingFnAttributes</a></li> <li><a href="#readingFnAttributes">readingFnAttributes</a></li>
<li>forecast - hourly/daily, display of forecast data.</li> <a id="Weather-attr-forecast"></a>
<li>forecastLimit - Number of forecast data records which should be written as a reading.</li> <li><i>forecast</i> - hourly/daily, display of forecast data.</li>
<li>alerts - 0/1 should alert messages be written similar to Unwetterwarnung</li> <a id="Weather-attr-forecastLimit"></a>
<li><i>forecastLimit</i> - Number of forecast data records which should be written as a reading.</li>
<a id="Weather-attr-alerts"></a>
<li><i>alerts</i> - 0/1 should alert messages be written similar to Unwetterwarnung</li>
</ul> </ul>
<br> <br>
</ul> </ul>
@@ -1328,7 +1360,7 @@ sub Weather_CheckOptions {
=end html =end html
=begin html_DE =begin html_DE
<a name="Weather"></a> <a id="Weather"></a>
<h3>Weather</h3> <h3>Weather</h3>
<ul> <ul>
Hinweis: es wird das Perl-Modul JSON ben&ouml;tigt. Mit <code>apt-get install Hinweis: es wird das Perl-Modul JSON ben&ouml;tigt. Mit <code>apt-get install
@@ -1345,9 +1377,8 @@ sub Weather_CheckOptions {
Eine solche virtuelle Wetterstation sammelt periodisch aktuelle Wetterdaten Eine solche virtuelle Wetterstation sammelt periodisch aktuelle Wetterdaten
und Wettervorhersagen aus dem verwendeten API.<br><br> und Wettervorhersagen aus dem verwendeten API.<br><br>
<a id="Weather-define"></a>
<a name="Weatherdefine"></a> <h4>Define</h4><br><br>
<b>Define</b><br><br>
<ul> <ul>
<code>define &lt;name&gt; Weather [API=&lt;API&gt;[,&lt;apioptions&gt;]] [apikey=&lt;apikey&gt;] <code>define &lt;name&gt; Weather [API=&lt;API&gt;[,&lt;apioptions&gt;]] [apikey=&lt;apikey&gt;]
[location=&lt;location&gt;] [interval=&lt;interval&gt;] [lang=&lt;lang&gt;]</code><br><br> [location=&lt;location&gt;] [interval=&lt;interval&gt;] [lang=&lt;lang&gt;]</code><br><br>
@@ -1383,7 +1414,7 @@ sub Weather_CheckOptions {
Es folgt die API-spezifische Dokumentation.<p> Es folgt die API-spezifische Dokumentation.<p>
<b>Dark Sky</b><p> <h4>Dark Sky</h4><p>
<table> <table>
<tr><td>API</td><td><code>DarkSkyAPI</code></td></tr> <tr><td>API</td><td><code>DarkSkyAPI</code></td></tr>
@@ -1397,7 +1428,7 @@ sub Weather_CheckOptions {
</table> </table>
<p><p> <p><p>
<b>OpenWeatherMap</b><p> <h4>OpenWeatherMap</h4><p>
<table> <table>
<tr><td>API</td><td><code>OpenWeatherMapAPI</code></td></tr> <tr><td>API</td><td><code>OpenWeatherMapAPI</code></td></tr>
@@ -1418,7 +1449,7 @@ sub Weather_CheckOptions {
</table> </table>
<p><p> <p><p>
<b>Wunderground</b><p> <h4>Wunderground</h4><p>
<table> <table>
<tr><td>API</td><td><code>wundergroundAPI</code></td></tr> <tr><td>API</td><td><code>wundergroundAPI</code></td></tr>
@@ -1455,55 +1486,76 @@ sub Weather_CheckOptions {
</ul> </ul>
<br> <br>
<a name="Weatherset"></a> <a id="Weather-set"></a>
<b>Set </b> <h4>Set</h4>
<ul> <ul>
<li> <a id="Weather-set-update"></a>
<code>set &lt;name&gt; update</code><br><br> <li><i>set &lt;name&gt; update</i><br><br>
Erzwingt eine Abfrage der Wetterdaten. Die darauffolgende Abfrage Erzwingt eine Abfrage der Wetterdaten. Die darauffolgende Abfrage
wird gem&auml;&szlig; dem eingestellten wird gem&auml;&szlig; dem eingestellten
Intervall <code>interval</code> Sekunden sp&auml;ter durchgef&uuml;hrt. Intervall <code>interval</code> Sekunden sp&auml;ter durchgef&uuml;hrt.
</li> </li>
<a id="Weather-set-newLocation"></a>
<li> <li>
<code>set &lt;name&gt; newLocation latitude,longitude</code><br><br> <i>set &lt;name&gt; newLocation latitude,longitude</i><br><br>
Gibt die M&ouml;glichkeit eine neue tempor&auml;re Location zu setzen. Gibt die M&ouml;glichkeit eine neue tempor&auml;re Location zu setzen.
Das Wertepaar Latitude Longitude wird durch ein Komma getrennt &uuml;bergeben. Das Wertepaar Latitude Longitude wird durch ein Komma getrennt &uuml;bergeben.
Wird kein Wert mitgegebn (leere &Uuml;bergabe) wird automatisch die per Definition erkannte Location genommen<br><br> Wird kein Wert mitgegebn (leere &Uuml;bergabe) wird automatisch die per Definition erkannte Location genommen<br><br>
</li> </li>
</ul> </ul>
<br> <br>
<a id="Weather-get"></a>
<a name="Weatherget"></a> <h4>Get</h4>
<b>Get</b>
<ul> <ul>
<code>get &lt;name&gt; &lt;reading&gt;</code><br><br> <code>get &lt;name&gt; &lt;reading&gt;</code><br><br>
G&uuml;ltige ausgelesene Daten (readings) und ihre Bedeutung (das ? kann einen der Werte 1, 2, 3 , 4 oder 5 annehmen und steht f&uuml;r heute, morgen, &uuml;bermorgen etc.):<br><br> G&uuml;ltige ausgelesene Daten (readings) und ihre Bedeutung (das ? kann einen der Werte 1, 2, 3 , 4 oder 5 annehmen und steht f&uuml;r heute, morgen, &uuml;bermorgen etc.):<br><br>
<table> <table>
<a id="Weather-get-.license"></a>
<tr><td>.license</td><td>Lizenz des jeweiligen API-Anbieters, sofern vorhanden</td></tr> <tr><td>.license</td><td>Lizenz des jeweiligen API-Anbieters, sofern vorhanden</td></tr>
<a id="Weather-get-city"></a>
<tr><td>city</td><td>Name der Stadt, der f&uuml;r die location &uuml;bermittelt wird</td></tr> <tr><td>city</td><td>Name der Stadt, der f&uuml;r die location &uuml;bermittelt wird</td></tr>
<a id="Weather-get-code"></a>
<tr><td>code</td><td>Code f&uuml;r die aktuellen Wetterverh&auml;ltnisse</td></tr> <tr><td>code</td><td>Code f&uuml;r die aktuellen Wetterverh&auml;ltnisse</td></tr>
<a id="Weather-get-condition"></a>
<tr><td>condition</td><td>aktuelle Wetterverh&auml;ltnisse</td></tr> <tr><td>condition</td><td>aktuelle Wetterverh&auml;ltnisse</td></tr>
<a id="Weather-get-current_date_time"></a>
<tr><td>current_date_time</td><td>Zeitstempel der letzten Aktualisierung der Wetterdaten vom Server</td></tr> <tr><td>current_date_time</td><td>Zeitstempel der letzten Aktualisierung der Wetterdaten vom Server</td></tr>
<a id="Weather-get-fc?_code"></a>
<tr><td>fc?_code</td><td>Code f&uuml;r die vorhergesagten Wetterverh&auml;ltnisse</td></tr> <tr><td>fc?_code</td><td>Code f&uuml;r die vorhergesagten Wetterverh&auml;ltnisse</td></tr>
<a id="Weather-get-fc?_condition"></a>
<tr><td>fc?_condition</td><td>vorhergesagte Wetterverh&auml;ltnisse</td></tr> <tr><td>fc?_condition</td><td>vorhergesagte Wetterverh&auml;ltnisse</td></tr>
<a id="Weather-get-fc?_day_of_week"></a>
<tr><td>fc?_day_of_week</td><td>Wochentag des Tages, der durch ? dargestellt wird</td></tr> <tr><td>fc?_day_of_week</td><td>Wochentag des Tages, der durch ? dargestellt wird</td></tr>
<a id="Weather-get-fc?_high_c"></a>
<tr><td>fc?_high_c</td><td>vorhergesagte maximale Tagestemperatur in Grad Celsius</td></tr> <tr><td>fc?_high_c</td><td>vorhergesagte maximale Tagestemperatur in Grad Celsius</td></tr>
<a id="Weather-get-fc?_icon"></a>
<tr><td>fc?_icon</td><td>Icon f&uuml;r Vorhersage</td></tr> <tr><td>fc?_icon</td><td>Icon f&uuml;r Vorhersage</td></tr>
<a id="Weather-get-fc?_low_c"></a>
<tr><td>fc?_low_c</td><td>vorhergesagte niedrigste Tagestemperatur in Grad Celsius</td></tr> <tr><td>fc?_low_c</td><td>vorhergesagte niedrigste Tagestemperatur in Grad Celsius</td></tr>
<a id="Weather-get-humidity"></a>
<tr><td>humidity</td><td>gegenw&auml;rtige Luftfeuchtgkeit in %</td></tr> <tr><td>humidity</td><td>gegenw&auml;rtige Luftfeuchtgkeit in %</td></tr>
<a id="Weather-get-icon"></a>
<tr><td>icon</td><td>relativer Pfad f&uuml;r das aktuelle Icon</td></tr> <tr><td>icon</td><td>relativer Pfad f&uuml;r das aktuelle Icon</td></tr>
<a id="Weather-get-pressure"></a>
<tr><td>pressure</td><td>Luftdruck in hPa</td></tr> <tr><td>pressure</td><td>Luftdruck in hPa</td></tr>
<a id="Weather-get-temperature"></a>
<tr><td>temperature</td><td>gegenw&auml;rtige Temperatur in Grad Celsius</td></tr> <tr><td>temperature</td><td>gegenw&auml;rtige Temperatur in Grad Celsius</td></tr>
<a id="Weather-get-temp_c"></a>
<tr><td>temp_c</td><td>gegenw&auml;rtige Temperatur in Grad Celsius</td></tr> <tr><td>temp_c</td><td>gegenw&auml;rtige Temperatur in Grad Celsius</td></tr>
<a id="Weather-get-temp_f"></a>
<tr><td>temp_f</td><td>gegenw&auml;rtige Temperatur in Grad Celsius</td></tr> <tr><td>temp_f</td><td>gegenw&auml;rtige Temperatur in Grad Celsius</td></tr>
<a id="Weather-get-visibility"></a>
<tr><td>visibility</td><td>Sichtweite in km</td></tr> <tr><td>visibility</td><td>Sichtweite in km</td></tr>
<a id="Weather-get-wind"></a>
<tr><td>wind</td><td>Windgeschwindigkeit in km/h</td></tr> <tr><td>wind</td><td>Windgeschwindigkeit in km/h</td></tr>
<a id="Weather-get-wind_condition"></a>
<tr><td>wind_condition</td><td>Windrichtung und -geschwindigkeit</td></tr> <tr><td>wind_condition</td><td>Windrichtung und -geschwindigkeit</td></tr>
<a id="Weather-get-wind_direction"></a>
<tr><td>wind_direction</td><td>Gradangabe der Windrichtung (0 = Nordwind)</td></tr> <tr><td>wind_direction</td><td>Gradangabe der Windrichtung (0 = Nordwind)</td></tr>
<a id="Weather-get-wind_speed"></a>
<tr><td>wind_speed</td><td>Windgeschwindigkeit in km/h (mit wind identisch)</td></tr> <tr><td>wind_speed</td><td>Windgeschwindigkeit in km/h (mit wind identisch)</td></tr>
<a id="Weather-get-validity"></a>
<tr><td>validity</td><td>stale, wenn der Ver&ouml;ffentlichungszeitpunkt auf dem entfernten Server vor dem Zeitpunkt der aktuellen Daten (readings) liegt</td></tr> <tr><td>validity</td><td>stale, wenn der Ver&ouml;ffentlichungszeitpunkt auf dem entfernten Server vor dem Zeitpunkt der aktuellen Daten (readings) liegt</td></tr>
</table> </table>
<br> <br>
@@ -1515,16 +1567,20 @@ sub Weather_CheckOptions {
</ul> </ul>
<br> <br>
<a name="Weatherattr"></a> <a id="Weather-attr"></a>
<b>Attribute</b> <h4>Attribute</h4>
<ul> <ul>
<li>disable: stellt die Abfrage der Wetterdaten ab - der Timer l&auml;ft <a id="Weather-attr-disable"></a>
<li><i>disable</i> - stellt die Abfrage der Wetterdaten ab - der Timer l&auml;ft
gem&auml;&szlig Plan doch es werden keine Daten vom gem&auml;&szlig Plan doch es werden keine Daten vom
API angefordert.</li> API angefordert.</li>
<li><a href="#readingFnAttributes">readingFnAttributes</a></li> <li><a href="#readingFnAttributes">readingFnAttributes</a></li>
<li>forecast - hourly/daily, Anzeige von forecast Daten.</li> <a id="Weather-attr-forecast"></a>
<li>forecastLimit - Anzahl der Forecast-Datens&auml;tze welche als Reading geschrieben werden sollen.</li> <li><i>forecast</i> - hourly/daily, Anzeige von forecast Daten.</li>
<li>alerts - 0/1 Sollen Alert Meldungen &auml;nlich Unwetterwarnung geschrieben werden.</li> <a id="Weather-attr-forecastLimit"></a>
<li><i>forecastLimit</i> - Anzahl der Forecast-Datens&auml;tze welche als Reading geschrieben werden sollen.</li>
<a id="Weather-attr-alerts"></a>
<li><i>alerts</i> - 0/1 Sollen Alert Meldungen &auml;nlich Unwetterwarnung geschrieben werden.</li>
</ul> </ul>
<br> <br>
@@ -1550,7 +1606,7 @@ sub Weather_CheckOptions {
], ],
"release_status": "stable", "release_status": "stable",
"license": "GPL_2", "license": "GPL_2",
"version": "v2.2.15", "version": "v2.2.20",
"author": [ "author": [
"Marko Oldenburg <fhemdevelopment@cooltux.net>" "Marko Oldenburg <fhemdevelopment@cooltux.net>"
], ],

8
controls_Weather.txt
View File

@@ -1,4 +1,4 @@
UPD 2023-01-05_18:36:31 55320 FHEM/59_Weather.pm UPD 2023-01-07_13:28:16 57768 FHEM/59_Weather.pm
UPD 2023-01-04_16:37:24 49883 lib/FHEM/APIs/Weather/DarkSkyAPI.pm UPD 2023-01-07_13:28:44 49884 lib/FHEM/APIs/Weather/DarkSkyAPI.pm
UPD 2023-01-05_19:39:00 33259 lib/FHEM/APIs/Weather/OpenWeatherMapAPI.pm UPD 2023-01-07_13:28:59 33258 lib/FHEM/APIs/Weather/OpenWeatherMapAPI.pm
UPD 2023-01-04_16:37:24 36090 lib/FHEM/APIs/Weather/wundergroundAPI.pm UPD 2023-01-07_13:29:12 36090 lib/FHEM/APIs/Weather/wundergroundAPI.pm

36
hooks/commit-msg Executable file
View File

@@ -0,0 +1,36 @@
#!/bin/sh
#
# An example hook script to check the commit log message.
# Called by "git commit" with one argument, the name of the file
# that has the commit message. The hook should exit with non-zero
# status after issuing an appropriate message if it wants to stop the
# commit. The hook is allowed to edit the commit message file.
#
# To enable this hook, rename this file to "commit-msg".
# Uncomment the below to add a Signed-off-by line to the message.
# Doing this in a hook is a bad idea in general, but the prepare-commit-msg
# hook is more suited to it.
#
# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"
# This example catches duplicate Signed-off-by lines.
commit_msg=$(cat "${1:?Missing commit message file}")
test "" = "$(grep '^Signed-off-by: ' "$1" |
sort | uniq -c | sed -e '/^[ ]*1[ ]/d')" || {
echo >&2 Duplicate Signed-off-by lines.
exit 1
}
if ! echo "$commit_msg" | grep -Eq "^(build|chore|ci|docs|feat|feat!|fix|perf|refactor|revert|style|test)(\(.+\))?: .*$" ; then
echo "Invalid commit message"
exit 1
fi
echo "Commit message is valid!"

18
hooks/post-commit Executable file
View File

@@ -0,0 +1,18 @@
#!/bin/bash
set -eu
# destination of the final changelog file
OUTPUT_FILE=CHANGELOG.md
# generate the changelog
git --no-pager log --no-merges --format="### %s%d%n>%aD%n%n>Author: %aN (%aE)%n%n>Commiter: %cN (%cE)%n%n%b%n%N%n" > $OUTPUT_FILE
# prevent recursion!
# since a 'commit --amend' will trigger the post-commit script again
# we have to check if the changelog file has changed or not
res=$(git status --porcelain | grep -c ".\$OUTPUT_FILE$")
if [ "$res" -gt 0 ]; then
git add $OUTPUT_FILE
git commit --amend
echo "Populated Changelog in $OUTPUT_FILE"
fi

2
lib/FHEM/APIs/Weather/DarkSkyAPI.pm
View File

@@ -773,7 +773,7 @@ sub _strftimeWrapper {
"abstract": "Wetter API für Weather DarkSky" "abstract": "Wetter API für Weather DarkSky"
} }
}, },
"version": "v1.2.1", "version": "v1.2.10",
"author": [ "author": [
"Marko Oldenburg <fhemdevelopment@cooltux.net>" "Marko Oldenburg <fhemdevelopment@cooltux.net>"
], ],

2
lib/FHEM/APIs/Weather/OpenWeatherMapAPI.pm
View File

@@ -1024,7 +1024,7 @@ sub _strftimeWrapper {
"abstract": "Wetter API für OpenWeatherMap" "abstract": "Wetter API für OpenWeatherMap"
} }
}, },
"version": "v3.0.15", "version": "v3.2.5",
"author": [ "author": [
"Marko Oldenburg <fhemdevelopment@cooltux.net>" "Marko Oldenburg <fhemdevelopment@cooltux.net>"
], ],

2
lib/FHEM/APIs/Weather/wundergroundAPI.pm
View File

@@ -805,7 +805,7 @@ sub _strftimeWrapper {
"abstract": "Wetter API für Weather Underground" "abstract": "Wetter API für Weather Underground"
} }
}, },
"version": "v1.0.3", "version": "v1.2.0",
"author": [ "author": [
"Julian Pawlowski <julian.pawlowski@gmail.com>" "Julian Pawlowski <julian.pawlowski@gmail.com>"
], ],