h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2026-02-20 21:24:44 +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-07-13 16:57:11 +00:00
committed by github-actions[bot]
parent 21b00bc573
commit eb07944deb
22 changed files with 916 additions and 696 deletions
Download Patch File Download Diff File Expand all files Collapse all files

173
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-07-12 19:48:18.749451287 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-07-12 19:48:19.897452968 +0000
--- HMI/n2t-out/Program.s.txt 2022-07-13 16:57:06.544404168 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-07-13 16:57:07.448403502 +0000
@@ -11,9 +11,4 @@
// dim value
int dimValue=40
@@ -12,12 +12,12 @@ 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/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt
--- HMI/n2t-out/cardAlarm.txt 2022-07-12 19:48:18.753451293 +0000
+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-07-12 19:48:19.901452974 +0000
@@ -12,25 +12,6 @@
Events
Preinitialize Event
--- HMI/n2t-out/cardAlarm.txt 2022-07-13 16:57:06.548404165 +0000
+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-07-13 16:57:07.452403499 +0000
@@ -37,25 +37,6 @@
vis tCode,0
vis bPrev,0
vis bNext,0
- cardAlarm.bco=defaultBcoColor
- for(sys0=0;sys0<40;sys0++)
- {
@@ -37,18 +37,9 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt
- tCode.bco=10565
- tCode.pco=40179
- }
dim=dimValueNormal
vis p0,0
vis tSend,0
@@ -142,7 +123,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
- Text : xxxxxxx
+ Text :
Max. Text Size : 10
Text tIcon
Variable (string) strCommand
Attributes
@@ -759,18 +740,6 @@
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
@@ -69,12 +60,12 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-07-12 19:48:18.753451293 +0000
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-07-12 19:48:19.901452974 +0000
@@ -12,26 +12,6 @@
Events
Preinitialize Event
--- HMI/n2t-out/cardEntities.txt 2022-07-13 16:57:06.548404165 +0000
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-07-13 16:57:07.448403502 +0000
@@ -65,26 +65,6 @@
vis nNum4,0
vis bPrev,0
vis bNext,0
- cardEntities.bco=defaultBcoColor
- for(sys0=0;sys0<65;sys0++)
- {
@@ -95,9 +86,9 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
- b[sys0].pic2=15
- }
- }
dim=dimValueNormal
//wup=cardEntities
//remove background & activate reparse mode
Variable (string) strCommand
Attributes
@@ -1028,10 +1008,6 @@
//popupLight.tEntity.txt=tEntity3.txt
page popupLight
@@ -162,12 +153,12 @@ 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-07-12 19:48:18.753451293 +0000
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-07-12 19:48:19.901452974 +0000
@@ -12,15 +12,6 @@
Events
Preinitialize Event
--- HMI/n2t-out/cardGrid.txt 2022-07-13 16:57:06.548404165 +0000
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-07-13 16:57:07.448403502 +0000
@@ -36,15 +36,6 @@
vis tEntity6,0
vis bPrev,0
vis bNext,0
- cardGrid.bco=defaultBcoColor
- for(sys0=0;sys0<42;sys0++)
- {
@@ -177,9 +168,9 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
- b[sys0].pco=defaultFontColor
- }
- }
dim=dimValueNormal
//remove background & activate reparse mode
vis p0,0
Variable (string) strCommand
Attributes
@@ -859,18 +850,6 @@
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
@@ -211,12 +202,12 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
TouchCap tc0
Attributes
diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt
--- HMI/n2t-out/cardMedia.txt 2022-07-12 19:48:18.753451293 +0000
+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-07-12 19:48:19.897452968 +0000
@@ -12,21 +12,6 @@
Events
Preinitialize Event
--- HMI/n2t-out/cardMedia.txt 2022-07-13 16:57:06.548404165 +0000
+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-07-13 16:57:07.448403502 +0000
@@ -21,21 +21,6 @@
vis t5,0
vis bPrev,0
vis bNext,0
- cardMedia.bco=defaultBcoColor
- for(sys0=0;sys0<34;sys0++)
- {
@@ -232,9 +223,9 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt
- hVolume.pic1=13
- hVolume.pic2=15
- }
dim=dimValueNormal
vis p0,0
vis tSend,0
Variable (string) strCommand
Attributes
@@ -681,18 +666,6 @@
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
@@ -255,12 +246,12 @@ 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-07-12 19:48:18.753451293 +0000
+++ HMI/US/landscape/n2t-out/cardQR.txt 2022-07-12 19:48:19.901452974 +0000
@@ -12,25 +12,6 @@
Events
Preinitialize Event
--- HMI/n2t-out/cardQR.txt 2022-07-13 16:57:06.548404165 +0000
+++ HMI/US/landscape/n2t-out/cardQR.txt 2022-07-13 16:57:07.448403502 +0000
@@ -32,25 +32,6 @@
vis bText2,0
tsw m0,0
tsw m1,0
- cardQR.bco=defaultBcoColor
- for(sys0=0;sys0<32;sys0++)
- {
@@ -280,9 +271,9 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt
- b[sys0].pic2=11
- }
- }
dim=dimValueNormal
vis p0,0
vis tSend,0
Variable (string) strCommand
Attributes
@@ -628,18 +609,6 @@
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
@@ -303,12 +294,12 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
--- HMI/n2t-out/cardThermo.txt 2022-07-12 19:48:18.753451293 +0000
+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-07-12 19:48:19.901452974 +0000
@@ -12,21 +12,6 @@
Events
Preinitialize Event
--- HMI/n2t-out/cardThermo.txt 2022-07-13 16:57:06.548404165 +0000
+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-07-13 16:57:07.452403499 +0000
@@ -41,21 +41,6 @@
vis xTempDest1,0
vis bPrev,0
vis bNext,0
- cardThermo.bco=defaultBcoColor
- for(sys0=0;sys0<53;sys0++)
- {
@@ -324,9 +315,9 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
- b[sys0].pco=defaultFontColor
- }
- }
dim=dimValueNormal
vis p0,0
vis tSend,0
Variable (string) strCommand
Attributes
@@ -1171,18 +1156,6 @@
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
@@ -347,8 +338,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-07-12 19:48:18.749451287 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-07-12 19:48:19.901452974 +0000
--- HMI/n2t-out/pageStartup.txt 2022-07-13 16:57:06.544404168 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-07-13 16:57:07.448403502 +0000
@@ -177,7 +177,7 @@
recmod=1
bauds=115200
@@ -378,8 +369,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/pageTest.txt HMI/US/landscape/n2t-out/pageTest.txt
--- HMI/n2t-out/pageTest.txt 2022-07-12 19:48:18.749451287 +0000
+++ HMI/US/landscape/n2t-out/pageTest.txt 2022-07-12 19:48:19.897452968 +0000
--- HMI/n2t-out/pageTest.txt 2022-07-13 16:57:06.544404168 +0000
+++ HMI/US/landscape/n2t-out/pageTest.txt 2022-07-13 16:57:07.448403502 +0000
@@ -13,46 +13,6 @@
Events
Preinitialize Event
@@ -429,12 +420,12 @@ diff -bur HMI/n2t-out/pageTest.txt HMI/US/landscape/n2t-out/pageTest.txt
Attributes
Only in HMI/n2t-out: popupFan.txt
diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
--- HMI/n2t-out/popupLight.txt 2022-07-12 19:48:18.753451293 +0000
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-07-12 19:48:19.901452974 +0000
@@ -12,29 +12,6 @@
Events
Preinitialize Event
--- HMI/n2t-out/popupLight.txt 2022-07-13 16:57:06.544404168 +0000
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-07-13 16:57:07.448403502 +0000
@@ -50,29 +50,6 @@
vis t0,0
vis pColorWheel,0
//vis t0,0
- popupLight.bco=defaultBcoColor
- for(sys0=0;sys0<27;sys0++)
- {
@@ -458,9 +449,9 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
- hTempSlider.pic1=17
- hTempSlider.pic2=15
- }
dim=dimValueNormal
//get entitiy name
tEntity.txt=pageIcons.tTmp1.txt
Variable (string) strCommand
Attributes
@@ -589,18 +566,6 @@
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
@@ -481,8 +472,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-07-12 19:48:18.753451293 +0000
+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-07-12 19:48:19.901452974 +0000
--- HMI/n2t-out/popupNotify.txt 2022-07-13 16:57:06.544404168 +0000
+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-07-13 16:57:07.448403502 +0000
@@ -12,24 +12,12 @@
Events
@@ -528,12 +519,12 @@ 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-07-12 19:48:18.753451293 +0000
+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-07-12 19:48:19.901452974 +0000
@@ -12,40 +12,6 @@
Events
Preinitialize Event
--- HMI/n2t-out/popupShutter.txt 2022-07-13 16:57:06.544404168 +0000
+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-07-13 16:57:07.448403502 +0000
@@ -40,40 +40,6 @@
prints sys0,2
prints tSend.txt,0
prints crcval,2
- popupShutter.bco=defaultBcoColor
- b0.bco=defaultBcoColor
- tIcon1.bco=defaultBcoColor
@@ -568,9 +559,9 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt
- hPosition.pic1=13
- hPosition.pic2=15
- }
dim=dimValueNormal
//get entitiy name
tEntity.txt=pageIcons.tTmp1.txt
Variable (string) strCommand
Attributes
@@ -143,7 +109,7 @@
Send Component ID : disabled
Associated Keyboard : none
@@ -697,8 +688,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-07-12 19:48:18.753451293 +0000
+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-07-12 19:48:19.901452974 +0000
--- HMI/n2t-out/screensaver.txt 2022-07-13 16:57:06.544404168 +0000
+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-07-13 16:57:07.452403499 +0000
@@ -406,22 +406,10 @@
// get value
spstr strCommand.txt,tTmp.txt,"~",1