From fad46a23bc7714ba002f0b9b9f4c94fc6f64b2c2 Mon Sep 17 00:00:00 2001 From: simatec Date: Mon, 9 Dec 2024 15:21:41 +0100 Subject: [PATCH] (simatec) Fix eslint error --- lib/shutterDownChildren.js | 36 ++++++++--------- lib/shutterDownComplete.js | 37 ++++++++--------- lib/shutterDownLate.js | 17 ++++---- lib/shutterDownLiving.js | 36 ++++++++--------- lib/shutterDownSleep.js | 36 ++++++++--------- lib/shutterGoldenHour.js | 82 ++++++++++++++++++-------------------- 6 files changed, 115 insertions(+), 129 deletions(-) diff --git a/lib/shutterDownChildren.js b/lib/shutterDownChildren.js index 84f6615..f71cbe3 100644 --- a/lib/shutterDownChildren.js +++ b/lib/shutterDownChildren.js @@ -23,14 +23,14 @@ async function sleep(ms) { */ function getDate(d) { d = d || new Date(); - return ('0' + d.getHours()).slice(-2) + ':' + ('0' + d.getMinutes()).slice(-2); + return `${(`0${ d.getHours()}`).slice(-2) }:${ (`0${ d.getMinutes()}`).slice(-2)}`; } // @ts-ignore async function driveshutterDownChildren(adapter, downTimeChildren, autoChildrenStr, shutterSettings, childrenType, driveDelayUpChildren, timeoutChildrenAuto) { if (shutterSettings) { - const resChildren = shutterSettings.filter((/** @type {{ typeDown: string; }} */ d) => d.typeDown == childrenType); // Filter Area children or children-auto - const result = resChildren.filter((/** @type {{ enabled: boolean | string; }} */ d) => d.enabled === true || d.enabled === 'true'); // Filter enabled + const resChildren = shutterSettings.filter((d) => d.typeDown == childrenType); // Filter Area children or children-auto + const result = resChildren.filter((d) => d.enabled === true || d.enabled === 'true'); // Filter enabled let number = 0; if (childrenType == 'children') { @@ -87,9 +87,9 @@ async function driveshutterDownChildren(adapter, downTimeChildren, autoChildrenS if (pendingAlarm == false) { const _triggerState = shutterSettings[s].triggerID != '' ? await adapter.getForeignStateAsync(shutterSettings[s].triggerID).catch((e) => adapter.log.warn(e)) : null; - const mustValue = ('' + shutterSettings[s].triggerState); - const mustValueTilted = shutterSettings[s].triggerStateTilted == 'none' ? ('' + shutterSettings[s].triggerState) : ('' + shutterSettings[s].triggerStateTilted); - const currentValue = _triggerState?.val !== null && _triggerState?.val !== undefined ? ('' + _triggerState.val) : ''; + const mustValue = (`${ shutterSettings[s].triggerState}`); + const mustValueTilted = shutterSettings[s].triggerStateTilted == 'none' ? (`${ shutterSettings[s].triggerState}`) : (`${ shutterSettings[s].triggerStateTilted}`); + const currentValue = _triggerState?.val !== null && _triggerState?.val !== undefined ? (`${ _triggerState.val}`) : ''; if (currentValue === mustValue || @@ -113,9 +113,8 @@ async function driveshutterDownChildren(adapter, downTimeChildren, autoChildrenS await setShutterState(adapter, shutterSettings, shutterSettings[s], targetLevel2Set, nameDevice, 'Children down #26'); adapter.log.debug(`last automatic Action for ${shutterSettings[s].shutterName}: ${shutterSettings[s].lastAutoAction}`); - adapter.log.debug('shutterDownChildren #1 ' + shutterSettings[s].shutterName + ' old height: ' + shutterSettings[s].oldHeight + '% new height: ' + targetLevel2Set + '%'); - } - else if (_shutterState?.val !== null && _shutterState?.val !== undefined && + adapter.log.debug(`shutterDownChildren #1 ${ shutterSettings[s].shutterName } old height: ${ shutterSettings[s].oldHeight }% new height: ${ targetLevel2Set }%`); + } else if (_shutterState?.val !== null && _shutterState?.val !== undefined && Math.round(_shutterState.val / adapter.config.shutterStateRound) * adapter.config.shutterStateRound == targetLevel2Set) { shutterSettings[s].currentHeight = targetLevel2Set; @@ -123,7 +122,7 @@ async function driveshutterDownChildren(adapter, downTimeChildren, autoChildrenS await setShutterInfo(adapter, shutterSettings, shutterSettings[s], nameDevice); - adapter.log.debug('shutterDownChildren #1 ' + shutterSettings[s].shutterName + ' already down at: ' + targetLevel2Set + '% - setting current action: ' + shutterSettings[s].currentAction); + adapter.log.debug(`shutterDownChildren #1 ${ shutterSettings[s].shutterName } already down at: ${ targetLevel2Set }% - setting current action: ${ shutterSettings[s].currentAction}`); } } else if (shutterSettings[s].triggerID == '') { const _shutterState = await adapter.getForeignStateAsync(shutterSettings[s].name).catch((e) => adapter.log.warn(e)); @@ -138,9 +137,8 @@ async function driveshutterDownChildren(adapter, downTimeChildren, autoChildrenS await setShutterState(adapter, shutterSettings, shutterSettings[s], targetLevel2Set, nameDevice, 'Children down #27'); adapter.log.debug(`last automatic Action for ${shutterSettings[s].shutterName}: ${shutterSettings[s].lastAutoAction}`); - adapter.log.debug('shutterDownChildren #2 ' + shutterSettings[s].shutterName + ' old height: ' + shutterSettings[s].oldHeight + '% new height: ' + targetLevel2Set + '%'); - } - else if (_shutterState?.val !== null && _shutterState?.val !== undefined && + adapter.log.debug(`shutterDownChildren #2 ${ shutterSettings[s].shutterName } old height: ${ shutterSettings[s].oldHeight }% new height: ${ targetLevel2Set }%`); + } else if (_shutterState?.val !== null && _shutterState?.val !== undefined && Math.round(_shutterState.val / adapter.config.shutterStateRound) * adapter.config.shutterStateRound == targetLevel2Set) { shutterSettings[s].currentHeight = targetLevel2Set; @@ -148,7 +146,7 @@ async function driveshutterDownChildren(adapter, downTimeChildren, autoChildrenS await setShutterInfo(adapter, shutterSettings, shutterSettings[s], nameDevice); - adapter.log.debug('shutterDownChildren #2 ' + shutterSettings[s].shutterName + ' already down at: ' + targetLevel2Set + '% - setting current action: ' + shutterSettings[s].currentAction); + adapter.log.debug(`shutterDownChildren #2 ${ shutterSettings[s].shutterName } already down at: ${ targetLevel2Set }% - setting current action: ${ shutterSettings[s].currentAction}`); } } else if (currentValue != mustValue && currentValue != mustValueTilted && @@ -162,14 +160,14 @@ async function driveshutterDownChildren(adapter, downTimeChildren, autoChildrenS shutterSettings[s].triggerHeight = targetLevel2Set; shutterSettings[s].triggerAction = 'down'; - adapter.log.info('#28 Will close ID: ' + shutterSettings[s].shutterName + ' value: ' + targetLevel2Set + '%' + ' after the window has been closed '); - adapter.log.debug('save new trigger height: ' + shutterSettings[s].triggerHeight + '%'); - adapter.log.debug('save new trigger action: ' + shutterSettings[s].triggerAction); + adapter.log.info(`#28 Will close ID: ${ shutterSettings[s].shutterName } value: ${ targetLevel2Set }%` + ` after the window has been closed `); + adapter.log.debug(`save new trigger height: ${ shutterSettings[s].triggerHeight }%`); + adapter.log.debug(`save new trigger action: ${ shutterSettings[s].triggerAction}`); } } await sleep(driveDelayUpChildren); } else { - adapter.log.info('Down children not moving now due to active alarm: ' + shutterSettings[s].shutterName + ' value: ' + targetLevel2Set + '%'); + adapter.log.info(`Down children not moving now due to active alarm: ${ shutterSettings[s].shutterName } value: ${ targetLevel2Set }%`); } } } @@ -208,7 +206,7 @@ async function shutterDownChildren(adapter, downTimeChildren, delayDown, autoChi schedule.cancelJob('shutterDownChildren'); try { - const downChildren = schedule.scheduleJob('shutterDownChildren', downTime[1] + ' ' + downTime[0] + ' * * *', async function () { + const downChildren = schedule.scheduleJob('shutterDownChildren', `${downTime[1] } ${ downTime[0] } * * *`, async function () { delayDown = delayDown * driveDelayUpLiving; await sleep(delayDown); driveshutterDownChildren(adapter, downTimeChildren, autoChildrenStr, shutterSettings, childrenType, driveDelayUpChildren, timeoutChildrenAuto); diff --git a/lib/shutterDownComplete.js b/lib/shutterDownComplete.js index 8b0da65..23617ce 100644 --- a/lib/shutterDownComplete.js +++ b/lib/shutterDownComplete.js @@ -24,16 +24,16 @@ async function shutterDownComplete(adapter, delayDown, shutterSettings) { const driveDelayDownLiving = adapter.config.driveDelayDownLiving * 1000; const downTimeComplete = adapter.config.betweenPositionTime.split(':'); - adapter.log.debug('complete down at ' + adapter.config.betweenPositionTime); + adapter.log.debug(`complete down at ${ adapter.config.betweenPositionTime}`); schedule.cancelJob('shutterDownComplete'); - const downComplete = schedule.scheduleJob('shutterDownComplete', downTimeComplete[1] + ' ' + downTimeComplete[0] + ' * * *', async function () { + const downComplete = schedule.scheduleJob('shutterDownComplete', `${downTimeComplete[1] } ${ downTimeComplete[0] } * * *`, async function () { delayDown = delayDown * driveDelayDownLiving; if (shutterSettings) { - const resLiving = shutterSettings.filter((/** @type {{ betweenPosition: boolean; }} */ d) => d.betweenPosition == true); // Filter Area Living - const result = resLiving.filter((/** @type {{ enabled: boolean | string; }} */ d) => d.enabled === true || d.enabled === 'true'); // Filter enabled + const resLiving = shutterSettings.filter((d) => d.betweenPosition == true); // Filter Area Living + const result = resLiving.filter((d) => d.enabled === true || d.enabled === 'true'); // Filter enabled for (const i in result) { for (const s in shutterSettings) { @@ -72,9 +72,9 @@ async function shutterDownComplete(adapter, delayDown, shutterSettings) { if (_autoDownState?.val) { if (pendingAlarm == false) { const _triggerState = shutterSettings[s].triggerID != '' ? await adapter.getForeignStateAsync(shutterSettings[s].triggerID).catch((e) => adapter.log.warn(e)) : null; - const mustValue = ('' + shutterSettings[s].triggerState); - const mustValueTilted = shutterSettings[s].triggerStateTilted == 'none' ? ('' + shutterSettings[s].triggerState) : ('' + shutterSettings[s].triggerStateTilted); - const currentValue = _triggerState?.val !== null && _triggerState?.val !== undefined ? ('' + _triggerState.val) : ''; + const mustValue = (`${ shutterSettings[s].triggerState}`); + const mustValueTilted = shutterSettings[s].triggerStateTilted == 'none' ? (`${ shutterSettings[s].triggerState}`) : (`${ shutterSettings[s].triggerStateTilted}`); + const currentValue = _triggerState?.val !== null && _triggerState?.val !== undefined ? (`${ _triggerState.val}`) : ''; if (currentValue === mustValue || currentValue === mustValueTilted || @@ -97,8 +97,7 @@ async function shutterDownComplete(adapter, delayDown, shutterSettings) { await setShutterState(adapter, shutterSettings, shutterSettings[s], targetLevel2Set, nameDevice, 'Complete Down #12'); adapter.log.debug(`last automatic Action for ${shutterSettings[s].shutterName}: ${shutterSettings[s].lastAutoAction}`); - } - else if (_shutterState?.val !== null && _shutterState?.val !== undefined && + } else if (_shutterState?.val !== null && _shutterState?.val !== undefined && Math.round(_shutterState.val / adapter.config.shutterStateRound) * adapter.config.shutterStateRound == targetLevel2Set) { shutterSettings[s].currentHeight = targetLevel2Set; @@ -106,7 +105,7 @@ async function shutterDownComplete(adapter, delayDown, shutterSettings) { await setShutterInfo(adapter, shutterSettings, shutterSettings[s], nameDevice); - adapter.log.debug('Complete down ' + shutterSettings[s].shutterName + ' already down at: ' + targetLevel2Set + '% - setting current action: ' + shutterSettings[s].currentAction); + adapter.log.debug(`Complete down ${ shutterSettings[s].shutterName } already down at: ${ targetLevel2Set }% - setting current action: ${ shutterSettings[s].currentAction}`); } } else if (shutterSettings[s].triggerID == '') { const _shutterState = await adapter.getForeignStateAsync(shutterSettings[s].name).catch((e) => adapter.log.warn(e)); @@ -121,8 +120,7 @@ async function shutterDownComplete(adapter, delayDown, shutterSettings) { await setShutterState(adapter, shutterSettings, shutterSettings[s], targetLevel2Set, nameDevice, 'Complete Down #13'); adapter.log.debug(`last automatic Action for ${shutterSettings[s].shutterName}: ${shutterSettings[s].lastAutoAction}`); - } - else if (_shutterState?.val !== null && _shutterState?.val !== undefined && + } else if (_shutterState?.val !== null && _shutterState?.val !== undefined && Math.round(_shutterState.val / adapter.config.shutterStateRound) * adapter.config.shutterStateRound == targetLevel2Set) { shutterSettings[s].currentHeight = targetLevel2Set; @@ -130,7 +128,7 @@ async function shutterDownComplete(adapter, delayDown, shutterSettings) { await setShutterInfo(adapter, shutterSettings, shutterSettings[s], nameDevice); - adapter.log.debug('Complete down ' + shutterSettings[s].shutterName + ' already down at: ' + targetLevel2Set + '% - setting current action: ' + shutterSettings[s].currentAction); + adapter.log.debug(`Complete down ${ shutterSettings[s].shutterName } already down at: ${ targetLevel2Set }% - setting current action: ${ shutterSettings[s].currentAction}`); } } else if (currentValue != mustValue && currentValue != mustValueTilted && @@ -144,14 +142,14 @@ async function shutterDownComplete(adapter, delayDown, shutterSettings) { shutterSettings[s].triggerHeight = targetLevel2Set; shutterSettings[s].triggerAction = 'down'; - adapter.log.info('#14 Will close ID: ' + shutterSettings[s].shutterName + ' value: ' + targetLevel2Set + '%' + ' after the window has been closed '); - adapter.log.debug('save new trigger height: ' + targetLevel2Set + '%'); - adapter.log.debug('save new trigger action: ' + shutterSettings[s].triggerAction); + adapter.log.info(`#14 Will close ID: ${ shutterSettings[s].shutterName } value: ${ targetLevel2Set }%` + ` after the window has been closed `); + adapter.log.debug(`save new trigger height: ${ targetLevel2Set }%`); + adapter.log.debug(`save new trigger action: ${ shutterSettings[s].triggerAction}`); } } await sleep(delayDown); } else { - adapter.log.info('Down Complete not moving now due to active alarm: ' + shutterSettings[s].shutterName + ' value: ' + targetLevel2Set + '%'); + adapter.log.info(`Down Complete not moving now due to active alarm: ${ shutterSettings[s].shutterName } value: ${ targetLevel2Set }%`); } } } @@ -162,9 +160,8 @@ async function shutterDownComplete(adapter, delayDown, shutterSettings) { return (shutterSettings); } }); - } - catch (e) { - adapter.log.error('exception catch shutterDownComplete [' + e + ']'); + } catch (e) { + adapter.log.error(`exception catch shutterDownComplete [${ e }]`); } } module.exports = shutterDownComplete; \ No newline at end of file diff --git a/lib/shutterDownLate.js b/lib/shutterDownLate.js index 95b14f5..5279e29 100644 --- a/lib/shutterDownLate.js +++ b/lib/shutterDownLate.js @@ -22,14 +22,14 @@ async function shutterDownLate(adapter, shutterSettings) { const driveDelayDownLiving = adapter.config.driveDelayUpLiving != 0 ? adapter.config.driveDelayUpLiving * 1000 : 20; const downTimeLate = adapter.config.LateAllDownTime.split(':'); - adapter.log.debug('late down at ' + adapter.config.LateAllDownTime); + adapter.log.debug(`late down at ${ adapter.config.LateAllDownTime}`); schedule.cancelJob('shutterDownLate'); - const downLate = schedule.scheduleJob('shutterDownLate', downTimeLate[1] + ' ' + downTimeLate[0] + ' * * *', async function () { + const downLate = schedule.scheduleJob('shutterDownLate', `${downTimeLate[1] } ${ downTimeLate[0] } * * *`, async function () { if (shutterSettings) { - const resEnabled = shutterSettings.filter((/** @type {{ enabled: boolean | string; }} */ d) => d.enabled === true || d.enabled === 'true'); // Filter enabled - const resLateDown = resEnabled.filter((/** @type {{ LateDown: boolean; }} */ d) => d.LateDown === true); // Filter late down + const resEnabled = shutterSettings.filter((d) => d.enabled === true || d.enabled === 'true'); // Filter enabled + const resLateDown = resEnabled.filter((d) => d.LateDown === true); // Filter late down for (const i in resLateDown) { for (const s in shutterSettings) { @@ -62,11 +62,11 @@ async function shutterDownLate(adapter, shutterSettings) { await setShutterState(adapter, shutterSettings, shutterSettings[s], targetLevel2Set, nameDevice, 'Down Late #25'); adapter.log.debug(`last automatic Action for ${shutterSettings[s].shutterName}: ${shutterSettings[s].lastAutoAction}`); - adapter.log.debug('save current height: ' + shutterSettings[s].currentHeight + '%' + ' from ' + shutterSettings[s].shutterName); + adapter.log.debug(`save current height: ${ shutterSettings[s].currentHeight }%` + ` from ${ shutterSettings[s].shutterName}`); await sleep(driveDelayDownLiving); } else { - adapter.log.info('Down Late not moving now due to active alarm: ' + shutterSettings[s].shutterName + ' value: ' + targetLevel2Set + '%'); + adapter.log.info(`Down Late not moving now due to active alarm: ${ shutterSettings[s].shutterName } value: ${ targetLevel2Set }%`); } } } @@ -76,9 +76,8 @@ async function shutterDownLate(adapter, shutterSettings) { } }); } - } - catch (e) { - adapter.log.error('exception catch shutterDownLate [' + e + ']'); + } catch (e) { + adapter.log.error(`exception catch shutterDownLate [${ e }]`); } } module.exports = shutterDownLate; \ No newline at end of file diff --git a/lib/shutterDownLiving.js b/lib/shutterDownLiving.js index acd259c..b6ab272 100644 --- a/lib/shutterDownLiving.js +++ b/lib/shutterDownLiving.js @@ -23,14 +23,14 @@ async function sleep(ms) { */ function getDate(d) { d = d || new Date(); - return ('0' + d.getHours()).slice(-2) + ':' + ('0' + d.getMinutes()).slice(-2); + return `${(`0${d.getHours()}`).slice(-2)}:${(`0${d.getMinutes()}`).slice(-2)}`; } // @ts-ignore async function driveshutterDownLiving(adapter, downTimeLiving, autoLivingStr, shutterSettings, livingType, driveDelayUpLiving, timeoutLivingAuto) { if (shutterSettings) { - const resLiving = shutterSettings.filter((/** @type {{ typeDown: string; }} */ d) => d.typeDown == livingType); // Filter Area Living or living-auto - const result = resLiving.filter((/** @type {{ enabled: boolean | string; }} */ d) => d.enabled === true || d.enabled === 'true'); // Filter enabled + const resLiving = shutterSettings.filter((d) => d.typeDown == livingType); // Filter Area Living or living-auto + const result = resLiving.filter((d) => d.enabled === true || d.enabled === 'true'); // Filter enabled let number = 0; @@ -87,9 +87,9 @@ async function driveshutterDownLiving(adapter, downTimeLiving, autoLivingStr, sh if (_autoDownState?.val === true) { if (pendingAlarm == false) { const _triggerState = shutterSettings[s].triggerID != '' ? await adapter.getForeignStateAsync(shutterSettings[s].triggerID).catch((e) => adapter.log.warn(e)) : null; - const mustValue = ('' + shutterSettings[s].triggerState); - const mustValueTilted = shutterSettings[s].triggerStateTilted == 'none' ? ('' + shutterSettings[s].triggerState) : ('' + shutterSettings[s].triggerStateTilted); - const currentValue = _triggerState?.val !== null && _triggerState?.val !== undefined ? ('' + _triggerState.val) : ''; + const mustValue = (`${shutterSettings[s].triggerState}`); + const mustValueTilted = shutterSettings[s].triggerStateTilted == 'none' ? (`${shutterSettings[s].triggerState}`) : (`${shutterSettings[s].triggerStateTilted}`); + const currentValue = _triggerState?.val !== null && _triggerState?.val !== undefined ? (`${_triggerState.val}`) : ''; if (currentValue === mustValue || currentValue === mustValueTilted || @@ -112,9 +112,8 @@ async function driveshutterDownLiving(adapter, downTimeLiving, autoLivingStr, sh await setShutterState(adapter, shutterSettings, shutterSettings[s], targetLevel2Set, nameDevice, 'Living down #17'); adapter.log.debug(`last automatic Action for ${shutterSettings[s].shutterName}: ${shutterSettings[s].lastAutoAction}`); - adapter.log.debug('shutterDownLiving #1 ' + shutterSettings[s].shutterName + ' old height: ' + shutterSettings[s].oldHeight + '% new height: ' + targetLevel2Set + '%'); - } - else if (_shutterState?.val !== null && _shutterState?.val !== undefined && + adapter.log.debug(`shutterDownLiving #1 ${shutterSettings[s].shutterName} old height: ${shutterSettings[s].oldHeight}% new height: ${targetLevel2Set}%`); + } else if (_shutterState?.val !== null && _shutterState?.val !== undefined && Math.round(_shutterState.val / adapter.config.shutterStateRound) * adapter.config.shutterStateRound == targetLevel2Set) { shutterSettings[s].currentHeight = targetLevel2Set; @@ -122,7 +121,7 @@ async function driveshutterDownLiving(adapter, downTimeLiving, autoLivingStr, sh await setShutterInfo(adapter, shutterSettings, shutterSettings[s], nameDevice); - adapter.log.debug('shutterDownLiving #1 ' + shutterSettings[s].shutterName + ' already down at: ' + targetLevel2Set + '% - setting current action: ' + shutterSettings[s].currentAction); + adapter.log.debug(`shutterDownLiving #1 ${shutterSettings[s].shutterName} already down at: ${targetLevel2Set}% - setting current action: ${shutterSettings[s].currentAction}`); } } else if (shutterSettings[s].triggerID == '') { const _shutterState = await adapter.getForeignStateAsync(shutterSettings[s].name).catch((e) => adapter.log.warn(e)); @@ -137,9 +136,8 @@ async function driveshutterDownLiving(adapter, downTimeLiving, autoLivingStr, sh await setShutterState(adapter, shutterSettings, shutterSettings[s], targetLevel2Set, nameDevice, 'Living down #18'); adapter.log.debug(`last automatic Action for ${shutterSettings[s].shutterName}: ${shutterSettings[s].lastAutoAction}`); - adapter.log.debug('shutterDownLiving #2 ' + shutterSettings[s].shutterName + ' old height: ' + shutterSettings[s].oldHeight + '% new height: ' + targetLevel2Set + '%'); - } - else if (_shutterState?.val !== null && _shutterState?.val !== undefined && + adapter.log.debug(`shutterDownLiving #2 ${shutterSettings[s].shutterName} old height: ${shutterSettings[s].oldHeight}% new height: ${targetLevel2Set}%`); + } else if (_shutterState?.val !== null && _shutterState?.val !== undefined && Math.round(_shutterState.val / adapter.config.shutterStateRound) * adapter.config.shutterStateRound == targetLevel2Set) { shutterSettings[s].currentHeight = targetLevel2Set; @@ -147,7 +145,7 @@ async function driveshutterDownLiving(adapter, downTimeLiving, autoLivingStr, sh await setShutterInfo(adapter, shutterSettings, shutterSettings[s], nameDevice); - adapter.log.debug('shutterDownLiving #2 ' + shutterSettings[s].shutterName + ' already down at: ' + targetLevel2Set + '% - setting current action: ' + shutterSettings[s].currentAction); + adapter.log.debug(`shutterDownLiving #2 ${shutterSettings[s].shutterName} already down at: ${targetLevel2Set}% - setting current action: ${shutterSettings[s].currentAction}`); } } else if (currentValue != mustValue && currentValue != mustValueTilted && @@ -160,14 +158,14 @@ async function driveshutterDownLiving(adapter, downTimeLiving, autoLivingStr, sh shutterSettings[s].triggerHeight = targetLevel2Set; shutterSettings[s].triggerAction = downAction; - adapter.log.info('#19 Will close ID: ' + shutterSettings[s].shutterName + ' value: ' + targetLevel2Set + '%' + ' after the window has been closed '); - adapter.log.debug('save new trigger height: ' + shutterSettings[s].triggerHeight + '%'); - adapter.log.debug('save new trigger action: ' + shutterSettings[s].triggerAction); + adapter.log.info(`#19 Will close ID: ${shutterSettings[s].shutterName} value: ${targetLevel2Set}%` + ` after the window has been closed `); + adapter.log.debug(`save new trigger height: ${shutterSettings[s].triggerHeight}%`); + adapter.log.debug(`save new trigger action: ${shutterSettings[s].triggerAction}`); } } await sleep(driveDelayUpLiving); } else { - adapter.log.info('Down living not moving now due to active alarm: ' + shutterSettings[s].shutterName + ' value: ' + targetLevel2Set + '%'); + adapter.log.info(`Down living not moving now due to active alarm: ${shutterSettings[s].shutterName} value: ${targetLevel2Set}%`); } } } @@ -201,7 +199,7 @@ async function shutterDownLiving(adapter, downTimeLiving, autoLivingStr, shutter schedule.cancelJob('shutterDownLiving'); - const downLiving = schedule.scheduleJob('shutterDownLiving', downTime[1] + ' ' + downTime[0] + ' * * *', async function () { + const downLiving = schedule.scheduleJob('shutterDownLiving', `${downTime[1]} ${downTime[0]} * * *`, async function () { driveshutterDownLiving(adapter, downTimeLiving, autoLivingStr, shutterSettings, livingType, driveDelayUpLiving, timeoutLivingAuto); }); } diff --git a/lib/shutterDownSleep.js b/lib/shutterDownSleep.js index ce329e0..60e8477 100644 --- a/lib/shutterDownSleep.js +++ b/lib/shutterDownSleep.js @@ -23,14 +23,14 @@ async function sleep(ms) { */ function getDate(d) { d = d || new Date(); - return ('0' + d.getHours()).slice(-2) + ':' + ('0' + d.getMinutes()).slice(-2); + return `${(`0${ d.getHours()}`).slice(-2) }:${ (`0${ d.getMinutes()}`).slice(-2)}`; } // @ts-ignore async function driveshutterDownSleep(adapter, downTimeSleep, autoSleepStr, shutterSettings, sleepType, driveDelayUpSleep, timeoutSleepAuto) { if (shutterSettings) { - const resSleep = shutterSettings.filter((/** @type {{ typeDown: any; }} */ d) => d.typeDown == sleepType); // Filter Area sleep - const result = resSleep.filter((/** @type {{ enabled: boolean | string; }} */ d) => d.enabled === true || d.enabled === 'true'); // Filter enabled + const resSleep = shutterSettings.filter((d) => d.typeDown == sleepType); // Filter Area sleep + const result = resSleep.filter((d) => d.enabled === true || d.enabled === 'true'); // Filter enabled let number = 0; @@ -86,9 +86,9 @@ async function driveshutterDownSleep(adapter, downTimeSleep, autoSleepStr, shutt if (_autoDownState?.val === true) { if (pendingAlarm == false) { const _triggerState = shutterSettings[s].triggerID != '' ? await adapter.getForeignStateAsync(shutterSettings[s].triggerID).catch((e) => adapter.log.warn(e)) : null; - const mustValue = ('' + shutterSettings[s].triggerState); - const mustValueTilted = shutterSettings[s].triggerStateTilted == 'none' ? ('' + shutterSettings[s].triggerState) : ('' + shutterSettings[s].triggerStateTilted); - const currentValue = _triggerState?.val !== null && _triggerState?.val !== undefined ? ('' + _triggerState.val) : ''; + const mustValue = (`${ shutterSettings[s].triggerState}`); + const mustValueTilted = shutterSettings[s].triggerStateTilted == 'none' ? (`${ shutterSettings[s].triggerState}`) : (`${ shutterSettings[s].triggerStateTilted}`); + const currentValue = _triggerState?.val !== null && _triggerState?.val !== undefined ? (`${ _triggerState.val}`) : ''; if (currentValue === mustValue || @@ -112,9 +112,8 @@ async function driveshutterDownSleep(adapter, downTimeSleep, autoSleepStr, shutt await setShutterState(adapter, shutterSettings, shutterSettings[s], targetLevel2Set, nameDevice, 'Sleep down #26'); adapter.log.debug(`last automatic Action for ${shutterSettings[s].shutterName}: ${shutterSettings[s].lastAutoAction}`); - adapter.log.debug('shutterDownSleep #1 ' + shutterSettings[s].shutterName + ' old height: ' + shutterSettings[s].oldHeight + '% new height: ' + targetLevel2Set + '%'); - } - else if (_shutterState?.val !== null && _shutterState?.val !== undefined && + adapter.log.debug(`shutterDownSleep #1 ${ shutterSettings[s].shutterName } old height: ${ shutterSettings[s].oldHeight }% new height: ${ targetLevel2Set }%`); + } else if (_shutterState?.val !== null && _shutterState?.val !== undefined && Math.round(_shutterState.val / adapter.config.shutterStateRound) * adapter.config.shutterStateRound == targetLevel2Set) { shutterSettings[s].currentHeight = targetLevel2Set; @@ -124,7 +123,7 @@ async function driveshutterDownSleep(adapter, downTimeSleep, autoSleepStr, shutt await setShutterInfo(adapter, shutterSettings, shutterSettings[s], nameDevice); - adapter.log.debug('shutterDownSleep #1 ' + shutterSettings[s].shutterName + ' already down at: ' + targetLevel2Set + '% - setting current action: ' + shutterSettings[s].currentAction); + adapter.log.debug(`shutterDownSleep #1 ${ shutterSettings[s].shutterName } already down at: ${ targetLevel2Set }% - setting current action: ${ shutterSettings[s].currentAction}`); } } else if (shutterSettings[s].triggerID == '') { const _shutterState = await adapter.getForeignStateAsync(shutterSettings[s].name).catch((e) => adapter.log.warn(e)); @@ -139,9 +138,8 @@ async function driveshutterDownSleep(adapter, downTimeSleep, autoSleepStr, shutt await setShutterState(adapter, shutterSettings, shutterSettings[s], targetLevel2Set, nameDevice, 'Sleep down #27'); adapter.log.debug(`last automatic Action for ${shutterSettings[s].shutterName}: ${shutterSettings[s].lastAutoAction}`); - adapter.log.debug('shutterDownSleep #2 ' + shutterSettings[s].shutterName + ' old height: ' + shutterSettings[s].oldHeight + '% new height: ' + targetLevel2Set + '%'); - } - else if (_shutterState?.val !== null && _shutterState?.val !== undefined && + adapter.log.debug(`shutterDownSleep #2 ${ shutterSettings[s].shutterName } old height: ${ shutterSettings[s].oldHeight }% new height: ${ targetLevel2Set }%`); + } else if (_shutterState?.val !== null && _shutterState?.val !== undefined && Math.round(_shutterState.val / adapter.config.shutterStateRound) * adapter.config.shutterStateRound == targetLevel2Set) { shutterSettings[s].currentHeight = targetLevel2Set; @@ -149,7 +147,7 @@ async function driveshutterDownSleep(adapter, downTimeSleep, autoSleepStr, shutt await setShutterInfo(adapter, shutterSettings, shutterSettings[s], nameDevice); - adapter.log.debug('shutterDownSleep #2 ' + shutterSettings[s].shutterName + ' already down at: ' + targetLevel2Set + '% - setting current action: ' + shutterSettings[s].currentAction); + adapter.log.debug(`shutterDownSleep #2 ${ shutterSettings[s].shutterName } already down at: ${ targetLevel2Set }% - setting current action: ${ shutterSettings[s].currentAction}`); } } else if (currentValue != mustValue && currentValue != mustValueTilted && @@ -163,14 +161,14 @@ async function driveshutterDownSleep(adapter, downTimeSleep, autoSleepStr, shutt shutterSettings[s].triggerHeight = targetLevel2Set; shutterSettings[s].triggerAction = downAction; - adapter.log.info('#28 Will close ID: ' + shutterSettings[s].shutterName + ' value: ' + targetLevel2Set + '%' + ' after the window has been closed'); - adapter.log.debug('save new trigger height: ' + shutterSettings[s].triggerHeight + '%'); - adapter.log.debug('save new trigger action: ' + shutterSettings[s].triggerAction); + adapter.log.info(`#28 Will close ID: ${ shutterSettings[s].shutterName } value: ${ targetLevel2Set }%` + ` after the window has been closed`); + adapter.log.debug(`save new trigger height: ${ shutterSettings[s].triggerHeight }%`); + adapter.log.debug(`save new trigger action: ${ shutterSettings[s].triggerAction}`); } } await sleep(driveDelayUpSleep); } else { - adapter.log.info('Down sleep not moving now due to active alarm: ' + shutterSettings[s].shutterName + ' value: ' + targetLevel2Set + '%'); + adapter.log.info(`Down sleep not moving now due to active alarm: ${ shutterSettings[s].shutterName } value: ${ targetLevel2Set }%`); } } } @@ -205,7 +203,7 @@ async function shutterDownSleep(adapter, downTimeSleep, delayDown, autoSleepStr, schedule.cancelJob('shutterDownSleep'); // @ts-ignore - const downSleep = schedule.scheduleJob('shutterDownSleep', downTime[1] + ' ' + downTime[0] + ' * * *', async function () { + const downSleep = schedule.scheduleJob('shutterDownSleep', `${downTime[1] } ${ downTime[0] } * * *`, async function () { delayDown = delayDown * driveDelayUpLiving; await sleep(delayDown); diff --git a/lib/shutterGoldenHour.js b/lib/shutterGoldenHour.js index 3dbe3ed..439c926 100644 --- a/lib/shutterGoldenHour.js +++ b/lib/shutterGoldenHour.js @@ -23,7 +23,7 @@ async function sleep(ms) { */ function getDate(d) { d = d || new Date(); - return ('0' + d.getHours()).slice(-2) + ':' + ('0' + d.getMinutes()).slice(-2); + return `${(`0${d.getHours()}`).slice(-2)}:${(`0${d.getMinutes()}`).slice(-2)}`; } // @ts-ignore @@ -35,10 +35,10 @@ async function shutterGoldenHour(adapter, goldenHourEnd, goldenHour, shutterSett schedule.cancelJob('shutterUpGoldenHourEnd'); - const upGoldenHour = schedule.scheduleJob('shutterUpGoldenHourEnd', upTime[1] + ' ' + upTime[0] + ' * * *', async function () { + const upGoldenHour = schedule.scheduleJob('shutterUpGoldenHourEnd', `${upTime[1]} ${upTime[0]} * * *`, async function () { if (shutterSettings) { - const resLiving = shutterSettings.filter((/** @type {{ typeUp: string; }} */ d) => d.typeUp == 'goldenhour End'); // Filter Area goldenhour end - const result = resLiving.filter((/** @type {{ enabled: boolean | string; }} */ d) => d.enabled === true || d.enabled === 'true'); // Filter enabled + const resLiving = shutterSettings.filter((d) => d.typeUp == 'goldenhour End'); // Filter Area goldenhour end + const result = resLiving.filter((d) => d.enabled === true || d.enabled === 'true'); // Filter enabled for (const i in result) { for (const s in shutterSettings) { @@ -63,9 +63,9 @@ async function shutterGoldenHour(adapter, goldenHourEnd, goldenHour, shutterSett if (pendingAlarm == false) { const _triggerState = shutterSettings[s].triggerID != '' ? await adapter.getForeignStateAsync(shutterSettings[s].triggerID) : null; - const mustValue = ('' + shutterSettings[s].triggerState); - const mustValueTilted = shutterSettings[s].triggerStateTilted == 'none' ? ('' + shutterSettings[s].triggerState) : ('' + shutterSettings[s].triggerStateTilted); - const currentValue = _triggerState?.val !== null && _triggerState?.val !== undefined ? ('' + _triggerState.val) : ''; + const mustValue = (`${shutterSettings[s].triggerState}`); + const mustValueTilted = shutterSettings[s].triggerStateTilted == 'none' ? (`${shutterSettings[s].triggerState}`) : (`${shutterSettings[s].triggerStateTilted}`); + const currentValue = _triggerState?.val !== null && _triggerState?.val !== undefined ? (`${_triggerState.val}`) : ''; if (currentValue === mustValue || currentValue === mustValueTilted || @@ -87,9 +87,8 @@ async function shutterGoldenHour(adapter, goldenHourEnd, goldenHour, shutterSett await setShutterState(adapter, shutterSettings, shutterSettings[s], shutterHeight, nameDevice, 'Goldenhour end #5'); adapter.log.debug(`last automatic Action for ${shutterSettings[s].shutterName}: ${shutterSettings[s].lastAutoAction}`); - adapter.log.debug('save current height: ' + shutterSettings[s].currentHeight + '%' + ' from ' + shutterSettings[s].shutterName); - } - else if (_shutterState?.val !== null && _shutterState?.val !== undefined && + adapter.log.debug(`save current height: ${shutterSettings[s].currentHeight}%` + ` from ${shutterSettings[s].shutterName}`); + } else if (_shutterState?.val !== null && _shutterState?.val !== undefined && Math.round(_shutterState.val / adapter.config.shutterStateRound) * adapter.config.shutterStateRound == shutterHeight) { shutterSettings[s].currentHeight = shutterHeight; @@ -98,7 +97,7 @@ async function shutterGoldenHour(adapter, goldenHourEnd, goldenHour, shutterSett await setShutterInfo(adapter, shutterSettings, shutterSettings[s], nameDevice); - adapter.log.debug('GoldenHour up ' + shutterSettings[s].shutterName + ' already up at: ' + shutterSettings[s].heightUp + '% - setting current action: ' + shutterSettings[s].currentAction); + adapter.log.debug(`GoldenHour up ${shutterSettings[s].shutterName} already up at: ${shutterSettings[s].heightUp}% - setting current action: ${shutterSettings[s].currentAction}`); } } else if (shutterSettings[s].triggerID == '') { const _shutterState = await adapter.getForeignStateAsync(shutterSettings[s].name).catch((e) => adapter.log.warn(e)); @@ -112,16 +111,15 @@ async function shutterGoldenHour(adapter, goldenHourEnd, goldenHour, shutterSett await setShutterState(adapter, shutterSettings, shutterSettings[s], shutterHeight, nameDevice, 'Goldenhour end #6'); adapter.log.debug(`last automatic Action for ${shutterSettings[s].shutterName}: ${shutterSettings[s].lastAutoAction}`); - adapter.log.debug('save current height: ' + shutterSettings[s].currentHeight + '%' + ' from ' + shutterSettings[s].shutterName); - } - else if (_shutterState?.val !== null && _shutterState?.val !== undefined && + adapter.log.debug(`save current height: ${shutterSettings[s].currentHeight}%` + ` from ${shutterSettings[s].shutterName}`); + } else if (_shutterState?.val !== null && _shutterState?.val !== undefined && Math.round(_shutterState.val / adapter.config.shutterStateRound) * adapter.config.shutterStateRound == shutterHeight) { shutterSettings[s].currentHeight = shutterHeight; await setShutterInfo(adapter, shutterSettings, shutterSettings[s], nameDevice); - adapter.log.debug('GoldenHour up ' + shutterSettings[s].shutterName + ' already up at: ' + shutterSettings[s].heightUp + '% - setting current action: ' + shutterSettings[s].currentAction); + adapter.log.debug(`GoldenHour up ${shutterSettings[s].shutterName} already up at: ${shutterSettings[s].heightUp}% - setting current action: ${shutterSettings[s].currentAction}`); } } else if (currentValue != mustValue && currentValue != mustValueTilted && @@ -135,9 +133,9 @@ async function shutterGoldenHour(adapter, goldenHourEnd, goldenHour, shutterSett shutterSettings[s].triggerHeight = shutterHeight; shutterSettings[s].triggerAction = shutterSettings[s].currentAction; - adapter.log.info('#7 Will open ID: ' + shutterSettings[s].shutterName + ' value: ' + shutterHeight + '%' + ' after the window has been closed '); - adapter.log.debug('save new trigger height: ' + shutterHeight + '%'); - adapter.log.debug('save new trigger action: ' + shutterSettings[s].triggerAction); + adapter.log.info(`#7 Will open ID: ${shutterSettings[s].shutterName} value: ${shutterHeight}%` + ` after the window has been closed `); + adapter.log.debug(`save new trigger height: ${shutterHeight}%`); + adapter.log.debug(`save new trigger action: ${shutterSettings[s].triggerAction}`); } else if (_shutterState?.val !== null && _shutterState?.val !== undefined && Math.round(_shutterState.val / adapter.config.shutterStateRound) * adapter.config.shutterStateRound == shutterHeight) { @@ -150,7 +148,7 @@ async function shutterGoldenHour(adapter, goldenHourEnd, goldenHour, shutterSett } } } else { - adapter.log.info('Goldenhour up not moving now due to active alarm: ' + shutterSettings[s].shutterName + ' value: ' + shutterHeight + '%'); + adapter.log.info(`Goldenhour up not moving now due to active alarm: ${shutterSettings[s].shutterName} value: ${shutterHeight}%`); } await sleep(driveDelayUpAstro); } @@ -168,10 +166,10 @@ async function shutterGoldenHour(adapter, goldenHourEnd, goldenHour, shutterSett schedule.cancelJob('shutterDownGoldenHour'); - const downGoldenHour = schedule.scheduleJob('shutterDownGoldenHour', upTime[1] + ' ' + upTime[0] + ' * * *', async function () { + const downGoldenHour = schedule.scheduleJob('shutterDownGoldenHour', `${upTime[1]} ${upTime[0]} * * *`, async function () { if (shutterSettings) { - const resLiving = shutterSettings.filter((/** @type {{ typeDown: string; }} */ d) => d.typeDown == 'goldenhour'); // Filter Area Goldenhour - const result = resLiving.filter((/** @type {{ enabled: boolean | string; }} */ d) => d.enabled === true || d.enabled === 'true'); // Filter enabled + const resLiving = shutterSettings.filter((d) => d.typeDown == 'goldenhour'); // Filter Area Goldenhour + const result = resLiving.filter((d) => d.enabled === true || d.enabled === 'true'); // Filter enabled for (const i in result) { for (const s in shutterSettings) { @@ -218,9 +216,9 @@ async function shutterGoldenHour(adapter, goldenHourEnd, goldenHour, shutterSett if (_autoDownState?.val === true) { if (pendingAlarm == false) { const _triggerState = shutterSettings[s].triggerID != '' ? await adapter.getForeignStateAsync(shutterSettings[s].triggerID).catch((e) => adapter.log.warn(e)) : null; - const mustValue = ('' + shutterSettings[s].triggerState); - const mustValueTilted = shutterSettings[s].triggerStateTilted == 'none' ? ('' + shutterSettings[s].triggerState) : ('' + shutterSettings[s].triggerStateTilted); - const currentValue = _triggerState?.val !== null && _triggerState?.val !== undefined ? ('' + _triggerState.val) : ''; + const mustValue = (`${shutterSettings[s].triggerState}`); + const mustValueTilted = shutterSettings[s].triggerStateTilted == 'none' ? (`${shutterSettings[s].triggerState}`) : (`${shutterSettings[s].triggerStateTilted}`); + const currentValue = _triggerState?.val !== null && _triggerState?.val !== undefined ? (`${_triggerState.val}`) : ''; if (currentValue === mustValue || currentValue === mustValueTilted || @@ -231,7 +229,7 @@ async function shutterGoldenHour(adapter, goldenHourEnd, goldenHour, shutterSett const _shutterState = await adapter.getForeignStateAsync(shutterSettings[s].name).catch((e) => adapter.log.warn(e)); - if (_shutterState?.val !== null && _shutterState?.val !== undefined && + if (_shutterState?.val !== null && _shutterState?.val !== undefined && Math.round(_shutterState.val / adapter.config.shutterStateRound) * adapter.config.shutterStateRound != targetLevel2Set) { shutterSettings[s].currentHeight = targetLevel2Set; @@ -243,9 +241,8 @@ async function shutterGoldenHour(adapter, goldenHourEnd, goldenHour, shutterSett await setShutterState(adapter, shutterSettings, shutterSettings[s], targetLevel2Set, nameDevice, 'Goldenhour #8'); adapter.log.debug(`last automatic Action for ${shutterSettings[s].shutterName}: ${shutterSettings[s].lastAutoAction}`); - adapter.log.debug('save current height: ' + shutterSettings[s].currentHeight + '%' + ' from ' + shutterSettings[s].shutterName); - } - else if (_shutterState?.val !== null && _shutterState?.val !== undefined && + adapter.log.debug(`save current height: ${shutterSettings[s].currentHeight}%` + ` from ${shutterSettings[s].shutterName}`); + } else if (_shutterState?.val !== null && _shutterState?.val !== undefined && Math.round(_shutterState.val / adapter.config.shutterStateRound) * adapter.config.shutterStateRound == targetLevel2Set) { shutterSettings[s].currentHeight = targetLevel2Set; @@ -253,12 +250,12 @@ async function shutterGoldenHour(adapter, goldenHourEnd, goldenHour, shutterSett await setShutterInfo(adapter, shutterSettings, shutterSettings[s], nameDevice); - adapter.log.debug('GoldenHour down ' + shutterSettings[s].shutterName + ' already down at: ' + targetLevel2Set + '% - setting current action: ' + shutterSettings[s].currentAction); + adapter.log.debug(`GoldenHour down ${shutterSettings[s].shutterName} already down at: ${targetLevel2Set}% - setting current action: ${shutterSettings[s].currentAction}`); } } else if (shutterSettings[s].triggerID == '') { const _shutterState = await adapter.getForeignStateAsync(shutterSettings[s].name).catch((e) => adapter.log.warn(e)); - if (_shutterState?.val !== null && _shutterState?.val !== undefined && + if (_shutterState?.val !== null && _shutterState?.val !== undefined && Math.round(_shutterState.val / adapter.config.shutterStateRound) * adapter.config.shutterStateRound != targetLevel2Set) { shutterSettings[s].currentHeight = targetLevel2Set; @@ -268,9 +265,8 @@ async function shutterGoldenHour(adapter, goldenHourEnd, goldenHour, shutterSett await setShutterState(adapter, shutterSettings, shutterSettings[s], targetLevel2Set, nameDevice, 'Goldenhour #9'); adapter.log.debug(`last automatic Action for ${shutterSettings[s].shutterName}: ${shutterSettings[s].lastAutoAction}`); - adapter.log.debug('save current height: ' + shutterSettings[s].currentHeight + '%' + ' from ' + shutterSettings[s].shutterName); - } - else if (_shutterState?.val !== null && _shutterState?.val !== undefined && + adapter.log.debug(`save current height: ${shutterSettings[s].currentHeight}%` + ` from ${shutterSettings[s].shutterName}`); + } else if (_shutterState?.val !== null && _shutterState?.val !== undefined && Math.round(_shutterState.val / adapter.config.shutterStateRound) * adapter.config.shutterStateRound == targetLevel2Set) { shutterSettings[s].currentHeight = targetLevel2Set; @@ -278,28 +274,28 @@ async function shutterGoldenHour(adapter, goldenHourEnd, goldenHour, shutterSett await setShutterInfo(adapter, shutterSettings, shutterSettings[s], nameDevice); - adapter.log.debug('GoldenHour down ' + shutterSettings[s].shutterName + ' already down at: ' + targetLevel2Set + '% - setting current action: ' + shutterSettings[s].currentAction); + adapter.log.debug(`GoldenHour down ${shutterSettings[s].shutterName} already down at: ${targetLevel2Set}% - setting current action: ${shutterSettings[s].currentAction}`); } - } else if (currentValue != mustValue && - currentValue != mustValueTilted && + } else if (currentValue != mustValue && + currentValue != mustValueTilted && shutterSettings[s].driveAfterClose == true) { const _shutterState = await adapter.getForeignStateAsync(shutterSettings[s].name).catch((e) => adapter.log.warn(e)); - if (_shutterState?.val !== null && _shutterState?.val !== undefined && + if (_shutterState?.val !== null && _shutterState?.val !== undefined && Math.round(_shutterState.val / adapter.config.shutterStateRound) * adapter.config.shutterStateRound != targetLevel2Set) { - + shutterSettings[s].triggerHeight = targetLevel2Set; shutterSettings[s].triggerAction = downAction; - adapter.log.info('#7 Will close ID: ' + shutterSettings[s].shutterName + ' value: ' + targetLevel2Set + '%' + ' after the window has been closed '); - adapter.log.debug('save new trigger height: ' + targetLevel2Set + '%'); - adapter.log.debug('save new trigger action: ' + shutterSettings[s].triggerAction); + adapter.log.info(`#7 Will close ID: ${shutterSettings[s].shutterName} value: ${targetLevel2Set}%` + ` after the window has been closed `); + adapter.log.debug(`save new trigger height: ${targetLevel2Set}%`); + adapter.log.debug(`save new trigger action: ${shutterSettings[s].triggerAction}`); } } await sleep(driveDelayUpAstro); } else { - adapter.log.info('Goldenhour down not moving now due to active alarm: ' + shutterSettings[s].shutterName + ' value: ' + targetLevel2Set + '%'); + adapter.log.info(`Goldenhour down not moving now due to active alarm: ${shutterSettings[s].shutterName} value: ${targetLevel2Set}%`); } } }