h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2025-12-22 15:34:26 +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-03-31 18:31:21 +00:00
committed by GitHub Actions
parent d151c58057
commit 26bacb26c1
5 changed files with 110 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,7 +1,15 @@
diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt
--- HMI/n2t-out/cardAlarm.txt 2022-03-31 18:20:56.082303075 +0000 --- HMI/n2t-out/cardAlarm.txt 2022-03-31 18:31:19.852564647 +0000
+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-03-31 18:20:56.962304989 +0000 +++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-03-31 18:31:20.772581196 +0000
@@ -513,75 +513,48 @@ @@ -17,6 +17,7 @@
vis tInstruction,0
vis tTmp,0
vis tId,0
+ //vis nPageDisp,0
vis arm1,0
vis arm2,0
vis arm3,0
@@ -512,75 +513,48 @@
{ {
//entn //entn
spstr strCommand.txt,entn.txt,",",1 spstr strCommand.txt,entn.txt,",",1
@@ -88,8 +96,24 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt
if(tTmp.txt!="disable") if(tTmp.txt!="disable")
{ {
vis b0,1 vis b0,1
@@ -598,7 +571,7 @@ @@ -595,23 +569,9 @@
vis b9,1
vis b10,1
vis tCode,1 vis tCode,1
- }else
- {
- vis b0,0
- vis b1,0
- vis b2,0
- vis b3,0
- vis b4,0
- vis b5,0
- vis b6,0
- vis b7,0
- vis b8,0
- vis b9,0
- vis b10,0
- vis tCode,0
} }
//flashing status //flashing status
- spstr strCommand.txt,tTmp.txt,",",14 - spstr strCommand.txt,tTmp.txt,",",14
@@ -98,8 +122,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt
{ {
tmFlash.en=1 tmFlash.en=1
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-03-31 18:20:56.082303075 +0000 --- HMI/n2t-out/cardEntities.txt 2022-03-31 18:31:19.852564647 +0000
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-03-31 18:20:56.962304989 +0000 +++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-03-31 18:31:20.772581196 +0000
@@ -1120,33 +1120,6 @@ @@ -1120,33 +1120,6 @@
{ {
// command format: entityUpd,heading,navigation,[,type,internalName,iconId,displayName,optionalValue]x4 // command format: entityUpd,heading,navigation,[,type,internalName,iconId,displayName,optionalValue]x4
@@ -135,8 +159,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
spstr strCommand.txt,type1.txt,",",3 spstr strCommand.txt,type1.txt,",",3
// get internal name // get internal name
diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
--- HMI/n2t-out/cardGrid.txt 2022-03-31 18:20:56.082303075 +0000 --- HMI/n2t-out/cardGrid.txt 2022-03-31 18:31:19.852564647 +0000
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-03-31 18:20:56.962304989 +0000 +++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-03-31 18:31:20.772581196 +0000
@@ -568,33 +568,6 @@ @@ -568,33 +568,6 @@
{ {
// command format: entityUpd,heading,navigation,[,type,internalName,iconId,iconColor,displayName,optionalValue]x6 // command format: entityUpd,heading,navigation,[,type,internalName,iconId,iconColor,displayName,optionalValue]x6
@@ -172,8 +196,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
spstr strCommand.txt,type1.txt,",",3 spstr strCommand.txt,type1.txt,",",3
// get internal name // get internal name
diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt
--- HMI/n2t-out/cardMedia.txt 2022-03-31 18:20:56.082303075 +0000 --- HMI/n2t-out/cardMedia.txt 2022-03-31 18:31:19.852564647 +0000
+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-03-31 18:20:56.962304989 +0000 +++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-03-31 18:31:20.772581196 +0000
@@ -501,55 +501,28 @@ @@ -501,55 +501,28 @@
spstr strCommand.txt,tInstruction.txt,",",0 spstr strCommand.txt,tInstruction.txt,",",0
if(tInstruction.txt=="entityUpd") if(tInstruction.txt=="entityUpd")
@@ -257,8 +281,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt
{ {
vis t5,0 vis t5,0
diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
--- HMI/n2t-out/cardThermo.txt 2022-03-31 18:20:56.082303075 +0000 --- HMI/n2t-out/cardThermo.txt 2022-03-31 18:31:19.852564647 +0000
+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-03-31 18:20:56.962304989 +0000 +++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-03-31 18:31:20.772581196 +0000
@@ -638,53 +638,26 @@ @@ -638,53 +638,26 @@
spstr strCommand.txt,tInstruction.txt,",",0 spstr strCommand.txt,tInstruction.txt,",",0
if(tInstruction.txt=="entityUpd") if(tInstruction.txt=="entityUpd")

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

@@ -1,6 +1,6 @@
diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
--- HMI/n2t-out/Program.s.txt 2022-03-31 18:20:56.082303075 +0000 --- HMI/n2t-out/Program.s.txt 2022-03-31 18:31:19.852564647 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-31 18:20:56.530304049 +0000 +++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-31 18:31:20.312572922 +0000
@@ -11,6 +11,6 @@ @@ -11,6 +11,6 @@
// dim value // dim value
int dimValue=40 int dimValue=40
@@ -11,9 +11,17 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
+ //lcd_dev fffb 0002 0000 0020 + //lcd_dev fffb 0002 0000 0020
page pageStartup page pageStartup
diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
--- HMI/n2t-out/cardAlarm.txt 2022-03-31 18:20:56.082303075 +0000 --- HMI/n2t-out/cardAlarm.txt 2022-03-31 18:31:19.852564647 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-03-31 18:20:56.534304058 +0000 +++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-03-31 18:31:20.312572922 +0000
@@ -513,75 +513,48 @@ @@ -17,6 +17,7 @@
vis tInstruction,0
vis tTmp,0
vis tId,0
+ //vis nPageDisp,0
vis arm1,0
vis arm2,0
vis arm3,0
@@ -512,75 +513,48 @@
{ {
//entn //entn
spstr strCommand.txt,entn.txt,",",1 spstr strCommand.txt,entn.txt,",",1
@@ -100,8 +108,24 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
if(tTmp.txt!="disable") if(tTmp.txt!="disable")
{ {
vis b0,1 vis b0,1
@@ -598,7 +571,7 @@ @@ -595,23 +569,9 @@
vis b9,1
vis b10,1
vis tCode,1 vis tCode,1
- }else
- {
- vis b0,0
- vis b1,0
- vis b2,0
- vis b3,0
- vis b4,0
- vis b5,0
- vis b6,0
- vis b7,0
- vis b8,0
- vis b9,0
- vis b10,0
- vis tCode,0
} }
//flashing status //flashing status
- spstr strCommand.txt,tTmp.txt,",",14 - spstr strCommand.txt,tTmp.txt,",",14
@@ -110,8 +134,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
{ {
tmFlash.en=1 tmFlash.en=1
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-03-31 18:20:56.082303075 +0000 --- HMI/n2t-out/cardEntities.txt 2022-03-31 18:31:19.852564647 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-31 18:20:56.534304058 +0000 +++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-31 18:31:20.316572994 +0000
@@ -62,6 +62,26 @@ @@ -62,6 +62,26 @@
vis bText4,0 vis bText4,0
vis hSlider4,0 vis hSlider4,0
@@ -914,8 +938,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
if(tInstruction.txt=="pageType") if(tInstruction.txt=="pageType")
{ {
diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
--- HMI/n2t-out/cardGrid.txt 2022-03-31 18:20:56.082303075 +0000 --- HMI/n2t-out/cardGrid.txt 2022-03-31 18:31:19.852564647 +0000
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-03-31 18:20:56.534304058 +0000 +++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-03-31 18:31:20.312572922 +0000
@@ -568,33 +568,6 @@ @@ -568,33 +568,6 @@
{ {
// command format: entityUpd,heading,navigation,[,type,internalName,iconId,iconColor,displayName,optionalValue]x6 // command format: entityUpd,heading,navigation,[,type,internalName,iconId,iconColor,displayName,optionalValue]x6
@@ -951,8 +975,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
spstr strCommand.txt,type1.txt,",",3 spstr strCommand.txt,type1.txt,",",3
// get internal name // get internal name
diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
--- HMI/n2t-out/cardMedia.txt 2022-03-31 18:20:56.082303075 +0000 --- HMI/n2t-out/cardMedia.txt 2022-03-31 18:31:19.852564647 +0000
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-03-31 18:20:56.534304058 +0000 +++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-03-31 18:31:20.312572922 +0000
@@ -501,55 +501,28 @@ @@ -501,55 +501,28 @@
spstr strCommand.txt,tInstruction.txt,",",0 spstr strCommand.txt,tInstruction.txt,",",0
if(tInstruction.txt=="entityUpd") if(tInstruction.txt=="entityUpd")
@@ -1036,8 +1060,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
{ {
vis t5,0 vis t5,0
diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
--- HMI/n2t-out/cardThermo.txt 2022-03-31 18:20:56.082303075 +0000 --- HMI/n2t-out/cardThermo.txt 2022-03-31 18:31:19.852564647 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-03-31 18:20:56.534304058 +0000 +++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-03-31 18:31:20.312572922 +0000
@@ -638,53 +638,26 @@ @@ -638,53 +638,26 @@
spstr strCommand.txt,tInstruction.txt,",",0 spstr strCommand.txt,tInstruction.txt,",",0
if(tInstruction.txt=="entityUpd") if(tInstruction.txt=="entityUpd")
@@ -1365,8 +1389,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
udelete payloadLength-1 udelete payloadLength-1
bufferPos=0 bufferPos=0
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-03-31 18:20:56.082303075 +0000 --- HMI/n2t-out/pageStartup.txt 2022-03-31 18:31:19.852564647 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-31 18:20:56.534304058 +0000 +++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-31 18:31:20.312572922 +0000
@@ -142,7 +142,7 @@ @@ -142,7 +142,7 @@
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled

15
HMI/n2t-out-visual/cardAlarm.txt
View File

@@ -25,7 +25,6 @@ Page cardAlarm
vis tInstruction,0 vis tInstruction,0
vis tTmp,0 vis tTmp,0
vis tId,0 vis tId,0
//vis nPageDisp,0
vis arm1,0 vis arm1,0
vis arm2,0 vis arm2,0
vis arm3,0 vis arm3,0
@@ -1126,6 +1125,20 @@ Timer tmSerial
vis b9,1 vis b9,1
vis b10,1 vis b10,1
vis tCode,1 vis tCode,1
}else
{
vis b0,0
vis b1,0
vis b2,0
vis b3,0
vis b4,0
vis b5,0
vis b6,0
vis b7,0
vis b8,0
vis b9,0
vis b10,0
vis tCode,0
} }
//flashing status //flashing status
spstr strCommand.txt,tTmp.txt,",",14 spstr strCommand.txt,tTmp.txt,",",14

12
HMI/n2t-out-visual/nspanel_Stats.txt
View File

@@ -22,6 +22,10 @@ popupShutter
19 Component(s) 19 Component(s)
178 Line(s) of event code 178 Line(s) of event code
101 Unique line(s) of event code 101 Unique line(s) of event code
cardAlarm
35 Component(s)
338 Line(s) of event code
211 Unique line(s) of event code
pageStartup pageStartup
19 Component(s) 19 Component(s)
150 Line(s) of event code 150 Line(s) of event code
@@ -34,10 +38,6 @@ cardGrid
39 Component(s) 39 Component(s)
423 Line(s) of event code 423 Line(s) of event code
245 Unique line(s) of event code 245 Unique line(s) of event code
cardAlarm
35 Component(s)
324 Line(s) of event code
199 Unique line(s) of event code
screensaver screensaver
29 Component(s) 29 Component(s)
182 Line(s) of event code 182 Line(s) of event code
@@ -58,5 +58,5 @@ cardMedia
Total Total
13 Page(s) 13 Page(s)
351 Component(s) 351 Component(s)
3573 Line(s) of event code 3587 Line(s) of event code
1020 Unique line(s) of event code 1032 Unique line(s) of event code

15
HMI/n2t-out/cardAlarm.txt
View File

@@ -17,7 +17,6 @@ Page cardAlarm
vis tInstruction,0 vis tInstruction,0
vis tTmp,0 vis tTmp,0
vis tId,0 vis tId,0
//vis nPageDisp,0
vis arm1,0 vis arm1,0
vis arm2,0 vis arm2,0
vis arm3,0 vis arm3,0
@@ -596,6 +595,20 @@ Timer tmSerial
vis b9,1 vis b9,1
vis b10,1 vis b10,1
vis tCode,1 vis tCode,1
}else
{
vis b0,0
vis b1,0
vis b2,0
vis b3,0
vis b4,0
vis b5,0
vis b6,0
vis b7,0
vis b8,0
vis b9,0
vis b10,0
vis tCode,0
} }
//flashing status //flashing status
spstr strCommand.txt,tTmp.txt,",",14 spstr strCommand.txt,tTmp.txt,",",14