iobroker.pv-notifications 1.1.2 → 1.1.4

package/README.md

@@ -339,11 +339,14 @@ sadam6752@gmail.com
 	### **WORK IN PROGRESS**
 -->
 
-### 1.1.2 (2026-03-01)
+### 1.1.4 (2026-03-01)
 
-* (FIX) Weather data now read correctly using getForeignStateAsync() instead of getStateValue()
-* (FIX) Weather data added to daily statistics (buildDailyStatsMessage) and intermediate messages (buildIntermediateMessage)
-* (ADD) New checkbox 'weatherEnabled' to enable/disable weather data in messages
+* (ADD) Weather data (today and tomorrow) added to test message (testButton)
+* (ADD) "Weather today" translation key added
+
+### 1.1.3 (2026-03-01)
+
+* (ADD) Two separate checkboxes for weather data: 'weatherInIntermediate' and 'weatherInDailyStats'
 
 ### 1.1.1 (2026-03-01)
 

package/admin/i18n/de/translations.json

@@ -70,6 +70,10 @@
     "header_weather": "Wetter (Optional)",
     "label_weatherEnabled": "Wetterdaten in Nachrichten anzeigen",
     "tooltip_weatherEnabled": "Wenn aktiviert, werden Wetterdaten in Tagesstatistik und Batterie-Status-Nachrichten angezeigt",
+    "label_weatherInIntermediate": "Intermediate-Stufen",
+    "tooltip_weatherInIntermediate": "Wetterdaten in Intermediate-Nachrichten (20%, 40%, 60%, 80%) anzeigen",
+    "label_weatherInDailyStats": "Tagesstatistik",
+    "tooltip_weatherInDailyStats": "Wetterdaten in Tagesstatistik (22:00) anzeigen",
     "label_weatherTodayText": "Wetter heute",
     "tooltip_weatherTodayText": "Z.B. daswetter.0.Day0.forecast.currentSymbol",
     "label_weatherTodayTemp": "Temperatur heute (°C)",

package/admin/i18n/en/translations.json

@@ -70,6 +70,10 @@
     "header_weather": "Weather (Optional)",
     "label_weatherEnabled": "Show weather data in messages",
     "tooltip_weatherEnabled": "If enabled, weather data will be shown in daily statistics and battery status messages",
+    "label_weatherInIntermediate": "Intermediate levels",
+    "tooltip_weatherInIntermediate": "Show weather data in intermediate messages (20%, 40%, 60%, 80%)",
+    "label_weatherInDailyStats": "Daily statistics",
+    "tooltip_weatherInDailyStats": "Show weather data in daily statistics (22:00)",
     "label_weatherTodayText": "Weather today",
     "tooltip_weatherTodayText": "e.g. daswetter.0.Day0.forecast.currentSymbol",
     "label_weatherTodayTemp": "Temperature today (°C)",

package/admin/i18n/ru/translations.json

@@ -70,6 +70,10 @@
     "header_weather": "Погода (опционально)",
     "label_weatherEnabled": "Показывать данные о погоде в сообщениях",
     "tooltip_weatherEnabled": "Если включено, данные о погоде будут отображаться в дневной статистике и сообщениях о статусе батареи",
+    "label_weatherInIntermediate": "Промежуточные уровни",
+    "tooltip_weatherInIntermediate": "Показывать погоду в промежуточных сообщениях (20%, 40%, 60%, 80%)",
+    "label_weatherInDailyStats": "Дневная статистика",
+    "tooltip_weatherInDailyStats": "Показывать погоду в дневной статистике (22:00)",
     "label_weatherTodayText": "Погода сегодня",
     "tooltip_weatherTodayText": "Например: daswetter.0.Day0.forecast.currentSymbol",
     "label_weatherTodayTemp": "Температура сегодня (°C)",

package/admin/jsonConfig.json

@@ -433,6 +433,26 @@
       "default": true,
       "tooltip": "tooltip_weatherEnabled"
     },
+    "weatherInIntermediate": {
+      "type": "checkbox",
+      "label": "label_weatherInIntermediate",
+      "sm": 6,
+      "md": 6,
+      "lg": 6,
+      "default": true,
+      "tooltip": "tooltip_weatherInIntermediate",
+      "disabled": "!weatherEnabled"
+    },
+    "weatherInDailyStats": {
+      "type": "checkbox",
+      "label": "label_weatherInDailyStats",
+      "sm": 6,
+      "md": 6,
+      "lg": 6,
+      "default": true,
+      "tooltip": "tooltip_weatherInDailyStats",
+      "disabled": "!weatherEnabled"
+    },
     "weatherTodayText": {
       "type": "objectId",
       "label": "label_weatherTodayText",

package/io-package.json

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

package/main.js

@@ -981,8 +981,9 @@ class PvNotifications extends utils.Adapter {
 ⚡ ${production}: ${this.round(power)} W
 ${statusText}`;
 
-        // Wetter-Prognose für morgen hinzufügen (optional)
-        if (this.config.weatherEnabled !== false && (this.config.weatherTomorrowText || this.config.weatherTomorrow)) {
+        // Wetter-Prognose für morgen hinzufügen (optional, nur wenn weatherInIntermediate aktiv)
+        if (this.config.weatherEnabled !== false && this.config.weatherInIntermediate !== false && 
+            (this.config.weatherTomorrowText || this.config.weatherTomorrow)) {
             try {
                 const weatherTomorrowTextState = await this.getForeignStateAsync(this.config.weatherTomorrowText);
                 const weatherTomorrowState = await this.getForeignStateAsync(this.config.weatherTomorrow);
@@ -1041,8 +1042,9 @@ ${statusText}`;
 🔌 ${this.translate('Feed-in')}: ${feedIn} kWh
 ⚡ ${this.translate('Grid consumption')}: ${gridPower} kWh`;
 
-        // Wetter-Prognose für morgen hinzufügen
-        if (this.config.weatherEnabled !== false && (this.config.weatherTomorrowText || this.config.weatherTomorrow)) {
+        // Wetter-Prognose für morgen hinzufügen (optional, nur wenn weatherInDailyStats aktiv)
+        if (this.config.weatherEnabled !== false && this.config.weatherInDailyStats !== false && 
+            (this.config.weatherTomorrowText || this.config.weatherTomorrow)) {
             try {
                 const weatherTomorrowTextState = await this.getForeignStateAsync(this.config.weatherTomorrowText);
                 const weatherTomorrowState = await this.getForeignStateAsync(this.config.weatherTomorrow);
@@ -1492,6 +1494,11 @@ ${statusText}`;
                 en: 'Weather tomorrow',
                 ru: 'Погода завтра',
             },
+            'Weather today': {
+                de: 'Wetter heute',
+                en: 'Weather today',
+                ru: 'Погода сегодня',
+            },
             'Good PV production expected': {
                 de: 'Gute PV-Produktion erwartet',
                 en: 'Good PV production expected',
@@ -1598,7 +1605,7 @@ ${statusText}`;
         const selfConsumption = this.round(totalProd - feedIn, 1);
         const selfConsumptionRate = totalProd > 0 ? this.round((selfConsumption / totalProd) * 100, 1) : 0;
 
-        return `🧪 *${this.translate('Daily statistics PV system')} - TEST*
+        let message = `🧪 *${this.translate('Daily statistics PV system')} - TEST*
 ━━━━━━━━━━━━━━━━━━━━━━
 🔋 ${this.translate('Current charge level')}: ${soc}%
 ⚡ ${this.translate('Current energy')}: ${currentKWh} kWh (${batteryCapacityKWh} kWh ${this.translate('Total capacity')})
@@ -1608,9 +1615,48 @@ ${statusText}`;
 🔌 ${this.translate('Feed-in')}: ${feedIn} kWh
 ⚡ ${this.translate('Grid consumption')}: ${gridPower} kWh
 ━━━━━━━━━━━━━━━━━━━━━━
-💡 ${this.translate('A healthy cycle per day is normal')}
+💡 ${this.translate('A healthy cycle per day is normal')}`;
+
+        // Wetterdaten hinzufügen (heute und morgen) für Test
+        if (this.config.weatherEnabled !== false) {
+            try {
+                // Wetter heute
+                if (this.config.weatherTodayText || this.config.weatherTodayTemp) {
+                    const weatherTodayTextState = await this.getForeignStateAsync(this.config.weatherTodayText);
+                    const weatherTodayState = await this.getForeignStateAsync(this.config.weatherTodayTemp);
+
+                    const weatherTodayText = weatherTodayTextState && weatherTodayTextState.val !== null ? weatherTodayTextState.val : null;
+                    const weatherTodayTemp = weatherTodayState && weatherTodayState.val !== null ? weatherTodayState.val : null;
+                    const tempText = weatherTodayTemp ? ` ${this.round(weatherTodayTemp, 1)}°C` : '';
+
+                    if (weatherTodayText || weatherTodayTemp) {
+                        const weatherDesc = weatherTodayText ? this.getWeatherDescription(weatherTodayText) : '🌡️';
+                        message += `\n\n🌤️ *${this.translate('Weather today')}:* ${weatherDesc}${tempText}`;
+                    }
+                }
+
+                // Wetter morgen
+                if (this.config.weatherTomorrowText || this.config.weatherTomorrowTemp) {
+                    const weatherTomorrowTextState = await this.getForeignStateAsync(this.config.weatherTomorrowText);
+                    const weatherTomorrowState = await this.getForeignStateAsync(this.config.weatherTomorrowTemp);
+
+                    const weatherTomorrowText = weatherTomorrowTextState && weatherTomorrowTextState.val !== null ? weatherTomorrowTextState.val : null;
+                    const weatherTomorrowTemp = weatherTomorrowState && weatherTomorrowState.val !== null ? weatherTomorrowState.val : null;
+                    const tempText = weatherTomorrowTemp ? ` ${this.round(weatherTomorrowTemp, 1)}°C` : '';
 
-*${this.translate('Test Notification')} - pv-notifications v${this.version}*`;
+                    if (weatherTomorrowText || weatherTomorrowTemp) {
+                        const weatherDesc = weatherTomorrowText ? this.getWeatherDescription(weatherTomorrowText) : '🌡️';
+                        message += `\n🌤️ *${this.translate('Weather tomorrow')}:* ${weatherDesc}${tempText}`;
+                    }
+                }
+            } catch (e) {
+                this.log.debug(`Weather data for test not available: ${e.message}`);
+            }
+        }
+
+        message += `\n\n*${this.translate('Test Notification')} - pv-notifications v${this.version}*`;
+
+        return message;
     }
 
     /**

package/package.json

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