mirror of
https://github.com/joBr99/nspanel-lovelace-ui.git
synced 2025-12-21 15:04:24 +01:00
Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
922baa41b4 | ||
|
|
4ba40f0458 | ||
|
|
c2ee0d30f1 | ||
|
|
1f6e2a08f6 | ||
|
|
180e338453 | ||
|
|
c46cd3cb34 |
@@ -103,7 +103,7 @@ The following message can be used to update the content on the cardEntities Page
|
||||
|
||||
### popupLight Page
|
||||
|
||||
`entityUpdateDetail~*iconId*~*iconColor*~*buttonState*~*sliderBrightnessPos*~*sliderColorTempPos*~*colorMode*`
|
||||
`entityUpdateDetail~*iconId*~*iconColor*~*buttonState*~*sliderBrightnessPos*~*sliderColorTempPos*~*colorMode*~*color_translation*~*color_temp_translation*~*brightness_translation*`
|
||||
|
||||
`entityUpdateDetail~1~17299~1~100~78~enable`
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
|
||||
--- HMI/n2t-out/Program.s.txt 2022-05-07 15:37:51.728763344 +0000
|
||||
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-07 15:37:52.500817194 +0000
|
||||
--- HMI/n2t-out/Program.s.txt 2022-05-07 15:43:32.155996375 +0000
|
||||
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-07 15:43:33.036000662 +0000
|
||||
@@ -11,6 +11,4 @@
|
||||
// dim value
|
||||
int dimValue=40
|
||||
@@ -9,8 +9,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
|
||||
- lcd_dev fffb 0002 0000 0020
|
||||
page pageStartup
|
||||
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
|
||||
--- HMI/n2t-out/pageStartup.txt 2022-05-07 15:37:51.728763344 +0000
|
||||
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-07 15:37:52.500817194 +0000
|
||||
--- HMI/n2t-out/pageStartup.txt 2022-05-07 15:43:32.155996375 +0000
|
||||
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-07 15:43:33.036000662 +0000
|
||||
@@ -177,7 +177,7 @@
|
||||
recmod=1
|
||||
bauds=115200
|
||||
|
||||
@@ -10,14 +10,14 @@ pageTest
|
||||
13 Component(s)
|
||||
13 Line(s) of event code
|
||||
13 Unique line(s) of event code
|
||||
popupLight
|
||||
27 Component(s)
|
||||
341 Line(s) of event code
|
||||
185 Unique line(s) of event code
|
||||
popupShutter
|
||||
20 Component(s)
|
||||
193 Line(s) of event code
|
||||
109 Unique line(s) of event code
|
||||
popupLight
|
||||
27 Component(s)
|
||||
341 Line(s) of event code
|
||||
185 Unique line(s) of event code
|
||||
popupNotify
|
||||
17 Component(s)
|
||||
196 Line(s) of event code
|
||||
|
||||
@@ -154,7 +154,7 @@ Text t1
|
||||
Opacity : 127
|
||||
x coordinate : 25
|
||||
y coordinate : 226
|
||||
Width : 229
|
||||
Width : 208
|
||||
Height : 30
|
||||
Effect : load
|
||||
Effect Priority : 0
|
||||
|
||||
Binary file not shown.
Binary file not shown.
@@ -1,6 +1,6 @@
|
||||
diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
|
||||
--- HMI/n2t-out/Program.s.txt 2022-05-07 15:37:51.728763344 +0000
|
||||
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-07 15:37:52.104789571 +0000
|
||||
--- HMI/n2t-out/Program.s.txt 2022-05-07 15:43:32.155996375 +0000
|
||||
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-07 15:43:32.583998460 +0000
|
||||
@@ -11,6 +11,6 @@
|
||||
// dim value
|
||||
int dimValue=40
|
||||
@@ -11,8 +11,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
|
||||
+ //lcd_dev fffb 0002 0000 0020
|
||||
page pageStartup
|
||||
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
|
||||
--- HMI/n2t-out/cardEntities.txt 2022-05-07 15:37:51.728763344 +0000
|
||||
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-07 15:37:52.104789571 +0000
|
||||
--- HMI/n2t-out/cardEntities.txt 2022-05-07 15:43:32.155996375 +0000
|
||||
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-07 15:43:32.587998479 +0000
|
||||
@@ -62,6 +62,16 @@
|
||||
vis bText4,0
|
||||
vis hSlider4,0
|
||||
@@ -427,8 +427,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
|
||||
if(tInstruction.txt=="pageType")
|
||||
{
|
||||
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
|
||||
--- HMI/n2t-out/pageStartup.txt 2022-05-07 15:37:51.728763344 +0000
|
||||
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-07 15:37:52.104789571 +0000
|
||||
--- HMI/n2t-out/pageStartup.txt 2022-05-07 15:43:32.155996375 +0000
|
||||
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-07 15:43:32.583998460 +0000
|
||||
@@ -142,7 +142,7 @@
|
||||
Disable release event after dragging: 0
|
||||
Send Component ID : disabled
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-07 15:37:52.120790687 +0000
|
||||
+--- HMI/n2t-out/Program.s.txt 2022-05-07 15:37:51.728763344 +0000
|
||||
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-07 15:37:52.104789571 +0000
|
||||
+--- HMI/n2t-out/cardEntities.txt 2022-05-07 15:37:51.728763344 +0000
|
||||
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-07 15:37:52.104789571 +0000
|
||||
+--- HMI/n2t-out/pageStartup.txt 2022-05-07 15:37:51.728763344 +0000
|
||||
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-07 15:37:52.104789571 +0000
|
||||
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-07 15:43:32.599998538 +0000
|
||||
+--- HMI/n2t-out/Program.s.txt 2022-05-07 15:43:32.155996375 +0000
|
||||
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-07 15:43:32.583998460 +0000
|
||||
+--- HMI/n2t-out/cardEntities.txt 2022-05-07 15:43:32.155996375 +0000
|
||||
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-07 15:43:32.587998479 +0000
|
||||
+--- HMI/n2t-out/pageStartup.txt 2022-05-07 15:43:32.155996375 +0000
|
||||
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-07 15:43:32.583998460 +0000
|
||||
|
||||
@@ -154,7 +154,7 @@ Text t1
|
||||
Opacity : 127
|
||||
x coordinate : 10
|
||||
y coordinate : 226
|
||||
Width : 244
|
||||
Width : 211
|
||||
Height : 30
|
||||
Effect : load
|
||||
Effect Priority : 0
|
||||
|
||||
BIN
HMI/nspanel.HMI
BIN
HMI/nspanel.HMI
Binary file not shown.
BIN
HMI/nspanel.tft
BIN
HMI/nspanel.tft
Binary file not shown.
@@ -411,7 +411,7 @@ class LuiPagesGen(object):
|
||||
entity = self._ha_api.get_entity(entity)
|
||||
pos = int(entity.attributes.get("current_position", 50))
|
||||
pos_translation = get_translation(self._locale, "position")
|
||||
self._send_mqtt_msg(f"entityUpdateDetail~{pos}~~{pos_translation}")
|
||||
self._send_mqtt_msg(f"entityUpdateDetail~{pos}~{pos_translation}: {pos}~{pos_translation}")
|
||||
|
||||
def send_message_page(self, id, heading, msg, b1, b2):
|
||||
self._send_mqtt_msg(f"pageType~popupNotify")
|
||||
|
||||
@@ -1119,7 +1119,7 @@ function GenerateDetailPage(type: string, pageItem: PageItem): Payload[] {
|
||||
iconColor = GetIconColor(pageItem, true, false);
|
||||
}
|
||||
|
||||
out_msgs.push({ payload: "entityUpdateDetail~" + icon + "~" + + iconColor + "~" + switchVal + ",disable,disable,disable" })
|
||||
out_msgs.push({ payload: "entityUpdateDetail~" + icon + "~" + + iconColor + "~" + switchVal + ",disable,disable,disable" + "~Color~Temperature~Brightness" })
|
||||
}
|
||||
|
||||
//Dimmer
|
||||
@@ -1160,7 +1160,7 @@ function GenerateDetailPage(type: string, pageItem: PageItem): Payload[] {
|
||||
let colorTemp = "disable"
|
||||
let colorMode = "disable"
|
||||
|
||||
out_msgs.push({ payload: "entityUpdateDetail~" + icon + "~" + iconColor + "~" + switchVal + "~" + brightness + "~" + colorTemp + "~" + colorMode })
|
||||
out_msgs.push({ payload: "entityUpdateDetail~" + icon + "~" + iconColor + "~" + switchVal + "~" + brightness + "~" + colorTemp + "~" + colorMode + "~Color~Temperature~Brightness" })
|
||||
}
|
||||
//HUE-Licht
|
||||
if (o.common.role == "hue") {
|
||||
@@ -1213,7 +1213,7 @@ function GenerateDetailPage(type: string, pageItem: PageItem): Payload[] {
|
||||
console.warn("Alias-Datenpunkt: " + id + ".TEMPERATURE could not be read");
|
||||
}
|
||||
|
||||
out_msgs.push({ payload: "entityUpdateDetail~" + icon + "~" + iconColor + "~" + switchVal + "~" + brightness + "~" + colorTemp + "~" + colorMode })
|
||||
out_msgs.push({ payload: "entityUpdateDetail~" + icon + "~" + iconColor + "~" + switchVal + "~" + brightness + "~" + colorTemp + "~" + colorMode + "~Color~Temperature~Brightness" })
|
||||
}
|
||||
|
||||
//RGB-Licht
|
||||
@@ -1266,7 +1266,7 @@ function GenerateDetailPage(type: string, pageItem: PageItem): Payload[] {
|
||||
console.warn("Alias-Datenpunkt: " + id + ".TEMPERATURE could not be read");
|
||||
}
|
||||
|
||||
out_msgs.push({ payload: "entityUpdateDetail~" + icon + "~" + iconColor + "~" + switchVal + "~" + brightness + "~" + colorTemp + "~" + colorMode })
|
||||
out_msgs.push({ payload: "entityUpdateDetail~" + icon + "~" + iconColor + "~" + switchVal + "~" + brightness + "~" + colorTemp + "~" + colorMode + "~Color~Temperature~Brightness" })
|
||||
}
|
||||
|
||||
//RGB-Licht-einzeln (HEX)
|
||||
@@ -1323,7 +1323,7 @@ function GenerateDetailPage(type: string, pageItem: PageItem): Payload[] {
|
||||
console.warn("Alias-Datenpunkt: " + id + ".TEMPERATURE could not be read");
|
||||
}
|
||||
|
||||
out_msgs.push({ payload: "entityUpdateDetail~" + icon + "~" + iconColor + "~" + switchVal + "~" + brightness + "~" + colorTemp + "~" + colorMode })
|
||||
out_msgs.push({ payload: "entityUpdateDetail~" + icon + "~" + iconColor + "~" + switchVal + "~" + brightness + "~" + colorTemp + "~" + colorMode + "~Color~Temperature~Brightness" })
|
||||
}
|
||||
|
||||
//Farbtemperatur
|
||||
@@ -1368,7 +1368,7 @@ function GenerateDetailPage(type: string, pageItem: PageItem): Payload[] {
|
||||
console.warn("Alias-Datenpunkt: " + id + ".TEMPERATURE could not be read");
|
||||
}
|
||||
|
||||
out_msgs.push({ payload: "entityUpdateDetail~" + icon + "~" + iconColor + "~" + switchVal + "~" + brightness + "~" + colorTemp + "~" + colorMode })
|
||||
out_msgs.push({ payload: "entityUpdateDetail~" + icon + "~" + iconColor + "~" + switchVal + "~" + brightness + "~" + colorTemp + "~" + colorMode + "~Color~Temperature~Brightness" })
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1381,7 +1381,7 @@ function GenerateDetailPage(type: string, pageItem: PageItem): Payload[] {
|
||||
val = getState(id + ".SET").val;
|
||||
RegisterDetailEntityWatcher(id + ".SET", pageItem, type);
|
||||
}
|
||||
out_msgs.push({ payload: "entityUpdateDetail~" + val })
|
||||
out_msgs.push({ payload: "entityUpdateDetail~" + val + "~~Position" })
|
||||
}
|
||||
}
|
||||
return out_msgs
|
||||
|
||||
Reference in New Issue
Block a user