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

Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text)

Browse Source
This commit is contained in:
joBr99
2022-07-23 08:51:54 +00:00
committed by github-actions[bot]
parent ce8fb9b1ae
commit 69a5c7304c
13 changed files with 1338 additions and 651 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
HMI/US/landscape/diff-eu-version.txt
View File

@@ -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-07-13 16:57:06.544404168 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-07-13 16:57:07.448403502 +0000
--- HMI/n2t-out/Program.s.txt 2022-07-23 08:51:48.553338369 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-07-23 08:51:49.589361886 +0000
@@ -11,9 +11,4 @@
// dim value
int dimValue=40
@@ -12,8 +12,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/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt
--- HMI/n2t-out/cardAlarm.txt 2022-07-13 16:57:06.548404165 +0000
+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-07-13 16:57:07.452403499 +0000
--- HMI/n2t-out/cardAlarm.txt 2022-07-23 08:51:48.553338369 +0000
+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-07-23 08:51:49.589361886 +0000
@@ -37,25 +37,6 @@
vis tCode,0
vis bPrev,0
@@ -60,8 +60,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-07-13 16:57:06.548404165 +0000
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-07-13 16:57:07.448403502 +0000
--- HMI/n2t-out/cardEntities.txt 2022-07-23 08:51:48.553338369 +0000
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-07-23 08:51:49.589361886 +0000
@@ -65,26 +65,6 @@
vis nNum4,0
vis bPrev,0
@@ -153,8 +153,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
--- HMI/n2t-out/cardGrid.txt 2022-07-13 16:57:06.548404165 +0000
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-07-13 16:57:07.448403502 +0000
--- HMI/n2t-out/cardGrid.txt 2022-07-23 08:51:48.553338369 +0000
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-07-23 08:51:49.589361886 +0000
@@ -36,15 +36,6 @@
vis tEntity6,0
vis bPrev,0
@@ -202,8 +202,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
TouchCap tc0
Attributes
diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt
--- HMI/n2t-out/cardMedia.txt 2022-07-13 16:57:06.548404165 +0000
+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-07-13 16:57:07.448403502 +0000
--- HMI/n2t-out/cardMedia.txt 2022-07-23 08:51:48.553338369 +0000
+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-07-23 08:51:49.589361886 +0000
@@ -21,21 +21,6 @@
vis t5,0
vis bPrev,0
@@ -246,8 +246,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt
--- HMI/n2t-out/cardQR.txt 2022-07-13 16:57:06.548404165 +0000
+++ HMI/US/landscape/n2t-out/cardQR.txt 2022-07-13 16:57:07.448403502 +0000
--- HMI/n2t-out/cardQR.txt 2022-07-23 08:51:48.553338369 +0000
+++ HMI/US/landscape/n2t-out/cardQR.txt 2022-07-23 08:51:49.589361886 +0000
@@ -32,25 +32,6 @@
vis bText2,0
tsw m0,0
@@ -294,8 +294,8 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
--- HMI/n2t-out/cardThermo.txt 2022-07-13 16:57:06.548404165 +0000
+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-07-13 16:57:07.452403499 +0000
--- HMI/n2t-out/cardThermo.txt 2022-07-23 08:51:48.553338369 +0000
+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-07-23 08:51:49.589361886 +0000
@@ -41,21 +41,6 @@
vis xTempDest1,0
vis bPrev,0
@@ -338,8 +338,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-07-13 16:57:06.544404168 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-07-13 16:57:07.448403502 +0000
--- HMI/n2t-out/pageStartup.txt 2022-07-23 08:51:48.553338369 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-07-23 08:51:49.589361886 +0000
@@ -177,7 +177,7 @@
recmod=1
bauds=115200
@@ -368,60 +368,10 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
}
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/pageTest.txt HMI/US/landscape/n2t-out/pageTest.txt
--- HMI/n2t-out/pageTest.txt 2022-07-13 16:57:06.544404168 +0000
+++ HMI/US/landscape/n2t-out/pageTest.txt 2022-07-13 16:57:07.448403502 +0000
@@ -13,46 +13,6 @@
Events
Preinitialize Event
vis p0,0
- n0.val=defaultBcoColor
- n1.val=defaultFontColor
-
-Number n0
- Attributes
- Scope : local
- Dragging : 0
- Disable release event after dragging: 0
- Send Component ID : disabled
- Associated Keyboard : none
- Value : 0
-
-Number n1
- Attributes
- Scope : local
- Dragging : 0
- Disable release event after dragging: 0
- Send Component ID : disabled
- Associated Keyboard : none
- Value : 0
-
-Text t0
- Attributes
- Scope : local
- Dragging : 0
- Disable release event after dragging: 0
- Send Component ID : disabled
- Associated Keyboard : none
- Text : bco
- Max. Text Size : 10
-
-Text t1
- Attributes
- Scope : local
- Dragging : 0
- Disable release event after dragging: 0
- Send Component ID : disabled
- Associated Keyboard : none
- Text : font
- Max. Text Size : 10
Picture p0
Attributes
Only in HMI/n2t-out: popupFan.txt
diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
--- HMI/n2t-out/popupLight.txt 2022-07-13 16:57:06.544404168 +0000
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-07-13 16:57:07.448403502 +0000
--- HMI/n2t-out/popupLight.txt 2022-07-23 08:51:48.553338369 +0000
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-07-23 08:51:49.589361886 +0000
@@ -50,29 +50,6 @@
vis t0,0
vis pColorWheel,0
@@ -472,8 +422,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt
--- HMI/n2t-out/popupNotify.txt 2022-07-13 16:57:06.544404168 +0000
+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-07-13 16:57:07.448403502 +0000
--- HMI/n2t-out/popupNotify.txt 2022-07-23 08:51:48.553338369 +0000
+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-07-23 08:51:49.589361886 +0000
@@ -12,24 +12,12 @@
Events
@@ -519,8 +469,8 @@ diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt
--- HMI/n2t-out/popupShutter.txt 2022-07-13 16:57:06.544404168 +0000
+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-07-13 16:57:07.448403502 +0000
--- HMI/n2t-out/popupShutter.txt 2022-07-23 08:51:48.553338369 +0000
+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-07-23 08:51:49.589361886 +0000
@@ -40,40 +40,6 @@
prints sys0,2
prints tSend.txt,0
@@ -688,8 +638,8 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt
if(tInstruction.txt=="time")
{
diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt
--- HMI/n2t-out/screensaver.txt 2022-07-13 16:57:06.544404168 +0000
+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-07-13 16:57:07.452403499 +0000
--- HMI/n2t-out/screensaver.txt 2022-07-23 08:51:48.553338369 +0000
+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-07-23 08:51:49.589361886 +0000
@@ -406,22 +406,10 @@
// get value
spstr strCommand.txt,tTmp.txt,"~",1
@@ -713,4 +663,4 @@ diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt
- }
}
if(tInstruction.txt=="time")
{
{