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

Compare commits

base: FHEM:82d0e6b1b67a7eae752f3a366562aa3349736fab
Branches Tags
FHEM:dev FHEM:main FHEM:testing
FHEM:v2.3.3 FHEM:v2.3.0 FHEM:v2.2.22 FHEM:v2.2.21 FHEM:v2.2.20
..
compare: FHEM:0ab46dd00b6ff171ad1c85cc85207ab2f187754c
Branches Tags
FHEM:dev FHEM:main FHEM:testing
FHEM:v2.3.3 FHEM:v2.3.0 FHEM:v2.2.22 FHEM:v2.2.21 FHEM:v2.2.20

2 Commits
82d0e6b1b6 ... 0ab46dd00b

Author SHA1 Message Date
Marko Oldenburg
0ab46dd00b Bump Weather module version to v2.3.2 
Updated the version number of the Weather module from v2.3.1 to v2.3.2 in
 the module metadata. This version increment likely corresponds to minor
 bugfixes or improvements that have been implemented in the module. The
 version change ensures proper tracking of module updates for users and
 package management systems.
 2025-10-17 12:40:07 +02:00
Marko Oldenburg
437d04b87c Fix Weather.pm to use READINGS instead of readings 
This commit corrects the hash key used to access device readings in the
 Weather.pm module. All instances of the lowercase 'readings' hash key
 have been changed to the uppercase 'READINGS', which is the standard
 convention in FHEM. This fixes potential issues where weather data
 wasn't being properly accessed or displayed because the module was
 looking for readings in the wrong hash location. The change affects
 the Get function and HTML rendering methods for both vertical and
 horizontal layouts.
 2025-10-17 12:20:04 +02:00
2 changed files with 15 additions and 15 deletions
Expand all files Collapse all files

2
FHEM/59_Weather.pm
View File

@@ -516,7 +516,7 @@ __END__
], ],
"release_status": "stable", "release_status": "stable",
"license": "GPL_2", "license": "GPL_2",
"version": "v2.3.1", "version": "v2.3.2",
"author": [ "author": [
"Marko Oldenburg <fhemdevelopment@cooltux.net>" "Marko Oldenburg <fhemdevelopment@cooltux.net>"
], ],

28
lib/FHEM/Core/Weather.pm
View File

@@ -644,13 +644,13 @@ sub Get {
my $reading = shift @$aRef // return; my $reading = shift @$aRef // return;
my $value; my $value;
if ( defined( $hash->{readings}->{$reading} ) ) { if ( defined( $hash->{READINGS}->{$reading} ) ) {
$value = $hash->{readings}->{$reading}->{VAL}; $value = $hash->{READINGS}->{$reading}->{VAL};
} }
else { else {
my $rt = ''; my $rt = '';
if ( defined( $hash->{readings} ) ) { if ( defined( $hash->{READINGS} ) ) {
$rt = join( ":noArg ", sort keys %{ $hash->{readings} } ); $rt = join( ":noArg ", sort keys %{ $hash->{READINGS} } );
} }
return "Unknown reading $reading, choose one of " . $rt; return "Unknown reading $reading, choose one of " . $rt;
@@ -933,8 +933,8 @@ sub WeatherAsHtmlV {
else { else {
$fc = ( $fc = (
( (
defined( $h->{readings}->{fc1_day_of_week} ) defined( $h->{READINGS}->{fc1_day_of_week} )
&& $h->{readings}->{fc1_day_of_week} && $h->{READINGS}->{fc1_day_of_week}
) ? 'fc' : 'hfc' ) ? 'fc' : 'hfc'
); );
} }
@@ -950,8 +950,8 @@ sub WeatherAsHtmlV {
); );
for ( my $i = 1 ; $i < $items ; $i++ ) { for ( my $i = 1 ; $i < $items ; $i++ ) {
if ( defined( $h->{readings}->{"${fc}${i}_low_c"} ) if ( defined( $h->{READINGS}->{"${fc}${i}_low_c"} )
&& $h->{readings}->{"${fc}${i}_low_c"} ) && $h->{READINGS}->{"${fc}${i}_low_c"} )
{ {
$ret .= sprintf( $ret .= sprintf(
'<tr><td class="weatherIcon" width=%d>%s</td><td class="weatherValue"><span class="weatherDay">%s: %s</span><br><span class="weatherMin">min %s°C</span> <span class="weatherMax">max %s°C</span><br>%s</td></tr>', '<tr><td class="weatherIcon" width=%d>%s</td><td class="weatherValue"><span class="weatherDay">%s: %s</span><br><span class="weatherMin">min %s°C</span> <span class="weatherMax">max %s°C</span><br>%s</td></tr>',
@@ -1021,8 +1021,8 @@ sub WeatherAsHtmlH {
else { else {
$fc = ( $fc = (
( (
defined( $h->{readings}->{fc1_day_of_week} ) defined( $h->{READINGS}->{fc1_day_of_week} )
&& $h->{readings}->{fc1_day_of_week} && $h->{READINGS}->{fc1_day_of_week}
) ? 'fc' : 'hfc' ) ? 'fc' : 'hfc'
); );
} }
@@ -1056,8 +1056,8 @@ sub WeatherAsHtmlH {
::ReadingsVal( $d, "humidity", "" ) ::ReadingsVal( $d, "humidity", "" )
); );
for ( my $i = 1 ; $i < $items ; $i++ ) { for ( my $i = 1 ; $i < $items ; $i++ ) {
if ( defined( $h->{readings}->{"${fc}${i}_low_c"} ) if ( defined( $h->{READINGS}->{"${fc}${i}_low_c"} )
&& $h->{readings}->{"${fc}${i}_low_c"} ) && $h->{READINGS}->{"${fc}${i}_low_c"} )
{ {
$ret .= sprintf( '<td class="weatherMin">min %s°C</td>', $ret .= sprintf( '<td class="weatherMin">min %s°C</td>',
::ReadingsVal( $d, "${fc}${i}_low_c", " - " ) ); ::ReadingsVal( $d, "${fc}${i}_low_c", " - " ) );
@@ -1074,8 +1074,8 @@ sub WeatherAsHtmlH {
$ret .= sprintf( '<tr><td class="weatherMax">%s</td>', $ret .= sprintf( '<tr><td class="weatherMax">%s</td>',
::ReadingsVal( $d, "wind_condition", "" ) ); ::ReadingsVal( $d, "wind_condition", "" ) );
for ( my $i = 1 ; $i < $items ; $i++ ) { for ( my $i = 1 ; $i < $items ; $i++ ) {
if ( defined( $h->{readings}->{"${fc}${i}_high_c"} ) if ( defined( $h->{READINGS}->{"${fc}${i}_high_c"} )
&& $h->{readings}->{"${fc}${i}_high_c"} ) && $h->{READINGS}->{"${fc}${i}_high_c"} )
{ {
$ret .= sprintf( '<td class="weatherMax">max %s°C</td>', $ret .= sprintf( '<td class="weatherMax">max %s°C</td>',
::ReadingsVal( $d, "${fc}${i}_high_c", " - " ) ); ::ReadingsVal( $d, "${fc}${i}_high_c", " - " ) );