mirror of
https://github.com/joBr99/nspanel-lovelace-ui.git
synced 2026-02-20 13:14:44 +01:00
Compare commits
2 Commits
v4.4.0
...
9e4030cc8b
| Author | SHA1 | Date | |
|---|---|---|---|
|
9e4030cc8b | ||
|
|
127671047f |
2
.github/ISSUE_TEMPLATE/bug_report.md
vendored
2
.github/ISSUE_TEMPLATE/bug_report.md
vendored
@@ -58,5 +58,5 @@ _If applicable, add screenshots/pictures to help explain your problem._
|
|||||||
_Add any other context about the problem here._
|
_Add any other context about the problem here._
|
||||||
_Please note here in case you are using ioBroker_
|
_Please note here in case you are using ioBroker_
|
||||||
|
|
||||||
### PANEL / FIRMWARE VERSION
|
### PANEL / FIRMWARE VERION
|
||||||
_Please add the Panel/Firmware Version you are using (EU, US-L or US-P)_
|
_Please add the Panel/Firmware Version you are using (EU, US-L or US-P)_
|
||||||
|
|||||||
2
.github/ISSUE_TEMPLATE/feature-request.md
vendored
2
.github/ISSUE_TEMPLATE/feature-request.md
vendored
@@ -24,5 +24,5 @@ _A clear and concise description of what the feature should do._
|
|||||||
### ADDITIONAL CONTEXT
|
### ADDITIONAL CONTEXT
|
||||||
_Add any other context about the problem here._
|
_Add any other context about the problem here._
|
||||||
|
|
||||||
### PANEL / FIRMWARE VERSION
|
### PANEL / FIRMWARE VERION
|
||||||
_Please add the Panel/Firmware Version you are using (EU, US-L or US-P)_
|
_Please add the Panel/Firmware Version you are using (EU, US-L or US-P)_
|
||||||
|
|||||||
4
.github/workflows/builder.yaml
vendored
4
.github/workflows/builder.yaml
vendored
@@ -92,7 +92,7 @@ jobs:
|
|||||||
|
|
||||||
- name: Login to GitHub Container Registry
|
- name: Login to GitHub Container Registry
|
||||||
if: env.BUILD_ARGS != '--test'
|
if: env.BUILD_ARGS != '--test'
|
||||||
uses: docker/login-action@v3.1.0
|
uses: docker/login-action@v3.0.0
|
||||||
with:
|
with:
|
||||||
registry: ghcr.io
|
registry: ghcr.io
|
||||||
username: ${{ github.repository_owner }}
|
username: ${{ github.repository_owner }}
|
||||||
@@ -100,7 +100,7 @@ jobs:
|
|||||||
|
|
||||||
- name: Build ${{ matrix.addon }} add-on
|
- name: Build ${{ matrix.addon }} add-on
|
||||||
if: steps.check.outputs.build_arch == 'true'
|
if: steps.check.outputs.build_arch == 'true'
|
||||||
uses: home-assistant/builder@2024.03.5
|
uses: home-assistant/builder@2024.01.0
|
||||||
with:
|
with:
|
||||||
args: |
|
args: |
|
||||||
${{ env.BUILD_ARGS }} \
|
${{ env.BUILD_ARGS }} \
|
||||||
|
|||||||
@@ -102,28 +102,6 @@
|
|||||||
│ crcputs sys0,2
|
│ crcputs sys0,2
|
||||||
│ crcputs tSend.txt,0
|
│ crcputs tSend.txt,0
|
||||||
│ //send cmd
|
│ //send cmd
|
||||||
│ --- HMI/n2t-out/popupLight.txt
|
|
||||||
├── +++ HMI/US/landscape/n2t-out/popupLight.txt
|
|
||||||
│ @@ -453,19 +453,14 @@
|
|
||||||
│ ucopy strCommand.txt,4,payloadLength-5,0
|
|
||||||
│ // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
|
|
||||||
│ spstr strCommand.txt,tInstruction.txt,"~",0
|
|
||||||
│ spstr strCommand.txt,tTmp.txt,"~",1
|
|
||||||
│ if(tInstruction.txt=="entityUpdateDetail"&&entn.txt==tTmp.txt)
|
|
||||||
│ {
|
|
||||||
│ // change icon
|
|
||||||
│ - spstr strCommand.txt,tTmp.txt,"~",2
|
|
||||||
│ - if(tTmp.txt!="")
|
|
||||||
│ - {
|
|
||||||
│ - tIcon1.txt=tTmp.txt
|
|
||||||
│ - }
|
|
||||||
│ //spstr strCommand.txt,tIcon1.txt,"~",2
|
|
||||||
│ vis tIcon1,1
|
|
||||||
│ // change icon color
|
|
||||||
│ spstr strCommand.txt,tTmp.txt,"~",3
|
|
||||||
│ covx tTmp.txt,sys0,0,0
|
|
||||||
│ tIcon1.pco=sys0
|
|
||||||
│ // get Button State
|
|
||||||
│ --- HMI/n2t-out/popupNotify.txt
|
│ --- HMI/n2t-out/popupNotify.txt
|
||||||
├── +++ HMI/US/landscape/n2t-out/popupNotify.txt
|
├── +++ HMI/US/landscape/n2t-out/popupNotify.txt
|
||||||
│ @@ -439,18 +439,14 @@
|
│ @@ -439,18 +439,14 @@
|
||||||
@@ -543,3 +521,22 @@
|
|||||||
│ spstr strCommand.txt,tNotifyText.txt,"~",2
|
│ spstr strCommand.txt,tNotifyText.txt,"~",2
|
||||||
│ if(tNotifyHead.txt!=""||tNotifyText.txt!="")
|
│ if(tNotifyHead.txt!=""||tNotifyText.txt!="")
|
||||||
│ {
|
│ {
|
||||||
|
│ @@ -952,14 +812,18 @@
|
||||||
|
│ {
|
||||||
|
│ page cardPower
|
||||||
|
│ }
|
||||||
|
│ if(tId.txt=="cardChart")
|
||||||
|
│ {
|
||||||
|
│ page cardChart
|
||||||
|
│ }
|
||||||
|
│ + if(tId.txt=="cardLChart")
|
||||||
|
│ + {
|
||||||
|
│ + page cardLChart
|
||||||
|
│ + }
|
||||||
|
│ }
|
||||||
|
│ if(tInstruction.txt=="timeout")
|
||||||
|
│ {
|
||||||
|
│ //set timeout to global var
|
||||||
|
│ spstr strCommand.txt,tTmp.txt,"~",1
|
||||||
|
│ covx tTmp.txt,sleepTimeout,0,0
|
||||||
|
│ }
|
||||||
|
|||||||
@@ -1985,26 +1985,6 @@
|
|||||||
│ Variable (string) entn
|
│ Variable (string) entn
|
||||||
│ Attributes
|
│ Attributes
|
||||||
│ Scope : local
|
│ Scope : local
|
||||||
│ @@ -453,19 +453,14 @@
|
|
||||||
│ ucopy strCommand.txt,4,payloadLength-5,0
|
|
||||||
│ // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
|
|
||||||
│ spstr strCommand.txt,tInstruction.txt,"~",0
|
|
||||||
│ spstr strCommand.txt,tTmp.txt,"~",1
|
|
||||||
│ if(tInstruction.txt=="entityUpdateDetail"&&entn.txt==tTmp.txt)
|
|
||||||
│ {
|
|
||||||
│ // change icon
|
|
||||||
│ - spstr strCommand.txt,tTmp.txt,"~",2
|
|
||||||
│ - if(tTmp.txt!="")
|
|
||||||
│ - {
|
|
||||||
│ - tIcon1.txt=tTmp.txt
|
|
||||||
│ - }
|
|
||||||
│ //spstr strCommand.txt,tIcon1.txt,"~",2
|
|
||||||
│ vis tIcon1,1
|
|
||||||
│ // change icon color
|
|
||||||
│ spstr strCommand.txt,tTmp.txt,"~",3
|
|
||||||
│ covx tTmp.txt,sys0,0,0
|
|
||||||
│ tIcon1.pco=sys0
|
|
||||||
│ // get Button State
|
|
||||||
│ --- HMI/n2t-out/popupNotify.txt
|
│ --- HMI/n2t-out/popupNotify.txt
|
||||||
├── +++ HMI/US/portrait/n2t-out/popupNotify.txt
|
├── +++ HMI/US/portrait/n2t-out/popupNotify.txt
|
||||||
│ @@ -348,15 +348,15 @@
|
│ @@ -348,15 +348,15 @@
|
||||||
@@ -2486,3 +2466,22 @@
|
|||||||
│ spstr strCommand.txt,tNotifyText.txt,"~",2
|
│ spstr strCommand.txt,tNotifyText.txt,"~",2
|
||||||
│ if(tNotifyHead.txt!=""||tNotifyText.txt!="")
|
│ if(tNotifyHead.txt!=""||tNotifyText.txt!="")
|
||||||
│ {
|
│ {
|
||||||
|
│ @@ -952,14 +800,18 @@
|
||||||
|
│ {
|
||||||
|
│ page cardPower
|
||||||
|
│ }
|
||||||
|
│ if(tId.txt=="cardChart")
|
||||||
|
│ {
|
||||||
|
│ page cardChart
|
||||||
|
│ }
|
||||||
|
│ + if(tId.txt=="cardLChart")
|
||||||
|
│ + {
|
||||||
|
│ + page cardLChart
|
||||||
|
│ + }
|
||||||
|
│ }
|
||||||
|
│ if(tInstruction.txt=="timeout")
|
||||||
|
│ {
|
||||||
|
│ //set timeout to global var
|
||||||
|
│ spstr strCommand.txt,tTmp.txt,"~",1
|
||||||
|
│ covx tTmp.txt,sleepTimeout,0,0
|
||||||
|
│ }
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
+++ /dev/fd/62 2024-02-25 11:03:09.634837907 +0000
|
+++ /dev/fd/62 2024-01-20 19:56:08.135834636 +0000
|
||||||
+I/n2t-out/Program.s.txt
|
+I/n2t-out/Program.s.txt
|
||||||
++ HMI/US/portrait/n2t-out/Program.s.txt
|
++ HMI/US/portrait/n2t-out/Program.s.txt
|
||||||
+1 +12,11 @@
|
+1 +12,11 @@
|
||||||
@@ -686,13 +686,6 @@
|
|||||||
+ covx tTmp.txt,sys0,0,0
|
+ covx tTmp.txt,sys0,0,0
|
||||||
+ hSlider6.maxval=sys0
|
+ hSlider6.maxval=sys0
|
||||||
+ }
|
+ }
|
||||||
+ }
|
|
||||||
+ if(tInstruction.txt=="pageType")
|
|
||||||
+ {
|
|
||||||
+ sleepValue=0
|
|
||||||
+ //command format pageType,specialPageName
|
|
||||||
+ //write name of speical page to tId
|
|
||||||
+ spstr strCommand.txt,tId.txt,"~",1
|
|
||||||
+I/n2t-out/cardGrid.txt
|
+I/n2t-out/cardGrid.txt
|
||||||
++ HMI/US/portrait/n2t-out/cardGrid.txt
|
++ HMI/US/portrait/n2t-out/cardGrid.txt
|
||||||
+ +7,14 @@
|
+ +7,14 @@
|
||||||
@@ -946,6 +939,13 @@
|
|||||||
+ spstr strCommand.txt,tEntity9.txt,"~",66
|
+ spstr strCommand.txt,tEntity9.txt,"~",66
|
||||||
+ vis tEntity9,1
|
+ vis tEntity9,1
|
||||||
+ }
|
+ }
|
||||||
|
+ }
|
||||||
|
+ if(tInstruction.txt=="pageType")
|
||||||
|
+ {
|
||||||
|
+ sleepValue=0
|
||||||
|
+ //command format pageType,specialPageName
|
||||||
|
+ //write name of speical page to tId
|
||||||
|
+ spstr strCommand.txt,tId.txt,"~",1
|
||||||
+I/n2t-out/cardLChart.txt
|
+I/n2t-out/cardLChart.txt
|
||||||
++ HMI/US/portrait/n2t-out/cardLChart.txt
|
++ HMI/US/portrait/n2t-out/cardLChart.txt
|
||||||
+ +7,14 @@
|
+ +7,14 @@
|
||||||
@@ -1527,26 +1527,6 @@
|
|||||||
+e (string) entn
|
+e (string) entn
|
||||||
+ributes
|
+ributes
|
||||||
+ Scope : local
|
+ Scope : local
|
||||||
+19 +453,14 @@
|
|
||||||
+ ucopy strCommand.txt,4,payloadLength-5,0
|
|
||||||
+ // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
|
|
||||||
+ spstr strCommand.txt,tInstruction.txt,"~",0
|
|
||||||
+ spstr strCommand.txt,tTmp.txt,"~",1
|
|
||||||
+ if(tInstruction.txt=="entityUpdateDetail"&&entn.txt==tTmp.txt)
|
|
||||||
+ {
|
|
||||||
+ // change icon
|
|
||||||
+ spstr strCommand.txt,tTmp.txt,"~",2
|
|
||||||
+ if(tTmp.txt!="")
|
|
||||||
+ {
|
|
||||||
+ tIcon1.txt=tTmp.txt
|
|
||||||
+ }
|
|
||||||
+ //spstr strCommand.txt,tIcon1.txt,"~",2
|
|
||||||
+ vis tIcon1,1
|
|
||||||
+ // change icon color
|
|
||||||
+ spstr strCommand.txt,tTmp.txt,"~",3
|
|
||||||
+ covx tTmp.txt,sys0,0,0
|
|
||||||
+ tIcon1.pco=sys0
|
|
||||||
+ // get Button State
|
|
||||||
+I/n2t-out/popupNotify.txt
|
+I/n2t-out/popupNotify.txt
|
||||||
++ HMI/US/portrait/n2t-out/popupNotify.txt
|
++ HMI/US/portrait/n2t-out/popupNotify.txt
|
||||||
+15 +348,15 @@
|
+15 +348,15 @@
|
||||||
@@ -2028,3 +2008,22 @@
|
|||||||
+ spstr strCommand.txt,tNotifyText.txt,"~",2
|
+ spstr strCommand.txt,tNotifyText.txt,"~",2
|
||||||
+ if(tNotifyHead.txt!=""||tNotifyText.txt!="")
|
+ if(tNotifyHead.txt!=""||tNotifyText.txt!="")
|
||||||
+ {
|
+ {
|
||||||
|
+14 +800,18 @@
|
||||||
|
+ {
|
||||||
|
+ page cardPower
|
||||||
|
+ }
|
||||||
|
+ if(tId.txt=="cardChart")
|
||||||
|
+ {
|
||||||
|
+ page cardChart
|
||||||
|
+ }
|
||||||
|
+ if(tId.txt=="cardLChart")
|
||||||
|
+ {
|
||||||
|
+ page cardLChart
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ if(tInstruction.txt=="timeout")
|
||||||
|
+ {
|
||||||
|
+ //set timeout to global var
|
||||||
|
+ spstr strCommand.txt,tTmp.txt,"~",1
|
||||||
|
+ covx tTmp.txt,sleepTimeout,0,0
|
||||||
|
+ }
|
||||||
|
|||||||
@@ -30,10 +30,6 @@ popupLightNew
|
|||||||
23 Component(s)
|
23 Component(s)
|
||||||
412 Line(s) of event code
|
412 Line(s) of event code
|
||||||
209 Unique line(s) of event code
|
209 Unique line(s) of event code
|
||||||
popupLight
|
|
||||||
28 Component(s)
|
|
||||||
417 Line(s) of event code
|
|
||||||
228 Unique line(s) of event code
|
|
||||||
cardGrid2
|
cardGrid2
|
||||||
52 Component(s)
|
52 Component(s)
|
||||||
703 Line(s) of event code
|
703 Line(s) of event code
|
||||||
@@ -58,6 +54,10 @@ cardLChart
|
|||||||
33 Component(s)
|
33 Component(s)
|
||||||
412 Line(s) of event code
|
412 Line(s) of event code
|
||||||
267 Unique line(s) of event code
|
267 Unique line(s) of event code
|
||||||
|
popupLight
|
||||||
|
28 Component(s)
|
||||||
|
412 Line(s) of event code
|
||||||
|
227 Unique line(s) of event code
|
||||||
cardPower
|
cardPower
|
||||||
54 Component(s)
|
54 Component(s)
|
||||||
541 Line(s) of event code
|
541 Line(s) of event code
|
||||||
@@ -66,6 +66,10 @@ cardThermo
|
|||||||
57 Component(s)
|
57 Component(s)
|
||||||
550 Line(s) of event code
|
550 Line(s) of event code
|
||||||
320 Unique line(s) of event code
|
320 Unique line(s) of event code
|
||||||
|
screensaver2
|
||||||
|
64 Component(s)
|
||||||
|
424 Line(s) of event code
|
||||||
|
264 Unique line(s) of event code
|
||||||
popupInSel
|
popupInSel
|
||||||
34 Component(s)
|
34 Component(s)
|
||||||
621 Line(s) of event code
|
621 Line(s) of event code
|
||||||
@@ -86,10 +90,6 @@ popupThermo
|
|||||||
44 Component(s)
|
44 Component(s)
|
||||||
523 Line(s) of event code
|
523 Line(s) of event code
|
||||||
276 Unique line(s) of event code
|
276 Unique line(s) of event code
|
||||||
screensaver2
|
|
||||||
64 Component(s)
|
|
||||||
428 Line(s) of event code
|
|
||||||
266 Unique line(s) of event code
|
|
||||||
cardEntities
|
cardEntities
|
||||||
67 Component(s)
|
67 Component(s)
|
||||||
1205 Line(s) of event code
|
1205 Line(s) of event code
|
||||||
@@ -98,5 +98,5 @@ cardEntities
|
|||||||
Total
|
Total
|
||||||
23 Page(s)
|
23 Page(s)
|
||||||
881 Component(s)
|
881 Component(s)
|
||||||
10778 Line(s) of event code
|
10769 Line(s) of event code
|
||||||
2466 Unique line(s) of event code
|
2466 Unique line(s) of event code
|
||||||
|
|||||||
@@ -806,11 +806,6 @@ Timer tmSerial
|
|||||||
if(tInstruction.txt=="entityUpdateDetail"&&entn.txt==tTmp.txt)
|
if(tInstruction.txt=="entityUpdateDetail"&&entn.txt==tTmp.txt)
|
||||||
{
|
{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,tTmp.txt,"~",2
|
|
||||||
if(tTmp.txt!="")
|
|
||||||
{
|
|
||||||
tIcon1.txt=tTmp.txt
|
|
||||||
}
|
|
||||||
//spstr strCommand.txt,tIcon1.txt,"~",2
|
//spstr strCommand.txt,tIcon1.txt,"~",2
|
||||||
vis tIcon1,1
|
vis tIcon1,1
|
||||||
// change icon color
|
// change icon color
|
||||||
|
|||||||
@@ -1794,10 +1794,6 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
page cardChart
|
page cardChart
|
||||||
}
|
}
|
||||||
if(tId.txt=="cardLChart")
|
|
||||||
{
|
|
||||||
page cardLChart
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
if(tInstruction.txt=="timeout")
|
if(tInstruction.txt=="timeout")
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -457,11 +457,6 @@ Timer tmSerial
|
|||||||
if(tInstruction.txt=="entityUpdateDetail"&&entn.txt==tTmp.txt)
|
if(tInstruction.txt=="entityUpdateDetail"&&entn.txt==tTmp.txt)
|
||||||
{
|
{
|
||||||
// change icon
|
// change icon
|
||||||
spstr strCommand.txt,tTmp.txt,"~",2
|
|
||||||
if(tTmp.txt!="")
|
|
||||||
{
|
|
||||||
tIcon1.txt=tTmp.txt
|
|
||||||
}
|
|
||||||
//spstr strCommand.txt,tIcon1.txt,"~",2
|
//spstr strCommand.txt,tIcon1.txt,"~",2
|
||||||
vis tIcon1,1
|
vis tIcon1,1
|
||||||
// change icon color
|
// change icon color
|
||||||
|
|||||||
@@ -956,10 +956,6 @@ Timer tmSerial
|
|||||||
{
|
{
|
||||||
page cardChart
|
page cardChart
|
||||||
}
|
}
|
||||||
if(tId.txt=="cardLChart")
|
|
||||||
{
|
|
||||||
page cardLChart
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
if(tInstruction.txt=="timeout")
|
if(tInstruction.txt=="timeout")
|
||||||
{
|
{
|
||||||
|
|||||||
BIN
HMI/nspanel.HMI
BIN
HMI/nspanel.HMI
Binary file not shown.
BIN
HMI/nspanel.tft
BIN
HMI/nspanel.tft
Binary file not shown.
@@ -65,5 +65,3 @@ SmartHomeNG: https://github.com/sisamiwe/shng-nspanel-plugin
|
|||||||
OpenHAB: https://github.com/donoo/o2n2l
|
OpenHAB: https://github.com/donoo/o2n2l
|
||||||
|
|
||||||
NodeRed: https://github.com/laluz742/node-red-contrib-nspanel-lui
|
NodeRed: https://github.com/laluz742/node-red-contrib-nspanel-lui
|
||||||
|
|
||||||
ESPHome without any Backend: https://github.com/olicooper/esphome-nspanel-lovelace-native
|
|
||||||
|
|||||||
@@ -1,3 +1,2 @@
|
|||||||
ha_api = None
|
ha_api = None
|
||||||
mqtt_api = None
|
mqtt_api = None
|
||||||
ad_api = None
|
|
||||||
@@ -132,7 +132,6 @@ class LuiBackendConfig(object):
|
|||||||
'sleepTrackingZones': ["not_home", "off"],
|
'sleepTrackingZones': ["not_home", "off"],
|
||||||
'sleepOverride': None,
|
'sleepOverride': None,
|
||||||
'locale': "en_US",
|
'locale': "en_US",
|
||||||
'quiet': True,
|
|
||||||
'timeFormat': "%H:%M",
|
'timeFormat': "%H:%M",
|
||||||
'dateFormatBabel': "full",
|
'dateFormatBabel': "full",
|
||||||
'dateAdditionalTemplate': "",
|
'dateAdditionalTemplate': "",
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ import datetime
|
|||||||
import apis
|
import apis
|
||||||
from helper import scale, pos_to_color, rgb_dec565
|
from helper import scale, pos_to_color, rgb_dec565
|
||||||
from pages import LuiPagesGen
|
from pages import LuiPagesGen
|
||||||
from luibackend.config import Card
|
|
||||||
|
|
||||||
class LuiController(object):
|
class LuiController(object):
|
||||||
|
|
||||||
@@ -459,9 +458,3 @@ class LuiController(object):
|
|||||||
apis.ha_api.get_entity(entity_id).call_service("pause")
|
apis.ha_api.get_entity(entity_id).call_service("pause")
|
||||||
if button_type == "timer-finish":
|
if button_type == "timer-finish":
|
||||||
apis.ha_api.get_entity(entity_id).call_service("finish")
|
apis.ha_api.get_entity(entity_id).call_service("finish")
|
||||||
|
|
||||||
@property
|
|
||||||
def current_card(self) -> Card:
|
|
||||||
"""Used to get the current card"""
|
|
||||||
|
|
||||||
return self._current_card
|
|
||||||
|
|||||||
@@ -213,9 +213,6 @@ def get_icon_ha(entity_id, overwrite=None, stateOverwrite=None):
|
|||||||
entity = apis.ha_api.get_entity(entity_id)
|
entity = apis.ha_api.get_entity(entity_id)
|
||||||
state = entity.state if stateOverwrite is None else stateOverwrite
|
state = entity.state if stateOverwrite is None else stateOverwrite
|
||||||
|
|
||||||
if entity_id in ["sensor.weather_forecast_daily", "sensor.weather_forecast_hourly"]:
|
|
||||||
ha_type = "weather"
|
|
||||||
|
|
||||||
if overwrite is not None:
|
if overwrite is not None:
|
||||||
if type(overwrite) is str:
|
if type(overwrite) is str:
|
||||||
return get_icon_char(overwrite)
|
return get_icon_char(overwrite)
|
||||||
|
|||||||
@@ -77,13 +77,12 @@ class LuiMqttListener(object):
|
|||||||
self._controller.detail_open(msg[2], msg[3])
|
self._controller.detail_open(msg[2], msg[3])
|
||||||
|
|
||||||
class LuiMqttSender(object):
|
class LuiMqttSender(object):
|
||||||
def __init__(self, api, use_api, topic_send, api_panel_name, quiet):
|
def __init__(self, api, use_api, topic_send, api_panel_name):
|
||||||
self._ha_api = api
|
self._ha_api = api
|
||||||
self._use_api = use_api
|
self._use_api = use_api
|
||||||
self._topic_send = topic_send
|
self._topic_send = topic_send
|
||||||
self._api_panel_name = api_panel_name
|
self._api_panel_name = api_panel_name
|
||||||
self._prev_msg = ""
|
self._prev_msg = ""
|
||||||
self._quiet = quiet
|
|
||||||
|
|
||||||
def send_mqtt_msg(self, msg, topic=None, force=False):
|
def send_mqtt_msg(self, msg, topic=None, force=False):
|
||||||
if not force and self._prev_msg == msg:
|
if not force and self._prev_msg == msg:
|
||||||
@@ -91,9 +90,7 @@ class LuiMqttSender(object):
|
|||||||
return
|
return
|
||||||
self._prev_msg = msg
|
self._prev_msg = msg
|
||||||
|
|
||||||
if self._quiet is False:
|
apis.ha_api.log(f"Sending Message: {msg}")
|
||||||
apis.ha_api.log(f"Sending Message: {msg}")
|
|
||||||
|
|
||||||
if self._use_api:
|
if self._use_api:
|
||||||
apis.ha_api.call_service(service="esphome/" + self._api_panel_name + "_nspanelui_api_call", command=2, data=msg)
|
apis.ha_api.call_service(service="esphome/" + self._api_panel_name + "_nspanelui_api_call", command=2, data=msg)
|
||||||
else:
|
else:
|
||||||
|
|||||||
@@ -192,9 +192,6 @@ class LuiPagesGen(object):
|
|||||||
else:
|
else:
|
||||||
entityType = "delete"
|
entityType = "delete"
|
||||||
|
|
||||||
if entityId in ["sensor.weather_forecast_daily", "sensor.weather_forecast_hourly"]:
|
|
||||||
entityType = "weather"
|
|
||||||
|
|
||||||
apis.ha_api.log(f"Generating item for {entityId} with type {entityType}", level="DEBUG")
|
apis.ha_api.log(f"Generating item for {entityId} with type {entityType}", level="DEBUG")
|
||||||
|
|
||||||
status_entity = apis.ha_api.get_entity(item.status) if item.status and apis.ha_api.entity_exists(item.status) else None
|
status_entity = apis.ha_api.get_entity(item.status) if item.status and apis.ha_api.entity_exists(item.status) else None
|
||||||
@@ -224,7 +221,7 @@ class LuiPagesGen(object):
|
|||||||
if status_entity:
|
if status_entity:
|
||||||
icon_res = get_icon_ha(item.status, overwrite=icon)
|
icon_res = get_icon_ha(item.status, overwrite=icon)
|
||||||
icon_color = self.get_entity_color(status_entity, ha_type=item.status.split(".")[0], overwrite=colorOverride)
|
icon_color = self.get_entity_color(status_entity, ha_type=item.status.split(".")[0], overwrite=colorOverride)
|
||||||
if item.status.startswith("sensor") and cardType in ["cardGrid", "cardGrid1", "cardGrid2"] and item.iconOverride is None:
|
if item.status.startswith("sensor") and (cardType == "cardGrid" or cardType == "cardGrid2") and item.iconOverride is None:
|
||||||
icon_res = status_entity.state[:4]
|
icon_res = status_entity.state[:4]
|
||||||
if icon_res[-1] == ".":
|
if icon_res[-1] == ".":
|
||||||
icon_res = icon_res[:-1]
|
icon_res = icon_res[:-1]
|
||||||
@@ -248,7 +245,7 @@ class LuiPagesGen(object):
|
|||||||
if status_entity:
|
if status_entity:
|
||||||
icon_id = get_icon_ha(item.status, overwrite=icon)
|
icon_id = get_icon_ha(item.status, overwrite=icon)
|
||||||
icon_color = self.get_entity_color(status_entity, ha_type=item.status.split(".")[0], overwrite=colorOverride)
|
icon_color = self.get_entity_color(status_entity, ha_type=item.status.split(".")[0], overwrite=colorOverride)
|
||||||
if item.status.startswith("sensor") and cardType in ["cardGrid", "cardGrid1", "cardGrid2"] and item.iconOverride is None:
|
if item.status.startswith("sensor") and (cardType == "cardGrid" or cardType == "cardGrid2") and item.iconOverride is None:
|
||||||
icon_id = status_entity.state[:4]
|
icon_id = status_entity.state[:4]
|
||||||
if icon_id[-1] == ".":
|
if icon_id[-1] == ".":
|
||||||
icon_id = icon_id[:-1]
|
icon_id = icon_id[:-1]
|
||||||
@@ -321,7 +318,7 @@ class LuiPagesGen(object):
|
|||||||
value = value + unit_of_measurement
|
value = value + unit_of_measurement
|
||||||
if entityType == "binary_sensor":
|
if entityType == "binary_sensor":
|
||||||
value = get_translation(self._locale, f"backend.component.binary_sensor.state.{device_class}.{entity.state}")
|
value = get_translation(self._locale, f"backend.component.binary_sensor.state.{device_class}.{entity.state}")
|
||||||
if cardType in ["cardGrid", "cardGrid1", "cardGrid2"] and entityType == "sensor" and icon is None:
|
if (cardType == "cardGrid" or cardType == "cardGrid2") and entityType == "sensor" and icon is None:
|
||||||
icon_id = entity.state[:4]
|
icon_id = entity.state[:4]
|
||||||
if icon_id[-1] == ".":
|
if icon_id[-1] == ".":
|
||||||
icon_id = icon_id[:-1]
|
icon_id = icon_id[:-1]
|
||||||
@@ -782,8 +779,6 @@ class LuiPagesGen(object):
|
|||||||
if send_page_type:
|
if send_page_type:
|
||||||
if card.cardType == "cardGrid" and len(card.entities) > 6:
|
if card.cardType == "cardGrid" and len(card.entities) > 6:
|
||||||
card.cardType = "cardGrid2"
|
card.cardType = "cardGrid2"
|
||||||
if card.cardType == "cardGrid1":
|
|
||||||
card.cardType = "cardGrid"
|
|
||||||
self.page_type(card.cardType)
|
self.page_type(card.cardType)
|
||||||
|
|
||||||
# send sleep timeout if there is one configured for the current card
|
# send sleep timeout if there is one configured for the current card
|
||||||
@@ -793,7 +788,7 @@ class LuiPagesGen(object):
|
|||||||
self._send_mqtt_msg(f'timeout~{self._config.get("sleepTimeout")}')
|
self._send_mqtt_msg(f'timeout~{self._config.get("sleepTimeout")}')
|
||||||
|
|
||||||
temp_unit = card.raw_config.get("temperatureUnit", "celsius")
|
temp_unit = card.raw_config.get("temperatureUnit", "celsius")
|
||||||
if card.cardType in ["cardEntities", "cardGrid", "cardGrid1","cardGrid2"]:
|
if card.cardType in ["cardEntities", "cardGrid", "cardGrid2"]:
|
||||||
self.generate_entities_page(navigation, card.title, card.entities, card.cardType, temp_unit)
|
self.generate_entities_page(navigation, card.title, card.entities, card.cardType, temp_unit)
|
||||||
return
|
return
|
||||||
if card.cardType == "cardThermo":
|
if card.cardType == "cardThermo":
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import adbase as ad
|
import hassapi as hass
|
||||||
|
|
||||||
from luibackend.config import LuiBackendConfig
|
from luibackend.config import LuiBackendConfig
|
||||||
from luibackend.controller import LuiController
|
from luibackend.controller import LuiController
|
||||||
@@ -6,19 +6,15 @@ from luibackend.mqtt import LuiMqttListener, LuiMqttSender
|
|||||||
from luibackend.updater import Updater
|
from luibackend.updater import Updater
|
||||||
|
|
||||||
import apis
|
import apis
|
||||||
import json
|
|
||||||
from typing import Literal
|
|
||||||
|
|
||||||
class NsPanelLovelaceUIManager(ad.ADBase):
|
class NsPanelLovelaceUIManager(hass.Hass):
|
||||||
|
|
||||||
def initialize(self):
|
def initialize(self):
|
||||||
self.adapi = self.get_ad_api()
|
self.log('Starting')
|
||||||
self.adapi.log('Starting')
|
apis.ha_api = self
|
||||||
apis.ad_api = self.adapi
|
|
||||||
apis.ha_api = self.get_plugin_api("HASS")
|
|
||||||
apis.mqtt_api = self.get_plugin_api("MQTT")
|
apis.mqtt_api = self.get_plugin_api("MQTT")
|
||||||
|
|
||||||
cfg = self._cfg = LuiBackendConfig(apis.ha_api, self.args["config"])
|
cfg = self._cfg = LuiBackendConfig(self, self.args["config"])
|
||||||
|
|
||||||
use_api = cfg.get("use_api") == True
|
use_api = cfg.get("use_api") == True
|
||||||
|
|
||||||
@@ -26,11 +22,10 @@ class NsPanelLovelaceUIManager(ad.ADBase):
|
|||||||
topic_recv = cfg.get("panelRecvTopic")
|
topic_recv = cfg.get("panelRecvTopic")
|
||||||
api_panel_name = cfg.get("panelName")
|
api_panel_name = cfg.get("panelName")
|
||||||
api_device_id = cfg.get("panelDeviceId")
|
api_device_id = cfg.get("panelDeviceId")
|
||||||
quiet = cfg.get("quiet")
|
|
||||||
|
|
||||||
mqttsender = self._mqttsender = LuiMqttSender(apis.ha_api, use_api, topic_send, api_panel_name, quiet)
|
mqttsend = LuiMqttSender(self, use_api, topic_send, api_panel_name)
|
||||||
|
|
||||||
self._controller = LuiController(cfg, mqttsender.send_mqtt_msg)
|
controller = LuiController(cfg, mqttsend.send_mqtt_msg)
|
||||||
|
|
||||||
desired_tasmota_driver_version = 8
|
desired_tasmota_driver_version = 8
|
||||||
desired_display_firmware_version = 53
|
desired_display_firmware_version = 53
|
||||||
@@ -46,35 +41,11 @@ class NsPanelLovelaceUIManager(ad.ADBase):
|
|||||||
desired_tasmota_driver_url = cfg._config.get("berryURL", "https://raw.githubusercontent.com/joBr99/nspanel-lovelace-ui/main/tasmota/autoexec.be")
|
desired_tasmota_driver_url = cfg._config.get("berryURL", "https://raw.githubusercontent.com/joBr99/nspanel-lovelace-ui/main/tasmota/autoexec.be")
|
||||||
|
|
||||||
mode = cfg.get("updateMode")
|
mode = cfg.get("updateMode")
|
||||||
updater = Updater(self.adapi.log, mqttsender, topic_send, mode, desired_display_firmware_version, model, desired_display_firmware_url, desired_tasmota_driver_version, desired_tasmota_driver_url)
|
updater = Updater(self.log, mqttsend, topic_send, mode, desired_display_firmware_version, model, desired_display_firmware_url, desired_tasmota_driver_version, desired_tasmota_driver_url)
|
||||||
|
|
||||||
# Request Tasmota Driver Version
|
# Request Tasmota Driver Version
|
||||||
updater.request_berry_driver_version()
|
updater.request_berry_driver_version()
|
||||||
|
|
||||||
LuiMqttListener(use_api, topic_recv, api_panel_name, api_device_id, self._controller, updater)
|
LuiMqttListener(use_api, topic_recv, api_panel_name, api_device_id, controller, updater)
|
||||||
|
|
||||||
self.adapi.log(f'Started ({version})')
|
self.log(f'Started ({version})')
|
||||||
|
|
||||||
#
|
|
||||||
# helpers
|
|
||||||
#
|
|
||||||
|
|
||||||
def show_card(self, card_key: str) -> None:
|
|
||||||
"""Used to show card on panel"""
|
|
||||||
|
|
||||||
msg = json.dumps({"CustomRecv":f"event,buttonPress2,navigate.{card_key},button"})
|
|
||||||
topic = self._cfg.get("panelRecvTopic")
|
|
||||||
self._mqttsender.send_mqtt_msg(msg, topic)
|
|
||||||
|
|
||||||
def navigate(self, direction: Literal['up', 'prev', 'next']) -> None:
|
|
||||||
"""Used to navigate different directions on the panel"""
|
|
||||||
|
|
||||||
msg = json.dumps({"CustomRecv":f"event,buttonPress2,nav{direction.title()},button"})
|
|
||||||
topic = self._cfg.get("panelRecvTopic")
|
|
||||||
self._mqttsender.send_mqtt_msg(msg, topic)
|
|
||||||
|
|
||||||
@property
|
|
||||||
def current_card(self) -> str:
|
|
||||||
"""Used to get the panel's current card"""
|
|
||||||
|
|
||||||
return self._controller.current_card.key
|
|
||||||
|
|||||||
@@ -44,6 +44,8 @@ Using a 6th entity will automatically activate the alternative layout.
|
|||||||
type: 0
|
type: 0
|
||||||
- entity: weather.demo_weather_north
|
- entity: weather.demo_weather_north
|
||||||
type: 1
|
type: 1
|
||||||
|
- entity: weather.demo_weather_north
|
||||||
|
type: 2
|
||||||
- entity: sensor.energy_usage
|
- entity: sensor.energy_usage
|
||||||
- entity: delete
|
- entity: delete
|
||||||
- entity: sensor.indoor_temp
|
- entity: sensor.indoor_temp
|
||||||
|
|||||||
@@ -93,34 +93,3 @@ Now, to install NSPanel Lovelace UI Backend with HACS, follow these steps:
|
|||||||
6. A confirmation panel will appear, click on `Download`, and wait for HACS to
|
6. A confirmation panel will appear, click on `Download`, and wait for HACS to
|
||||||
proceed with the download
|
proceed with the download
|
||||||
7. The Backend Application is now installed, and HACS will inform you when updates are available
|
7. The Backend Application is now installed, and HACS will inform you when updates are available
|
||||||
|
|
||||||
# Workaround for HomeAssistant 2024.04
|
|
||||||
AppDaemon is using the old REST API that until AppDaemon moved on the the websocket API this woraround is needed to get weather forecast data from homeassistant. (https://github.com/AppDaemon/appdaemon/issues/1837)
|
|
||||||
|
|
||||||
To get the forecast data in appdaemon, there is a script needed in homeassistant's configuration.yaml:
|
|
||||||
|
|
||||||
```yaml
|
|
||||||
template:
|
|
||||||
- trigger:
|
|
||||||
- platform: time_pattern
|
|
||||||
hours: /1
|
|
||||||
action:
|
|
||||||
- service: weather.get_forecasts
|
|
||||||
data:
|
|
||||||
type: daily
|
|
||||||
target:
|
|
||||||
entity_id: weather.k3ll3r # change to your weather entity in this line
|
|
||||||
response_variable: daily
|
|
||||||
sensor:
|
|
||||||
- name: Weather Forecast Daily
|
|
||||||
unique_id: weather_forecast_daily
|
|
||||||
state: "{{ now().isoformat() }}"
|
|
||||||
attributes:
|
|
||||||
forecast: "{{ daily['weather.k3ll3r'].forecast }}" # change to your weather entity in this line
|
|
||||||
```
|
|
||||||
|
|
||||||
|
|
||||||
Adjust the entities in your apps.yaml that are accessing the forecast to the newly created trigger template:
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,130 +1,109 @@
|
|||||||
/**
|
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 Debug = false; // true für erweiterte Ausgaben im Log
|
const NSPanel_Path = '0_userdata.0.NSPanel.1.';
|
||||||
|
|
||||||
const NSPanel_Path = '0_userdata.0.NSPanel.';
|
|
||||||
const Path = NSPanel_Path + 'Influx2NSPanel.cardLChart.';
|
const Path = NSPanel_Path + 'Influx2NSPanel.cardLChart.';
|
||||||
const InfluxInstance = 'influxdb.0';
|
const InfluxInstance = 'influxdb.1';
|
||||||
const influxDbBucket = 'storage_short';
|
const influxDbBucket = 'iobroker';
|
||||||
const numberOfHoursAgo = 24;
|
const numberOfHoursAgo = 24;
|
||||||
const xAxisTicksEveryM = 60;
|
const xAxisTicksEveryM = 60;
|
||||||
const xAxisLabelEveryM = 240;
|
const xAxisLabelEveryM = 240;
|
||||||
//
|
|
||||||
|
|
||||||
const sensors : Record<string, Record <string, string>> = {};
|
// 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
|
||||||
* Hier werden die Sensoren festgelegt nach flogendem Schema
|
const sensors : Record<string, string> = {};
|
||||||
*
|
/* ↓ Id of the sensor ↓ Id of the data source for the charts */
|
||||||
* sensors[‘Datenpunkt(kompletter Pfad) des Messwertes'] = {'taget': 'Name des Datenpunkt für die Chartwerte', 'measurement': 'genutzter Alias in der Influxdb für den Messwert'};
|
sensors['deconz.0.Sensors.65.temperature'] = Path + 'buero_temperature.ACTUAL';
|
||||||
*
|
sensors['deconz.0.Sensors.65.humidity'] = Path + 'buero_luftfeuchte.ACTUAL';
|
||||||
* Wenn der Wert in der Datenbank keinen Alias hat bleibt der Wert 'measurement': weg.
|
|
||||||
* Jeder Messwert bekommt einen eigenen sensors[...] = {'target':....}
|
|
||||||
*/
|
|
||||||
|
|
||||||
|
|
||||||
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
|
// create data source for NsPanel on script startup
|
||||||
Object.keys(sensors).forEach(async id => {
|
Object.keys(sensors).forEach(async x => {
|
||||||
await generateDateAsync(id);
|
await generateDateAsync(x, sensors[x]);
|
||||||
});
|
});
|
||||||
|
|
||||||
// then listen to the sensors and update the data source states accordingly
|
// then listen to the sensors and update the data source states accordingly
|
||||||
on({ id: Object.keys(sensors), change: 'any' }, async function (obj) {
|
on({ id: Object.keys(sensors), change: 'any' }, async function (obj) {
|
||||||
if (!obj.id) {
|
if (!obj.id) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
await generateDateAsync(obj.id);
|
|
||||||
|
await generateDateAsync(obj.id, sensors[obj.id]);
|
||||||
});
|
});
|
||||||
|
|
||||||
//__________________________
|
async function generateDateAsync(sensorId: string, dataPointId: string) {
|
||||||
// Beschreibe diese Funktion: Daten generieren
|
const query =[
|
||||||
async function generateDateAsync(sensorId: string) {
|
'from(bucket: "' + influxDbBucket + '")',
|
||||||
let idMeasurement = sensors[sensorId].measurement;
|
'|> range(start: -' + numberOfHoursAgo + 'h)',
|
||||||
if (idMeasurement =='' ||idMeasurement == undefined) {idMeasurement = sensorId};
|
'|> filter(fn: (r) => r["_measurement"] == "' + sensorId + '")',
|
||||||
const dataPointId:string = Path + sensors[sensorId].target +'.ACTUAL';
|
'|> filter(fn: (r) => r["_field"] == "value")',
|
||||||
if (Debug) log(`(f) generateDateAsync: ${sensorId} ${dataPointId} > ${idMeasurement}`);
|
'|> 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('');
|
||||||
|
|
||||||
const query =[
|
if (Debug) console.log('Query: ' + 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;
|
||||||
|
}
|
||||||
|
|
||||||
const result : any = await sendToAsync(InfluxInstance, 'query', query);
|
if (Debug) console.log(result);
|
||||||
if (result.error) {
|
const numResults = result.result.length;
|
||||||
console.error(result.error);
|
let coordinates : string = '';
|
||||||
return;
|
for (let r = 0; r < numResults; r++)
|
||||||
}
|
{
|
||||||
if (Debug) console.log(JSON.stringify(result));
|
const list : string[] = []
|
||||||
const numResults = result.result.length;
|
const numValues = result.result[r].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++)
|
for (let i = 0; i < numValues; i++)
|
||||||
{
|
{
|
||||||
const time = Math.round(result.result[r][i]._rtime/1000/1000/1000/60);
|
const time = Math.round(result.result[r][i]._rtime/1000/1000/1000/60);
|
||||||
const value = Math.round(result.result[r][i]._value * 10);
|
const value = Math.round(result.result[r][i]._value * 10);
|
||||||
list.push(time + ":" + value);
|
list.push(time + ":" + value);
|
||||||
}
|
}
|
||||||
|
|
||||||
coordinates = list.join("~");
|
coordinates = list.join("~");
|
||||||
if (Debug) console.log(coordinates);
|
|
||||||
}
|
|
||||||
|
|
||||||
const ticksAndLabelsList : string[] = []
|
if (Debug) console.log(coordinates);
|
||||||
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);
|
const ticksAndLabelsList : string[] = []
|
||||||
}
|
const date = new Date();
|
||||||
}
|
date.setMinutes(0, 0, 0);
|
||||||
if (Debug) console.log('Ticks & Label: ' + ticksAndLabelsList);
|
const ts = Math.round(date.getTime() / 1000);
|
||||||
if (Debug) console.log('Coordinates: ' + coordinates);
|
const tsYesterday = ts - (numberOfHoursAgo * 3600);
|
||||||
await setOrCreate(dataPointId, ticksAndLabelsList.join("+") + '~' + coordinates, true);
|
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) {
|
async function setOrCreate(id : string, value : any, ack : boolean) {
|
||||||
if (!(await existsStateAsync(id))) {
|
if (!(await existsStateAsync(id))) {
|
||||||
await createStateAsync(id, value, {
|
await createStateAsync(id, value, {
|
||||||
name: id.split('.').reverse()[0],
|
name: id.split('.').reverse()[0],
|
||||||
desc: 'Sensor Values [~<time>:<value>]*',
|
desc: 'Sensor Values [~<time>:<value>]*',
|
||||||
type: 'string',
|
type: 'string',
|
||||||
role: 'value',
|
role: 'value',
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
await setStateAsync(id, value, ack);
|
await setStateAsync(id, value, ack);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
/*-----------------------------------------------------------------------
|
/*-----------------------------------------------------------------------
|
||||||
TypeScript v4.3.3.43 zur Steuerung des SONOFF NSPanel mit dem ioBroker by @Armilar / @TT-Tom / @ticaki / @Britzelpuf / @Sternmiere / @ravenS0ne
|
TypeScript v4.3.3.40 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
|
- 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
|
@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
|
NsPanelTs.ts (dieses TypeScript in ioBroker) Stable: https://github.com/joBr99/nspanel-lovelace-ui/blob/main/ioBroker/NsPanelTs.ts
|
||||||
@@ -108,15 +108,8 @@ ReleaseNotes:
|
|||||||
- 23.01.2024 - v4.3.3.39 Add: Optional setOn & setOff for HW button with mode 'set'
|
- 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
|
- 28.01.2024 - v4.3.3.39 Fix: ack for read-only state
|
||||||
- 03.02.2024 - v4.3.3.40 Fix: RGB maxValueColorTemp
|
- 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
|
|
||||||
- 07.02.2024 - v4.3.3.42 Minor Fixes
|
|
||||||
- 09.02.2024 - v4.3.3.42 Change pageId with Alias in Communication with HMI
|
|
||||||
- 09.02.2024 - v4.3.3.42 Spotify Media-Player: Dynamic loading of the speaker list, playlist, tracklist, fix repeat, add seek, add elapsed/duration
|
|
||||||
- 10.02.2024 - v4.3.3.42 Spotify Minor Fixes; Add miValue / maxValue to Volume-Slider
|
|
||||||
- 10.02.2024 - v4.3.3.43 Fix: cardGrid2 => 9 Entities for Layout 'us-p' issue #1167
|
|
||||||
- 11.02.2024 - v4.3.3.43 Fix VolumeSlider
|
|
||||||
|
|
||||||
Todo:
|
Todo:
|
||||||
- XX.XX.XXXX - v5.0.0 Change the bottomScreensaverEntity (rolling) if more than 6 entries are defined
|
- XX.XX.XXXX - v5.0.0 Change the bottomScreensaverEntity (rolling) if more than 6 entries are defined
|
||||||
@@ -138,8 +131,7 @@ Mögliche Seiten-Ansichten:
|
|||||||
(die 4 kleineren Icons können als Wetter-Vorschau + 4Tage (Symbol + Höchsttemperatur) oder zur Anzeige definierter Infos konfiguriert werden)
|
(die 4 kleineren Icons können als Wetter-Vorschau + 4Tage (Symbol + Höchsttemperatur) oder zur Anzeige definierter Infos konfiguriert werden)
|
||||||
cardEntities Page - 4 vertikale angeordnete Steuerelemente - auch als Subpage
|
cardEntities Page - 4 vertikale angeordnete Steuerelemente - auch als Subpage
|
||||||
cardGrid Page - 6 horizontal angeordnete Steuerelemente in 2 Reihen a 3 Steuerelemente - auch als Subpage
|
cardGrid Page - 6 horizontal angeordnete Steuerelemente in 2 Reihen a 3 Steuerelemente - auch als Subpage
|
||||||
cardGrid2 Page - 8 horizontal angeordnete Steuerelemente in 2 Reihen a 4 Steuerelemente bzw. beim US-Modell im Portrait-Modus
|
cardGrid2 Page - 8 horizontal angeordnete Steuerelemente in 2 Reihen a 4 Steuerelemente - auch als Subpage
|
||||||
9 horizontal angeordnete Steuerelemente in 3 Reihen a 3 Steuerelemente - auch als Subpage
|
|
||||||
cardThermo Page - Thermostat mit Solltemperatur, Isttemperatur, Mode - Weitere Eigenschaften können im Alias definiert werden
|
cardThermo Page - Thermostat mit Solltemperatur, Isttemperatur, Mode - Weitere Eigenschaften können im Alias definiert werden
|
||||||
cardMedia Page - Mediaplayer - Ausnahme: Alias sollte mit Alias-Manager automatisch über Alexa-Verzeichnis Player angelegt werden
|
cardMedia Page - Mediaplayer - Ausnahme: Alias sollte mit Alias-Manager automatisch über Alexa-Verzeichnis Player angelegt werden
|
||||||
cardAlarm Page - Alarmseite mit Zustand und Tastenfeld
|
cardAlarm Page - Alarmseite mit Zustand und Tastenfeld
|
||||||
@@ -215,7 +207,6 @@ Upgrades in Konsole:
|
|||||||
---------------------------------------------------------------------------------------
|
---------------------------------------------------------------------------------------
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
/******************************* Begin CONFIG Parameter *******************************/
|
/******************************* Begin CONFIG Parameter *******************************/
|
||||||
|
|
||||||
// DE: liefert bei true detailliertere Meldundgen im Log.
|
// DE: liefert bei true detailliertere Meldundgen im Log.
|
||||||
@@ -985,7 +976,7 @@ export const config: Config = {
|
|||||||
// _________________________________ DE: Ab hier keine Konfiguration mehr _____________________________________
|
// _________________________________ DE: Ab hier keine Konfiguration mehr _____________________________________
|
||||||
// _________________________________ EN: No more configuration from here _____________________________________
|
// _________________________________ EN: No more configuration from here _____________________________________
|
||||||
|
|
||||||
const scriptVersion: string = 'v4.3.3.43';
|
const scriptVersion: string = 'v4.3.3.40';
|
||||||
const tft_version: string = 'v4.3.3';
|
const tft_version: string = 'v4.3.3';
|
||||||
const desired_display_firmware_version = 53;
|
const desired_display_firmware_version = 53;
|
||||||
const berry_driver_version = 9;
|
const berry_driver_version = 9;
|
||||||
@@ -3386,11 +3377,7 @@ function GeneratePageElements(page: PageType): string {
|
|||||||
maxItems = 6;
|
maxItems = 6;
|
||||||
break;
|
break;
|
||||||
case 'cardGrid2':
|
case 'cardGrid2':
|
||||||
if (getState(NSPanel_Path + 'NSPanel_Version').val == 'us-p') {
|
maxItems = 8;
|
||||||
maxItems = 9;
|
|
||||||
} else {
|
|
||||||
maxItems = 8;
|
|
||||||
};
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -4769,25 +4756,81 @@ function unsubscribeMediaSubscriptions(): void {
|
|||||||
|
|
||||||
function subscribeMediaSubscriptions(id: string): void {
|
function subscribeMediaSubscriptions(id: string): void {
|
||||||
on({id: [id + '.STATE',
|
on({id: [id + '.STATE',
|
||||||
id + '.ARTIST',
|
|
||||||
id + '.TITLE',
|
|
||||||
id + '.ALBUM',
|
|
||||||
id + '.VOLUME',
|
id + '.VOLUME',
|
||||||
|
id + '.ARTIST',
|
||||||
|
id + '.ALBUM',
|
||||||
|
id + '.TITLE',
|
||||||
id + '.REPEAT',
|
id + '.REPEAT',
|
||||||
id + '.SHUFFLE',
|
id + '.SHUFFLE'], change: "any"}, async function () {
|
||||||
id + '.DURATION',
|
(function () { if (timeoutMedia) { clearTimeout(timeoutMedia); timeoutMedia = null; } })();
|
||||||
id + '.ELAPSED'], change: "any", ack: true}, async function () {
|
timeoutMedia = setTimeout(async function () {
|
||||||
if (useMediaEvents && pageCounter == 1) {
|
if (useMediaEvents) {
|
||||||
GeneratePage(activePage!);
|
GeneratePage(activePage!);
|
||||||
}
|
setTimeout(async function () {
|
||||||
|
GeneratePage(activePage!);
|
||||||
|
}, 3000);
|
||||||
|
}
|
||||||
|
},50)
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
function subscribeMediaSubscriptionsSonosAdd(id: string): void {
|
function subscribeMediaSubscriptionsSonosAdd(id: string): void {
|
||||||
on({id: [id + '.QUEUE'], change: "any", ack: true}, async function () {
|
on({id: [id + '.QUEUE',
|
||||||
if (useMediaEvents && pageCounter == 1) {
|
id + '.DURATION',
|
||||||
GeneratePage(activePage!);
|
id + '.ELAPSED'], change: "any"}, async function () {
|
||||||
}
|
(function () { if (timeoutMedia) { clearTimeout(timeoutMedia); timeoutMedia = null; } })();
|
||||||
|
timeoutMedia = setTimeout(async function () {
|
||||||
|
if (useMediaEvents) {
|
||||||
|
GeneratePage(activePage!);
|
||||||
|
setTimeout(async function () {
|
||||||
|
GeneratePage(activePage!);
|
||||||
|
}, 50);
|
||||||
|
}
|
||||||
|
},50)
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function subscribeMediaSubscriptionsAlexaAdd(id: string): void {
|
||||||
|
on({id: [id + '.DURATION',
|
||||||
|
id + '.ELAPSED'], change: "any"}, async function () {
|
||||||
|
(function () { if (timeoutMedia) { clearTimeout(timeoutMedia); timeoutMedia = null; } })();
|
||||||
|
timeoutMedia = setTimeout(async function () {
|
||||||
|
if (useMediaEvents) {
|
||||||
|
GeneratePage(activePage!);
|
||||||
|
setTimeout(async function () {
|
||||||
|
GeneratePage(activePage!);
|
||||||
|
}, 50);
|
||||||
|
}
|
||||||
|
},50)
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function subscribeMediaSubscriptionsBoseAdd(id: string): void {
|
||||||
|
on({id: [id + '.DURATION',
|
||||||
|
id + '.ELAPSED'], change: "any"}, async function () {
|
||||||
|
(function () { if (timeoutMedia) { clearTimeout(timeoutMedia); timeoutMedia = null; } })();
|
||||||
|
timeoutMedia = setTimeout(async function () {
|
||||||
|
if (useMediaEvents) {
|
||||||
|
GeneratePage(activePage!);
|
||||||
|
setTimeout(async function () {
|
||||||
|
GeneratePage(activePage!);
|
||||||
|
}, 50);
|
||||||
|
}
|
||||||
|
},50)
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function subscribeMediaSubscriptionsSqueezeboxAdd(id: string): void {
|
||||||
|
on({id: [id + '.ELAPSED'], change: "any"}, async function () {
|
||||||
|
(function () { if (timeoutMedia) { clearTimeout(timeoutMedia); timeoutMedia = null; } })();
|
||||||
|
timeoutMedia = setTimeout(async function () {
|
||||||
|
if (useMediaEvents) {
|
||||||
|
GeneratePage(activePage!);
|
||||||
|
setTimeout(async function () {
|
||||||
|
GeneratePage(activePage!);
|
||||||
|
}, 50);
|
||||||
|
}
|
||||||
|
},50)
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -4916,13 +4959,6 @@ async function createAutoMediaAlias (id: string, mediaDevice: string, adapterPla
|
|||||||
log('error at function createAutoMediaAlias Adapter spotify-premium: ' + err.message, 'warn');
|
log('error at function createAutoMediaAlias Adapter spotify-premium: ' + err.message, 'warn');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
//Add Spotify Datapoints > v4.3.3.42
|
|
||||||
//Spotify-Premium has Role value and a known Bug in player.progress
|
|
||||||
if (existsObject(id + '.DURATION') == false) {
|
|
||||||
const dpPath: string = adapterPlayerInstance;
|
|
||||||
await createAliasAsync(id + '.DURATION', dpPath + 'player.duration', true, <iobJS.StateCommon> {type: 'string', role: 'media.duration.text', name: 'DURATION'});
|
|
||||||
await createAliasAsync(id + '.ELAPSED', dpPath + 'player.progress', true, <iobJS.StateCommon> {type: 'string', role: 'media.elapsed.text', name: 'ELAPSED'});
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
@@ -4960,12 +4996,7 @@ async function createAutoMediaAlias (id: string, mediaDevice: string, adapterPla
|
|||||||
log('error function createAutoMediaAlias Adapter volumio: ' + err.message, 'warn');
|
log('error function createAutoMediaAlias Adapter volumio: ' + err.message, 'warn');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
//Add Volumio Datapoints > v4.3.3.42
|
|
||||||
if (existsObject(id + '.DURATION') == false) {
|
|
||||||
const dpPath: string = adapterPlayerInstance;
|
|
||||||
await createAliasAsync(id + '.DURATION', dpPath + 'playbackInfo.duration', true, <iobJS.StateCommon> {type: 'string', role: 'media.duration', name: 'DURATION'});
|
|
||||||
//await createAliasAsync(id + '.ELAPSED', dpPath + 'player.progress', true, <iobJS.StateCommon> {type: 'string', role: 'media.elapsed.text', name: 'ELAPSED'});
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case "squeezeboxrpc.0.":
|
case "squeezeboxrpc.0.":
|
||||||
@@ -5061,7 +5092,6 @@ function GenerateMediaPage(page: NSPanel.PageMedia): NSPanel.Payload[] {
|
|||||||
if (!page.items[0].id) throw new Error ('Missing page id for cardMedia!');
|
if (!page.items[0].id) throw new Error ('Missing page id for cardMedia!');
|
||||||
|
|
||||||
let id = page.items[0].id;
|
let id = page.items[0].id;
|
||||||
let tid = 0;
|
|
||||||
let out_msgs: NSPanel.Payload[] = [];
|
let out_msgs: NSPanel.Payload[] = [];
|
||||||
|
|
||||||
if (!page.items[0].adapterPlayerInstance!) throw new Error('page.items[0].adapterPlayerInstance is undefined!')
|
if (!page.items[0].adapterPlayerInstance!) throw new Error('page.items[0].adapterPlayerInstance is undefined!')
|
||||||
@@ -5088,10 +5118,12 @@ function GenerateMediaPage(page: NSPanel.PageMedia): NSPanel.Payload[] {
|
|||||||
subscribeMediaSubscriptions(page.items[0].id);
|
subscribeMediaSubscriptions(page.items[0].id);
|
||||||
if (v2Adapter == 'sonos') {
|
if (v2Adapter == 'sonos') {
|
||||||
subscribeMediaSubscriptionsSonosAdd(page.items[0].id);
|
subscribeMediaSubscriptionsSonosAdd(page.items[0].id);
|
||||||
} else if (v2Adapter == 'spotify-premium') {
|
} else if (v2Adapter == 'alexa2') {
|
||||||
setState(vInstance + 'getDevices', true);
|
subscribeMediaSubscriptionsAlexaAdd(page.items[0].id);
|
||||||
setState(vInstance + 'getPlaybackInfo', true);
|
} else if (v2Adapter == 'bosesoundtouch') {
|
||||||
setState(vInstance + 'getPlaylists', true);
|
subscribeMediaSubscriptionsBoseAdd(page.items[0].id);
|
||||||
|
} else if (v2Adapter == 'squeezeboxrpc') {
|
||||||
|
subscribeMediaSubscriptionsSqueezeboxAdd(page.items[0].id);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -5101,6 +5133,12 @@ function GenerateMediaPage(page: NSPanel.PageMedia): NSPanel.Payload[] {
|
|||||||
subscribeMediaSubscriptions(page.items[0].id);
|
subscribeMediaSubscriptions(page.items[0].id);
|
||||||
if (v2Adapter == 'sonos') {
|
if (v2Adapter == 'sonos') {
|
||||||
subscribeMediaSubscriptionsSonosAdd(page.items[0].id);
|
subscribeMediaSubscriptionsSonosAdd(page.items[0].id);
|
||||||
|
} else if (v2Adapter == 'alexa2') {
|
||||||
|
subscribeMediaSubscriptionsAlexaAdd(page.items[0].id);
|
||||||
|
} else if (v2Adapter == 'bosesoundtouch') {
|
||||||
|
subscribeMediaSubscriptionsBoseAdd(page.items[0].id);
|
||||||
|
} else if (v2Adapter == 'squeezeboxrpc') {
|
||||||
|
subscribeMediaSubscriptionsSqueezeboxAdd(page.items[0].id);
|
||||||
}
|
}
|
||||||
} else if (page.type == 'cardMedia' && pageCounter == -1) {
|
} else if (page.type == 'cardMedia' && pageCounter == -1) {
|
||||||
//Do Nothing
|
//Do Nothing
|
||||||
@@ -5111,8 +5149,8 @@ function GenerateMediaPage(page: NSPanel.PageMedia): NSPanel.Payload[] {
|
|||||||
if (existsObject(id)) {
|
if (existsObject(id)) {
|
||||||
let name = getState(id + '.ALBUM').val;
|
let name = getState(id + '.ALBUM').val;
|
||||||
let title = getState(id + '.TITLE').val;
|
let title = getState(id + '.TITLE').val;
|
||||||
if (title.length > 26) {
|
if (title.length > 27) {
|
||||||
title = title.slice(0, 26) + '...';
|
title = title.slice(0, 27) + '...';
|
||||||
}
|
}
|
||||||
if (existsObject(id + '.DURATION') && existsObject(id + '.ELAPSED')) {
|
if (existsObject(id + '.DURATION') && existsObject(id + '.ELAPSED')) {
|
||||||
if (v2Adapter == 'alexa2') {
|
if (v2Adapter == 'alexa2') {
|
||||||
@@ -5134,14 +5172,7 @@ function GenerateMediaPage(page: NSPanel.PageMedia): NSPanel.Payload[] {
|
|||||||
vDuration = vDuration.slice(1);
|
vDuration = vDuration.slice(1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (vDuration != '0:00') {
|
title = title + ' (' + vElapsed + '|' + vDuration + ')';
|
||||||
title = title + ' (' + vElapsed + '|' + vDuration + ')';
|
|
||||||
} else {
|
|
||||||
title = title + ' (' + vElapsed + ')';
|
|
||||||
}
|
|
||||||
if (title == ' (0:00)') {
|
|
||||||
title = '';
|
|
||||||
}
|
|
||||||
} else if (v2Adapter == 'sonos' && getState(page.items[0].adapterPlayerInstance + 'root.' + page.items[0].mediaDevice + '.current_type').val == 0) {
|
} else if (v2Adapter == 'sonos' && getState(page.items[0].adapterPlayerInstance + 'root.' + page.items[0].mediaDevice + '.current_type').val == 0) {
|
||||||
let vElapsed = getState(id + '.ELAPSED').val;
|
let vElapsed = getState(id + '.ELAPSED').val;
|
||||||
if (vElapsed.length == 5) {
|
if (vElapsed.length == 5) {
|
||||||
@@ -5197,24 +5228,6 @@ function GenerateMediaPage(page: NSPanel.PageMedia): NSPanel.Payload[] {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Settings >>Aktualisierungsintervall für Statusinformationen<< = 1 !
|
|
||||||
// If the refresh time is set to 1 second in the spotify-premium.X instance,
|
|
||||||
// the elapsed refresh bug '00:00' is not visible
|
|
||||||
if (v2Adapter == 'spotify-premium') {
|
|
||||||
let vElapsed: string = getState(id + '.ELAPSED').val;
|
|
||||||
if (vElapsed.substring(0,1) == '0') {
|
|
||||||
vElapsed = vElapsed.slice(1)
|
|
||||||
}
|
|
||||||
let vDuration: string = getState(id + '.DURATION').val;
|
|
||||||
if (vDuration.substring(0,1) == '0') {
|
|
||||||
vDuration = vDuration.slice(1)
|
|
||||||
}
|
|
||||||
title = title + ' (' + vElapsed + '|' + vDuration + ')';
|
|
||||||
if (title == ' (0:00|0:00)') {
|
|
||||||
title = '';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
let shuffle = getState(id + '.SHUFFLE').val;
|
let shuffle = getState(id + '.SHUFFLE').val;
|
||||||
|
|
||||||
//New Adapter/Player
|
//New Adapter/Player
|
||||||
@@ -5225,23 +5238,19 @@ function GenerateMediaPage(page: NSPanel.PageMedia): NSPanel.Payload[] {
|
|||||||
media_icon = Icons.GetIcon('spotify');
|
media_icon = Icons.GetIcon('spotify');
|
||||||
name = getState(id + '.CONTEXT_DESCRIPTION').val;
|
name = getState(id + '.CONTEXT_DESCRIPTION').val;
|
||||||
let nameLength = name.length;
|
let nameLength = name.length;
|
||||||
if (name.substring(0,17) == 'Playlist: This Is') {
|
if (name.substring(0,9) == 'Playlist:') {
|
||||||
name = name.slice(18, 34) + '...';
|
|
||||||
} else if (name.substring(0,9) == 'Playlist:') {
|
|
||||||
name = name.slice(10, 26) + '...';
|
name = name.slice(10, 26) + '...';
|
||||||
} else if (name.substring(0,6) == 'Album:') {
|
} else if (name.substring(0,6) == 'Album:') {
|
||||||
name = name.slice(7, 23) + '...';
|
name = name.slice(7, 23) + '...';
|
||||||
} else if (name.substring(0,6) == 'Track:') {
|
} else if (name.substring(0,6) == 'Track') {
|
||||||
name = name.slice(7, 23) + '...';
|
name = 'Spotify-Premium';
|
||||||
} else if (name.substring(0,7) == 'Artist:') {
|
|
||||||
name = name.slice(8, 24) + '...';
|
|
||||||
}
|
}
|
||||||
if (nameLength == 0) {
|
if (nameLength == 0) {
|
||||||
name = 'Spotify-Premium';
|
name = 'Spotify-Premium';
|
||||||
}
|
}
|
||||||
author = getState(id + '.ARTIST').val + ' | ' + getState(id + '.ALBUM').val;
|
author = getState(id + '.ARTIST').val + ' | ' + getState(id + '.ALBUM').val;
|
||||||
if (author.length > 37) {
|
if (author.length > 30) {
|
||||||
author = author.slice(0,37) + '...';
|
author = getState(id + '.ARTIST').val;
|
||||||
}
|
}
|
||||||
if ((getState(id + '.ARTIST').val).length == 0) {
|
if ((getState(id + '.ARTIST').val).length == 0) {
|
||||||
author = findLocale('media','no_music_to_control');
|
author = findLocale('media','no_music_to_control');
|
||||||
@@ -5292,10 +5301,9 @@ function GenerateMediaPage(page: NSPanel.PageMedia): NSPanel.Payload[] {
|
|||||||
//Logitech Squeezebox RPC
|
//Logitech Squeezebox RPC
|
||||||
if (v2Adapter == 'squeezeboxrpc') {
|
if (v2Adapter == 'squeezeboxrpc') {
|
||||||
media_icon = Icons.GetIcon('dlna');
|
media_icon = Icons.GetIcon('dlna');
|
||||||
if (name.length == 0) {
|
let nameLength = name.length;
|
||||||
name = page.heading;
|
if (nameLength == 0) {
|
||||||
} else if (name.length > 16) {
|
name = page.items[0].mediaDevice;
|
||||||
name = name.slice(0,16) + '...'
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -5313,8 +5321,6 @@ function GenerateMediaPage(page: NSPanel.PageMedia): NSPanel.Payload[] {
|
|||||||
}
|
}
|
||||||
if (nameLength == 0) {
|
if (nameLength == 0) {
|
||||||
name = 'Alexa Player';
|
name = 'Alexa Player';
|
||||||
} else {
|
|
||||||
name = name.slice(0,16) + '...';
|
|
||||||
}
|
}
|
||||||
author = getState(id + '.ARTIST').val + ' | ' + getState(id + '.ALBUM').val;
|
author = getState(id + '.ARTIST').val + ' | ' + getState(id + '.ALBUM').val;
|
||||||
if (author.length > 30) {
|
if (author.length > 30) {
|
||||||
@@ -5327,12 +5333,12 @@ function GenerateMediaPage(page: NSPanel.PageMedia): NSPanel.Payload[] {
|
|||||||
|
|
||||||
//Volumio
|
//Volumio
|
||||||
if (v2Adapter == 'volumio') {
|
if (v2Adapter == 'volumio') {
|
||||||
media_icon = Icons.GetIcon('clock-time-twelve-outline');
|
if (name != undefined) { author = author + " [" + name + "]"; }
|
||||||
if (name != undefined) { author = author + " | " + name; }
|
name = getState(vInstance + 'info.name').val; /* page.heading;
|
||||||
name = page.heading;
|
getState(id + '.TRACK').val; */
|
||||||
}
|
}
|
||||||
|
|
||||||
let volume = scale(getState(id + '.VOLUME').val, activePage!.items[0]!.minValue ?? 0, activePage!.items[0]!.maxValue ?? 100, 100, 0);
|
let volume = getState(id + '.VOLUME').val;
|
||||||
let iconplaypause = Icons.GetIcon('pause'); //pause
|
let iconplaypause = Icons.GetIcon('pause'); //pause
|
||||||
let shuffle_icon = Icons.GetIcon('shuffle-variant'); //shuffle
|
let shuffle_icon = Icons.GetIcon('shuffle-variant'); //shuffle
|
||||||
let onoffbutton = 1374;
|
let onoffbutton = 1374;
|
||||||
@@ -5340,9 +5346,7 @@ function GenerateMediaPage(page: NSPanel.PageMedia): NSPanel.Payload[] {
|
|||||||
if (shuffle == 'off' || shuffle == false || shuffle == 0 || shuffle == 'false') {
|
if (shuffle == 'off' || shuffle == false || shuffle == 0 || shuffle == 'false') {
|
||||||
shuffle_icon = Icons.GetIcon('shuffle-disabled'); //shuffle
|
shuffle_icon = Icons.GetIcon('shuffle-disabled'); //shuffle
|
||||||
}
|
}
|
||||||
|
if (v2Adapter == 'volumio') { shuffle_icon = Icons.GetIcon('refresh'); } //Volumio: refresh playlist
|
||||||
// Todo: Refresh automatisieren und dafür wieder Shuffle nutzen
|
|
||||||
//if (v2Adapter == 'volumio') { shuffle_icon = Icons.GetIcon('shuffle-disabled'); } //Volumio: refresh playlist
|
|
||||||
|
|
||||||
|
|
||||||
//For all players
|
//For all players
|
||||||
@@ -5373,7 +5377,7 @@ function GenerateMediaPage(page: NSPanel.PageMedia): NSPanel.Payload[] {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
let currentSpeaker: string = findLocale('media','no_speaker_found');
|
let currentSpeaker = findLocale('media','no_speaker_found');
|
||||||
|
|
||||||
if (v2Adapter == 'alexa2') {
|
if (v2Adapter == 'alexa2') {
|
||||||
currentSpeaker = getState(([page.items[0].adapterPlayerInstance, 'Echo-Devices.', page.items[0].mediaDevice, '.Info.name'].join(''))).val;
|
currentSpeaker = getState(([page.items[0].adapterPlayerInstance, 'Echo-Devices.', page.items[0].mediaDevice, '.Info.name'].join(''))).val;
|
||||||
@@ -5385,8 +5389,6 @@ function GenerateMediaPage(page: NSPanel.PageMedia): NSPanel.Payload[] {
|
|||||||
currentSpeaker = getState(([page.items[0].adapterPlayerInstance, 'Players.', page.items[0].mediaDevice, '.Playername'].join(''))).val;
|
currentSpeaker = getState(([page.items[0].adapterPlayerInstance, 'Players.', page.items[0].mediaDevice, '.Playername'].join(''))).val;
|
||||||
} else if (v2Adapter == 'bosesoundtouch') {
|
} else if (v2Adapter == 'bosesoundtouch') {
|
||||||
currentSpeaker = getState(([page.items[0].adapterPlayerInstance, 'deviceInfo.name'].join(''))).val;
|
currentSpeaker = getState(([page.items[0].adapterPlayerInstance, 'deviceInfo.name'].join(''))).val;
|
||||||
} else if (v2Adapter == 'volumio') {
|
|
||||||
currentSpeaker = getState(([page.items[0].adapterPlayerInstance, 'info.name'].join(''))).val;
|
|
||||||
}
|
}
|
||||||
//-------------------------------------------------------------------------------------------------------------
|
//-------------------------------------------------------------------------------------------------------------
|
||||||
// All Alexa devices (the online / player and commands directory is available) are listed and linked below
|
// All Alexa devices (the online / player and commands directory is available) are listed and linked below
|
||||||
@@ -5403,11 +5405,6 @@ function GenerateMediaPage(page: NSPanel.PageMedia): NSPanel.Payload[] {
|
|||||||
speakerListArray.push(getState(playerId).val);
|
speakerListArray.push(getState(playerId).val);
|
||||||
page.items[0].speakerList = speakerListArray;
|
page.items[0].speakerList = speakerListArray;
|
||||||
});
|
});
|
||||||
} else if (v2Adapter == 'spotify-premium') {
|
|
||||||
// All possible Devices if page.items[0].speakerList empty
|
|
||||||
if (Debug) log(getState(page.items[0].adapterPlayerInstance + 'devices.availableDeviceListString').val);
|
|
||||||
speakerListArray = (getState(page.items[0].adapterPlayerInstance + 'devices.availableDeviceListString').val).split(';');
|
|
||||||
page.items[0].speakerList = speakerListArray;
|
|
||||||
} else {
|
} else {
|
||||||
let i_list = Array.prototype.slice.apply($('[state.id="' + page.items[0].adapterPlayerInstance + 'Echo-Devices.*.Info.name"]'));
|
let i_list = Array.prototype.slice.apply($('[state.id="' + page.items[0].adapterPlayerInstance + 'Echo-Devices.*.Info.name"]'));
|
||||||
for (let i_index in i_list) {
|
for (let i_index in i_list) {
|
||||||
@@ -5433,7 +5430,7 @@ function GenerateMediaPage(page: NSPanel.PageMedia): NSPanel.Payload[] {
|
|||||||
if (speakerListArray.length > 0) {
|
if (speakerListArray.length > 0) {
|
||||||
speakerListIconCol = rgb_dec565(HMIOn);
|
speakerListIconCol = rgb_dec565(HMIOn);
|
||||||
speakerListString = 'input_sel' + '~' +
|
speakerListString = 'input_sel' + '~' +
|
||||||
tid + '?speakerlist' + '~' +
|
id + '?speakerlist' + '~' +
|
||||||
Icons.GetIcon('speaker') + '~' +
|
Icons.GetIcon('speaker') + '~' +
|
||||||
speakerListIconCol + '~' +
|
speakerListIconCol + '~' +
|
||||||
findLocale('media','speaker') + '~' +
|
findLocale('media','speaker') + '~' +
|
||||||
@@ -5467,13 +5464,10 @@ function GenerateMediaPage(page: NSPanel.PageMedia): NSPanel.Payload[] {
|
|||||||
});
|
});
|
||||||
|
|
||||||
}
|
}
|
||||||
/* Spotify: get all playlists if empty */
|
|
||||||
} else if (v2Adapter == 'spotify-premium') {
|
|
||||||
page.items[0].playList = (getState(page.items[0].adapterPlayerInstance + 'playlists.playlistListString').val).split(';');
|
|
||||||
}
|
}
|
||||||
playListIconCol = rgb_dec565(HMIOn);
|
playListIconCol = rgb_dec565(HMIOn);
|
||||||
playListString = 'input_sel' + '~' +
|
playListString = 'input_sel' + '~' +
|
||||||
tid + '?playlist' + '~' +
|
id + '?playlist' + '~' +
|
||||||
Icons.GetIcon('playlist-play') + '~' +
|
Icons.GetIcon('playlist-play') + '~' +
|
||||||
playListIconCol + '~' +
|
playListIconCol + '~' +
|
||||||
//'PlayL ' + page.heading + '~' +
|
//'PlayL ' + page.heading + '~' +
|
||||||
@@ -5483,7 +5477,9 @@ function GenerateMediaPage(page: NSPanel.PageMedia): NSPanel.Payload[] {
|
|||||||
|
|
||||||
//InSel Tracklist
|
//InSel Tracklist
|
||||||
globalTracklist = ''
|
globalTracklist = ''
|
||||||
|
if (v2Adapter == 'spotify-premium') {
|
||||||
|
globalTracklist = ' ' //Todo
|
||||||
|
}
|
||||||
let trackListString: string = '~~~~~~'
|
let trackListString: string = '~~~~~~'
|
||||||
let trackListIconCol = rgb_dec565(HMIOff);
|
let trackListIconCol = rgb_dec565(HMIOff);
|
||||||
if (v2Adapter == 'volumio') { /* Volumio: get queue */
|
if (v2Adapter == 'volumio') { /* Volumio: get queue */
|
||||||
@@ -5534,19 +5530,12 @@ function GenerateMediaPage(page: NSPanel.PageMedia): NSPanel.Payload[] {
|
|||||||
trackList = trackList + ']';
|
trackList = trackList + ']';
|
||||||
if (Debug) log(trackList, 'info');
|
if (Debug) log(trackList, 'info');
|
||||||
globalTracklist = trackList;
|
globalTracklist = trackList;
|
||||||
} else if (v2Adapter == 'spotify-premium') {
|
|
||||||
try {
|
|
||||||
let tempTrackList = JSON.parse(getState(page.items[0].adapterPlayerInstance + 'player.playlist.trackListArray').val);
|
|
||||||
globalTracklist = tempTrackList;
|
|
||||||
} catch {
|
|
||||||
log('Hello Mr. Developer something went wrong in tracklist!', 'debug')
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (globalTracklist != null && globalTracklist.length != 0) {
|
if (globalTracklist != null && globalTracklist.length != 0) {
|
||||||
trackListIconCol = rgb_dec565(HMIOn);
|
trackListIconCol = rgb_dec565(HMIOn);
|
||||||
trackListString = 'input_sel' + '~' +
|
trackListString = 'input_sel' + '~' +
|
||||||
tid + '?tracklist' + '~' +
|
id + '?tracklist' + '~' +
|
||||||
Icons.GetIcon('animation-play-outline') + '~' +
|
Icons.GetIcon('animation-play-outline') + '~' +
|
||||||
trackListIconCol + '~' +
|
trackListIconCol + '~' +
|
||||||
findLocale('media','tracklist') + '~' +
|
findLocale('media','tracklist') + '~' +
|
||||||
@@ -5559,7 +5548,7 @@ function GenerateMediaPage(page: NSPanel.PageMedia): NSPanel.Payload[] {
|
|||||||
if (page.items[0].equalizerList != undefined) {
|
if (page.items[0].equalizerList != undefined) {
|
||||||
equalizerListIconCol = rgb_dec565(HMIOn);
|
equalizerListIconCol = rgb_dec565(HMIOn);
|
||||||
equalizerListString = 'input_sel' + '~' +
|
equalizerListString = 'input_sel' + '~' +
|
||||||
tid + '?equalizer' + '~' +
|
id + '?equalizer' + '~' +
|
||||||
Icons.GetIcon('equalizer-outline') + '~' +
|
Icons.GetIcon('equalizer-outline') + '~' +
|
||||||
equalizerListIconCol + '~' +
|
equalizerListIconCol + '~' +
|
||||||
findLocale('media','equalizer') + '~' +
|
findLocale('media','equalizer') + '~' +
|
||||||
@@ -5568,7 +5557,7 @@ function GenerateMediaPage(page: NSPanel.PageMedia): NSPanel.Payload[] {
|
|||||||
let equalizerListIconCol = rgb_dec565(HMIOn);
|
let equalizerListIconCol = rgb_dec565(HMIOn);
|
||||||
//equalizerListString is used for favariteList
|
//equalizerListString is used for favariteList
|
||||||
equalizerListString = 'input_sel' + '~' +
|
equalizerListString = 'input_sel' + '~' +
|
||||||
tid + '?favorites' + '~' +
|
id + '?favorites' + '~' +
|
||||||
Icons.GetIcon('playlist-star') + '~' +
|
Icons.GetIcon('playlist-star') + '~' +
|
||||||
equalizerListIconCol + '~' +
|
equalizerListIconCol + '~' +
|
||||||
findLocale('media','favorites') + '~' +
|
findLocale('media','favorites') + '~' +
|
||||||
@@ -5617,10 +5606,15 @@ function GenerateMediaPage(page: NSPanel.PageMedia): NSPanel.Payload[] {
|
|||||||
repeatIcon = Icons.GetIcon('repeat');
|
repeatIcon = Icons.GetIcon('repeat');
|
||||||
repeatIconCol = rgb_dec565(HMIOn);
|
repeatIconCol = rgb_dec565(HMIOn);
|
||||||
}
|
}
|
||||||
|
/*
|
||||||
|
else {
|
||||||
|
repeatIcon = Icons.GetIcon('repeat-off');
|
||||||
|
}
|
||||||
|
*/
|
||||||
} else if (v2Adapter == 'volumio') { /* Volumio: only Repeat true/false with API */
|
} else if (v2Adapter == 'volumio') { /* Volumio: only Repeat true/false with API */
|
||||||
if (getState(id + '.REPEAT').val == true) {
|
if (getState(id + '.REPEAT').val == true) {
|
||||||
repeatIcon = Icons.GetIcon('repeat-variant');
|
repeatIcon = Icons.GetIcon('repeat-variant');
|
||||||
repeatIconCol = rgb_dec565(HMIOn);
|
repeatIconCol = rgb_dec565(colMediaIcon);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -5631,7 +5625,7 @@ function GenerateMediaPage(page: NSPanel.PageMedia): NSPanel.Payload[] {
|
|||||||
v2Adapter == 'volumio' ||
|
v2Adapter == 'volumio' ||
|
||||||
v2Adapter == 'squeezeboxrpc') {
|
v2Adapter == 'squeezeboxrpc') {
|
||||||
repeatButtonString = 'button' + '~' +
|
repeatButtonString = 'button' + '~' +
|
||||||
tid + '?repeat' + '~' +
|
id + '?repeat' + '~' +
|
||||||
repeatIcon + '~' +
|
repeatIcon + '~' +
|
||||||
repeatIconCol + '~' +
|
repeatIconCol + '~' +
|
||||||
'Repeat' + '~' +
|
'Repeat' + '~' +
|
||||||
@@ -5644,14 +5638,14 @@ function GenerateMediaPage(page: NSPanel.PageMedia): NSPanel.Payload[] {
|
|||||||
if (v2Adapter == 'sonos') {
|
if (v2Adapter == 'sonos') {
|
||||||
if (page.items[0].crossfade == undefined || page.items[0].crossfade == false) {
|
if (page.items[0].crossfade == undefined || page.items[0].crossfade == false) {
|
||||||
toolsString = 'input_sel' + '~' +
|
toolsString = 'input_sel' + '~' +
|
||||||
tid + '?seek' + '~' +
|
id + '?seek' + '~' +
|
||||||
media_icon + '~' +
|
media_icon + '~' +
|
||||||
toolsIconCol + '~' +
|
toolsIconCol + '~' +
|
||||||
findLocale('media','seek') + '~' +
|
findLocale('media','seek') + '~' +
|
||||||
'media5~'
|
'media5~'
|
||||||
} else {
|
} else {
|
||||||
toolsString = 'input_sel' + '~' +
|
toolsString = 'input_sel' + '~' +
|
||||||
tid + '?crossfade' + '~' +
|
id + '?crossfade' + '~' +
|
||||||
media_icon + '~' +
|
media_icon + '~' +
|
||||||
toolsIconCol + '~' +
|
toolsIconCol + '~' +
|
||||||
findLocale('media','crossfade') + '~' +
|
findLocale('media','crossfade') + '~' +
|
||||||
@@ -5660,16 +5654,7 @@ function GenerateMediaPage(page: NSPanel.PageMedia): NSPanel.Payload[] {
|
|||||||
} else if (v2Adapter == 'squeezeboxrpc') {
|
} else if (v2Adapter == 'squeezeboxrpc') {
|
||||||
if (page.items[0].crossfade == undefined || page.items[0].crossfade == false) {
|
if (page.items[0].crossfade == undefined || page.items[0].crossfade == false) {
|
||||||
toolsString = 'input_sel' + '~' +
|
toolsString = 'input_sel' + '~' +
|
||||||
tid + '?seek' + '~' +
|
id + '?seek' + '~' +
|
||||||
media_icon + '~' +
|
|
||||||
toolsIconCol + '~' +
|
|
||||||
findLocale('media','seek') + '~' +
|
|
||||||
'media5~'
|
|
||||||
}
|
|
||||||
} else if (v2Adapter == 'spotify-premium') {
|
|
||||||
if (page.items[0].crossfade == undefined || page.items[0].crossfade == false) {
|
|
||||||
toolsString = 'input_sel' + '~' +
|
|
||||||
tid + '?seek' + '~' +
|
|
||||||
media_icon + '~' +
|
media_icon + '~' +
|
||||||
toolsIconCol + '~' +
|
toolsIconCol + '~' +
|
||||||
findLocale('media','seek') + '~' +
|
findLocale('media','seek') + '~' +
|
||||||
@@ -5677,7 +5662,7 @@ function GenerateMediaPage(page: NSPanel.PageMedia): NSPanel.Payload[] {
|
|||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
toolsString = 'button' + '~' +
|
toolsString = 'button' + '~' +
|
||||||
tid + '' + '~' +
|
id + '' + '~' +
|
||||||
media_icon + '~' +
|
media_icon + '~' +
|
||||||
toolsIconCol + '~' +
|
toolsIconCol + '~' +
|
||||||
findLocale('media','tools') + '~' +
|
findLocale('media','tools') + '~' +
|
||||||
@@ -5688,7 +5673,7 @@ function GenerateMediaPage(page: NSPanel.PageMedia): NSPanel.Payload[] {
|
|||||||
payload: 'entityUpd~' + //entityUpd
|
payload: 'entityUpd~' + //entityUpd
|
||||||
name + '~' + //heading
|
name + '~' + //heading
|
||||||
GetNavigationString(pageId) + '~' + //navigation
|
GetNavigationString(pageId) + '~' + //navigation
|
||||||
tid + '~' + //internalNameEntiy
|
id + '~' + //internalNameEntiy
|
||||||
title + '~' + //title
|
title + '~' + //title
|
||||||
rgb_dec565(colMediaTitle) + '~' + //titleColor
|
rgb_dec565(colMediaTitle) + '~' + //titleColor
|
||||||
author + '~' + //author
|
author + '~' + //author
|
||||||
@@ -6107,6 +6092,8 @@ function subscribePowerSubscriptions(id: string): void {
|
|||||||
function GeneratePowerPage(page: NSPanel.PagePower): NSPanel.Payload[] {
|
function GeneratePowerPage(page: NSPanel.PagePower): NSPanel.Payload[] {
|
||||||
try {
|
try {
|
||||||
|
|
||||||
|
if (!page.items[0].id) throw new Error ('Missing pageItem.id for PowerPage!');
|
||||||
|
|
||||||
let obj:object = {};
|
let obj:object = {};
|
||||||
let demoMode = false;
|
let demoMode = false;
|
||||||
if (page.items[0].id == undefined){
|
if (page.items[0].id == undefined){
|
||||||
@@ -6498,21 +6485,17 @@ function HandleButtonEvent(words: any): void {
|
|||||||
GeneratePage(activePage!);
|
GeneratePage(activePage!);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 'bHome':
|
case 'bHome':
|
||||||
if (Debug) {
|
if (Debug) {
|
||||||
log('HandleButtonEvent -> bHome: ' + words[4] + ' - ' + pageId, 'info');
|
log('HandleButtonEvent -> bHome: ' + words[4] + ' - ' + pageId, 'info');
|
||||||
}
|
}
|
||||||
UnsubscribeWatcher();
|
UnsubscribeWatcher();
|
||||||
const home = activePage!.home;
|
if (activePage!.home != undefined) {
|
||||||
if (home !== undefined) {
|
GeneratePage(eval(activePage!.home));
|
||||||
pageId = config.pages.findIndex(a => a == eval(home))
|
} else {
|
||||||
pageId = pageId === -1 ? 0 : pageId;
|
GeneratePage(config.pages[0]);
|
||||||
GeneratePage(eval(home));
|
}
|
||||||
} else {
|
break;
|
||||||
pageId = 0;
|
|
||||||
GeneratePage(config.pages[0]);
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case 'notifyAction':
|
case 'notifyAction':
|
||||||
if (words[4] == 'yes') {
|
if (words[4] == 'yes') {
|
||||||
setState(popupNotifyInternalName, <iobJS.State>{ val: words[2], ack: true });
|
setState(popupNotifyInternalName, <iobJS.State>{ val: words[2], ack: true });
|
||||||
@@ -6633,20 +6616,19 @@ function HandleButtonEvent(words: any): void {
|
|||||||
|
|
||||||
switch (deviceAdapterRP) {
|
switch (deviceAdapterRP) {
|
||||||
case 'spotify-premium':
|
case 'spotify-premium':
|
||||||
if (Debug) log(getState(id + '.REPEAT').val);
|
let stateSpotifyRepeat = getState(id + '.REPEAT').val
|
||||||
let stateSpotifyRepeat = getState(id + '.REPEAT').val;
|
if (stateSpotifyRepeat == 'none') {
|
||||||
if (stateSpotifyRepeat == 'off') {
|
setIfExists(id + '.REPEAT', 'all');
|
||||||
setIfExists(id + '.REPEAT', 'context');
|
} else if (stateSpotifyRepeat == 'all') {
|
||||||
} else if (stateSpotifyRepeat == 'context') {
|
setIfExists(id + '.REPEAT', 'one');
|
||||||
setIfExists(id + '.REPEAT', 'track');
|
} else if (stateSpotifyRepeat == 'one') {
|
||||||
} else if (stateSpotifyRepeat == 'track') {
|
setIfExists(id + '.REPEAT', 'none');
|
||||||
setIfExists(id + '.REPEAT', 'off');
|
|
||||||
}
|
}
|
||||||
GeneratePage(activePage!);
|
GeneratePage(activePage!);
|
||||||
break;
|
break;
|
||||||
case 'bosesoundtouch':
|
case 'bosesoundtouch':
|
||||||
if (Debug) log(adapterInstanceRepeat);
|
if (Debug) log(adapterInstanceRepeat);
|
||||||
let stateBoseRepeat = getState(id + '.REPEAT').val;
|
let stateBoseRepeat = getState(id + '.REPEAT').val
|
||||||
if (stateBoseRepeat == 'REPEAT_OFF') {
|
if (stateBoseRepeat == 'REPEAT_OFF') {
|
||||||
setIfExists(adapterInstanceRepeat + 'key', 'REPEAT_ALL');
|
setIfExists(adapterInstanceRepeat + 'key', 'REPEAT_ALL');
|
||||||
} else if (stateBoseRepeat == 'REPEAT_ALL') {
|
} else if (stateBoseRepeat == 'REPEAT_ALL') {
|
||||||
@@ -6657,7 +6639,7 @@ function HandleButtonEvent(words: any): void {
|
|||||||
GeneratePage(activePage!);
|
GeneratePage(activePage!);
|
||||||
break;
|
break;
|
||||||
case 'sonos':
|
case 'sonos':
|
||||||
let stateSonosRepeat = getState(id + '.REPEAT').val;
|
let stateSonosRepeat = getState(id + '.REPEAT').val
|
||||||
if (stateSonosRepeat == 0) {
|
if (stateSonosRepeat == 0) {
|
||||||
setIfExists(id + '.REPEAT', 1);
|
setIfExists(id + '.REPEAT', 1);
|
||||||
} else if (stateSonosRepeat == 1) {
|
} else if (stateSonosRepeat == 1) {
|
||||||
@@ -6956,11 +6938,15 @@ function HandleButtonEvent(words: any): void {
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case 'volumeSlider':
|
case 'volumeSlider':
|
||||||
subscribeMediaSubscriptions(id);
|
pageCounter = -1;
|
||||||
useMediaEvents = true;
|
(function () { if (timeoutSlider) { clearTimeout(timeoutSlider); timeoutSlider = null; } })();
|
||||||
pageCounter = 1;
|
timeoutSlider = setTimeout(async function () {
|
||||||
let vVolume = scale(parseInt(words[4]), 100, 0, activePage!.items[0]!.minValue ?? 0, activePage!.items[0]!.maxValue ?? 100);
|
setIfExists(id + '.VOLUME', parseInt(words[4]));
|
||||||
setIfExists(id + '.VOLUME', Math.floor(vVolume));
|
setTimeout(async function () {
|
||||||
|
pageCounter = 1;
|
||||||
|
GeneratePage(activePage!);
|
||||||
|
}, 3000);
|
||||||
|
}, 20);
|
||||||
break;
|
break;
|
||||||
case 'mode-speakerlist':
|
case 'mode-speakerlist':
|
||||||
let pageItem = findPageItem(id);
|
let pageItem = findPageItem(id);
|
||||||
@@ -7084,9 +7070,8 @@ function HandleButtonEvent(words: any): void {
|
|||||||
|
|
||||||
switch (deviceAdapterTL) {
|
switch (deviceAdapterTL) {
|
||||||
case 'spotify-premium':
|
case 'spotify-premium':
|
||||||
//let trackArray = (function () { try {return JSON.parse(getState(pageItemTL.adapterPlayerInstance + 'player.playlist.trackListArray').val);} catch(e) {return {};}})();
|
let trackArray = (function () { try {return JSON.parse(getState(pageItemTL.adapterPlayerInstance + 'player.playlist.trackListArray').val);} catch(e) {return {};}})();
|
||||||
//setState(adapterInstanceTL + 'player.trackId', getAttr(trackArray, words[4] + '.id'));
|
setState(adapterInstanceTL + 'player.trackId', getAttr(trackArray, words[4] + '.id'));
|
||||||
setState(adapterInstanceTL + 'player.playlist.trackNo', parseInt(words[4]) + 1);
|
|
||||||
break;
|
break;
|
||||||
case 'sonos':
|
case 'sonos':
|
||||||
setState(adapterInstanceTL + 'root.' + pageItemTL.mediaDevice + '.current_track_number', parseInt(words[4]) + 1);
|
setState(adapterInstanceTL + 'root.' + pageItemTL.mediaDevice + '.current_track_number', parseInt(words[4]) + 1);
|
||||||
@@ -7164,7 +7149,6 @@ function HandleButtonEvent(words: any): void {
|
|||||||
let deviceAdapterSK: NSPanel.PlayerType = adapterSK[0] as NSPanel.PlayerType;
|
let deviceAdapterSK: NSPanel.PlayerType = adapterSK[0] as NSPanel.PlayerType;
|
||||||
switch (deviceAdapterSK) {
|
switch (deviceAdapterSK) {
|
||||||
case 'spotify-premium':
|
case 'spotify-premium':
|
||||||
setState(adapterInstanceSK + 'player.progressPercentage', parseInt(words[4]) * 10);
|
|
||||||
break;
|
break;
|
||||||
case 'squeezeboxrpc':
|
case 'squeezeboxrpc':
|
||||||
const vDuration: number = getState(adapterInstanceSK + 'Players.' + pageItemSeek.mediaDevice + '.Duration').val;
|
const vDuration: number = getState(adapterInstanceSK + 'Players.' + pageItemSeek.mediaDevice + '.Duration').val;
|
||||||
@@ -8262,11 +8246,6 @@ function GenerateDetailPage(type: NSPanel.PopupType, optional: NSPanel.mediaOpti
|
|||||||
actualState = Math.round(actualStateTemp / 10) * 10 + '%';
|
actualState = Math.round(actualStateTemp / 10) * 10 + '%';
|
||||||
optionalString = '0%?10%?20%?30%?40%?50%?60%?70%?80%?90%?100%';
|
optionalString = '0%?10%?20%?30%?40%?50%?60%?70%?80%?90%?100%';
|
||||||
}
|
}
|
||||||
if (vAdapter == 'spotify-premium') {
|
|
||||||
const actualStateTemp: number = getState(pageItem.adapterPlayerInstance + 'player.progressPercentage').val;
|
|
||||||
actualState = Math.round(actualStateTemp / 10) * 10 + '%';
|
|
||||||
optionalString = '0%?10%?20%?30%?40%?50%?60%?70%?80%?90%?100%';
|
|
||||||
}
|
|
||||||
if (vAdapter == 'squeezeboxrpc') {
|
if (vAdapter == 'squeezeboxrpc') {
|
||||||
const actualStateTime: number = parseInt(getState(pageItem.adapterPlayerInstance + 'Players.' + pageItem.mediaDevice + '.Time').val);
|
const actualStateTime: number = parseInt(getState(pageItem.adapterPlayerInstance + 'Players.' + pageItem.mediaDevice + '.Time').val);
|
||||||
const actualStateDuration: number = parseInt(getState(pageItem.adapterPlayerInstance + 'Players.' + pageItem.mediaDevice + '.Duration').val);
|
const actualStateDuration: number = parseInt(getState(pageItem.adapterPlayerInstance + 'Players.' + pageItem.mediaDevice + '.Duration').val);
|
||||||
@@ -8409,7 +8388,7 @@ function GenerateDetailPage(type: NSPanel.PopupType, optional: NSPanel.mediaOpti
|
|||||||
//Limit 900 characters, then memory overflow --> Shorten as much as possible
|
//Limit 900 characters, then memory overflow --> Shorten as much as possible
|
||||||
let temp_array: any[] = [];
|
let temp_array: any[] = [];
|
||||||
//let trackArray = (function () { try {return JSON.parse(getState(pageItem.adapterPlayerInstance + 'player.playlist.trackListArray').val);} catch(e) {return {};}})();
|
//let trackArray = (function () { try {return JSON.parse(getState(pageItem.adapterPlayerInstance + 'player.playlist.trackListArray').val);} catch(e) {return {};}})();
|
||||||
for (let track_index = 0; track_index < 48; track_index++) {
|
for (let track_index = 0; track_index < 45; track_index++) {
|
||||||
let temp_cut_array = getAttr(globalTracklist, track_index + '.title');
|
let temp_cut_array = getAttr(globalTracklist, track_index + '.title');
|
||||||
/* Volumio: @local/NAS no title -> name */
|
/* Volumio: @local/NAS no title -> name */
|
||||||
if (temp_cut_array == undefined) {
|
if (temp_cut_array == undefined) {
|
||||||
@@ -8854,10 +8833,9 @@ function HandleScreensaverUpdate(): void {
|
|||||||
iconColor + '~' +
|
iconColor + '~' +
|
||||||
config.bottomScreensaverEntity[4].ScreensaverEntityText + '~' +
|
config.bottomScreensaverEntity[4].ScreensaverEntityText + '~' +
|
||||||
val
|
val
|
||||||
} // Ende zusätzlichen Status Alternativ Layout
|
}
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
// USER definierte Bottom Entities
|
|
||||||
let checkpoint = true;
|
let checkpoint = true;
|
||||||
let i = 0;
|
let i = 0;
|
||||||
for (i = 0; i < maxEntities - 1 && i < config.bottomScreensaverEntity.length; i++) {
|
for (i = 0; i < maxEntities - 1 && i < config.bottomScreensaverEntity.length; i++) {
|
||||||
@@ -8911,7 +8889,7 @@ function HandleScreensaverUpdate(): void {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const temp = config.bottomScreensaverEntity[i].ScreensaverEntityIconColor
|
const temp = config.bottomScreensaverEntity[4].ScreensaverEntityIconColor
|
||||||
if (temp && typeof temp == 'string' && existsObject(temp)) {
|
if (temp && typeof temp == 'string' && existsObject(temp)) {
|
||||||
iconColor = getState(temp).val;
|
iconColor = getState(temp).val;
|
||||||
}
|
}
|
||||||
@@ -8982,8 +8960,6 @@ function HandleScreensaverUpdate(): void {
|
|||||||
SendToPanel({ payload: 'weatherUpdate~' + payloadString });
|
SendToPanel({ payload: 'weatherUpdate~' + payloadString });
|
||||||
|
|
||||||
HandleScreensaverStatusIcons();
|
HandleScreensaverStatusIcons();
|
||||||
|
|
||||||
HandleScreensaverColors();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
} catch (err: any) {
|
} catch (err: any) {
|
||||||
@@ -9978,7 +9954,7 @@ namespace NSPanel {
|
|||||||
export type SerialType = 'button' | 'light' | 'shutter' | 'text' | 'input_sel' | 'timer' | 'number' | 'fan'
|
export type SerialType = 'button' | 'light' | 'shutter' | 'text' | 'input_sel' | 'timer' | 'number' | 'fan'
|
||||||
|
|
||||||
export type roles = 'light' |'socket'|'dimmer'| 'hue' | 'rgb' | 'rgbSingle' | 'ct' | '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'
|
| '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'
|
| 'cie' | 'gate' | 'motion' | 'buttonSensor' | 'button' | 'value.time' | 'level.timer' | 'value.alarmtime' | 'level.mode.fan' | 'lock' | 'slider'
|
||||||
| 'switch.mode.wlan' | 'media' | 'timeTable' | 'airCondition'
|
| 'switch.mode.wlan' | 'media' | 'timeTable' | 'airCondition'
|
||||||
|
|
||||||
@@ -10038,7 +10014,7 @@ namespace NSPanel {
|
|||||||
|
|
||||||
export type PageGrid2 = {
|
export type PageGrid2 = {
|
||||||
type: 'cardGrid2',
|
type: 'cardGrid2',
|
||||||
items: [PageItem?, PageItem?, PageItem?, PageItem?, PageItem?, PageItem?, PageItem?, PageItem?, PageItem?],
|
items: [PageItem?, PageItem?, PageItem?, PageItem?, PageItem?, PageItem?, PageItem?, PageItem?],
|
||||||
} & PageBaseType
|
} & PageBaseType
|
||||||
|
|
||||||
export type PageThermo = {
|
export type PageThermo = {
|
||||||
@@ -10142,6 +10118,7 @@ namespace NSPanel {
|
|||||||
navigate?: boolean,
|
navigate?: boolean,
|
||||||
colormode?: string,
|
colormode?: string,
|
||||||
colorScale?: IconScaleElement,
|
colorScale?: IconScaleElement,
|
||||||
|
//adapterPlayerInstance?: adapterPlayerInstanceType,
|
||||||
targetPage?: string,
|
targetPage?: string,
|
||||||
modeList?: string[],
|
modeList?: string[],
|
||||||
hidePassword?: boolean,
|
hidePassword?: boolean,
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*-----------------------------------------------------------------------
|
/*-----------------------------------------------------------------------
|
||||||
TypeScript v4.3.3.43 zur Steuerung des SONOFF NSPanel mit dem ioBroker by @Armilar / @TT-Tom / @ticaki / @Britzelpuf / @Sternmiere / @ravenS0ne
|
TypeScript v4.3.3.40 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
|
- 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
|
@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
|
NsPanelTs.ts (dieses TypeScript in ioBroker) Stable: https://github.com/joBr99/nspanel-lovelace-ui/blob/main/ioBroker/NsPanelTs.ts
|
||||||
@@ -108,15 +108,8 @@ ReleaseNotes:
|
|||||||
- 23.01.2024 - v4.3.3.39 Add: Optional setOn & setOff for HW button with mode 'set'
|
- 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
|
- 28.01.2024 - v4.3.3.39 Fix: ack for read-only state
|
||||||
- 03.02.2024 - v4.3.3.40 Fix: RGB maxValueColorTemp
|
- 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
|
|
||||||
- 07.02.2024 - v4.3.3.42 Minor Fixes
|
|
||||||
- 09.02.2024 - v4.3.3.42 Change pageId with Alias in Communication with HMI
|
|
||||||
- 09.02.2024 - v4.3.3.42 Spotify Media-Player: Dynamic loading of the speaker list, playlist, tracklist, fix repeat, add seek, add elapsed/duration
|
|
||||||
- 10.02.2024 - v4.3.3.42 Spotify Minor Fixes; Add miValue / maxValue to Volume-Slider
|
|
||||||
- 10.02.2024 - v4.3.3.43 Fix: cardGrid2 => 9 Entities for Layout 'us-p' issue #1167
|
|
||||||
- 11.02.2024 - v4.3.3.43 Fix VolumeSlider
|
|
||||||
|
|
||||||
Todo:
|
Todo:
|
||||||
- XX.XX.XXXX - v5.0.0 Change the bottomScreensaverEntity (rolling) if more than 6 entries are defined
|
- XX.XX.XXXX - v5.0.0 Change the bottomScreensaverEntity (rolling) if more than 6 entries are defined
|
||||||
@@ -138,8 +131,7 @@ Mögliche Seiten-Ansichten:
|
|||||||
(die 4 kleineren Icons können als Wetter-Vorschau + 4Tage (Symbol + Höchsttemperatur) oder zur Anzeige definierter Infos konfiguriert werden)
|
(die 4 kleineren Icons können als Wetter-Vorschau + 4Tage (Symbol + Höchsttemperatur) oder zur Anzeige definierter Infos konfiguriert werden)
|
||||||
cardEntities Page - 4 vertikale angeordnete Steuerelemente - auch als Subpage
|
cardEntities Page - 4 vertikale angeordnete Steuerelemente - auch als Subpage
|
||||||
cardGrid Page - 6 horizontal angeordnete Steuerelemente in 2 Reihen a 3 Steuerelemente - auch als Subpage
|
cardGrid Page - 6 horizontal angeordnete Steuerelemente in 2 Reihen a 3 Steuerelemente - auch als Subpage
|
||||||
cardGrid2 Page - 8 horizontal angeordnete Steuerelemente in 2 Reihen a 4 Steuerelemente bzw. beim US-Modell im Portrait-Modus
|
cardGrid2 Page - 8 horizontal angeordnete Steuerelemente in 2 Reihen a 4 Steuerelemente - auch als Subpage
|
||||||
9 horizontal angeordnete Steuerelemente in 3 Reihen a 3 Steuerelemente - auch als Subpage
|
|
||||||
cardThermo Page - Thermostat mit Solltemperatur, Isttemperatur, Mode - Weitere Eigenschaften können im Alias definiert werden
|
cardThermo Page - Thermostat mit Solltemperatur, Isttemperatur, Mode - Weitere Eigenschaften können im Alias definiert werden
|
||||||
cardMedia Page - Mediaplayer - Ausnahme: Alias sollte mit Alias-Manager automatisch über Alexa-Verzeichnis Player angelegt werden
|
cardMedia Page - Mediaplayer - Ausnahme: Alias sollte mit Alias-Manager automatisch über Alexa-Verzeichnis Player angelegt werden
|
||||||
cardAlarm Page - Alarmseite mit Zustand und Tastenfeld
|
cardAlarm Page - Alarmseite mit Zustand und Tastenfeld
|
||||||
@@ -215,7 +207,6 @@ Upgrades in Konsole:
|
|||||||
---------------------------------------------------------------------------------------
|
---------------------------------------------------------------------------------------
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
/******************************* Begin CONFIG Parameter *******************************/
|
/******************************* Begin CONFIG Parameter *******************************/
|
||||||
|
|
||||||
// DE: liefert bei true detailliertere Meldundgen im Log.
|
// DE: liefert bei true detailliertere Meldundgen im Log.
|
||||||
@@ -985,7 +976,7 @@ export const config: Config = {
|
|||||||
// _________________________________ DE: Ab hier keine Konfiguration mehr _____________________________________
|
// _________________________________ DE: Ab hier keine Konfiguration mehr _____________________________________
|
||||||
// _________________________________ EN: No more configuration from here _____________________________________
|
// _________________________________ EN: No more configuration from here _____________________________________
|
||||||
|
|
||||||
const scriptVersion: string = 'v4.3.3.43';
|
const scriptVersion: string = 'v4.3.3.40';
|
||||||
const tft_version: string = 'v4.3.3';
|
const tft_version: string = 'v4.3.3';
|
||||||
const desired_display_firmware_version = 53;
|
const desired_display_firmware_version = 53;
|
||||||
const berry_driver_version = 9;
|
const berry_driver_version = 9;
|
||||||
@@ -1525,11 +1516,11 @@ InitActiveBrightness();
|
|||||||
|
|
||||||
on({id: [NSPanel_Path + 'ScreensaverInfo.activeBrightness'], change: 'ne'}, async function (obj) {
|
on({id: [NSPanel_Path + 'ScreensaverInfo.activeBrightness'], change: 'ne'}, async function (obj) {
|
||||||
try {
|
try {
|
||||||
let active = getState(NSPanel_Path + 'ScreensaverInfo.activeDimmodeBrightness').val ?? -1;
|
let active = getState(NSPanel_Path + 'ScreensaverInfo.activeDimmodeBrightness').val;
|
||||||
if (obj.state.val >= 0 || obj.state.val <= 100) {
|
if (obj.state.val >= 0 || obj.state.val <= 100) {
|
||||||
log('action at trigger activeBrightness: ' + obj.state.val + ' - activeDimmodeBrightness: ' + active, 'info');
|
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 });
|
SendToPanel({ payload: 'dimmode~' + active + '~' + obj.state.val + '~' + rgb_dec565(config.defaultBackgroundColor) + '~' + rgb_dec565(globalTextColor) + '~' + Sliders2 });
|
||||||
InitDimmode();
|
InitDimmode();
|
||||||
}
|
}
|
||||||
} catch (err:any) {
|
} catch (err:any) {
|
||||||
log('error at trigger activeBrightness: ' + err.message, 'warn');
|
log('error at trigger activeBrightness: ' + err.message, 'warn');
|
||||||
@@ -1538,7 +1529,7 @@ on({id: [NSPanel_Path + 'ScreensaverInfo.activeBrightness'], change: 'ne'}, asyn
|
|||||||
|
|
||||||
on({id: [NSPanel_Path + 'ScreensaverInfo.activeDimmodeBrightness'], change: "ne"}, async function (obj) {
|
on({id: [NSPanel_Path + 'ScreensaverInfo.activeDimmodeBrightness'], change: "ne"}, async function (obj) {
|
||||||
try {
|
try {
|
||||||
let active = getState(NSPanel_Path + 'ScreensaverInfo.activeBrightness').val ?? 80;
|
let active = getState(NSPanel_Path + 'ScreensaverInfo.activeBrightness').val;
|
||||||
if (obj.state.val != null && obj.state.val != -1) {
|
if (obj.state.val != null && obj.state.val != -1) {
|
||||||
if (obj.state.val < -1 || obj.state.val > 100) {
|
if (obj.state.val < -1 || obj.state.val > 100) {
|
||||||
log('activeDimmodeBrightness value only between -1 and 100', 'info');
|
log('activeDimmodeBrightness value only between -1 and 100', 'info');
|
||||||
@@ -1568,7 +1559,7 @@ on({id: [NSPanel_Path + 'ScreensaverInfo.activeDimmodeBrightness'], change: "ne"
|
|||||||
|
|
||||||
on({id: String(NSPanel_Path) + 'ScreensaverInfo.Trigger_Dimmode', change: "ne"}, async function (obj) {
|
on({id: String(NSPanel_Path) + 'ScreensaverInfo.Trigger_Dimmode', change: "ne"}, async function (obj) {
|
||||||
try {
|
try {
|
||||||
let active = getState(NSPanel_Path + 'ScreensaverInfo.activeBrightness').val ?? 80;
|
let active = getState(NSPanel_Path + 'ScreensaverInfo.activeBrightness').val;
|
||||||
if (obj.state.val) {
|
if (obj.state.val) {
|
||||||
SendToPanel({ payload: 'dimmode~' + 100 + '~' + active + '~' + rgb_dec565(config.defaultBackgroundColor) + '~' + rgb_dec565(globalTextColor) + '~' + Sliders2 });
|
SendToPanel({ payload: 'dimmode~' + 100 + '~' + active + '~' + rgb_dec565(config.defaultBackgroundColor) + '~' + rgb_dec565(globalTextColor) + '~' + Sliders2 });
|
||||||
} else {
|
} else {
|
||||||
@@ -1919,8 +1910,8 @@ on({id: [NSPanel_Path + 'PageNavi'], change: "any"}, async function (obj) {
|
|||||||
//----------------------Begin Dimmode
|
//----------------------Begin Dimmode
|
||||||
function ScreensaverDimmode(timeDimMode:NSPanel.DimMode) {
|
function ScreensaverDimmode(timeDimMode:NSPanel.DimMode) {
|
||||||
try {
|
try {
|
||||||
let active = getState(NSPanel_Path + 'ScreensaverInfo.activeBrightness').val ?? 80
|
let active = getState(NSPanel_Path + 'ScreensaverInfo.activeBrightness').val
|
||||||
let dimmode = getState(NSPanel_Path + 'ScreensaverInfo.activeDimmodeBrightness').val ?? -1
|
let dimmode = getState(NSPanel_Path + 'ScreensaverInfo.activeDimmodeBrightness').val
|
||||||
if (Debug) {
|
if (Debug) {
|
||||||
log('function ScreensaverDimmode RGB-Wert HMIDark' + rgb_dec565(HMIDark), 'info');
|
log('function ScreensaverDimmode RGB-Wert HMIDark' + rgb_dec565(HMIDark), 'info');
|
||||||
}
|
}
|
||||||
@@ -2027,12 +2018,12 @@ async function InitDimmode() {
|
|||||||
ScreensaverDimmode(timeDimMode);
|
ScreensaverDimmode(timeDimMode);
|
||||||
});
|
});
|
||||||
if (getState(NSPanel_Path + 'ScreensaverInfo.activeDimmodeBrightness').val != null && getState(NSPanel_Path + 'ScreensaverInfo.activeDimmodeBrightness').val != -1) {
|
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 + '~' + rgb_dec565(config.defaultBackgroundColor) + '~' + rgb_dec565(globalTextColor) + '~' + Sliders2 });
|
SendToPanel({ payload: 'dimmode~' + getState(NSPanel_Path + 'ScreensaverInfo.activeDimmodeBrightness').val + '~' + getState(NSPanel_Path + 'ScreensaverInfo.activeBrightness').val + '~' + rgb_dec565(config.defaultBackgroundColor) + '~' + rgb_dec565(globalTextColor) + '~' + Sliders2 });
|
||||||
} else {
|
} else {
|
||||||
if (isDimTimeInRange(timeDimMode.timeDay,timeDimMode.timeNight)) {
|
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 });
|
SendToPanel({ payload: 'dimmode~' + timeDimMode.brightnessDay + '~' + getState(NSPanel_Path + 'ScreensaverInfo.activeBrightness').val + '~' + rgb_dec565(config.defaultBackgroundColor) + '~' + rgb_dec565(globalTextColor) + '~' + Sliders2 });
|
||||||
} else {
|
} else {
|
||||||
SendToPanel({ payload: 'dimmode~' + timeDimMode.brightnessNight + '~' + getState(NSPanel_Path + 'ScreensaverInfo.activeBrightness').val ?? 80 + '~' + rgb_dec565(config.defaultBackgroundColor) + '~' + rgb_dec565(globalTextColor) + '~' + Sliders2 });
|
SendToPanel({ payload: 'dimmode~' + timeDimMode.brightnessNight + '~' + getState(NSPanel_Path + 'ScreensaverInfo.activeBrightness').val + '~' + rgb_dec565(config.defaultBackgroundColor) + '~' + rgb_dec565(globalTextColor) + '~' + Sliders2 });
|
||||||
}
|
}
|
||||||
ScreensaverDimmode(timeDimMode);
|
ScreensaverDimmode(timeDimMode);
|
||||||
}
|
}
|
||||||
@@ -3386,11 +3377,7 @@ function GeneratePageElements(page: PageType): string {
|
|||||||
maxItems = 6;
|
maxItems = 6;
|
||||||
break;
|
break;
|
||||||
case 'cardGrid2':
|
case 'cardGrid2':
|
||||||
if (getState(NSPanel_Path + 'NSPanel_Version').val == 'us-p') {
|
maxItems = 8;
|
||||||
maxItems = 9;
|
|
||||||
} else {
|
|
||||||
maxItems = 8;
|
|
||||||
};
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -4769,25 +4756,81 @@ function unsubscribeMediaSubscriptions(): void {
|
|||||||
|
|
||||||
function subscribeMediaSubscriptions(id: string): void {
|
function subscribeMediaSubscriptions(id: string): void {
|
||||||
on({id: [id + '.STATE',
|
on({id: [id + '.STATE',
|
||||||
id + '.ARTIST',
|
|
||||||
id + '.TITLE',
|
|
||||||
id + '.ALBUM',
|
|
||||||
id + '.VOLUME',
|
id + '.VOLUME',
|
||||||
|
id + '.ARTIST',
|
||||||
|
id + '.ALBUM',
|
||||||
|
id + '.TITLE',
|
||||||
id + '.REPEAT',
|
id + '.REPEAT',
|
||||||
id + '.SHUFFLE',
|
id + '.SHUFFLE'], change: "any"}, async function () {
|
||||||
id + '.DURATION',
|
(function () { if (timeoutMedia) { clearTimeout(timeoutMedia); timeoutMedia = null; } })();
|
||||||
id + '.ELAPSED'], change: "any", ack: true}, async function () {
|
timeoutMedia = setTimeout(async function () {
|
||||||
if (useMediaEvents && pageCounter == 1) {
|
if (useMediaEvents) {
|
||||||
GeneratePage(activePage!);
|
GeneratePage(activePage!);
|
||||||
}
|
setTimeout(async function () {
|
||||||
|
GeneratePage(activePage!);
|
||||||
|
}, 3000);
|
||||||
|
}
|
||||||
|
},50)
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
function subscribeMediaSubscriptionsSonosAdd(id: string): void {
|
function subscribeMediaSubscriptionsSonosAdd(id: string): void {
|
||||||
on({id: [id + '.QUEUE'], change: "any", ack: true}, async function () {
|
on({id: [id + '.QUEUE',
|
||||||
if (useMediaEvents && pageCounter == 1) {
|
id + '.DURATION',
|
||||||
GeneratePage(activePage!);
|
id + '.ELAPSED'], change: "any"}, async function () {
|
||||||
}
|
(function () { if (timeoutMedia) { clearTimeout(timeoutMedia); timeoutMedia = null; } })();
|
||||||
|
timeoutMedia = setTimeout(async function () {
|
||||||
|
if (useMediaEvents) {
|
||||||
|
GeneratePage(activePage!);
|
||||||
|
setTimeout(async function () {
|
||||||
|
GeneratePage(activePage!);
|
||||||
|
}, 50);
|
||||||
|
}
|
||||||
|
},50)
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function subscribeMediaSubscriptionsAlexaAdd(id: string): void {
|
||||||
|
on({id: [id + '.DURATION',
|
||||||
|
id + '.ELAPSED'], change: "any"}, async function () {
|
||||||
|
(function () { if (timeoutMedia) { clearTimeout(timeoutMedia); timeoutMedia = null; } })();
|
||||||
|
timeoutMedia = setTimeout(async function () {
|
||||||
|
if (useMediaEvents) {
|
||||||
|
GeneratePage(activePage!);
|
||||||
|
setTimeout(async function () {
|
||||||
|
GeneratePage(activePage!);
|
||||||
|
}, 50);
|
||||||
|
}
|
||||||
|
},50)
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function subscribeMediaSubscriptionsBoseAdd(id: string): void {
|
||||||
|
on({id: [id + '.DURATION',
|
||||||
|
id + '.ELAPSED'], change: "any"}, async function () {
|
||||||
|
(function () { if (timeoutMedia) { clearTimeout(timeoutMedia); timeoutMedia = null; } })();
|
||||||
|
timeoutMedia = setTimeout(async function () {
|
||||||
|
if (useMediaEvents) {
|
||||||
|
GeneratePage(activePage!);
|
||||||
|
setTimeout(async function () {
|
||||||
|
GeneratePage(activePage!);
|
||||||
|
}, 50);
|
||||||
|
}
|
||||||
|
},50)
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function subscribeMediaSubscriptionsSqueezeboxAdd(id: string): void {
|
||||||
|
on({id: [id + '.ELAPSED'], change: "any"}, async function () {
|
||||||
|
(function () { if (timeoutMedia) { clearTimeout(timeoutMedia); timeoutMedia = null; } })();
|
||||||
|
timeoutMedia = setTimeout(async function () {
|
||||||
|
if (useMediaEvents) {
|
||||||
|
GeneratePage(activePage!);
|
||||||
|
setTimeout(async function () {
|
||||||
|
GeneratePage(activePage!);
|
||||||
|
}, 50);
|
||||||
|
}
|
||||||
|
},50)
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -4916,13 +4959,6 @@ async function createAutoMediaAlias (id: string, mediaDevice: string, adapterPla
|
|||||||
log('error at function createAutoMediaAlias Adapter spotify-premium: ' + err.message, 'warn');
|
log('error at function createAutoMediaAlias Adapter spotify-premium: ' + err.message, 'warn');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
//Add Spotify Datapoints > v4.3.3.42
|
|
||||||
//Spotify-Premium has Role value and a known Bug in player.progress
|
|
||||||
if (existsObject(id + '.DURATION') == false) {
|
|
||||||
const dpPath: string = adapterPlayerInstance;
|
|
||||||
await createAliasAsync(id + '.DURATION', dpPath + 'player.duration', true, <iobJS.StateCommon> {type: 'string', role: 'media.duration.text', name: 'DURATION'});
|
|
||||||
await createAliasAsync(id + '.ELAPSED', dpPath + 'player.progress', true, <iobJS.StateCommon> {type: 'string', role: 'media.elapsed.text', name: 'ELAPSED'});
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
@@ -4960,12 +4996,7 @@ async function createAutoMediaAlias (id: string, mediaDevice: string, adapterPla
|
|||||||
log('error function createAutoMediaAlias Adapter volumio: ' + err.message, 'warn');
|
log('error function createAutoMediaAlias Adapter volumio: ' + err.message, 'warn');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
//Add Volumio Datapoints > v4.3.3.42
|
|
||||||
if (existsObject(id + '.DURATION') == false) {
|
|
||||||
const dpPath: string = adapterPlayerInstance;
|
|
||||||
await createAliasAsync(id + '.DURATION', dpPath + 'playbackInfo.duration', true, <iobJS.StateCommon> {type: 'string', role: 'media.duration', name: 'DURATION'});
|
|
||||||
//await createAliasAsync(id + '.ELAPSED', dpPath + 'player.progress', true, <iobJS.StateCommon> {type: 'string', role: 'media.elapsed.text', name: 'ELAPSED'});
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case "squeezeboxrpc.0.":
|
case "squeezeboxrpc.0.":
|
||||||
@@ -5061,7 +5092,6 @@ function GenerateMediaPage(page: NSPanel.PageMedia): NSPanel.Payload[] {
|
|||||||
if (!page.items[0].id) throw new Error ('Missing page id for cardMedia!');
|
if (!page.items[0].id) throw new Error ('Missing page id for cardMedia!');
|
||||||
|
|
||||||
let id = page.items[0].id;
|
let id = page.items[0].id;
|
||||||
let tid = 0;
|
|
||||||
let out_msgs: NSPanel.Payload[] = [];
|
let out_msgs: NSPanel.Payload[] = [];
|
||||||
|
|
||||||
if (!page.items[0].adapterPlayerInstance!) throw new Error('page.items[0].adapterPlayerInstance is undefined!')
|
if (!page.items[0].adapterPlayerInstance!) throw new Error('page.items[0].adapterPlayerInstance is undefined!')
|
||||||
@@ -5088,10 +5118,12 @@ function GenerateMediaPage(page: NSPanel.PageMedia): NSPanel.Payload[] {
|
|||||||
subscribeMediaSubscriptions(page.items[0].id);
|
subscribeMediaSubscriptions(page.items[0].id);
|
||||||
if (v2Adapter == 'sonos') {
|
if (v2Adapter == 'sonos') {
|
||||||
subscribeMediaSubscriptionsSonosAdd(page.items[0].id);
|
subscribeMediaSubscriptionsSonosAdd(page.items[0].id);
|
||||||
} else if (v2Adapter == 'spotify-premium') {
|
} else if (v2Adapter == 'alexa2') {
|
||||||
setState(vInstance + 'getDevices', true);
|
subscribeMediaSubscriptionsAlexaAdd(page.items[0].id);
|
||||||
setState(vInstance + 'getPlaybackInfo', true);
|
} else if (v2Adapter == 'bosesoundtouch') {
|
||||||
setState(vInstance + 'getPlaylists', true);
|
subscribeMediaSubscriptionsBoseAdd(page.items[0].id);
|
||||||
|
} else if (v2Adapter == 'squeezeboxrpc') {
|
||||||
|
subscribeMediaSubscriptionsSqueezeboxAdd(page.items[0].id);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -5101,6 +5133,12 @@ function GenerateMediaPage(page: NSPanel.PageMedia): NSPanel.Payload[] {
|
|||||||
subscribeMediaSubscriptions(page.items[0].id);
|
subscribeMediaSubscriptions(page.items[0].id);
|
||||||
if (v2Adapter == 'sonos') {
|
if (v2Adapter == 'sonos') {
|
||||||
subscribeMediaSubscriptionsSonosAdd(page.items[0].id);
|
subscribeMediaSubscriptionsSonosAdd(page.items[0].id);
|
||||||
|
} else if (v2Adapter == 'alexa2') {
|
||||||
|
subscribeMediaSubscriptionsAlexaAdd(page.items[0].id);
|
||||||
|
} else if (v2Adapter == 'bosesoundtouch') {
|
||||||
|
subscribeMediaSubscriptionsBoseAdd(page.items[0].id);
|
||||||
|
} else if (v2Adapter == 'squeezeboxrpc') {
|
||||||
|
subscribeMediaSubscriptionsSqueezeboxAdd(page.items[0].id);
|
||||||
}
|
}
|
||||||
} else if (page.type == 'cardMedia' && pageCounter == -1) {
|
} else if (page.type == 'cardMedia' && pageCounter == -1) {
|
||||||
//Do Nothing
|
//Do Nothing
|
||||||
@@ -5111,8 +5149,8 @@ function GenerateMediaPage(page: NSPanel.PageMedia): NSPanel.Payload[] {
|
|||||||
if (existsObject(id)) {
|
if (existsObject(id)) {
|
||||||
let name = getState(id + '.ALBUM').val;
|
let name = getState(id + '.ALBUM').val;
|
||||||
let title = getState(id + '.TITLE').val;
|
let title = getState(id + '.TITLE').val;
|
||||||
if (title.length > 26) {
|
if (title.length > 27) {
|
||||||
title = title.slice(0, 26) + '...';
|
title = title.slice(0, 27) + '...';
|
||||||
}
|
}
|
||||||
if (existsObject(id + '.DURATION') && existsObject(id + '.ELAPSED')) {
|
if (existsObject(id + '.DURATION') && existsObject(id + '.ELAPSED')) {
|
||||||
if (v2Adapter == 'alexa2') {
|
if (v2Adapter == 'alexa2') {
|
||||||
@@ -5134,14 +5172,7 @@ function GenerateMediaPage(page: NSPanel.PageMedia): NSPanel.Payload[] {
|
|||||||
vDuration = vDuration.slice(1);
|
vDuration = vDuration.slice(1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (vDuration != '0:00') {
|
title = title + ' (' + vElapsed + '|' + vDuration + ')';
|
||||||
title = title + ' (' + vElapsed + '|' + vDuration + ')';
|
|
||||||
} else {
|
|
||||||
title = title + ' (' + vElapsed + ')';
|
|
||||||
}
|
|
||||||
if (title == ' (0:00)') {
|
|
||||||
title = '';
|
|
||||||
}
|
|
||||||
} else if (v2Adapter == 'sonos' && getState(page.items[0].adapterPlayerInstance + 'root.' + page.items[0].mediaDevice + '.current_type').val == 0) {
|
} else if (v2Adapter == 'sonos' && getState(page.items[0].adapterPlayerInstance + 'root.' + page.items[0].mediaDevice + '.current_type').val == 0) {
|
||||||
let vElapsed = getState(id + '.ELAPSED').val;
|
let vElapsed = getState(id + '.ELAPSED').val;
|
||||||
if (vElapsed.length == 5) {
|
if (vElapsed.length == 5) {
|
||||||
@@ -5197,24 +5228,6 @@ function GenerateMediaPage(page: NSPanel.PageMedia): NSPanel.Payload[] {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Settings >>Aktualisierungsintervall für Statusinformationen<< = 1 !
|
|
||||||
// If the refresh time is set to 1 second in the spotify-premium.X instance,
|
|
||||||
// the elapsed refresh bug '00:00' is not visible
|
|
||||||
if (v2Adapter == 'spotify-premium') {
|
|
||||||
let vElapsed: string = getState(id + '.ELAPSED').val;
|
|
||||||
if (vElapsed.substring(0,1) == '0') {
|
|
||||||
vElapsed = vElapsed.slice(1)
|
|
||||||
}
|
|
||||||
let vDuration: string = getState(id + '.DURATION').val;
|
|
||||||
if (vDuration.substring(0,1) == '0') {
|
|
||||||
vDuration = vDuration.slice(1)
|
|
||||||
}
|
|
||||||
title = title + ' (' + vElapsed + '|' + vDuration + ')';
|
|
||||||
if (title == ' (0:00|0:00)') {
|
|
||||||
title = '';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
let shuffle = getState(id + '.SHUFFLE').val;
|
let shuffle = getState(id + '.SHUFFLE').val;
|
||||||
|
|
||||||
//New Adapter/Player
|
//New Adapter/Player
|
||||||
@@ -5225,23 +5238,19 @@ function GenerateMediaPage(page: NSPanel.PageMedia): NSPanel.Payload[] {
|
|||||||
media_icon = Icons.GetIcon('spotify');
|
media_icon = Icons.GetIcon('spotify');
|
||||||
name = getState(id + '.CONTEXT_DESCRIPTION').val;
|
name = getState(id + '.CONTEXT_DESCRIPTION').val;
|
||||||
let nameLength = name.length;
|
let nameLength = name.length;
|
||||||
if (name.substring(0,17) == 'Playlist: This Is') {
|
if (name.substring(0,9) == 'Playlist:') {
|
||||||
name = name.slice(18, 34) + '...';
|
|
||||||
} else if (name.substring(0,9) == 'Playlist:') {
|
|
||||||
name = name.slice(10, 26) + '...';
|
name = name.slice(10, 26) + '...';
|
||||||
} else if (name.substring(0,6) == 'Album:') {
|
} else if (name.substring(0,6) == 'Album:') {
|
||||||
name = name.slice(7, 23) + '...';
|
name = name.slice(7, 23) + '...';
|
||||||
} else if (name.substring(0,6) == 'Track:') {
|
} else if (name.substring(0,6) == 'Track') {
|
||||||
name = name.slice(7, 23) + '...';
|
name = 'Spotify-Premium';
|
||||||
} else if (name.substring(0,7) == 'Artist:') {
|
|
||||||
name = name.slice(8, 24) + '...';
|
|
||||||
}
|
}
|
||||||
if (nameLength == 0) {
|
if (nameLength == 0) {
|
||||||
name = 'Spotify-Premium';
|
name = 'Spotify-Premium';
|
||||||
}
|
}
|
||||||
author = getState(id + '.ARTIST').val + ' | ' + getState(id + '.ALBUM').val;
|
author = getState(id + '.ARTIST').val + ' | ' + getState(id + '.ALBUM').val;
|
||||||
if (author.length > 37) {
|
if (author.length > 30) {
|
||||||
author = author.slice(0,37) + '...';
|
author = getState(id + '.ARTIST').val;
|
||||||
}
|
}
|
||||||
if ((getState(id + '.ARTIST').val).length == 0) {
|
if ((getState(id + '.ARTIST').val).length == 0) {
|
||||||
author = findLocale('media','no_music_to_control');
|
author = findLocale('media','no_music_to_control');
|
||||||
@@ -5292,10 +5301,9 @@ function GenerateMediaPage(page: NSPanel.PageMedia): NSPanel.Payload[] {
|
|||||||
//Logitech Squeezebox RPC
|
//Logitech Squeezebox RPC
|
||||||
if (v2Adapter == 'squeezeboxrpc') {
|
if (v2Adapter == 'squeezeboxrpc') {
|
||||||
media_icon = Icons.GetIcon('dlna');
|
media_icon = Icons.GetIcon('dlna');
|
||||||
if (name.length == 0) {
|
let nameLength = name.length;
|
||||||
name = page.heading;
|
if (nameLength == 0) {
|
||||||
} else if (name.length > 16) {
|
name = page.items[0].mediaDevice;
|
||||||
name = name.slice(0,16) + '...'
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -5313,8 +5321,6 @@ function GenerateMediaPage(page: NSPanel.PageMedia): NSPanel.Payload[] {
|
|||||||
}
|
}
|
||||||
if (nameLength == 0) {
|
if (nameLength == 0) {
|
||||||
name = 'Alexa Player';
|
name = 'Alexa Player';
|
||||||
} else {
|
|
||||||
name = name.slice(0,16) + '...';
|
|
||||||
}
|
}
|
||||||
author = getState(id + '.ARTIST').val + ' | ' + getState(id + '.ALBUM').val;
|
author = getState(id + '.ARTIST').val + ' | ' + getState(id + '.ALBUM').val;
|
||||||
if (author.length > 30) {
|
if (author.length > 30) {
|
||||||
@@ -5327,12 +5333,12 @@ function GenerateMediaPage(page: NSPanel.PageMedia): NSPanel.Payload[] {
|
|||||||
|
|
||||||
//Volumio
|
//Volumio
|
||||||
if (v2Adapter == 'volumio') {
|
if (v2Adapter == 'volumio') {
|
||||||
media_icon = Icons.GetIcon('clock-time-twelve-outline');
|
if (name != undefined) { author = author + " [" + name + "]"; }
|
||||||
if (name != undefined) { author = author + " | " + name; }
|
name = getState(vInstance + 'info.name').val; /* page.heading;
|
||||||
name = page.heading;
|
getState(id + '.TRACK').val; */
|
||||||
}
|
}
|
||||||
|
|
||||||
let volume = scale(getState(id + '.VOLUME').val, activePage!.items[0]!.minValue ?? 0, activePage!.items[0]!.maxValue ?? 100, 100, 0);
|
let volume = getState(id + '.VOLUME').val;
|
||||||
let iconplaypause = Icons.GetIcon('pause'); //pause
|
let iconplaypause = Icons.GetIcon('pause'); //pause
|
||||||
let shuffle_icon = Icons.GetIcon('shuffle-variant'); //shuffle
|
let shuffle_icon = Icons.GetIcon('shuffle-variant'); //shuffle
|
||||||
let onoffbutton = 1374;
|
let onoffbutton = 1374;
|
||||||
@@ -5340,9 +5346,7 @@ function GenerateMediaPage(page: NSPanel.PageMedia): NSPanel.Payload[] {
|
|||||||
if (shuffle == 'off' || shuffle == false || shuffle == 0 || shuffle == 'false') {
|
if (shuffle == 'off' || shuffle == false || shuffle == 0 || shuffle == 'false') {
|
||||||
shuffle_icon = Icons.GetIcon('shuffle-disabled'); //shuffle
|
shuffle_icon = Icons.GetIcon('shuffle-disabled'); //shuffle
|
||||||
}
|
}
|
||||||
|
if (v2Adapter == 'volumio') { shuffle_icon = Icons.GetIcon('refresh'); } //Volumio: refresh playlist
|
||||||
// Todo: Refresh automatisieren und dafür wieder Shuffle nutzen
|
|
||||||
//if (v2Adapter == 'volumio') { shuffle_icon = Icons.GetIcon('shuffle-disabled'); } //Volumio: refresh playlist
|
|
||||||
|
|
||||||
|
|
||||||
//For all players
|
//For all players
|
||||||
@@ -5373,7 +5377,7 @@ function GenerateMediaPage(page: NSPanel.PageMedia): NSPanel.Payload[] {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
let currentSpeaker: string = findLocale('media','no_speaker_found');
|
let currentSpeaker = findLocale('media','no_speaker_found');
|
||||||
|
|
||||||
if (v2Adapter == 'alexa2') {
|
if (v2Adapter == 'alexa2') {
|
||||||
currentSpeaker = getState(([page.items[0].adapterPlayerInstance, 'Echo-Devices.', page.items[0].mediaDevice, '.Info.name'].join(''))).val;
|
currentSpeaker = getState(([page.items[0].adapterPlayerInstance, 'Echo-Devices.', page.items[0].mediaDevice, '.Info.name'].join(''))).val;
|
||||||
@@ -5385,8 +5389,6 @@ function GenerateMediaPage(page: NSPanel.PageMedia): NSPanel.Payload[] {
|
|||||||
currentSpeaker = getState(([page.items[0].adapterPlayerInstance, 'Players.', page.items[0].mediaDevice, '.Playername'].join(''))).val;
|
currentSpeaker = getState(([page.items[0].adapterPlayerInstance, 'Players.', page.items[0].mediaDevice, '.Playername'].join(''))).val;
|
||||||
} else if (v2Adapter == 'bosesoundtouch') {
|
} else if (v2Adapter == 'bosesoundtouch') {
|
||||||
currentSpeaker = getState(([page.items[0].adapterPlayerInstance, 'deviceInfo.name'].join(''))).val;
|
currentSpeaker = getState(([page.items[0].adapterPlayerInstance, 'deviceInfo.name'].join(''))).val;
|
||||||
} else if (v2Adapter == 'volumio') {
|
|
||||||
currentSpeaker = getState(([page.items[0].adapterPlayerInstance, 'info.name'].join(''))).val;
|
|
||||||
}
|
}
|
||||||
//-------------------------------------------------------------------------------------------------------------
|
//-------------------------------------------------------------------------------------------------------------
|
||||||
// All Alexa devices (the online / player and commands directory is available) are listed and linked below
|
// All Alexa devices (the online / player and commands directory is available) are listed and linked below
|
||||||
@@ -5403,11 +5405,6 @@ function GenerateMediaPage(page: NSPanel.PageMedia): NSPanel.Payload[] {
|
|||||||
speakerListArray.push(getState(playerId).val);
|
speakerListArray.push(getState(playerId).val);
|
||||||
page.items[0].speakerList = speakerListArray;
|
page.items[0].speakerList = speakerListArray;
|
||||||
});
|
});
|
||||||
} else if (v2Adapter == 'spotify-premium') {
|
|
||||||
// All possible Devices if page.items[0].speakerList empty
|
|
||||||
if (Debug) log(getState(page.items[0].adapterPlayerInstance + 'devices.availableDeviceListString').val);
|
|
||||||
speakerListArray = (getState(page.items[0].adapterPlayerInstance + 'devices.availableDeviceListString').val).split(';');
|
|
||||||
page.items[0].speakerList = speakerListArray;
|
|
||||||
} else {
|
} else {
|
||||||
let i_list = Array.prototype.slice.apply($('[state.id="' + page.items[0].adapterPlayerInstance + 'Echo-Devices.*.Info.name"]'));
|
let i_list = Array.prototype.slice.apply($('[state.id="' + page.items[0].adapterPlayerInstance + 'Echo-Devices.*.Info.name"]'));
|
||||||
for (let i_index in i_list) {
|
for (let i_index in i_list) {
|
||||||
@@ -5433,7 +5430,7 @@ function GenerateMediaPage(page: NSPanel.PageMedia): NSPanel.Payload[] {
|
|||||||
if (speakerListArray.length > 0) {
|
if (speakerListArray.length > 0) {
|
||||||
speakerListIconCol = rgb_dec565(HMIOn);
|
speakerListIconCol = rgb_dec565(HMIOn);
|
||||||
speakerListString = 'input_sel' + '~' +
|
speakerListString = 'input_sel' + '~' +
|
||||||
tid + '?speakerlist' + '~' +
|
id + '?speakerlist' + '~' +
|
||||||
Icons.GetIcon('speaker') + '~' +
|
Icons.GetIcon('speaker') + '~' +
|
||||||
speakerListIconCol + '~' +
|
speakerListIconCol + '~' +
|
||||||
findLocale('media','speaker') + '~' +
|
findLocale('media','speaker') + '~' +
|
||||||
@@ -5467,13 +5464,10 @@ function GenerateMediaPage(page: NSPanel.PageMedia): NSPanel.Payload[] {
|
|||||||
});
|
});
|
||||||
|
|
||||||
}
|
}
|
||||||
/* Spotify: get all playlists if empty */
|
|
||||||
} else if (v2Adapter == 'spotify-premium') {
|
|
||||||
page.items[0].playList = (getState(page.items[0].adapterPlayerInstance + 'playlists.playlistListString').val).split(';');
|
|
||||||
}
|
}
|
||||||
playListIconCol = rgb_dec565(HMIOn);
|
playListIconCol = rgb_dec565(HMIOn);
|
||||||
playListString = 'input_sel' + '~' +
|
playListString = 'input_sel' + '~' +
|
||||||
tid + '?playlist' + '~' +
|
id + '?playlist' + '~' +
|
||||||
Icons.GetIcon('playlist-play') + '~' +
|
Icons.GetIcon('playlist-play') + '~' +
|
||||||
playListIconCol + '~' +
|
playListIconCol + '~' +
|
||||||
//'PlayL ' + page.heading + '~' +
|
//'PlayL ' + page.heading + '~' +
|
||||||
@@ -5483,7 +5477,9 @@ function GenerateMediaPage(page: NSPanel.PageMedia): NSPanel.Payload[] {
|
|||||||
|
|
||||||
//InSel Tracklist
|
//InSel Tracklist
|
||||||
globalTracklist = ''
|
globalTracklist = ''
|
||||||
|
if (v2Adapter == 'spotify-premium') {
|
||||||
|
globalTracklist = ' ' //Todo
|
||||||
|
}
|
||||||
let trackListString: string = '~~~~~~'
|
let trackListString: string = '~~~~~~'
|
||||||
let trackListIconCol = rgb_dec565(HMIOff);
|
let trackListIconCol = rgb_dec565(HMIOff);
|
||||||
if (v2Adapter == 'volumio') { /* Volumio: get queue */
|
if (v2Adapter == 'volumio') { /* Volumio: get queue */
|
||||||
@@ -5534,19 +5530,12 @@ function GenerateMediaPage(page: NSPanel.PageMedia): NSPanel.Payload[] {
|
|||||||
trackList = trackList + ']';
|
trackList = trackList + ']';
|
||||||
if (Debug) log(trackList, 'info');
|
if (Debug) log(trackList, 'info');
|
||||||
globalTracklist = trackList;
|
globalTracklist = trackList;
|
||||||
} else if (v2Adapter == 'spotify-premium') {
|
|
||||||
try {
|
|
||||||
let tempTrackList = JSON.parse(getState(page.items[0].adapterPlayerInstance + 'player.playlist.trackListArray').val);
|
|
||||||
globalTracklist = tempTrackList;
|
|
||||||
} catch {
|
|
||||||
log('Hello Mr. Developer something went wrong in tracklist!', 'debug')
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (globalTracklist != null && globalTracklist.length != 0) {
|
if (globalTracklist != null && globalTracklist.length != 0) {
|
||||||
trackListIconCol = rgb_dec565(HMIOn);
|
trackListIconCol = rgb_dec565(HMIOn);
|
||||||
trackListString = 'input_sel' + '~' +
|
trackListString = 'input_sel' + '~' +
|
||||||
tid + '?tracklist' + '~' +
|
id + '?tracklist' + '~' +
|
||||||
Icons.GetIcon('animation-play-outline') + '~' +
|
Icons.GetIcon('animation-play-outline') + '~' +
|
||||||
trackListIconCol + '~' +
|
trackListIconCol + '~' +
|
||||||
findLocale('media','tracklist') + '~' +
|
findLocale('media','tracklist') + '~' +
|
||||||
@@ -5559,7 +5548,7 @@ function GenerateMediaPage(page: NSPanel.PageMedia): NSPanel.Payload[] {
|
|||||||
if (page.items[0].equalizerList != undefined) {
|
if (page.items[0].equalizerList != undefined) {
|
||||||
equalizerListIconCol = rgb_dec565(HMIOn);
|
equalizerListIconCol = rgb_dec565(HMIOn);
|
||||||
equalizerListString = 'input_sel' + '~' +
|
equalizerListString = 'input_sel' + '~' +
|
||||||
tid + '?equalizer' + '~' +
|
id + '?equalizer' + '~' +
|
||||||
Icons.GetIcon('equalizer-outline') + '~' +
|
Icons.GetIcon('equalizer-outline') + '~' +
|
||||||
equalizerListIconCol + '~' +
|
equalizerListIconCol + '~' +
|
||||||
findLocale('media','equalizer') + '~' +
|
findLocale('media','equalizer') + '~' +
|
||||||
@@ -5568,7 +5557,7 @@ function GenerateMediaPage(page: NSPanel.PageMedia): NSPanel.Payload[] {
|
|||||||
let equalizerListIconCol = rgb_dec565(HMIOn);
|
let equalizerListIconCol = rgb_dec565(HMIOn);
|
||||||
//equalizerListString is used for favariteList
|
//equalizerListString is used for favariteList
|
||||||
equalizerListString = 'input_sel' + '~' +
|
equalizerListString = 'input_sel' + '~' +
|
||||||
tid + '?favorites' + '~' +
|
id + '?favorites' + '~' +
|
||||||
Icons.GetIcon('playlist-star') + '~' +
|
Icons.GetIcon('playlist-star') + '~' +
|
||||||
equalizerListIconCol + '~' +
|
equalizerListIconCol + '~' +
|
||||||
findLocale('media','favorites') + '~' +
|
findLocale('media','favorites') + '~' +
|
||||||
@@ -5617,10 +5606,15 @@ function GenerateMediaPage(page: NSPanel.PageMedia): NSPanel.Payload[] {
|
|||||||
repeatIcon = Icons.GetIcon('repeat');
|
repeatIcon = Icons.GetIcon('repeat');
|
||||||
repeatIconCol = rgb_dec565(HMIOn);
|
repeatIconCol = rgb_dec565(HMIOn);
|
||||||
}
|
}
|
||||||
|
/*
|
||||||
|
else {
|
||||||
|
repeatIcon = Icons.GetIcon('repeat-off');
|
||||||
|
}
|
||||||
|
*/
|
||||||
} else if (v2Adapter == 'volumio') { /* Volumio: only Repeat true/false with API */
|
} else if (v2Adapter == 'volumio') { /* Volumio: only Repeat true/false with API */
|
||||||
if (getState(id + '.REPEAT').val == true) {
|
if (getState(id + '.REPEAT').val == true) {
|
||||||
repeatIcon = Icons.GetIcon('repeat-variant');
|
repeatIcon = Icons.GetIcon('repeat-variant');
|
||||||
repeatIconCol = rgb_dec565(HMIOn);
|
repeatIconCol = rgb_dec565(colMediaIcon);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -5631,7 +5625,7 @@ function GenerateMediaPage(page: NSPanel.PageMedia): NSPanel.Payload[] {
|
|||||||
v2Adapter == 'volumio' ||
|
v2Adapter == 'volumio' ||
|
||||||
v2Adapter == 'squeezeboxrpc') {
|
v2Adapter == 'squeezeboxrpc') {
|
||||||
repeatButtonString = 'button' + '~' +
|
repeatButtonString = 'button' + '~' +
|
||||||
tid + '?repeat' + '~' +
|
id + '?repeat' + '~' +
|
||||||
repeatIcon + '~' +
|
repeatIcon + '~' +
|
||||||
repeatIconCol + '~' +
|
repeatIconCol + '~' +
|
||||||
'Repeat' + '~' +
|
'Repeat' + '~' +
|
||||||
@@ -5644,14 +5638,14 @@ function GenerateMediaPage(page: NSPanel.PageMedia): NSPanel.Payload[] {
|
|||||||
if (v2Adapter == 'sonos') {
|
if (v2Adapter == 'sonos') {
|
||||||
if (page.items[0].crossfade == undefined || page.items[0].crossfade == false) {
|
if (page.items[0].crossfade == undefined || page.items[0].crossfade == false) {
|
||||||
toolsString = 'input_sel' + '~' +
|
toolsString = 'input_sel' + '~' +
|
||||||
tid + '?seek' + '~' +
|
id + '?seek' + '~' +
|
||||||
media_icon + '~' +
|
media_icon + '~' +
|
||||||
toolsIconCol + '~' +
|
toolsIconCol + '~' +
|
||||||
findLocale('media','seek') + '~' +
|
findLocale('media','seek') + '~' +
|
||||||
'media5~'
|
'media5~'
|
||||||
} else {
|
} else {
|
||||||
toolsString = 'input_sel' + '~' +
|
toolsString = 'input_sel' + '~' +
|
||||||
tid + '?crossfade' + '~' +
|
id + '?crossfade' + '~' +
|
||||||
media_icon + '~' +
|
media_icon + '~' +
|
||||||
toolsIconCol + '~' +
|
toolsIconCol + '~' +
|
||||||
findLocale('media','crossfade') + '~' +
|
findLocale('media','crossfade') + '~' +
|
||||||
@@ -5660,16 +5654,7 @@ function GenerateMediaPage(page: NSPanel.PageMedia): NSPanel.Payload[] {
|
|||||||
} else if (v2Adapter == 'squeezeboxrpc') {
|
} else if (v2Adapter == 'squeezeboxrpc') {
|
||||||
if (page.items[0].crossfade == undefined || page.items[0].crossfade == false) {
|
if (page.items[0].crossfade == undefined || page.items[0].crossfade == false) {
|
||||||
toolsString = 'input_sel' + '~' +
|
toolsString = 'input_sel' + '~' +
|
||||||
tid + '?seek' + '~' +
|
id + '?seek' + '~' +
|
||||||
media_icon + '~' +
|
|
||||||
toolsIconCol + '~' +
|
|
||||||
findLocale('media','seek') + '~' +
|
|
||||||
'media5~'
|
|
||||||
}
|
|
||||||
} else if (v2Adapter == 'spotify-premium') {
|
|
||||||
if (page.items[0].crossfade == undefined || page.items[0].crossfade == false) {
|
|
||||||
toolsString = 'input_sel' + '~' +
|
|
||||||
tid + '?seek' + '~' +
|
|
||||||
media_icon + '~' +
|
media_icon + '~' +
|
||||||
toolsIconCol + '~' +
|
toolsIconCol + '~' +
|
||||||
findLocale('media','seek') + '~' +
|
findLocale('media','seek') + '~' +
|
||||||
@@ -5677,7 +5662,7 @@ function GenerateMediaPage(page: NSPanel.PageMedia): NSPanel.Payload[] {
|
|||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
toolsString = 'button' + '~' +
|
toolsString = 'button' + '~' +
|
||||||
tid + '' + '~' +
|
id + '' + '~' +
|
||||||
media_icon + '~' +
|
media_icon + '~' +
|
||||||
toolsIconCol + '~' +
|
toolsIconCol + '~' +
|
||||||
findLocale('media','tools') + '~' +
|
findLocale('media','tools') + '~' +
|
||||||
@@ -5688,7 +5673,7 @@ function GenerateMediaPage(page: NSPanel.PageMedia): NSPanel.Payload[] {
|
|||||||
payload: 'entityUpd~' + //entityUpd
|
payload: 'entityUpd~' + //entityUpd
|
||||||
name + '~' + //heading
|
name + '~' + //heading
|
||||||
GetNavigationString(pageId) + '~' + //navigation
|
GetNavigationString(pageId) + '~' + //navigation
|
||||||
tid + '~' + //internalNameEntiy
|
id + '~' + //internalNameEntiy
|
||||||
title + '~' + //title
|
title + '~' + //title
|
||||||
rgb_dec565(colMediaTitle) + '~' + //titleColor
|
rgb_dec565(colMediaTitle) + '~' + //titleColor
|
||||||
author + '~' + //author
|
author + '~' + //author
|
||||||
@@ -6107,6 +6092,8 @@ function subscribePowerSubscriptions(id: string): void {
|
|||||||
function GeneratePowerPage(page: NSPanel.PagePower): NSPanel.Payload[] {
|
function GeneratePowerPage(page: NSPanel.PagePower): NSPanel.Payload[] {
|
||||||
try {
|
try {
|
||||||
|
|
||||||
|
if (!page.items[0].id) throw new Error ('Missing pageItem.id for PowerPage!');
|
||||||
|
|
||||||
let obj:object = {};
|
let obj:object = {};
|
||||||
let demoMode = false;
|
let demoMode = false;
|
||||||
if (page.items[0].id == undefined){
|
if (page.items[0].id == undefined){
|
||||||
@@ -6498,21 +6485,17 @@ function HandleButtonEvent(words: any): void {
|
|||||||
GeneratePage(activePage!);
|
GeneratePage(activePage!);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 'bHome':
|
case 'bHome':
|
||||||
if (Debug) {
|
if (Debug) {
|
||||||
log('HandleButtonEvent -> bHome: ' + words[4] + ' - ' + pageId, 'info');
|
log('HandleButtonEvent -> bHome: ' + words[4] + ' - ' + pageId, 'info');
|
||||||
}
|
}
|
||||||
UnsubscribeWatcher();
|
UnsubscribeWatcher();
|
||||||
const home = activePage!.home;
|
if (activePage!.home != undefined) {
|
||||||
if (home !== undefined) {
|
GeneratePage(eval(activePage!.home));
|
||||||
pageId = config.pages.findIndex(a => a == eval(home))
|
} else {
|
||||||
pageId = pageId === -1 ? 0 : pageId;
|
GeneratePage(config.pages[0]);
|
||||||
GeneratePage(eval(home));
|
}
|
||||||
} else {
|
break;
|
||||||
pageId = 0;
|
|
||||||
GeneratePage(config.pages[0]);
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case 'notifyAction':
|
case 'notifyAction':
|
||||||
if (words[4] == 'yes') {
|
if (words[4] == 'yes') {
|
||||||
setState(popupNotifyInternalName, <iobJS.State>{ val: words[2], ack: true });
|
setState(popupNotifyInternalName, <iobJS.State>{ val: words[2], ack: true });
|
||||||
@@ -6633,20 +6616,19 @@ function HandleButtonEvent(words: any): void {
|
|||||||
|
|
||||||
switch (deviceAdapterRP) {
|
switch (deviceAdapterRP) {
|
||||||
case 'spotify-premium':
|
case 'spotify-premium':
|
||||||
if (Debug) log(getState(id + '.REPEAT').val);
|
let stateSpotifyRepeat = getState(id + '.REPEAT').val
|
||||||
let stateSpotifyRepeat = getState(id + '.REPEAT').val;
|
if (stateSpotifyRepeat == 'none') {
|
||||||
if (stateSpotifyRepeat == 'off') {
|
setIfExists(id + '.REPEAT', 'all');
|
||||||
setIfExists(id + '.REPEAT', 'context');
|
} else if (stateSpotifyRepeat == 'all') {
|
||||||
} else if (stateSpotifyRepeat == 'context') {
|
setIfExists(id + '.REPEAT', 'one');
|
||||||
setIfExists(id + '.REPEAT', 'track');
|
} else if (stateSpotifyRepeat == 'one') {
|
||||||
} else if (stateSpotifyRepeat == 'track') {
|
setIfExists(id + '.REPEAT', 'none');
|
||||||
setIfExists(id + '.REPEAT', 'off');
|
|
||||||
}
|
}
|
||||||
GeneratePage(activePage!);
|
GeneratePage(activePage!);
|
||||||
break;
|
break;
|
||||||
case 'bosesoundtouch':
|
case 'bosesoundtouch':
|
||||||
if (Debug) log(adapterInstanceRepeat);
|
if (Debug) log(adapterInstanceRepeat);
|
||||||
let stateBoseRepeat = getState(id + '.REPEAT').val;
|
let stateBoseRepeat = getState(id + '.REPEAT').val
|
||||||
if (stateBoseRepeat == 'REPEAT_OFF') {
|
if (stateBoseRepeat == 'REPEAT_OFF') {
|
||||||
setIfExists(adapterInstanceRepeat + 'key', 'REPEAT_ALL');
|
setIfExists(adapterInstanceRepeat + 'key', 'REPEAT_ALL');
|
||||||
} else if (stateBoseRepeat == 'REPEAT_ALL') {
|
} else if (stateBoseRepeat == 'REPEAT_ALL') {
|
||||||
@@ -6657,7 +6639,7 @@ function HandleButtonEvent(words: any): void {
|
|||||||
GeneratePage(activePage!);
|
GeneratePage(activePage!);
|
||||||
break;
|
break;
|
||||||
case 'sonos':
|
case 'sonos':
|
||||||
let stateSonosRepeat = getState(id + '.REPEAT').val;
|
let stateSonosRepeat = getState(id + '.REPEAT').val
|
||||||
if (stateSonosRepeat == 0) {
|
if (stateSonosRepeat == 0) {
|
||||||
setIfExists(id + '.REPEAT', 1);
|
setIfExists(id + '.REPEAT', 1);
|
||||||
} else if (stateSonosRepeat == 1) {
|
} else if (stateSonosRepeat == 1) {
|
||||||
@@ -6956,11 +6938,15 @@ function HandleButtonEvent(words: any): void {
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case 'volumeSlider':
|
case 'volumeSlider':
|
||||||
subscribeMediaSubscriptions(id);
|
pageCounter = -1;
|
||||||
useMediaEvents = true;
|
(function () { if (timeoutSlider) { clearTimeout(timeoutSlider); timeoutSlider = null; } })();
|
||||||
pageCounter = 1;
|
timeoutSlider = setTimeout(async function () {
|
||||||
let vVolume = scale(parseInt(words[4]), 100, 0, activePage!.items[0]!.minValue ?? 0, activePage!.items[0]!.maxValue ?? 100);
|
setIfExists(id + '.VOLUME', parseInt(words[4]));
|
||||||
setIfExists(id + '.VOLUME', Math.floor(vVolume));
|
setTimeout(async function () {
|
||||||
|
pageCounter = 1;
|
||||||
|
GeneratePage(activePage!);
|
||||||
|
}, 3000);
|
||||||
|
}, 20);
|
||||||
break;
|
break;
|
||||||
case 'mode-speakerlist':
|
case 'mode-speakerlist':
|
||||||
let pageItem = findPageItem(id);
|
let pageItem = findPageItem(id);
|
||||||
@@ -7084,9 +7070,8 @@ function HandleButtonEvent(words: any): void {
|
|||||||
|
|
||||||
switch (deviceAdapterTL) {
|
switch (deviceAdapterTL) {
|
||||||
case 'spotify-premium':
|
case 'spotify-premium':
|
||||||
//let trackArray = (function () { try {return JSON.parse(getState(pageItemTL.adapterPlayerInstance + 'player.playlist.trackListArray').val);} catch(e) {return {};}})();
|
let trackArray = (function () { try {return JSON.parse(getState(pageItemTL.adapterPlayerInstance + 'player.playlist.trackListArray').val);} catch(e) {return {};}})();
|
||||||
//setState(adapterInstanceTL + 'player.trackId', getAttr(trackArray, words[4] + '.id'));
|
setState(adapterInstanceTL + 'player.trackId', getAttr(trackArray, words[4] + '.id'));
|
||||||
setState(adapterInstanceTL + 'player.playlist.trackNo', parseInt(words[4]) + 1);
|
|
||||||
break;
|
break;
|
||||||
case 'sonos':
|
case 'sonos':
|
||||||
setState(adapterInstanceTL + 'root.' + pageItemTL.mediaDevice + '.current_track_number', parseInt(words[4]) + 1);
|
setState(adapterInstanceTL + 'root.' + pageItemTL.mediaDevice + '.current_track_number', parseInt(words[4]) + 1);
|
||||||
@@ -7164,7 +7149,6 @@ function HandleButtonEvent(words: any): void {
|
|||||||
let deviceAdapterSK: NSPanel.PlayerType = adapterSK[0] as NSPanel.PlayerType;
|
let deviceAdapterSK: NSPanel.PlayerType = adapterSK[0] as NSPanel.PlayerType;
|
||||||
switch (deviceAdapterSK) {
|
switch (deviceAdapterSK) {
|
||||||
case 'spotify-premium':
|
case 'spotify-premium':
|
||||||
setState(adapterInstanceSK + 'player.progressPercentage', parseInt(words[4]) * 10);
|
|
||||||
break;
|
break;
|
||||||
case 'squeezeboxrpc':
|
case 'squeezeboxrpc':
|
||||||
const vDuration: number = getState(adapterInstanceSK + 'Players.' + pageItemSeek.mediaDevice + '.Duration').val;
|
const vDuration: number = getState(adapterInstanceSK + 'Players.' + pageItemSeek.mediaDevice + '.Duration').val;
|
||||||
@@ -8262,11 +8246,6 @@ function GenerateDetailPage(type: NSPanel.PopupType, optional: NSPanel.mediaOpti
|
|||||||
actualState = Math.round(actualStateTemp / 10) * 10 + '%';
|
actualState = Math.round(actualStateTemp / 10) * 10 + '%';
|
||||||
optionalString = '0%?10%?20%?30%?40%?50%?60%?70%?80%?90%?100%';
|
optionalString = '0%?10%?20%?30%?40%?50%?60%?70%?80%?90%?100%';
|
||||||
}
|
}
|
||||||
if (vAdapter == 'spotify-premium') {
|
|
||||||
const actualStateTemp: number = getState(pageItem.adapterPlayerInstance + 'player.progressPercentage').val;
|
|
||||||
actualState = Math.round(actualStateTemp / 10) * 10 + '%';
|
|
||||||
optionalString = '0%?10%?20%?30%?40%?50%?60%?70%?80%?90%?100%';
|
|
||||||
}
|
|
||||||
if (vAdapter == 'squeezeboxrpc') {
|
if (vAdapter == 'squeezeboxrpc') {
|
||||||
const actualStateTime: number = parseInt(getState(pageItem.adapterPlayerInstance + 'Players.' + pageItem.mediaDevice + '.Time').val);
|
const actualStateTime: number = parseInt(getState(pageItem.adapterPlayerInstance + 'Players.' + pageItem.mediaDevice + '.Time').val);
|
||||||
const actualStateDuration: number = parseInt(getState(pageItem.adapterPlayerInstance + 'Players.' + pageItem.mediaDevice + '.Duration').val);
|
const actualStateDuration: number = parseInt(getState(pageItem.adapterPlayerInstance + 'Players.' + pageItem.mediaDevice + '.Duration').val);
|
||||||
@@ -8409,7 +8388,7 @@ function GenerateDetailPage(type: NSPanel.PopupType, optional: NSPanel.mediaOpti
|
|||||||
//Limit 900 characters, then memory overflow --> Shorten as much as possible
|
//Limit 900 characters, then memory overflow --> Shorten as much as possible
|
||||||
let temp_array: any[] = [];
|
let temp_array: any[] = [];
|
||||||
//let trackArray = (function () { try {return JSON.parse(getState(pageItem.adapterPlayerInstance + 'player.playlist.trackListArray').val);} catch(e) {return {};}})();
|
//let trackArray = (function () { try {return JSON.parse(getState(pageItem.adapterPlayerInstance + 'player.playlist.trackListArray').val);} catch(e) {return {};}})();
|
||||||
for (let track_index = 0; track_index < 48; track_index++) {
|
for (let track_index = 0; track_index < 45; track_index++) {
|
||||||
let temp_cut_array = getAttr(globalTracklist, track_index + '.title');
|
let temp_cut_array = getAttr(globalTracklist, track_index + '.title');
|
||||||
/* Volumio: @local/NAS no title -> name */
|
/* Volumio: @local/NAS no title -> name */
|
||||||
if (temp_cut_array == undefined) {
|
if (temp_cut_array == undefined) {
|
||||||
@@ -8854,10 +8833,9 @@ function HandleScreensaverUpdate(): void {
|
|||||||
iconColor + '~' +
|
iconColor + '~' +
|
||||||
config.bottomScreensaverEntity[4].ScreensaverEntityText + '~' +
|
config.bottomScreensaverEntity[4].ScreensaverEntityText + '~' +
|
||||||
val
|
val
|
||||||
} // Ende zusätzlichen Status Alternativ Layout
|
}
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
// USER definierte Bottom Entities
|
|
||||||
let checkpoint = true;
|
let checkpoint = true;
|
||||||
let i = 0;
|
let i = 0;
|
||||||
for (i = 0; i < maxEntities - 1 && i < config.bottomScreensaverEntity.length; i++) {
|
for (i = 0; i < maxEntities - 1 && i < config.bottomScreensaverEntity.length; i++) {
|
||||||
@@ -8911,7 +8889,7 @@ function HandleScreensaverUpdate(): void {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const temp = config.bottomScreensaverEntity[i].ScreensaverEntityIconColor
|
const temp = config.bottomScreensaverEntity[4].ScreensaverEntityIconColor
|
||||||
if (temp && typeof temp == 'string' && existsObject(temp)) {
|
if (temp && typeof temp == 'string' && existsObject(temp)) {
|
||||||
iconColor = getState(temp).val;
|
iconColor = getState(temp).val;
|
||||||
}
|
}
|
||||||
@@ -8982,8 +8960,6 @@ function HandleScreensaverUpdate(): void {
|
|||||||
SendToPanel({ payload: 'weatherUpdate~' + payloadString });
|
SendToPanel({ payload: 'weatherUpdate~' + payloadString });
|
||||||
|
|
||||||
HandleScreensaverStatusIcons();
|
HandleScreensaverStatusIcons();
|
||||||
|
|
||||||
HandleScreensaverColors();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
} catch (err: any) {
|
} catch (err: any) {
|
||||||
@@ -9977,8 +9953,8 @@ namespace NSPanel {
|
|||||||
|
|
||||||
export type SerialType = 'button' | 'light' | 'shutter' | 'text' | 'input_sel' | 'timer' | 'number' | 'fan'
|
export type SerialType = 'button' | 'light' | 'shutter' | 'text' | 'input_sel' | 'timer' | 'number' | 'fan'
|
||||||
|
|
||||||
export type roles = 'light' |'socket'|'dimmer'| 'hue' | 'rgb' | 'rgbSingle' | 'ct' | 'blind' | 'door' | 'window' | 'volumeGroup' | 'volume'
|
export type roles = 'light' |'socket'|'dimmer'| 'hue' | 'rgb' | 'rgbSingle' | 'cd' | 'blind' | 'door' | 'window' | 'volumeGroup' | 'volume'
|
||||||
| 'info' | 'humidity' | 'temperature' | 'value.temperature' | 'value.humidity' | 'sensor.door' | 'sensor.window' | 'thermostat' | 'warning'
|
| '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'
|
| 'cie' | 'gate' | 'motion' | 'buttonSensor' | 'button' | 'value.time' | 'level.timer' | 'value.alarmtime' | 'level.mode.fan' | 'lock' | 'slider'
|
||||||
| 'switch.mode.wlan' | 'media' | 'timeTable' | 'airCondition'
|
| 'switch.mode.wlan' | 'media' | 'timeTable' | 'airCondition'
|
||||||
|
|
||||||
@@ -10038,7 +10014,7 @@ namespace NSPanel {
|
|||||||
|
|
||||||
export type PageGrid2 = {
|
export type PageGrid2 = {
|
||||||
type: 'cardGrid2',
|
type: 'cardGrid2',
|
||||||
items: [PageItem?, PageItem?, PageItem?, PageItem?, PageItem?, PageItem?, PageItem?, PageItem?, PageItem?],
|
items: [PageItem?, PageItem?, PageItem?, PageItem?, PageItem?, PageItem?, PageItem?, PageItem?],
|
||||||
} & PageBaseType
|
} & PageBaseType
|
||||||
|
|
||||||
export type PageThermo = {
|
export type PageThermo = {
|
||||||
@@ -10142,6 +10118,7 @@ namespace NSPanel {
|
|||||||
navigate?: boolean,
|
navigate?: boolean,
|
||||||
colormode?: string,
|
colormode?: string,
|
||||||
colorScale?: IconScaleElement,
|
colorScale?: IconScaleElement,
|
||||||
|
//adapterPlayerInstance?: adapterPlayerInstanceType,
|
||||||
targetPage?: string,
|
targetPage?: string,
|
||||||
modeList?: string[],
|
modeList?: string[],
|
||||||
hidePassword?: boolean,
|
hidePassword?: boolean,
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
# https://developers.home-assistant.io/docs/add-ons/configuration#add-on-config
|
# https://developers.home-assistant.io/docs/add-ons/configuration#add-on-config
|
||||||
name: NSPanel Lovelace UI Addon
|
name: NSPanel Lovelace UI Addon
|
||||||
version: "4.7.80"
|
version: "4.7.74"
|
||||||
slug: nspanel-lovelace-ui
|
slug: nspanel-lovelace-ui
|
||||||
description: NSPanel Lovelace UI Addon
|
description: NSPanel Lovelace UI Addon
|
||||||
services:
|
services:
|
||||||
|
|||||||
@@ -209,11 +209,11 @@ class HAEntity(panel_cards.Entity):
|
|||||||
forecast = libs.home_assistant.execute_script(
|
forecast = libs.home_assistant.execute_script(
|
||||||
entity_name=self.entity_id,
|
entity_name=self.entity_id,
|
||||||
domain='weather',
|
domain='weather',
|
||||||
service="get_forecasts",
|
service="get_forecast",
|
||||||
service_data={
|
service_data={
|
||||||
'type': forecast_type
|
'type': forecast_type
|
||||||
}
|
}
|
||||||
).get(self.entity_id,{}).get("forecast", [])
|
).get("forecast", [])
|
||||||
if len(forecast) > pos:
|
if len(forecast) > pos:
|
||||||
forcast_pos = forecast[pos]
|
forcast_pos = forecast[pos]
|
||||||
forcast_condition = forcast_pos.get("condition", "")
|
forcast_condition = forcast_pos.get("condition", "")
|
||||||
|
|||||||
@@ -20,32 +20,27 @@ def calculate_dim_values(sleepTracking, sleepTrackingZones, sleepBrightness, scr
|
|||||||
dimmode = sleepBrightness
|
dimmode = sleepBrightness
|
||||||
elif isinstance(sleepBrightness, list):
|
elif isinstance(sleepBrightness, list):
|
||||||
logging.error("list style config for sleepBrightness no longer supported")
|
logging.error("list style config for sleepBrightness no longer supported")
|
||||||
#elif sleepBrightness.startswith("ha:"):
|
elif sleepBrightness.startswith("ha:"):
|
||||||
# time.sleep(1)
|
time.sleep(1)
|
||||||
# dimmode = int(float(libs.home_assistant.get_template(sleepBrightness)[3:]))
|
dimmode = int(float(libs.home_assistant.get_template(sleepBrightness)[3:]))
|
||||||
# involved_entities.extend(libs.home_assistant.get_template_listener_entities(sleepBrightness))
|
involved_entities.extend(libs.home_assistant.get_template_listener_entities(sleepBrightness))
|
||||||
elif libs.home_assistant.is_existent(sleepBrightness):
|
elif libs.home_assistant.is_existent(sleepBrightness):
|
||||||
involved_entities.append(sleepBrightness)
|
involved_entities.append(sleepBrightness)
|
||||||
try:
|
dimmode = int(float(libs.home_assistant.get_entity_data(sleepBrightness).get('state', 10)))
|
||||||
dimmode = int(float(libs.home_assistant.get_entity_data(sleepBrightness).get('state', 10)))
|
|
||||||
except ValueError:
|
|
||||||
print("sleepBrightness entity invalid")
|
|
||||||
|
|
||||||
if screenBrightness:
|
if screenBrightness:
|
||||||
if isinstance(screenBrightness, int):
|
if isinstance(screenBrightness, int):
|
||||||
dimValueNormal = screenBrightness
|
dimValueNormal = screenBrightness
|
||||||
elif isinstance(screenBrightness, list):
|
elif isinstance(screenBrightness, list):
|
||||||
logging.error("list style config for screenBrightness no longer supported")
|
logging.error("list style config for screenBrightness no longer supported")
|
||||||
#elif screenBrightness.startswith("ha:"):
|
elif screenBrightness.startswith("ha:"):
|
||||||
# time.sleep(1)
|
time.sleep(1)
|
||||||
# dimValueNormal = int(float(libs.home_assistant.get_template(screenBrightness)[3:]))
|
dimValueNormal = int(float(libs.home_assistant.get_template(screenBrightness)[3:]))
|
||||||
# involved_entities.extend(libs.home_assistant.get_template_listener_entities(screenBrightness))
|
involved_entities.extend(libs.home_assistant.get_template_listener_entities(screenBrightness))
|
||||||
elif libs.home_assistant.is_existent(screenBrightness):
|
elif libs.home_assistant.is_existent(screenBrightness):
|
||||||
involved_entities.append(screenBrightness)
|
involved_entities.append(screenBrightness)
|
||||||
try:
|
dimValueNormal = int(float(libs.home_assistant.get_entity_data(screenBrightness).get('state', 100)))
|
||||||
dimValueNormal = int(float(libs.home_assistant.get_entity_data(screenBrightness).get('state', 100)))
|
|
||||||
except ValueError:
|
|
||||||
print("screenBrightness entity invalid")
|
|
||||||
# force sleep brightness to zero in case sleepTracking is active
|
# force sleep brightness to zero in case sleepTracking is active
|
||||||
if sleepTracking:
|
if sleepTracking:
|
||||||
if libs.home_assistant.is_existent(sleepTracking):
|
if libs.home_assistant.is_existent(sleepTracking):
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
paho-mqtt==1.6.1
|
paho-mqtt
|
||||||
pyyaml
|
pyyaml
|
||||||
websockets
|
websockets
|
||||||
websocket-client
|
websocket-client
|
||||||
|
|||||||
Reference in New Issue
Block a user