Merge pull request #1164 from tt-tom17/patch-tt-tom17

update CardLChart_Influx2.ts

ioBroker/Blockly/CardLChart_Influx2.ts

@@ -1,109 +1,130 @@
-const Debug = false;
+/**
+ * Dieses Script fragt eine influxDb ab, um Daten für die cardLcart (Liniendiagramm) zuberechnen und im richtigen Format bereitzustellen.
+ * Es erstellt automatisch einen Datenpunkt.
+ * Die Abfrage muss ggf. angepasst werden. Aktuell ermittelt sie Werte der letzten 24h, zu Stundenwerten zusammengefasst.
+ */
 
-const NSPanel_Path = '0_userdata.0.NSPanel.1.';
+const Debug = false; // true für erweiterte Ausgaben im Log
+ 
+const NSPanel_Path = '0_userdata.0.NSPanel.';
 const Path = NSPanel_Path + 'Influx2NSPanel.cardLChart.';
-const InfluxInstance = 'influxdb.1';
-const influxDbBucket = 'iobroker';
+const InfluxInstance = 'influxdb.0';
+const influxDbBucket = 'storage_short';
 const numberOfHoursAgo = 24;
 const xAxisTicksEveryM = 60;
 const xAxisLabelEveryM = 240;
+//
+ 
+const sensors : Record<string, Record <string, string>> = {};
+/**
+ * Hier werden die Sensoren festgelegt nach flogendem Schema
+ * 
+ * sensors[‘Datenpunkt(kompletter Pfad) des Messwertes'] = {'taget': 'Name des Datenpunkt für die Chartwerte', 'measurement': 'genutzter Alias in der Influxdb für den Messwert'};
+ * 
+ * Wenn der Wert in der Datenbank keinen Alias hat bleibt der Wert 'measurement':  weg.
+ * Jeder Messwert bekommt einen eigenen sensors[...] = {'target':....}
+ */
 
-// this records holds all sensors and their corresponding states which act as the data source for the charts
-// add all sensors which are to be displayed in this script, there is no need to use multiple scripts
-const sensors : Record<string, string> = {};
-/*         ↓ Id of the sensor                 ↓ Id of the data source for the charts */
-sensors['deconz.0.Sensors.65.temperature'] = Path + 'buero_temperature.ACTUAL';
-sensors['deconz.0.Sensors.65.humidity'] = Path + 'buero_luftfeuchte.ACTUAL';
 
+sensors['netatmo-crawler.0.stationData.1.temperature'] = {'target':'AussenTemp', 'measurement':'wetter.temperatur'};
+ 
+//  #####   ab hier keine Änderungen mehr nötig   #####
+ 
 // create data source for NsPanel on script startup
-Object.keys(sensors).forEach(async x => {
-    await generateDateAsync(x, sensors[x]);
+Object.keys(sensors).forEach(async id => {
+   await generateDateAsync(id);
 });
-
+ 
 // then listen to the sensors and update the data source states accordingly
 on({ id: Object.keys(sensors), change: 'any' }, async function (obj) {
-    if (!obj.id) {
-        return;
-    }
-
-    await generateDateAsync(obj.id, sensors[obj.id]);
+   if (!obj.id) {
+       return;
+   }
+   await generateDateAsync(obj.id);
 });
-
-async function generateDateAsync(sensorId: string, dataPointId: string) {
-    const query =[
-        'from(bucket: "' + influxDbBucket + '")',
-        '|> range(start: -' + numberOfHoursAgo + 'h)',
-        '|> filter(fn: (r) => r["_measurement"] == "' + sensorId + '")',
-        '|> filter(fn: (r) => r["_field"] == "value")',
-        '|> drop(columns: ["from", "ack", "q"])',
-        '|> aggregateWindow(every: 1h, fn: last, createEmpty: false)',
-        '|> map(fn: (r) => ({ r with _rtime: int(v: r._time) - int(v: r._start)}))',
-        '|> yield(name: "_result")'].join('');
-
-    if (Debug) console.log('Query: ' + query);
-
-    const result : any = await sendToAsync(InfluxInstance, 'query', query);
-    if (result.error) {
-        console.error(result.error);
-        return;
-    }
-    
-    if (Debug) console.log(result);
-    const numResults = result.result.length;
-    let coordinates : string = '';
-    for (let r = 0; r < numResults; r++) 
-    {
-        const list : string[] = []
-        const numValues = result.result[r].length;
-
-        for (let i = 0; i < numValues; i++) 
-        {
-            const time = Math.round(result.result[r][i]._rtime/1000/1000/1000/60);
-            const value = Math.round(result.result[r][i]._value * 10);
-            list.push(time + ":" + value);
-        }
-
-        coordinates = list.join("~");
-
-        if (Debug) console.log(coordinates);
-    }
-
-    const ticksAndLabelsList : string[] = []
-    const date = new Date();
-    date.setMinutes(0, 0, 0);
-    const ts = Math.round(date.getTime() / 1000);
-    const tsYesterday = ts - (numberOfHoursAgo * 3600);
-    if (Debug) console.log('Iterate from ' + tsYesterday + ' to ' + ts + ' stepsize=' + (xAxisTicksEveryM * 60));
-    for (let x = tsYesterday, i = 0; x < ts; x += (xAxisTicksEveryM * 60), i += xAxisTicksEveryM)
-    {
-        if ((i % xAxisLabelEveryM))
-            ticksAndLabelsList.push('' + i);
-        else
-        {
-            const currentDate = new Date(x * 1000);
-            // Hours part from the timestamp
-            const hours = "0" + String(currentDate.getHours());
-            // Minutes part from the timestamp
-            const minutes = "0" + String(currentDate.getMinutes());
-            const formattedTime = hours.slice(-2) + ':' + minutes.slice(-2);
-
-            ticksAndLabelsList.push(String(i) + "^" + formattedTime);
-        }
-    }
-    if (Debug) console.log('Ticks & Label: ' + ticksAndLabelsList);
-    if (Debug) console.log('Coordinates: ' + coordinates);
-    await setOrCreate(dataPointId, ticksAndLabelsList.join("+") + '~' + coordinates, true);
+ 
+//__________________________
+// Beschreibe diese Funktion: Daten generieren
+async function generateDateAsync(sensorId: string) {
+   let idMeasurement = sensors[sensorId].measurement;
+   if (idMeasurement =='' ||idMeasurement == undefined) {idMeasurement = sensorId};
+   const dataPointId:string = Path + sensors[sensorId].target +'.ACTUAL';
+   if (Debug) log(`(f) generateDateAsync: ${sensorId} ${dataPointId} > ${idMeasurement}`);
+   
+   const query =[
+       'from(bucket: "' + influxDbBucket + '")',
+       '|> range(start: -' + numberOfHoursAgo + 'h)',
+       '|> filter(fn: (r) => r["_measurement"] == "' + idMeasurement + '")',
+       '|> filter(fn: (r) => r["_field"] == "value")',
+       '|> drop(columns: ["from", "ack", "q"])',
+       '|> aggregateWindow(every: 1h, fn: last, createEmpty: false)',
+       '|> map(fn: (r) => ({ r with _rtime: int(v: r._time) - int(v: r._start)}))',
+       '|> yield(name: "_result")'].join('');
+ 
+   if (Debug) console.log('Query: ' + query);
+ 
+   const result : any = await sendToAsync(InfluxInstance, 'query', query);
+   if (result.error) {
+       console.error(result.error);
+       return;
+   }
+   if (Debug) console.log(JSON.stringify(result));
+   const numResults = result.result.length;
+   let coordinates : string = '';
+   for (let r = 0; r < numResults; r++) 
+   {
+       const list : string[] = [];
+       const numValues = result.result[r].length;
+ 
+       for (let i = 0; i < numValues; i++) 
+       {
+           const time = Math.round(result.result[r][i]._rtime/1000/1000/1000/60);
+           const value = Math.round(result.result[r][i]._value * 10);
+           list.push(time + ":" + value);
+       }
+ 
+       coordinates = list.join("~");
+       if (Debug) console.log(coordinates);
+   }
+ 
+   const ticksAndLabelsList : string[] = []
+   const date = new Date();
+   date.setMinutes(0, 0, 0);
+   const ts = Math.round(date.getTime() / 1000); 
+   const tsYesterday = ts - (numberOfHoursAgo * 3600);
+   if (Debug) console.log('Iterate from ' + tsYesterday + ' to ' + ts + ' stepsize=' + (xAxisTicksEveryM * 60));
+   for (let x = tsYesterday, i = 0; x < ts; x += (xAxisTicksEveryM * 60), i += xAxisTicksEveryM)
+   {
+       if ((i % xAxisLabelEveryM))
+           ticksAndLabelsList.push('' + i);
+       else
+       {
+           const currentDate = new Date(x * 1000);
+           // Hours part from the timestamp
+           const hours = "0" + String(currentDate.getHours());
+           // Minutes part from the timestamp
+           const minutes = "0" + String(currentDate.getMinutes());
+           const formattedTime = hours.slice(-2) + ':' + minutes.slice(-2);
+ 
+           ticksAndLabelsList.push(String(i) + "^" + formattedTime);
+       }
+   }
+   if (Debug) console.log('Ticks & Label: ' + ticksAndLabelsList);
+   if (Debug) console.log('Coordinates: ' + coordinates);
+   await setOrCreate(dataPointId, ticksAndLabelsList.join("+") + '~' + coordinates, true);
 }
-
+ 
+//__________________________
+// Beschreibe diese Funktion: Datenpunkte anlegen bzw. schreiben
 async function setOrCreate(id : string, value : any, ack : boolean) {
-    if (!(await existsStateAsync(id))) {
-         await createStateAsync(id, value, {
-            name: id.split('.').reverse()[0],
-            desc: 'Sensor Values [~<time>:<value>]*',
-            type: 'string',
-            role: 'value',
-        });
-    } else {
-        await setStateAsync(id, value, ack);
-    }
-}
+   if (!(await existsStateAsync(id))) {
+        await createStateAsync(id, value, {
+           name: id.split('.').reverse()[0],
+           desc: 'Sensor Values [~<time>:<value>]*',
+           type: 'string',
+           role: 'value',
+       });
+   } else {
+       await setStateAsync(id, value, ack);
+   }
+}

ioBroker/DEV/NSPanelTs.ts

@@ -1,5 +1,5 @@
 /*-----------------------------------------------------------------------
-TypeScript v4.3.3.40 zur Steuerung des SONOFF NSPanel mit dem ioBroker by @Armilar / @TT-Tom / @ticaki / @Britzelpuf / @Sternmiere / @ravenS0ne
+TypeScript v4.3.3.41 zur Steuerung des SONOFF NSPanel mit dem ioBroker by @Armilar / @TT-Tom / @ticaki / @Britzelpuf / @Sternmiere / @ravenS0ne
 - abgestimmt auf TFT 53 / v4.3.3 / BerryDriver 9 / Tasmota 13.3.0
 @joBr99 Projekt: https://github.com/joBr99/nspanel-lovelace-ui/tree/main/ioBroker
 NsPanelTs.ts (dieses TypeScript in ioBroker) Stable: https://github.com/joBr99/nspanel-lovelace-ui/blob/main/ioBroker/NsPanelTs.ts
@@ -108,7 +108,9 @@ ReleaseNotes:
         - 23.01.2024 - v4.3.3.39 Add: Optional setOn & setOff for HW button with mode 'set'
         - 28.01.2024 - v4.3.3.39 Fix: ack for read-only state
         - 03.02.2024 - v4.3.3.40 Fix: RGB maxValueColorTemp
-        - 05.02.2024 - v4.3.3.40 Fix SqueezeboxRPC-Media-Player and add some Functions
+        - 05.02.2024 - v4.3.3.40 Fix: SqueezeboxRPC-Media-Player and add some Functions
+        - 06.02.2024 - v4.3.3.41 Fix: activeBrightness -> null
+        - 06.02.2024 - v4.3.3.41 Fix: bHome -> corrected PageId
 
 
         Todo:
@@ -976,7 +978,7 @@ export const config: Config = {
 // _________________________________ DE: Ab hier keine Konfiguration mehr _____________________________________
 // _________________________________ EN:  No more configuration from here _____________________________________
 
-const scriptVersion: string = 'v4.3.3.40';
+const scriptVersion: string = 'v4.3.3.41';
 const tft_version: string = 'v4.3.3';
 const desired_display_firmware_version = 53;
 const berry_driver_version = 9;
@@ -6485,17 +6487,21 @@ function HandleButtonEvent(words: any): void {
                     GeneratePage(activePage!);
                 }
                 break;
-            case 'bHome':
-                if (Debug) {
-                    log('HandleButtonEvent -> bHome: ' + words[4] + ' - ' + pageId, 'info');
-                }
-                UnsubscribeWatcher();
-                if (activePage!.home != undefined) {
-                    GeneratePage(eval(activePage!.home));
-                } else {
-                    GeneratePage(config.pages[0]);
-                }
-                break;
+                case 'bHome':
+                    if (Debug) {
+                        log('HandleButtonEvent -> bHome: ' + words[4] + ' - ' + pageId, 'info');
+                    }
+                    UnsubscribeWatcher();
+                    const home = activePage!.home;
+                    if (home !== undefined) {
+                        pageId = config.pages.findIndex(a => a == eval(home))
+                        pageId = pageId === -1 ? 0 : pageId;
+                        GeneratePage(eval(home));
+                    } else {
+                        pageId = 0;
+                        GeneratePage(config.pages[0]);
+                    }
+                    break;
             case 'notifyAction':
                 if (words[4] == 'yes') {
                     setState(popupNotifyInternalName, <iobJS.State>{ val: words[2], ack: true });

ioBroker/NsPanelTs.ts

@@ -1,5 +1,5 @@
 /*-----------------------------------------------------------------------
-TypeScript v4.3.3.40 zur Steuerung des SONOFF NSPanel mit dem ioBroker by @Armilar / @TT-Tom / @ticaki / @Britzelpuf / @Sternmiere / @ravenS0ne
+TypeScript v4.3.3.41 zur Steuerung des SONOFF NSPanel mit dem ioBroker by @Armilar / @TT-Tom / @ticaki / @Britzelpuf / @Sternmiere / @ravenS0ne
 - abgestimmt auf TFT 53 / v4.3.3 / BerryDriver 9 / Tasmota 13.3.0
 @joBr99 Projekt: https://github.com/joBr99/nspanel-lovelace-ui/tree/main/ioBroker
 NsPanelTs.ts (dieses TypeScript in ioBroker) Stable: https://github.com/joBr99/nspanel-lovelace-ui/blob/main/ioBroker/NsPanelTs.ts
@@ -108,7 +108,9 @@ ReleaseNotes:
         - 23.01.2024 - v4.3.3.39 Add: Optional setOn & setOff for HW button with mode 'set'
         - 28.01.2024 - v4.3.3.39 Fix: ack for read-only state
         - 03.02.2024 - v4.3.3.40 Fix: RGB maxValueColorTemp
-        - 05.02.2024 - v4.3.3.40 Fix SqueezeboxRPC-Media-Player and add some Functions
+        - 05.02.2024 - v4.3.3.40 Fix: SqueezeboxRPC-Media-Player and add some Functions
+        - 06.02.2024 - v4.3.3.41 Fix: activeBrightness -> null
+        - 06.02.2024 - v4.3.3.41 Fix: bHome -> corrected PageId
 
 
         Todo:
@@ -976,7 +978,7 @@ export const config: Config = {
 // _________________________________ DE: Ab hier keine Konfiguration mehr _____________________________________
 // _________________________________ EN:  No more configuration from here _____________________________________
 
-const scriptVersion: string = 'v4.3.3.40';
+const scriptVersion: string = 'v4.3.3.41';
 const tft_version: string = 'v4.3.3';
 const desired_display_firmware_version = 53;
 const berry_driver_version = 9;
@@ -1516,11 +1518,11 @@ InitActiveBrightness();
 
 on({id: [NSPanel_Path + 'ScreensaverInfo.activeBrightness'], change: 'ne'}, async function (obj) {
     try {
-        let active = getState(NSPanel_Path + 'ScreensaverInfo.activeDimmodeBrightness').val;
+        let active = getState(NSPanel_Path + 'ScreensaverInfo.activeDimmodeBrightness').val ?? -1;
         if (obj.state.val >= 0 || obj.state.val <= 100) {
-        log('action at trigger activeBrightness: ' + obj.state.val + ' - activeDimmodeBrightness: ' + active, 'info');
-        SendToPanel({ payload: 'dimmode~' + active + '~' + obj.state.val + '~' + rgb_dec565(config.defaultBackgroundColor) + '~' + rgb_dec565(globalTextColor) + '~' + Sliders2 });
-        InitDimmode();
+            log('action at trigger activeBrightness: ' + obj.state.val + ' - activeDimmodeBrightness: ' + active, 'info');
+            SendToPanel({ payload: 'dimmode~' + active + '~' + obj.state.val + '~' + rgb_dec565(config.defaultBackgroundColor) + '~' + rgb_dec565(globalTextColor) + '~' + Sliders2 });
+            InitDimmode();
         }
     } catch (err:any) {
             log('error at trigger activeBrightness: ' + err.message, 'warn');
@@ -1529,7 +1531,7 @@ on({id: [NSPanel_Path + 'ScreensaverInfo.activeBrightness'], change: 'ne'}, asyn
 
 on({id: [NSPanel_Path + 'ScreensaverInfo.activeDimmodeBrightness'], change: "ne"}, async function (obj) {
     try {
-        let active = getState(NSPanel_Path + 'ScreensaverInfo.activeBrightness').val;
+        let active = getState(NSPanel_Path + 'ScreensaverInfo.activeBrightness').val ?? 80;
         if (obj.state.val != null && obj.state.val != -1) {
             if (obj.state.val < -1 || obj.state.val > 100) {
                 log('activeDimmodeBrightness value only between -1 and 100', 'info');
@@ -1559,7 +1561,7 @@ on({id: [NSPanel_Path + 'ScreensaverInfo.activeDimmodeBrightness'], change: "ne"
 
 on({id: String(NSPanel_Path) + 'ScreensaverInfo.Trigger_Dimmode', change: "ne"}, async function (obj) {
     try {
-        let active = getState(NSPanel_Path + 'ScreensaverInfo.activeBrightness').val;
+        let active = getState(NSPanel_Path + 'ScreensaverInfo.activeBrightness').val ?? 80;
         if (obj.state.val) {
             SendToPanel({ payload: 'dimmode~' + 100 + '~' + active + '~' + rgb_dec565(config.defaultBackgroundColor) + '~' + rgb_dec565(globalTextColor) + '~' + Sliders2 });
         } else {
@@ -1910,8 +1912,8 @@ on({id: [NSPanel_Path + 'PageNavi'], change: "any"}, async function (obj) {
 //----------------------Begin Dimmode
 function ScreensaverDimmode(timeDimMode:NSPanel.DimMode) {
     try {
-        let active = getState(NSPanel_Path + 'ScreensaverInfo.activeBrightness').val
-        let dimmode = getState(NSPanel_Path + 'ScreensaverInfo.activeDimmodeBrightness').val
+        let active = getState(NSPanel_Path + 'ScreensaverInfo.activeBrightness').val ?? 80
+        let dimmode = getState(NSPanel_Path + 'ScreensaverInfo.activeDimmodeBrightness').val ?? -1
         if (Debug) {
             log('function ScreensaverDimmode RGB-Wert HMIDark' + rgb_dec565(HMIDark), 'info');
         }
@@ -2018,12 +2020,12 @@ async function InitDimmode() {
                 ScreensaverDimmode(timeDimMode);
             });
             if (getState(NSPanel_Path + 'ScreensaverInfo.activeDimmodeBrightness').val != null && getState(NSPanel_Path + 'ScreensaverInfo.activeDimmodeBrightness').val != -1) {
-                SendToPanel({ payload: 'dimmode~' + getState(NSPanel_Path + 'ScreensaverInfo.activeDimmodeBrightness').val + '~' + getState(NSPanel_Path + 'ScreensaverInfo.activeBrightness').val + '~' + rgb_dec565(config.defaultBackgroundColor) + '~' + rgb_dec565(globalTextColor) + '~' + Sliders2 });
+                SendToPanel({ payload: 'dimmode~' + getState(NSPanel_Path + 'ScreensaverInfo.activeDimmodeBrightness').val + '~' + getState(NSPanel_Path + 'ScreensaverInfo.activeBrightness').val ?? 80 + '~' + rgb_dec565(config.defaultBackgroundColor) + '~' + rgb_dec565(globalTextColor) + '~' + Sliders2 });
             } else {
                 if (isDimTimeInRange(timeDimMode.timeDay,timeDimMode.timeNight)) {
-                    SendToPanel({ payload: 'dimmode~' + timeDimMode.brightnessDay + '~' + getState(NSPanel_Path + 'ScreensaverInfo.activeBrightness').val + '~' + rgb_dec565(config.defaultBackgroundColor) + '~' + rgb_dec565(globalTextColor) + '~' + Sliders2 });
+                    SendToPanel({ payload: 'dimmode~' + timeDimMode.brightnessDay + '~' + getState(NSPanel_Path + 'ScreensaverInfo.activeBrightness').val?? 80 + '~' + rgb_dec565(config.defaultBackgroundColor) + '~' + rgb_dec565(globalTextColor) + '~' + Sliders2 });
                 } else {
-                    SendToPanel({ payload: 'dimmode~' + timeDimMode.brightnessNight + '~' + getState(NSPanel_Path + 'ScreensaverInfo.activeBrightness').val + '~' + rgb_dec565(config.defaultBackgroundColor) + '~' + rgb_dec565(globalTextColor) + '~' + Sliders2 });
+                    SendToPanel({ payload: 'dimmode~' + timeDimMode.brightnessNight + '~' + getState(NSPanel_Path + 'ScreensaverInfo.activeBrightness').val ?? 80 + '~' + rgb_dec565(config.defaultBackgroundColor) + '~' + rgb_dec565(globalTextColor) + '~' + Sliders2 });
                 }
                 ScreensaverDimmode(timeDimMode);
             }
@@ -6485,17 +6487,21 @@ function HandleButtonEvent(words: any): void {
                     GeneratePage(activePage!);
                 }
                 break;
-            case 'bHome':
-                if (Debug) {
-                    log('HandleButtonEvent -> bHome: ' + words[4] + ' - ' + pageId, 'info');
-                }
-                UnsubscribeWatcher();
-                if (activePage!.home != undefined) {
-                    GeneratePage(eval(activePage!.home));
-                } else {
-                    GeneratePage(config.pages[0]);
-                }
-                break;
+                case 'bHome':
+                    if (Debug) {
+                        log('HandleButtonEvent -> bHome: ' + words[4] + ' - ' + pageId, 'info');
+                    }
+                    UnsubscribeWatcher();
+                    const home = activePage!.home;
+                    if (home !== undefined) {
+                        pageId = config.pages.findIndex(a => a == eval(home))
+                        pageId = pageId === -1 ? 0 : pageId;
+                        GeneratePage(eval(home));
+                    } else {
+                        pageId = 0;
+                        GeneratePage(config.pages[0]);
+                    }
+                    break;
             case 'notifyAction':
                 if (words[4] == 'yes') {
                     setState(popupNotifyInternalName, <iobJS.State>{ val: words[2], ack: true });
@@ -9953,7 +9959,7 @@ namespace NSPanel {
 
     export type SerialType = 'button' | 'light' | 'shutter' | 'text' | 'input_sel' | 'timer' | 'number' | 'fan' 
 
-    export type roles = 'light' |'socket'|'dimmer'| 'hue' | 'rgb' | 'rgbSingle' | 'cd' | 'blind' | 'door' | 'window' | 'volumeGroup' | 'volume' 
+    export type roles = 'light' |'socket'|'dimmer'| 'hue' | 'rgb' | 'rgbSingle' | 'ct' | 'blind' | 'door' | 'window' | 'volumeGroup' | 'volume' 
         | 'info' | 'humidity' | 'temperature' | 'value.temperature' | 'value.humidity' | 'sensor.door' | 'sensor.window' | 'thermostat' | 'warning' | 'ct' 
         | 'cie' | 'gate' | 'motion' | 'buttonSensor' | 'button' | 'value.time' | 'level.timer' | 'value.alarmtime' | 'level.mode.fan' | 'lock' | 'slider'  
         | 'switch.mode.wlan' | 'media' | 'timeTable' | 'airCondition'