h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2025-12-23 07:54:25 +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-04-05 20:30:08 +00:00
committed by GitHub Actions
parent ac9ea168f3
commit 9e1b6044f5
8 changed files with 35 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
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 diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
--- HMI/n2t-out/Program.s.txt 2022-04-04 21:26:08.660575169 +0000 --- HMI/n2t-out/Program.s.txt 2022-04-05 20:30:06.540918537 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-04 21:26:09.652584145 +0000 +++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-05 20:30:07.536951384 +0000
@@ -11,6 +11,6 @@ @@ -11,6 +11,6 @@
// dim value // dim value
int dimValue=40 int dimValue=40
@@ -11,8 +11,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/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/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-04-04 21:26:08.660575169 +0000 --- HMI/n2t-out/pageStartup.txt 2022-04-05 20:30:06.544918675 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-04 21:26:09.652584145 +0000 +++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-05 20:30:07.536951384 +0000
@@ -177,7 +177,7 @@ @@ -177,7 +177,7 @@
recmod=1 recmod=1
bauds=115200 bauds=115200

2
HMI/US/landscape/n2t-out-visual/cardThermo.txt
View File

@@ -1233,7 +1233,7 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",4 spstr strCommand.txt,tTmp.txt,"~",4
covx tTmp.txt,xTempCurr.val,0,0 covx tTmp.txt,xTempCurr.val,0,0
//dstTemp //dstTemp
spstr strCommand.txt,tTmp.txt,"~",4 spstr strCommand.txt,tTmp.txt,"~",5
covx tTmp.txt,xTempDest.val,0,0 covx tTmp.txt,xTempDest.val,0,0
//status //status
spstr strCommand.txt,tStatus.txt,"~",6 spstr strCommand.txt,tStatus.txt,"~",6

8
HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt
View File

@@ -10,10 +10,6 @@ pageTest
13 Component(s) 13 Component(s)
13 Line(s) of event code 13 Line(s) of event code
13 Unique line(s) of event code 13 Unique line(s) of event code
cardThermo
41 Component(s)
442 Line(s) of event code
245 Unique line(s) of event code
popupNotify popupNotify
17 Component(s) 17 Component(s)
178 Line(s) of event code 178 Line(s) of event code
@@ -42,6 +38,10 @@ cardGrid
39 Component(s) 39 Component(s)
418 Line(s) of event code 418 Line(s) of event code
243 Unique line(s) of event code 243 Unique line(s) of event code
cardThermo
41 Component(s)
442 Line(s) of event code
246 Unique line(s) of event code
screensaver screensaver
33 Component(s) 33 Component(s)
195 Line(s) of event code 195 Line(s) of event code

2
HMI/US/landscape/n2t-out/cardThermo.txt
View File

@@ -680,7 +680,7 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",4 spstr strCommand.txt,tTmp.txt,"~",4
covx tTmp.txt,xTempCurr.val,0,0 covx tTmp.txt,xTempCurr.val,0,0
//dstTemp //dstTemp
spstr strCommand.txt,tTmp.txt,"~",4 spstr strCommand.txt,tTmp.txt,"~",5
covx tTmp.txt,xTempDest.val,0,0 covx tTmp.txt,xTempDest.val,0,0
//status //status
spstr strCommand.txt,tStatus.txt,"~",6 spstr strCommand.txt,tStatus.txt,"~",6

53
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-04-04 21:26:08.660575169 +0000 --- HMI/n2t-out/Program.s.txt 2022-04-05 20:30:06.540918537 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-04 21:26:09.160579693 +0000 +++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-05 20:30:07.032935506 +0000
@@ -11,6 +11,6 @@ @@ -11,6 +11,6 @@
// dim value // dim value
int dimValue=40 int dimValue=40
@@ -11,8 +11,8 @@ 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-04-04 21:26:08.660575169 +0000 --- HMI/n2t-out/cardAlarm.txt 2022-04-05 20:30:06.544918675 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-04-04 21:26:09.160579693 +0000 +++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-04-05 20:30:07.036935643 +0000
@@ -113,7 +113,7 @@ @@ -113,7 +113,7 @@
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
@@ -34,8 +34,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
spstr strCommand.txt,tTmp.txt,"~",12 spstr strCommand.txt,tTmp.txt,"~",12
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
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-04-04 21:26:08.660575169 +0000 --- HMI/n2t-out/cardEntities.txt 2022-04-05 20:30:06.544918675 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-04 21:26:09.160579693 +0000 +++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-05 20:30:07.036935643 +0000
@@ -62,6 +62,26 @@ @@ -62,6 +62,26 @@
vis bText4,0 vis bText4,0
vis hSlider4,0 vis hSlider4,0
@@ -848,8 +848,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-04-04 21:26:08.660575169 +0000 --- HMI/n2t-out/cardGrid.txt 2022-04-05 20:30:06.544918675 +0000
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-04-04 21:26:09.160579693 +0000 +++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-04-05 20:30:07.036935643 +0000
@@ -613,7 +613,9 @@ @@ -613,7 +613,9 @@
}else }else
{ {
@@ -917,8 +917,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
// change icon color // change icon color
spstr strCommand.txt,tTmp.txt,"~",36 spstr strCommand.txt,tTmp.txt,"~",36
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-04-04 21:26:08.660575169 +0000 --- HMI/n2t-out/cardMedia.txt 2022-04-05 20:30:06.544918675 +0000
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-04-04 21:26:09.160579693 +0000 +++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-04-05 20:30:07.036935643 +0000
@@ -540,7 +540,9 @@ @@ -540,7 +540,9 @@
//entity name //entity name
spstr strCommand.txt,entn.txt,"~",3 spstr strCommand.txt,entn.txt,"~",3
@@ -942,17 +942,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
spstr strCommand.txt,tSpeaker.txt,"~",9 spstr strCommand.txt,tSpeaker.txt,"~",9
if(tSpeaker.txt!="") if(tSpeaker.txt!="")
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-04-04 21:26:08.660575169 +0000 --- HMI/n2t-out/cardThermo.txt 2022-04-05 20:30:06.544918675 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-04-04 21:26:09.160579693 +0000 +++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-04-05 20:30:07.036935643 +0000
@@ -680,7 +680,7 @@
spstr strCommand.txt,tTmp.txt,"~",4
covx tTmp.txt,xTempCurr.val,0,0
//dstTemp
- spstr strCommand.txt,tTmp.txt,"~",4
+ spstr strCommand.txt,tTmp.txt,"~",5
covx tTmp.txt,xTempDest.val,0,0
//status
spstr strCommand.txt,tStatus.txt,"~",6
@@ -704,9 +704,12 @@ @@ -704,9 +704,12 @@
vis bt7,0 vis bt7,0
vis bt8,0 vis bt8,0
@@ -1121,8 +1112,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
spstr strCommand.txt,tTmp.txt,"~",43 spstr strCommand.txt,tTmp.txt,"~",43
covx tTmp.txt,bt8.pco2,0,0 covx tTmp.txt,bt8.pco2,0,0
diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt
--- HMI/n2t-out/pageIcons.txt 2022-04-04 21:26:08.660575169 +0000 --- HMI/n2t-out/pageIcons.txt 2022-04-05 20:30:06.544918675 +0000
+++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-04-04 21:26:09.160579693 +0000 +++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-04-05 20:30:07.032935506 +0000
@@ -22,6 +22,16 @@ @@ -22,6 +22,16 @@
Text : Text :
Max. Text Size: 35 Max. Text Size: 35
@@ -1142,8 +1133,8 @@ diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt
Scope : global Scope : global
Only in HMI/US/portrait/n2t-out: pageSerialTest.txt Only in HMI/US/portrait/n2t-out: pageSerialTest.txt
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-04-04 21:26:08.660575169 +0000 --- HMI/n2t-out/pageStartup.txt 2022-04-05 20:30:06.544918675 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-04 21:26:09.160579693 +0000 +++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-05 20:30:07.032935506 +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
@@ -1172,8 +1163,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt
--- HMI/n2t-out/pageTest.txt 2022-04-04 21:26:08.660575169 +0000 --- HMI/n2t-out/pageTest.txt 2022-04-05 20:30:06.544918675 +0000
+++ HMI/US/portrait/n2t-out/pageTest.txt 2022-04-04 21:26:09.160579693 +0000 +++ HMI/US/portrait/n2t-out/pageTest.txt 2022-04-05 20:30:07.032935506 +0000
@@ -35,6 +35,20 @@ @@ -35,6 +35,20 @@
Touch Press Event Touch Press Event
page cardEntities page cardEntities
@@ -1214,8 +1205,8 @@ diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt
- bauds=115200 - bauds=115200
- -
diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
--- HMI/n2t-out/popupLight.txt 2022-04-04 21:26:08.660575169 +0000 --- HMI/n2t-out/popupLight.txt 2022-04-05 20:30:06.544918675 +0000
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-04 21:26:09.160579693 +0000 +++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-05 20:30:07.032935506 +0000
@@ -442,7 +442,9 @@ @@ -442,7 +442,9 @@
if(tInstruction.txt=="entityUpdateDetail") if(tInstruction.txt=="entityUpdateDetail")
{ {
@@ -1228,8 +1219,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
// change icon color // change icon color
spstr strCommand.txt,tTmp.txt,"~",2 spstr strCommand.txt,tTmp.txt,"~",2
diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt
--- HMI/n2t-out/screensaver.txt 2022-04-04 21:26:08.660575169 +0000 --- HMI/n2t-out/screensaver.txt 2022-04-05 20:30:06.544918675 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-04 21:26:09.160579693 +0000 +++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-05 20:30:07.032935506 +0000
@@ -48,6 +48,26 @@ @@ -48,6 +48,26 @@
Scope: local Scope: local
Value: 0 Value: 0

2
HMI/n2t-out-visual/cardThermo.txt
View File

@@ -1233,7 +1233,7 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",4 spstr strCommand.txt,tTmp.txt,"~",4
covx tTmp.txt,xTempCurr.val,0,0 covx tTmp.txt,xTempCurr.val,0,0
//dstTemp //dstTemp
spstr strCommand.txt,tTmp.txt,"~",4 spstr strCommand.txt,tTmp.txt,"~",5
covx tTmp.txt,xTempDest.val,0,0 covx tTmp.txt,xTempDest.val,0,0
//status //status
spstr strCommand.txt,tStatus.txt,"~",6 spstr strCommand.txt,tStatus.txt,"~",6

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

@@ -45,7 +45,7 @@ cardAlarm
cardThermo cardThermo
41 Component(s) 41 Component(s)
442 Line(s) of event code 442 Line(s) of event code
245 Unique line(s) of event code 246 Unique line(s) of event code
cardEntities cardEntities
62 Component(s) 62 Component(s)
964 Line(s) of event code 964 Line(s) of event code

2
HMI/n2t-out/cardThermo.txt
View File

@@ -680,7 +680,7 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",4 spstr strCommand.txt,tTmp.txt,"~",4
covx tTmp.txt,xTempCurr.val,0,0 covx tTmp.txt,xTempCurr.val,0,0
//dstTemp //dstTemp
spstr strCommand.txt,tTmp.txt,"~",4 spstr strCommand.txt,tTmp.txt,"~",5
covx tTmp.txt,xTempDest.val,0,0 covx tTmp.txt,xTempDest.val,0,0
//status //status
spstr strCommand.txt,tStatus.txt,"~",6 spstr strCommand.txt,tStatus.txt,"~",6