diff --git a/ioBroker/DEV/NSPanelTs.ts b/ioBroker/DEV/NSPanelTs.ts index b13c87c0..abc67751 100644 --- a/ioBroker/DEV/NSPanelTs.ts +++ b/ioBroker/DEV/NSPanelTs.ts @@ -672,7 +672,7 @@ let NSPanel_Service_SubPage: PageType = 'items': [ /*PageItem*/{ id: AliasPath + 'Config.Screensaver.alternativeScreensaverLayout', name: findLocaleServMenu('alternative_layout') ,icon: 'page-previous-outline', offColor: HMIOff, onColor: HMIOn}, /*PageItem*/{ id: AliasPath + 'Config.Screensaver.ScreensaverAdvanced', name: findLocaleServMenu('advanced_layout') ,icon: 'page-next-outline', offColor: HMIOff, onColor: HMIOn}, - /*PageItem*/{ id: AliasPath + 'Config.Screensaver.ScreensaverEasyView', name: findLocaleServMenu('easyview_layout') ,icon: 'page-next-outline', offColor: HMIOff, onColor: HMIOn}, + /*PageItem*///{ id: AliasPath + 'Config.Screensaver.ScreensaverEasyView', name: findLocaleServMenu('easyview_layout') ,icon: 'page-next-outline', offColor: HMIOff, onColor: HMIOn}, ] }; @@ -1427,7 +1427,7 @@ async function InitConfigParameters() { name: 'SET', }); - await createStateAsync(NSPanel_Path + ScreensaverEasyViewEndPath, false, { type: 'boolean', write: true }); + /*await createStateAsync(NSPanel_Path + ScreensaverEasyViewEndPath, false, { type: 'boolean', write: true }); setObject(AliasPath + ScreensaverEasyViewEndPath, { type: 'channel', common: { role: 'socket', name: 'Easy-View Screensaver' }, native: {} }); await createAliasAsync(`${AliasPath}${ScreensaverEasyViewEndPath}.ACTUAL`, NSPanel_Path + ScreensaverEasyViewEndPath, true, { type: 'boolean', @@ -1438,7 +1438,7 @@ async function InitConfigParameters() { type: 'boolean', role: 'switch', name: 'SET', - }); + });*/ // autoWeatherColorScreensaverLayout (socket) await createStateAsync(NSPanel_Path + 'Config.Screensaver.autoWeatherColorScreensaverLayout', true, { type: 'boolean', write: true }); @@ -1669,9 +1669,9 @@ async function Init_ScreensaverAdvanced() { if (existsState(`${NSPanel_Path}${ScreensaverAdvancedEndPath}`) == false) { await createStateAsync(`${NSPanel_Path}${ScreensaverAdvancedEndPath}`, false, true, { type: 'boolean', write: true }); } - if (existsState(`${NSPanel_Path}${ScreensaverEasyViewEndPath}`) == false) { + /*if (existsState(`${NSPanel_Path}${ScreensaverEasyViewEndPath}`) == false) { await createStateAsync(`${NSPanel_Path}${ScreensaverEasyViewEndPath}`, false, true, { type: 'boolean', write: true }); - } + }*/ } catch (err: any) { log('error at function Init_ScreensaverAdvanced: ' + err.message, 'warn'); } @@ -1786,7 +1786,7 @@ on({ id: NSPanel_Path + 'ScreensaverInfo.bgColorIndicator', change: 'ne' }, asyn on({ id: `${NSPanel_Path}${ScreensaverAdvancedEndPath}`, change: 'ne' }, async function (obj) { try { if (obj.state.val) setState(`${NSPanel_Path}Config.Screensaver.alternativeScreensaverLayout`, false, true); - if (obj.state.val) setState(`${NSPanel_Path}${ScreensaverEasyViewEndPath}`, false, true); + //if (obj.state.val) setState(`${NSPanel_Path}${ScreensaverEasyViewEndPath}`, false, true); if (obj.id) await setStateAsync(obj.id, obj.state.val, true); //setState(config.panelSendTopic, 'pageType~pageStartup'); } catch (err: any) { @@ -1822,7 +1822,7 @@ on({ id: `${NSPanel_Path}${ScreensaverEasyViewEndPath}`, change: 'ne' }, async f on({ id: NSPanel_Path + 'Config.Screensaver.alternativeScreensaverLayout', change: 'ne' }, async function (obj) { try { if (obj.state.val) setState(`${NSPanel_Path}${ScreensaverAdvancedEndPath}`, false, true); - if (obj.state.val) setState(`${NSPanel_Path}${ScreensaverEasyViewEndPath}`, false, true); + //if (obj.state.val) setState(`${NSPanel_Path}${ScreensaverEasyViewEndPath}`, false, true); if (obj.id) await setStateAsync(obj.id, obj.state.val, true); //setState(config.panelSendTopic, 'pageType~pageStartup'); @@ -2770,21 +2770,21 @@ async function InitDimmode() { 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 ?? 80) + '~' + getState(NSPanel_Path + 'ScreensaverInfo.activeBrightness').val ?? - 80 + '~' + rgb_dec565(config.defaultBackgroundColor) + '~' + rgb_dec565(globalTextColor) + '~' + Sliders2, + 'dimmode~' + getState(NSPanel_Path + 'ScreensaverInfo.activeDimmodeBrightness').val + '~' + (getState(NSPanel_Path + 'ScreensaverInfo.activeBrightness').val ?? '80') + '~' + + (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 ?? - 80 + '~' + rgb_dec565(config.defaultBackgroundColor) + '~' + rgb_dec565(globalTextColor) + '~' + Sliders2, + '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 ?? - 80 + '~' + rgb_dec565(config.defaultBackgroundColor) + '~' + rgb_dec565(globalTextColor) + '~' + Sliders2, + 'dimmode~' + timeDimMode.brightnessNight + '~' + (getState(NSPanel_Path + 'ScreensaverInfo.activeBrightness').val ?? + '80') + '~' + rgb_dec565(config.defaultBackgroundColor) + '~' + rgb_dec565(globalTextColor) + '~' + Sliders2, }); } ScreensaverDimmode(timeDimMode); @@ -3268,14 +3268,14 @@ let scheduleSwichScreensaver = adapterSchedule(undefined, screensaverChangeTime, wForecast == true && wForecastTimer == true ) { - setStateDelayed(NSPanel_Path + 'ScreensaverInfo.weatherForecast', false, (changeTime / 2) * 1000, false); + setStateDelayed(NSPanel_Path + 'ScreensaverInfo.weatherForecast', {val:false, ack:true}, (changeTime / 2) * 1000, false); } else if ( heading == '' && text == '' && wForecast == false && wForecastTimer == true ) { - setStateDelayed(NSPanel_Path + 'ScreensaverInfo.weatherForecast', true, (changeTime / 2) * 1000, false); + setStateDelayed(NSPanel_Path + 'ScreensaverInfo.weatherForecast', {val:true, ack:true}, (changeTime / 2) * 1000, false); } } catch (err: any) { log('error at schedule entityChangeTime: ' + err.message, 'warn');