iobroker.pv-notifications 1.1.7 → 1.1.9

package/README.md

@@ -339,14 +339,14 @@ sadam6752@gmail.com
 	### **WORK IN PROGRESS**
 -->
 
-### 1.1.7 (2026-03-01)
+### 1.1.9 (2026-03-01)
 
-* (FIX) Weather data reading: Added null checks before calling getForeignStateAsync() to prevent "id needs to be string" error
-* (FIX) Better error logging shows which weather data points are configured
+* (ADD) Weather today added to battery full (100%) and empty (0%) messages
+* (ADD) Full and empty messages now show both today and tomorrow weather
 
-### 1.1.6 (2026-03-01)
+### 1.1.8 (2026-03-01)
 
-* (ADD) Debug logging added to buildIntermediateMessage() for troubleshooting weather data issues
+* (ADD) Weather today added to intermediate messages (when weatherTodayText or weatherTodayTemp is configured)
 
 ### 1.1.1 (2026-03-01)
 

package/io-package.json

@@ -1,7 +1,7 @@
 {
   "common": {
     "name": "pv-notifications",
-    "version": "1.1.7",
+    "version": "1.1.9",
     "titleLang": {
       "en": "PV Notifications",
       "de": "PV-Benachrichtigungen",

package/main.js

@@ -881,21 +881,44 @@ class PvNotifications extends utils.Adapter {
 ☀️ ${this.translate('Production today')}: ${this.round(totalProd)} kWh
 🔌 ${this.translate('Feed-in today')}: ${this.round(Math.abs(feedIn), 0)} kWh`;
 
-        // Wetter-Prognose hinzufügen (optional)
-        if (this.config.weatherTomorrowText || this.config.weatherTomorrow) {
+        // Wetter-Prognose hinzufügen (heute und morgen)
+        const weatherConfigured = this.config.weatherTodayText || this.config.weatherTodayTemp || this.config.weatherTomorrowText || this.config.weatherTomorrow;
+        if (this.config.weatherEnabled !== false && weatherConfigured) {
             try {
-                const weatherTomorrowText = this.getStateValue(this.config.weatherTomorrowText);
-                const weatherTomorrow = this.getStateValue(this.config.weatherTomorrow);
-                const tempTomorrow = this.getStateValue(this.config.weatherTomorrowTemp);
-                const tempText = tempTomorrow ? ` ${this.round(tempTomorrow, 1)}°C` : '';
-
-                const weatherText = weatherTomorrowText || weatherTomorrow;
-                if (weatherText) {
-                    const weatherDesc = this.getWeatherDescription(weatherText);
-                    message += `\n🌤️ Morgen: ${weatherDesc}${tempText}`;
-
-                    if (this.isWeatherBad(weatherText)) {
-                        message += `\n💡 ${this.translate('Tip tomorrow little sun use consumers today')}`;
+                // Wetter heute
+                if (this.config.weatherTodayText || this.config.weatherTodayTemp) {
+                    const weatherTodayTextState = this.config.weatherTodayText ? await this.getForeignStateAsync(this.config.weatherTodayText) : null;
+                    const weatherTodayTempState = this.config.weatherTodayTemp ? await this.getForeignStateAsync(this.config.weatherTodayTemp) : null;
+                    
+                    const weatherTodayText = weatherTodayTextState && weatherTodayTextState.val !== null ? weatherTodayTextState.val : null;
+                    const weatherTodayTemp = weatherTodayTempState && weatherTodayTempState.val !== null ? weatherTodayTempState.val : null;
+                    const todayTempText = weatherTodayTemp ? ` ${this.round(weatherTodayTemp, 1)}°C` : '';
+                    
+                    if (weatherTodayText || weatherTodayTemp) {
+                        const weatherDesc = weatherTodayText ? this.getWeatherDescription(weatherTodayText) : '🌡️';
+                        message += `\n🌤️ Heute: ${weatherDesc}${todayTempText}`;
+                    }
+                }
+                
+                // Wetter morgen
+                if (this.config.weatherTomorrowText || this.config.weatherTomorrow) {
+                    const weatherTomorrowTextState = this.config.weatherTomorrowText ? await this.getForeignStateAsync(this.config.weatherTomorrowText) : null;
+                    const weatherTomorrowState = this.config.weatherTomorrow ? await this.getForeignStateAsync(this.config.weatherTomorrow) : null;
+                    const tempTomorrowState = this.config.weatherTomorrowTemp ? await this.getForeignStateAsync(this.config.weatherTomorrowTemp) : null;
+                    
+                    const weatherTomorrowText = weatherTomorrowTextState && weatherTomorrowTextState.val !== null ? weatherTomorrowTextState.val : null;
+                    const weatherTomorrow = weatherTomorrowState && weatherTomorrowState.val !== null ? weatherTomorrowState.val : null;
+                    const tempTomorrow = tempTomorrowState && tempTomorrowState.val !== null ? tempTomorrowState.val : null;
+                    const tempText = tempTomorrow ? ` ${this.round(tempTomorrow, 1)}°C` : '';
+                    
+                    const weatherText = weatherTomorrowText || weatherTomorrow;
+                    if (weatherText) {
+                        const weatherDesc = this.getWeatherDescription(weatherText);
+                        message += `\n🌤️ Morgen: ${weatherDesc}${tempText}`;
+
+                        if (this.isWeatherBad(weatherText)) {
+                            message += `\n💡 ${this.translate('Tip tomorrow little sun use consumers today')}`;
+                        }
                     }
                 }
             } catch (e) {
@@ -929,21 +952,44 @@ class PvNotifications extends utils.Adapter {
 ⚠️ ${this.translate('Grid consumption today')}: ${this.round(gridPower)} W
 🏠 ${this.translate('Consumption today')}: ${this.round(consumption)} W`;
 
-        // Wetter-Prognose
-        if (this.config.weatherTomorrowText || this.config.weatherTomorrow) {
+        // Wetter-Prognose hinzufügen (heute und morgen)
+        const weatherConfigured = this.config.weatherTodayText || this.config.weatherTodayTemp || this.config.weatherTomorrowText || this.config.weatherTomorrow;
+        if (this.config.weatherEnabled !== false && weatherConfigured) {
             try {
-                const weatherTomorrowText = this.getStateValue(this.config.weatherTomorrowText);
-                const weatherTomorrow = this.getStateValue(this.config.weatherTomorrow);
-                const tempTomorrow = this.getStateValue(this.config.weatherTomorrowTemp);
-                const tempText = tempTomorrow ? ` ${this.round(tempTomorrow, 1)}°C` : '';
-
-                const weatherText = weatherTomorrowText || weatherTomorrow;
-                if (weatherText) {
-                    const weatherDesc = this.getWeatherDescription(weatherText);
-                    message += `\n🌤️ Morgen: ${weatherDesc}${tempText}`;
-
-                    if (this.isWeatherGood(weatherText)) {
-                        message += `\n💡 ${this.translate('Good news tomorrow more sun')}`;
+                // Wetter heute
+                if (this.config.weatherTodayText || this.config.weatherTodayTemp) {
+                    const weatherTodayTextState = this.config.weatherTodayText ? await this.getForeignStateAsync(this.config.weatherTodayText) : null;
+                    const weatherTodayTempState = this.config.weatherTodayTemp ? await this.getForeignStateAsync(this.config.weatherTodayTemp) : null;
+                    
+                    const weatherTodayText = weatherTodayTextState && weatherTodayTextState.val !== null ? weatherTodayTextState.val : null;
+                    const weatherTodayTemp = weatherTodayTempState && weatherTodayTempState.val !== null ? weatherTodayTempState.val : null;
+                    const todayTempText = weatherTodayTemp ? ` ${this.round(weatherTodayTemp, 1)}°C` : '';
+                    
+                    if (weatherTodayText || weatherTodayTemp) {
+                        const weatherDesc = weatherTodayText ? this.getWeatherDescription(weatherTodayText) : '🌡️';
+                        message += `\n🌤️ Heute: ${weatherDesc}${todayTempText}`;
+                    }
+                }
+                
+                // Wetter morgen
+                if (this.config.weatherTomorrowText || this.config.weatherTomorrow) {
+                    const weatherTomorrowTextState = this.config.weatherTomorrowText ? await this.getForeignStateAsync(this.config.weatherTomorrowText) : null;
+                    const weatherTomorrowState = this.config.weatherTomorrow ? await this.getForeignStateAsync(this.config.weatherTomorrow) : null;
+                    const tempTomorrowState = this.config.weatherTomorrowTemp ? await this.getForeignStateAsync(this.config.weatherTomorrowTemp) : null;
+                    
+                    const weatherTomorrowText = weatherTomorrowTextState && weatherTomorrowTextState.val !== null ? weatherTomorrowTextState.val : null;
+                    const weatherTomorrow = weatherTomorrowState && weatherTomorrowState.val !== null ? weatherTomorrowState.val : null;
+                    const tempTomorrow = tempTomorrowState && tempTomorrowState.val !== null ? tempTomorrowState.val : null;
+                    const tempText = tempTomorrow ? ` ${this.round(tempTomorrow, 1)}°C` : '';
+                    
+                    const weatherText = weatherTomorrowText || weatherTomorrow;
+                    if (weatherText) {
+                        const weatherDesc = this.getWeatherDescription(weatherText);
+                        message += `\n🌤️ Morgen: ${weatherDesc}${tempText}`;
+
+                        if (this.isWeatherGood(weatherText)) {
+                            message += `\n💡 ${this.translate('Good news tomorrow more sun')}`;
+                        }
                     }
                 }
             } catch (e) {
@@ -992,36 +1038,51 @@ class PvNotifications extends utils.Adapter {
 ${statusText}`;
 
         // Wetter-Prognose für morgen hinzufügen (optional, nur wenn weatherInIntermediate aktiv)
-        const weatherConfigured = this.config.weatherTomorrowText || this.config.weatherTomorrow;
+        const weatherConfigured = this.config.weatherTomorrowText || this.config.weatherTomorrow || this.config.weatherTodayText || this.config.weatherTodayTemp;
         this.log.debug(`Weather config: enabled=${this.config.weatherEnabled}, inIntermediate=${this.config.weatherInIntermediate}, configured=${weatherConfigured}`);
-        this.log.debug(`Weather data points: tomorrowText="${this.config.weatherTomorrowText}", tomorrow="${this.config.weatherTomorrow}", tomorrowTemp="${this.config.weatherTomorrowTemp}"`);
+        this.log.debug(`Weather data points: todayText="${this.config.weatherTodayText}", todayTemp="${this.config.weatherTodayTemp}", tomorrowText="${this.config.weatherTomorrowText}", tomorrow="${this.config.weatherTomorrow}", tomorrowTemp="${this.config.weatherTomorrowTemp}"`);
         
         if (this.config.weatherEnabled !== false && this.config.weatherInIntermediate !== false && weatherConfigured) {
             try {
                 this.log.debug('Attempting to read weather data...');
                 
-                const weatherTomorrowTextState = this.config.weatherTomorrowText ? await this.getForeignStateAsync(this.config.weatherTomorrowText) : null;
-                const weatherTomorrowState = this.config.weatherTomorrow ? await this.getForeignStateAsync(this.config.weatherTomorrow) : null;
-                const tempTomorrowState = this.config.weatherTomorrowTemp ? await this.getForeignStateAsync(this.config.weatherTomorrowTemp) : null;
-
-                const weatherTomorrowText = weatherTomorrowTextState && weatherTomorrowTextState.val !== null ? weatherTomorrowTextState.val : null;
-                const weatherTomorrow = weatherTomorrowState && weatherTomorrowState.val !== null ? weatherTomorrowState.val : null;
-                const tempTomorrow = tempTomorrowState && tempTomorrowState.val !== null ? tempTomorrowState.val : null;
-                const tempText = tempTomorrow ? ` ${this.round(tempTomorrow, 1)}°C` : '';
-
-                this.log.debug(`Weather data read: text=${weatherTomorrowText}, temp=${weatherTomorrow}, tempValue=${tempTomorrow}`);
+                // Wetter heute lesen
+                if (this.config.weatherTodayText || this.config.weatherTodayTemp) {
+                    const weatherTodayTextState = this.config.weatherTodayText ? await this.getForeignStateAsync(this.config.weatherTodayText) : null;
+                    const weatherTodayTempState = this.config.weatherTodayTemp ? await this.getForeignStateAsync(this.config.weatherTodayTemp) : null;
+                    
+                    const weatherTodayText = weatherTodayTextState && weatherTodayTextState.val !== null ? weatherTodayTextState.val : null;
+                    const weatherTodayTemp = weatherTodayTempState && weatherTodayTempState.val !== null ? weatherTodayTempState.val : null;
+                    const todayTempText = weatherTodayTemp ? ` ${this.round(weatherTodayTemp, 1)}°C` : '';
+                    
+                    if (weatherTodayText || weatherTodayTemp) {
+                        const weatherDesc = weatherTodayText ? this.getWeatherDescription(weatherTodayText) : '🌡️';
+                        message += `\n\n🌤️ ${this.translate('Weather today')}: ${weatherDesc}${todayTempText}`;
+                        this.log.info(`Weather today added to intermediate message: ${weatherDesc}${todayTempText}`);
+                    }
+                }
+                
+                // Wetter morgen lesen
+                if (this.config.weatherTomorrowText || this.config.weatherTomorrow) {
+                    const weatherTomorrowTextState = this.config.weatherTomorrowText ? await this.getForeignStateAsync(this.config.weatherTomorrowText) : null;
+                    const weatherTomorrowState = this.config.weatherTomorrow ? await this.getForeignStateAsync(this.config.weatherTomorrow) : null;
+                    const tempTomorrowState = this.config.weatherTomorrowTemp ? await this.getForeignStateAsync(this.config.weatherTomorrowTemp) : null;
 
-                const weatherText = weatherTomorrowText || weatherTomorrow;
-                if (weatherText) {
-                    const weatherDesc = this.getWeatherDescription(weatherText);
-                    message += `\n\n🌤️ ${this.translate('Weather tomorrow')}: ${weatherDesc}${tempText}`;
-                    this.log.info(`Weather added to intermediate message: ${weatherDesc}${tempText}`);
-                } else {
-                    this.log.debug('No weather text found (states may be null or empty)');
+                    const weatherTomorrowText = weatherTomorrowTextState && weatherTomorrowTextState.val !== null ? weatherTomorrowTextState.val : null;
+                    const weatherTomorrow = weatherTomorrowState && weatherTomorrowState.val !== null ? weatherTomorrowState.val : null;
+                    const tempTomorrow = tempTomorrowState && tempTomorrowState.val !== null ? tempTomorrowState.val : null;
+                    const tempText = tempTomorrow ? ` ${this.round(tempTomorrow, 1)}°C` : '';
+
+                    const weatherText = weatherTomorrowText || weatherTomorrow;
+                    if (weatherText) {
+                        const weatherDesc = this.getWeatherDescription(weatherText);
+                        message += `\n🌤️ ${this.translate('Weather tomorrow')}: ${weatherDesc}${tempText}`;
+                        this.log.info(`Weather tomorrow added to intermediate message: ${weatherDesc}${tempText}`);
+                    }
                 }
             } catch (e) {
                 this.log.error(`Weather data error: ${e.message}`);
-                this.log.error(`Config: weatherTomorrowText="${this.config.weatherTomorrowText}", weatherTomorrow="${this.config.weatherTomorrow}"`);
+                this.log.error(`Config: weatherTodayText="${this.config.weatherTodayText}", weatherTomorrowText="${this.config.weatherTomorrowText}"`);
             }
         } else {
             if (this.config.weatherEnabled === false) {
@@ -1031,7 +1092,7 @@ ${statusText}`;
                 this.log.debug('Weather disabled for intermediate (weatherInIntermediate=false)');
             }
             if (!weatherConfigured) {
-                this.log.debug('Weather not configured (no weatherTomorrowText or weatherTomorrow)');
+                this.log.debug('Weather not configured (no weatherTodayText, weatherTodayTemp, weatherTomorrowText or weatherTomorrow)');
             }
         }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.pv-notifications",
-  "version": "1.1.7",
+  "version": "1.1.9",
   "description": "PV-Anlage Batterie-Status Telegram Benachrichtigungen",
   "author": {
     "name": "Alex1808 via LLM: Qwen",