From e627a15c2f2615d46b426edc8adaae38abd018ae Mon Sep 17 00:00:00 2001 From: CoolTux Date: Thu, 23 Oct 2025 17:57:29 +0000 Subject: [PATCH] 59_Weather: Fix Weather.pm to use READINGS instead of readings git-svn-id: https://svn.fhem.de/fhem/trunk@30437 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/CHANGED | 1 + fhem/FHEM/59_Weather.pm | 2 +- fhem/lib/FHEM/Core/Weather.pm | 28 ++++++++++++++-------------- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/fhem/CHANGED b/fhem/CHANGED index 3ee83b4c0..7344f645c 100644 --- a/fhem/CHANGED +++ b/fhem/CHANGED @@ -1,5 +1,6 @@ # 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 + - bugfix: 59_Weather: Fix Weather.pm to use READINGS instead of readings - change: 11_OWDevice: replaced deprecated smartmatch - feature: 76_SolarForecast: Version 1.59.5 - bugfix: 73_NUKIBridge: Refactor command handler return logic for clarity diff --git a/fhem/FHEM/59_Weather.pm b/fhem/FHEM/59_Weather.pm index 96068ad0d..0829b14b0 100755 --- a/fhem/FHEM/59_Weather.pm +++ b/fhem/FHEM/59_Weather.pm @@ -516,7 +516,7 @@ __END__ ], "release_status": "stable", "license": "GPL_2", - "version": "v2.3.1", + "version": "v2.3.3", "author": [ "Marko Oldenburg " ], diff --git a/fhem/lib/FHEM/Core/Weather.pm b/fhem/lib/FHEM/Core/Weather.pm index 28e975a80..64d4b532e 100644 --- a/fhem/lib/FHEM/Core/Weather.pm +++ b/fhem/lib/FHEM/Core/Weather.pm @@ -644,13 +644,13 @@ sub Get { my $reading = shift @$aRef // return; my $value; - if ( defined( $hash->{readings}->{$reading} ) ) { - $value = $hash->{readings}->{$reading}->{VAL}; + if ( defined( $hash->{READINGS}->{$reading} ) ) { + $value = $hash->{READINGS}->{$reading}->{VAL}; } else { my $rt = ''; - if ( defined( $hash->{readings} ) ) { - $rt = join( ":noArg ", sort keys %{ $hash->{readings} } ); + if ( defined( $hash->{READINGS} ) ) { + $rt = join( ":noArg ", sort keys %{ $hash->{READINGS} } ); } return "Unknown reading $reading, choose one of " . $rt; @@ -933,8 +933,8 @@ sub WeatherAsHtmlV { else { $fc = ( ( - defined( $h->{readings}->{fc1_day_of_week} ) - && $h->{readings}->{fc1_day_of_week} + defined( $h->{READINGS}->{fc1_day_of_week} ) + && $h->{READINGS}->{fc1_day_of_week} ) ? 'fc' : 'hfc' ); } @@ -950,8 +950,8 @@ sub WeatherAsHtmlV { ); for ( my $i = 1 ; $i < $items ; $i++ ) { - if ( defined( $h->{readings}->{"${fc}${i}_low_c"} ) - && $h->{readings}->{"${fc}${i}_low_c"} ) + if ( defined( $h->{READINGS}->{"${fc}${i}_low_c"} ) + && $h->{READINGS}->{"${fc}${i}_low_c"} ) { $ret .= sprintf( '%s%s: %s
min %s°C max %s°C
%s', @@ -1021,8 +1021,8 @@ sub WeatherAsHtmlH { else { $fc = ( ( - defined( $h->{readings}->{fc1_day_of_week} ) - && $h->{readings}->{fc1_day_of_week} + defined( $h->{READINGS}->{fc1_day_of_week} ) + && $h->{READINGS}->{fc1_day_of_week} ) ? 'fc' : 'hfc' ); } @@ -1056,8 +1056,8 @@ sub WeatherAsHtmlH { ::ReadingsVal( $d, "humidity", "" ) ); for ( my $i = 1 ; $i < $items ; $i++ ) { - if ( defined( $h->{readings}->{"${fc}${i}_low_c"} ) - && $h->{readings}->{"${fc}${i}_low_c"} ) + if ( defined( $h->{READINGS}->{"${fc}${i}_low_c"} ) + && $h->{READINGS}->{"${fc}${i}_low_c"} ) { $ret .= sprintf( 'min %s°C', ::ReadingsVal( $d, "${fc}${i}_low_c", " - " ) ); @@ -1074,8 +1074,8 @@ sub WeatherAsHtmlH { $ret .= sprintf( '%s', ::ReadingsVal( $d, "wind_condition", "" ) ); for ( my $i = 1 ; $i < $items ; $i++ ) { - if ( defined( $h->{readings}->{"${fc}${i}_high_c"} ) - && $h->{readings}->{"${fc}${i}_high_c"} ) + if ( defined( $h->{READINGS}->{"${fc}${i}_high_c"} ) + && $h->{READINGS}->{"${fc}${i}_high_c"} ) { $ret .= sprintf( 'max %s°C', ::ReadingsVal( $d, "${fc}${i}_high_c", " - " ) );