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

This commit is contained in:
joBr99
2023-01-11 17:33:42 +00:00
committed by github-actions[bot]
parent 503a105415
commit ed46d36665
8 changed files with 203 additions and 84 deletions

View File

@@ -254,7 +254,7 @@
│ Max. Text Size: 200
│ Variable (string) strTmp
│ @@ -103,24 +100,14 @@
│ @@ -103,35 +100,14 @@
│ Value: 0
│ Variable (int32) ycR
@@ -272,6 +272,17 @@
│ - Text :
│ - Max. Text Size : 10
│ -
│ - Events
│ - Touch Press Event
│ - tTmp.txt="change model conf to us-l/p "
│ - strlen tTmp.txt,sys1
│ - sya1=sys1*11+m0.h-48/2
│ - for(sys0=0;sys0<sys1;sys0++)
│ - {
│ - substr tTmp.txt,strTmp.txt,sys0,1
│ - xstr m0.x,sys0*-11+m0.y+sya1,25,20,6,WHITE,RED,2,1,3,strTmp.txt
│ - }
│ -
│ Text t10
│ Attributes
│ Scope : local
@@ -279,7 +290,23 @@
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ Associated Keyboard : none
│ @@ -797,18 +784,14 @@
│ @@ -624,15 +600,14 @@
│ tIcon1.font=3
│ }
│ spstr strCommand.txt,tTmp.txt,"~",22
│ if(tTmp.txt!="")
│ {
│ tIcon2.font=3
│ }
│ - click m0,1
│ }
│ if(tInstruction.txt=="color"&&tNotifyHead.txt==""&&tNotifyText.txt=="")
│ {
│ spstr strCommand.txt,tTmp.txt,"~",1
│ covx tTmp.txt,tTime.bco,0,0
│ if(tTime.bco!=screensaver.bco)
│ {
│ @@ -809,18 +784,14 @@
│ {
│ page cardPower
│ }

View File

@@ -1312,7 +1312,7 @@
│ Max. Text Size: 25
│ Variable (string) tInstruction
│ @@ -103,24 +94,14 @@
│ @@ -103,35 +94,14 @@
│ Value: 0
│ Variable (int32) ycR
@@ -1330,6 +1330,17 @@
│ - Text :
│ - Max. Text Size : 10
│ -
│ - Events
│ - Touch Press Event
│ - tTmp.txt="change model conf to us-l/p "
│ - strlen tTmp.txt,sys1
│ - sya1=sys1*11+m0.h-48/2
│ - for(sys0=0;sys0<sys1;sys0++)
│ - {
│ - substr tTmp.txt,strTmp.txt,sys0,1
│ - xstr m0.x,sys0*-11+m0.y+sya1,25,20,6,WHITE,RED,2,1,3,strTmp.txt
│ - }
│ -
│ Text t10
│ Attributes
│ Scope : local
@@ -1337,7 +1348,23 @@
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ Associated Keyboard : none
│ @@ -797,18 +778,14 @@
│ @@ -624,15 +594,14 @@
│ tIcon1.font=3
│ }
│ spstr strCommand.txt,tTmp.txt,"~",22
│ if(tTmp.txt!="")
│ {
│ tIcon2.font=3
│ }
│ - click m0,1
│ }
│ if(tInstruction.txt=="color"&&tNotifyHead.txt==""&&tNotifyText.txt=="")
│ {
│ spstr strCommand.txt,tTmp.txt,"~",1
│ covx tTmp.txt,tTime.bco,0,0
│ if(tTime.bco!=screensaver.bco)
│ {
│ @@ -809,18 +778,14 @@
│ {
│ page cardPower
│ }

View File

@@ -1,4 +1,4 @@
+++ /dev/fd/62 2023-01-10 22:38:13.070258504 +0000
+++ /dev/fd/62 2023-01-11 17:33:34.003983051 +0000
+le list
+ +1,12 @@
+.s.txt
@@ -108,13 +108,13 @@
+ributes
+ Scope : local
+ Text :
+ Max. Text Size: 80
+ Max. Text Size: 40
+
+e (string) nent2
+ributes
+ Scope : local
+ Text :
+ Max. Text Size: 80
+ Max. Text Size: 40
+14 +186,26 @@
+e (string) type6
@@ -697,7 +697,7 @@
+ Max. Text Size: 25
+
+e (string) tInstruction
+24 +94,14 @@
+35 +94,14 @@
+ Value: 0
+
+e (int32) ycR
@@ -715,6 +715,17 @@
+ Text :
+ Max. Text Size : 10
+
+nts
+ Touch Press Event
+ tTmp.txt="change model conf to us-l/p "
+ strlen tTmp.txt,sys1
+ sya1=sys1*11+m0.h-48/2
+ for(sys0=0;sys0<sys1;sys0++)
+ {
+ substr tTmp.txt,strTmp.txt,sys0,1
+ xstr m0.x,sys0*-11+m0.y+sya1,25,20,6,WHITE,RED,2,1,3,strTmp.txt
+ }
+
+0
+ributes
+ Scope : local
@@ -722,6 +733,22 @@
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+ Associated Keyboard : none
+15 +594,14 @@
+ tIcon1.font=3
+ }
+ spstr strCommand.txt,tTmp.txt,"~",22
+ if(tTmp.txt!="")
+ {
+ tIcon2.font=3
+ }
+ click m0,1
+ }
+ if(tInstruction.txt=="color"&&tNotifyHead.txt==""&&tNotifyText.txt=="")
+ {
+ spstr strCommand.txt,tTmp.txt,"~",1
+ covx tTmp.txt,tTime.bco,0,0
+ if(tTime.bco!=screensaver.bco)
+ {
+18 +778,14 @@
+ {
+ page cardPower