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

sync (add nextion2text)

Browse Source
This commit is contained in:
joBr99
2022-06-01 14:51:22 +00:00
committed by github-actions[bot]
parent a4e2cb7c6a
commit db65c85a1b
9 changed files with 311 additions and 446 deletions
Download Patch File Download Diff File Expand all files Collapse all files

140
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-05-31 16:49:35.031556338 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-31 16:49:35.915562207 +0000
--- HMI/n2t-out/Program.s.txt 2022-06-01 14:51:15.788988952 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-01 14:51:16.805072637 +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/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-05-31 16:49:35.031556338 +0000
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-05-31 16:49:35.919562233 +0000
--- HMI/n2t-out/cardEntities.txt 2022-06-01 14:51:15.788988952 +0000
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-06-01 14:51:16.805072637 +0000
@@ -1925,10 +1925,6 @@
// get value
spstr strCommand.txt,tTmp.txt,"~",1
@@ -23,8 +23,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-05-31 16:49:35.031556338 +0000
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-05-31 16:49:35.915562207 +0000
--- HMI/n2t-out/cardGrid.txt 2022-06-01 14:51:15.788988952 +0000
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-06-01 14:51:16.805072637 +0000
@@ -846,10 +846,6 @@
// get value
spstr strCommand.txt,tTmp.txt,"~",1
@@ -37,8 +37,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt
--- HMI/n2t-out/cardMedia.txt 2022-05-31 16:49:35.031556338 +0000
+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-05-31 16:49:35.915562207 +0000
--- HMI/n2t-out/cardMedia.txt 2022-06-01 14:51:15.788988952 +0000
+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-06-01 14:51:16.805072637 +0000
@@ -636,10 +636,7 @@
// get value
spstr strCommand.txt,tTmp.txt,"~",1
@@ -52,108 +52,20 @@ 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-05-31 16:49:35.031556338 +0000
+++ HMI/US/landscape/n2t-out/cardQR.txt 2022-05-31 16:49:35.915562207 +0000
@@ -30,8 +30,6 @@
vis tIcon2,0
vis tEntity2,0
vis bText2,0
- tsw m0,0
- tsw m1,0
Variable (string) strCommand
--- HMI/n2t-out/cardQR.txt 2022-06-01 14:51:15.788988952 +0000
+++ HMI/US/landscape/n2t-out/cardQR.txt 2022-06-01 14:51:16.805072637 +0000
@@ -97,7 +97,7 @@
Attributes
@@ -93,12 +91,6 @@
Scope : local
Text :
Max. Text Size: 10
-Variable (string) vaQR
- Attributes
- Scope : local
- Text :
- Max. Text Size: 100
-
+ Max. Text Size: 80
Text tEntity1
Attributes
Scope : local
@@ -156,6 +148,15 @@
Disable release event after dragging: 0
Send Component ID : disabled
+QR Code qr0
+ Attributes
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+ Text :
+ Max. Text Size : 100
+
Button bNext
Attributes
Scope : local
@@ -350,20 +351,6 @@
Touch Press Event
click bPrev,1
-Hotspot m0
- Attributes
- Scope : local
- Dragging : 0
- Disable release event after dragging: 0
- Send Component ID : disabled
-
-Hotspot m1
- Attributes
- Scope : local
- Dragging : 0
- Disable release event after dragging: 0
- Send Component ID : disabled
-
Timer tmSerial
Attributes
Scope : local
@@ -456,7 +443,7 @@
bNext.txt=""
}
//text qrcode
- spstr strCommand.txt,vaQR.txt,"~",3
+ spstr strCommand.txt,qr0.txt,"~",3
// get Type
spstr strCommand.txt,type1.txt,"~",4
// get internal name
@@ -579,16 +566,6 @@
// get Text (optional Value)
spstr strCommand.txt,bText2.txt,"~",15
}
- if(type2.txt=="delete"||type2.txt=="")
- {
- if(type1.txt=="delete"||type1.txt=="")
- {
- qrcode m1.x,m1.y,200,6371,65535,-1,vaQR.txt
- }
- }else
- {
- qrcode m0.x,m0.y,200,6371,65535,-1,vaQR.txt
- }
}
if(tInstruction.txt=="time")
{
@@ -605,10 +582,7 @@
// get value
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0
- // get value normal
- spstr strCommand.txt,tTmp.txt,"~",2
- covx tTmp.txt,dimValueNormal,0,0
- dim=dimValueNormal
+ dim=dimValue
}
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
--- HMI/n2t-out/cardThermo.txt 2022-05-31 16:49:35.031556338 +0000
+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-05-31 16:49:35.919562233 +0000
--- HMI/n2t-out/cardThermo.txt 2022-06-01 14:51:15.788988952 +0000
+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-06-01 14:51:16.805072637 +0000
@@ -1170,10 +1170,6 @@
// get value
spstr strCommand.txt,tTmp.txt,"~",1
@@ -166,8 +78,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-05-31 16:49:35.031556338 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-31 16:49:35.915562207 +0000
--- HMI/n2t-out/pageStartup.txt 2022-06-01 14:51:15.788988952 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-01 14:51:16.805072637 +0000
@@ -177,7 +177,7 @@
recmod=1
bauds=115200
@@ -189,8 +101,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
--- HMI/n2t-out/popupLight.txt 2022-05-31 16:49:35.031556338 +0000
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-05-31 16:49:35.915562207 +0000
--- HMI/n2t-out/popupLight.txt 2022-06-01 14:51:15.788988952 +0000
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-06-01 14:51:16.805072637 +0000
@@ -561,10 +561,6 @@
// get value
spstr strCommand.txt,tTmp.txt,"~",1
@@ -203,8 +115,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-05-31 16:49:35.031556338 +0000
+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-05-31 16:49:35.915562207 +0000
--- HMI/n2t-out/popupNotify.txt 2022-06-01 14:51:15.788988952 +0000
+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-06-01 14:51:16.805072637 +0000
@@ -311,10 +311,6 @@
// get value
spstr strCommand.txt,tTmp.txt,"~",1
@@ -217,8 +129,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-05-31 16:49:35.031556338 +0000
+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-05-31 16:49:35.915562207 +0000
--- HMI/n2t-out/popupShutter.txt 2022-06-01 14:51:15.788988952 +0000
+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-06-01 14:51:16.805072637 +0000
@@ -406,10 +406,6 @@
// get value
spstr strCommand.txt,tTmp.txt,"~",1
@@ -231,8 +143,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-05-31 16:49:35.031556338 +0000
+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-05-31 16:49:35.919562233 +0000
--- HMI/n2t-out/screensaver.txt 2022-06-01 14:51:15.788988952 +0000
+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-06-01 14:51:16.809072966 +0000
@@ -397,9 +397,6 @@
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0