h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2026-02-19 03:16:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1133 from ticaki/main

Browse Source 
2 Fixes
This commit is contained in:
Armilar
2024-01-09 21:46:44 +01:00
committed by GitHub
parent 71b84cc8d3 dd14e66f10
commit a075e0cba8
1 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
ioBroker/DEV/NSPanelTs.ts
View File

@@ -1397,7 +1397,7 @@ async function Init_Screensaver_Backckground_Color_Switch() {
type: "number", type: "number",
name: "Color Indicator", name: "Color Indicator",
role: "level", role: "level",
states: {0:'black', 1:'red', 2:'green', 3:'attention', 4: 'pink'}, states: {0:'black', 1:'red', 2:'green', 3:'attention', 4: 'pink', 5: 'dark red'},
read: true, read: true,
write: true write: true
}, },
@@ -2175,7 +2175,7 @@ let pageId = 0;
let activePage: PageType | undefined = undefined; let activePage: PageType | undefined = undefined;
//Send time to NSPanel //Send time to NSPanel
let scheduleSendTime = adapterSchedule(new Date().setMilliseconds(0), 1, () => { let scheduleSendTime = adapterSchedule(new Date().setSeconds(0,0), 60, () => {
try { try {
SendTime(); SendTime();
HandleScreensaverUpdate(); HandleScreensaverUpdate();
@@ -9062,8 +9062,10 @@ function HandleScreensaverColors(): void {
scrSvrBGCol = rgb_dec565(scbackgroundInd3); scrSvrBGCol = rgb_dec565(scbackgroundInd3);
} else if (bgColorScrSaver == 4) { } else if (bgColorScrSaver == 4) {
scrSvrBGCol = rgb_dec565({red:255, green:16, blue:240}); scrSvrBGCol = rgb_dec565({red:255, green:16, blue:240});
} else if (bgColorScrSaver == 5) {
scrSvrBGCol = rgb_dec565({ red: 100, green: 0, blue: 0 });
} }
let payloadString = 'color' + '~' + let payloadString = 'color' + '~' +
scrSvrBGCol + '~' + //background scrSvrBGCol + '~' + //background
rgb_dec565(sctime) + '~' + //time rgb_dec565(sctime) + '~' + //time
@@ -9671,7 +9673,13 @@ type PageAlarm = NSPanel.PageAlarm;
// dont work with summer/winter time has to be fixed /**
*
* @param time object: { hour: number, minutes: number } | starttime
* @param repeatTime in ms
* @param callback what todo
* @returns
*/
function adapterSchedule(time: {hour?: number, minute?: number} | undefined | number, repeatTime: number, callback: () => void): number|null { function adapterSchedule(time: {hour?: number, minute?: number} | undefined | number, repeatTime: number, callback: () => void): number|null {
if (typeof callback !== 'function') return null if (typeof callback !== 'function') return null
const ref = Math.random() + 1; const ref = Math.random() + 1;
@@ -9685,18 +9693,21 @@ function _schedule(time: {hour?: number, minute?: number} | undefined | number,
let targetTime: number; let targetTime: number;
if ( time === undefined) { if ( time === undefined) {
targetTime = new Date().setMilliseconds(0) + repeatTime * 1000; targetTime = new Date().setMilliseconds(0) + repeatTime * 1000;
time = targetTime;
} else if (typeof time === 'number') { } else if (typeof time === 'number') {
targetTime = time + repeatTime * 1000; targetTime = time + repeatTime * 1000;
time = targetTime;
} else { } else {
time.hour = time.hour !== undefined ? time.hour : 0; time.hour = time.hour !== undefined ? time.hour : 1;
time.minute = time.minute !== undefined ? time.minute : 0; time.minute = time.minute !== undefined ? time.minute : 0;
targetTime = time.hour !== undefined ? new Date().setHours(time.hour, time.minute, 0) : new Date().setMinutes(time.minute, 0); targetTime = time.hour !== -1 ? new Date().setHours(time.hour, time.minute, 0) : new Date().setMinutes(time.minute, 0);
if (new Date().getTime() > targetTime) { if (new Date().getTime() > targetTime) {
targetTime += repeatTime * 1000; targetTime += repeatTime * 1000;
targetTime = time.hour !== -1 ? new Date(targetTime).setHours(time.hour, time.minute, 0) : new Date(targetTime).setMinutes(time.minute, 0);
} }
} }
const timeout = targetTime - new Date().getTime(); const timeout = targetTime - new Date().getTime();
scheduleList[ref] = setTimeout(_schedule, timeout, targetTime, ref, repeatTime, callback); scheduleList[ref] = setTimeout(_schedule, timeout, time, ref, repeatTime, callback);
} }
function _clearSchedule(ref: number): null { function _clearSchedule(ref: number): null {
if (scheduleList[ref]) clearTimeout(scheduleList[ref]); if (scheduleList[ref]) clearTimeout(scheduleList[ref]);