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

fixes #829 #830 (add nextion2text)

Browse Source
This commit is contained in:
joBr99
2023-03-27 15:57:51 +00:00
committed by github-actions[bot]
parent bdc2f1ebb7
commit a7d7d90a4d
10 changed files with 205 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,7 +2,7 @@
+++ HMI/US/landscape/n2t-out
│ --- HMI/n2t-out/Program.s.txt
├── +++ HMI/US/landscape/n2t-out/Program.s.txt
│ @@ -11,9 +11,9 @@
│ @@ -11,10 +11,9 @@
│ // dim value
│ int dimValue=40
│ int dimValueNormal=100
@@ -11,10 +11,50 @@
│ int defaultBcoColor=6371
│ // fix touch offset
│ - lcd_dev fffb 0002 0000 0020
│ - printh 00 00 00 ff ff ff 88 ff ff ff//Output power on information to serial port
│ + //lcd_dev fffb 0002 0000 0020
│ page pageStartup
│ --- HMI/n2t-out/cardQR.txt
├── +++ HMI/US/landscape/n2t-out/cardQR.txt
│ @@ -124,15 +124,15 @@
│ Text :
│ Max. Text Size: 10
│
│ Variable (string) vaQR
│ Attributes
│ Scope : local
│ Text :
│ - Max. Text Size: 70
│ + Max. Text Size: 80
│
│ Text tEntity1
│ Attributes
│ Scope : local
│ Dragging : 0
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ @@ -602,19 +602,19 @@
│ // get Text (optional Value)
│ spstr strCommand.txt,bText2.txt,"~",26
│ }
│ if(type2.txt=="delete"||type2.txt=="")
│ {
│ if(type1.txt=="delete"||type1.txt=="")
│ {
│ - qrcode m1.x,m1.y,200,65535,defaultBcoColor,-1,vaQR.txt
│ + qrcode m1.x,m1.y,200,defaultBcoColor,65535,-1,vaQR.txt
│ }
│ }else
│ {
│ - qrcode m0.x,m0.y,200,65535,defaultBcoColor,-1,vaQR.txt
│ + qrcode m0.x,m0.y,200,defaultBcoColor,65535,-1,vaQR.txt
│ }
│ }
│ if(tInstruction.txt=="time")
│ {
│ // get set time to global variable
│ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
│ }
│ @@ -751,15 +751,15 @@
│ if(sleepTimeout!=0&&dimValue!=dim)
│ {
@@ -51,6 +91,25 @@
│ crcputs sys0,2
│ crcputs tSend.txt,0
│ //send cmd
│ --- HMI/n2t-out/popupNotify.txt
├── +++ HMI/US/landscape/n2t-out/popupNotify.txt
│ @@ -15,16 +15,14 @@
│ popupNotify.bco=defaultBcoColor
│ dim=dimValueNormal
│ vis p0,0
│ vis tSend,0
│ vis tTmp,0
│ vis tInstruction,0
│ vis tId,0
│ - vis b1,0
│ - vis b2,0
│ popupNotify.bco=defaultBcoColor
│ tHeading.bco=defaultBcoColor
│ b0.bco=defaultBcoColor
│ tText.bco=defaultBcoColor
│ b1.bco=defaultBcoColor
│ b2.bco=defaultBcoColor
│ tIcon.bco=defaultBcoColor
│ --- HMI/n2t-out/screensaver.txt
├── +++ HMI/US/landscape/n2t-out/screensaver.txt
│ @@ -29,17 +29,14 @@

61
HMI/US/portrait/diff-eu-version.txt
View File

@@ -2,7 +2,7 @@
+++ HMI/US/portrait/n2t-out
│ --- HMI/n2t-out/Program.s.txt
├── +++ HMI/US/portrait/n2t-out/Program.s.txt
│ @@ -10,10 +10,10 @@
│ @@ -10,11 +10,10 @@
│ int sleepValue=0
│ // dim value
│ int dimValue=40
@@ -12,6 +12,7 @@
│ int defaultBcoColor=6371
│ - // fix touch offset
│ - lcd_dev fffb 0002 0000 0020
│ - printh 00 00 00 ff ff ff 88 ff ff ff//Output power on information to serial port
│ + // fix touch offset (Removed for US version)
│ + //lcd_dev fffb 0002 0000 0020
│ page pageStartup
@@ -1382,6 +1383,45 @@
│ Enabled : yes
│ --- HMI/n2t-out/cardQR.txt
├── +++ HMI/US/portrait/n2t-out/cardQR.txt
│ @@ -124,15 +124,15 @@
│ Text :
│ Max. Text Size: 10
│
│ Variable (string) vaQR
│ Attributes
│ Scope : local
│ Text :
│ - Max. Text Size: 70
│ + Max. Text Size: 80
│
│ Text tEntity1
│ Attributes
│ Scope : local
│ Dragging : 0
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ @@ -602,19 +602,19 @@
│ // get Text (optional Value)
│ spstr strCommand.txt,bText2.txt,"~",26
│ }
│ if(type2.txt=="delete"||type2.txt=="")
│ {
│ if(type1.txt=="delete"||type1.txt=="")
│ {
│ - qrcode m1.x,m1.y,200,65535,defaultBcoColor,-1,vaQR.txt
│ + qrcode m1.x,m1.y,200,defaultBcoColor,65535,-1,vaQR.txt
│ }
│ }else
│ {
│ - qrcode m0.x,m0.y,200,65535,defaultBcoColor,-1,vaQR.txt
│ + qrcode m0.x,m0.y,200,defaultBcoColor,65535,-1,vaQR.txt
│ }
│ }
│ if(tInstruction.txt=="time")
│ {
│ // get set time to global variable
│ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
│ }
│ @@ -751,15 +751,15 @@
│ if(sleepTimeout!=0&&dimValue!=dim)
│ {
@@ -1456,6 +1496,25 @@
│ crcputs sys0,2
│ crcputs tSend.txt,0
│ //send cmd
│ --- HMI/n2t-out/popupNotify.txt
├── +++ HMI/US/portrait/n2t-out/popupNotify.txt
│ @@ -15,16 +15,14 @@
│ popupNotify.bco=defaultBcoColor
│ dim=dimValueNormal
│ vis p0,0
│ vis tSend,0
│ vis tTmp,0
│ vis tInstruction,0
│ vis tId,0
│ - vis b1,0
│ - vis b2,0
│ popupNotify.bco=defaultBcoColor
│ tHeading.bco=defaultBcoColor
│ b0.bco=defaultBcoColor
│ tText.bco=defaultBcoColor
│ b1.bco=defaultBcoColor
│ b2.bco=defaultBcoColor
│ tIcon.bco=defaultBcoColor
│ --- HMI/n2t-out/screensaver.txt
├── +++ HMI/US/portrait/n2t-out/screensaver.txt
│ @@ -29,17 +29,14 @@

62
HMI/US/portrait/diff-filtered.txt
View File

@@ -1,6 +1,8 @@
+++ /dev/fd/62 2023-03-25 14:31:18.150326646 +0000
+++ /dev/fd/62 2023-03-27 15:57:43.735088348 +0000
+I/n2t-out/Program.s.txt
++ HMI/US/portrait/n2t-out/Program.s.txt
+1 +10,10 @@
+nth 00 00 00 ff ff ff 88 ff ff ff//Output power on information to serial port
+I/n2t-out/cardEntities.txt
++ HMI/US/portrait/n2t-out/cardEntities.txt
+6 +61,36 @@
@@ -802,6 +804,45 @@
+ Enabled : yes
+I/n2t-out/cardQR.txt
++ HMI/US/portrait/n2t-out/cardQR.txt
+15 +124,15 @@
+ Text :
+ Max. Text Size: 10
+
+e (string) vaQR
+ributes
+ Scope : local
+ Text :
+ Max. Text Size: 70
+ Max. Text Size: 80
+
+ntity1
+ributes
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+19 +602,19 @@
+ // get Text (optional Value)
+ spstr strCommand.txt,bText2.txt,"~",26
+ }
+ if(type2.txt=="delete"||type2.txt=="")
+ {
+ if(type1.txt=="delete"||type1.txt=="")
+ {
+ qrcode m1.x,m1.y,200,65535,defaultBcoColor,-1,vaQR.txt
+ qrcode m1.x,m1.y,200,defaultBcoColor,65535,-1,vaQR.txt
+ }
+ }else
+ {
+ qrcode m0.x,m0.y,200,65535,defaultBcoColor,-1,vaQR.txt
+ qrcode m0.x,m0.y,200,defaultBcoColor,65535,-1,vaQR.txt
+ }
+ }
+ if(tInstruction.txt=="time")
+ {
+ // get set time to global variable
+ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
+ }
+15 +751,15 @@
+ if(sleepTimeout!=0&&dimValue!=dim)
+ {
@@ -842,6 +883,25 @@
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+ Associated Keyboard : none
+I/n2t-out/popupNotify.txt
++ HMI/US/portrait/n2t-out/popupNotify.txt
+6 +15,14 @@
+ popupNotify.bco=defaultBcoColor
+ dim=dimValueNormal
+ vis p0,0
+ vis tSend,0
+ vis tTmp,0
+ vis tInstruction,0
+ vis tId,0
+ vis b1,0
+ vis b2,0
+ popupNotify.bco=defaultBcoColor
+ tHeading.bco=defaultBcoColor
+ b0.bco=defaultBcoColor
+ tText.bco=defaultBcoColor
+ b1.bco=defaultBcoColor
+ b2.bco=defaultBcoColor
+ tIcon.bco=defaultBcoColor
+I/n2t-out/screensaver.txt
++ HMI/US/portrait/n2t-out/screensaver.txt
+7 +29,14 @@