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

added seperate line for dateAdditonalTemplate (add nextion2text)

Browse Source
This commit is contained in:
joBr99
2022-06-06 17:10:48 +00:00
committed by github-actions[bot]
parent e0ef03bdee
commit f2fd6a11c0
14 changed files with 1414 additions and 341 deletions
Download Patch File Download Diff File Expand all files Collapse all files

293
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-06-06 12:47:19.779824907 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-06 12:47:20.835832380 +0000
--- HMI/n2t-out/Program.s.txt 2022-06-06 17:10:41.745533696 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-06 17:10:42.617522109 +0000
@@ -11,6 +11,4 @@
// dim value
int dimValue=40
@@ -9,8 +9,8 @@ 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/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-06-06 12:47:19.783824935 +0000
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-06-06 12:47:20.835832380 +0000
--- HMI/n2t-out/cardEntities.txt 2022-06-06 17:10:41.749533643 +0000
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-06-06 17:10:42.617522109 +0000
@@ -1925,10 +1925,6 @@
// get value
spstr strCommand.txt,tTmp.txt,"~",1
@@ -23,8 +23,8 @@ 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-06-06 12:47:19.783824935 +0000
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-06-06 12:47:20.835832380 +0000
--- HMI/n2t-out/cardGrid.txt 2022-06-06 17:10:41.745533696 +0000
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-06-06 17:10:42.617522109 +0000
@@ -846,10 +846,6 @@
// get value
spstr strCommand.txt,tTmp.txt,"~",1
@@ -37,8 +37,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt
--- HMI/n2t-out/cardMedia.txt 2022-06-06 12:47:19.783824935 +0000
+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-06-06 12:47:20.835832380 +0000
--- HMI/n2t-out/cardMedia.txt 2022-06-06 17:10:41.745533696 +0000
+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-06-06 17:10:42.617522109 +0000
@@ -45,12 +45,6 @@
Scope: local
Value: 0
@@ -99,8 +99,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.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-06-06 12:47:19.783824935 +0000
+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-06-06 12:47:20.835832380 +0000
--- HMI/n2t-out/cardThermo.txt 2022-06-06 17:10:41.749533643 +0000
+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-06-06 17:10:42.617522109 +0000
@@ -1152,10 +1152,6 @@
// get value
spstr strCommand.txt,tTmp.txt,"~",1
@@ -113,8 +113,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-06-06 12:47:19.783824935 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-06 12:47:20.835832380 +0000
--- HMI/n2t-out/pageStartup.txt 2022-06-06 17:10:41.745533696 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-06 17:10:42.617522109 +0000
@@ -177,7 +177,7 @@
recmod=1
bauds=115200
@@ -136,8 +136,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
--- HMI/n2t-out/popupLight.txt 2022-06-06 12:47:19.783824935 +0000
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-06-06 12:47:20.835832380 +0000
--- HMI/n2t-out/popupLight.txt 2022-06-06 17:10:41.745533696 +0000
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-06-06 17:10:42.617522109 +0000
@@ -561,10 +561,6 @@
// get value
spstr strCommand.txt,tTmp.txt,"~",1
@@ -150,8 +150,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-06-06 12:47:19.783824935 +0000
+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-06-06 12:47:20.835832380 +0000
--- HMI/n2t-out/popupNotify.txt 2022-06-06 17:10:41.745533696 +0000
+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-06-06 17:10:42.617522109 +0000
@@ -311,10 +311,6 @@
// get value
spstr strCommand.txt,tTmp.txt,"~",1
@@ -164,9 +164,236 @@ 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-06-06 12:47:19.783824935 +0000
+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-06-06 12:47:20.835832380 +0000
@@ -406,10 +406,6 @@
--- HMI/n2t-out/popupShutter.txt 2022-06-06 17:10:41.745533696 +0000
+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-06-06 17:10:42.617522109 +0000
@@ -19,12 +19,9 @@
entn.txt=pageIcons.tTmp2.txt
vis p0,0
vis tSend,0
- vis tPosHeading,0
- vis hPosition,0
- vis hTilt,0
- vis bTLeft,0
- vis bTStop,0
- vis bTRight,0
+ vis tTmp,0
+ vis tInstruction,0
+ vis tId,0
//page open event
// event,pageOpenDetail,typeOfPage,tEntityName
// craft command
@@ -53,24 +50,6 @@
Text :
Max. Text Size: 80
-Variable (string) tInstruction
- Attributes
- Scope : local
- Text :
- Max. Text Size: 20
-
-Variable (string) tId
- Attributes
- Scope : local
- Text :
- Max. Text Size: 20
-
-Variable (string) tTmp
- Attributes
- Scope : local
- Text :
- Max. Text Size: 10
-
Text tEntity
Attributes
Scope : local
@@ -101,17 +80,17 @@
Text : newtxt
Max. Text Size : 100
-Text tPosHeading
+Text tTmp
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
- Text : Position
- Max. Text Size : 15
+ Text :
+ Max. Text Size : 10
-Text tInfo1
+Text tInstruction
Attributes
Scope : local
Dragging : 0
@@ -119,9 +98,9 @@
Send Component ID : disabled
Associated Keyboard : none
Text :
- Max. Text Size : 40
+ Max. Text Size : 20
-Text tTiltHeading
+Text tId
Attributes
Scope : local
Dragging : 0
@@ -129,45 +108,36 @@
Send Component ID : disabled
Associated Keyboard : none
Text :
- Max. Text Size : 15
+ Max. Text Size : 20
-Picture p0
+Text tPosHeading
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
+ Associated Keyboard : none
+ Text : Position
+ Max. Text Size : 15
-Slider hPosition
+Text tInfo1
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
- Position : 50
- Upper range limit : 100
- Lower range limit : 0
+ Associated Keyboard : none
+ Text :
+ Max. Text Size : 40
- Events
- Touch Release Event
- // event,buttonPress2,internalNameEntity,positionSlider,50
- //craft command
- tSend.txt="event,buttonPress2,"+entn.txt+",positionSlider,"
- covx hPosition.val,tTmp.txt,0,0
- tSend.txt+=tTmp.txt
- //send calc crc
- btlen tSend.txt,sys0
- crcrest 1,0xffff // reset CRC
- crcputh 55 bb
- crcputs sys0,2
- crcputs tSend.txt,0
- //send cmd
- printh 55 bb
- prints sys0,2
- prints tSend.txt,0
- prints crcval,2
+Picture p0
+ Attributes
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled
-Slider hTilt
+Slider hPosition
Attributes
Scope : local
Dragging : 0
@@ -296,81 +266,6 @@
prints tSend.txt,0
prints crcval,2
-Button bTLeft
- Attributes
- Scope : local
- Dragging : 0
- Disable release event after dragging: 0
- Send Component ID : disabled
- State : unpressed
- Text : 
- Max. Text Size : 10
-
- Events
- Touch Press Event
- tSend.txt="event,buttonPress2,"+entn.txt+",up"
- //send calc crc
- btlen tSend.txt,sys0
- crcrest 1,0xffff // reset CRC
- crcputh 55 bb
- crcputs sys0,2
- crcputs tSend.txt,0
- //send cmd
- printh 55 bb
- prints sys0,2
- prints tSend.txt,0
- prints crcval,2
-
-Button bTStop
- Attributes
- Scope : local
- Dragging : 0
- Disable release event after dragging: 0
- Send Component ID : disabled
- State : unpressed
- Text : 
- Max. Text Size : 10
-
- Events
- Touch Press Event
- tSend.txt="event,buttonPress2,"+entn.txt+",stop"
- //send calc crc
- btlen tSend.txt,sys0
- crcrest 1,0xffff // reset CRC
- crcputh 55 bb
- crcputs sys0,2
- crcputs tSend.txt,0
- //send cmd
- printh 55 bb
- prints sys0,2
- prints tSend.txt,0
- prints crcval,2
-
-Button bTRight
- Attributes
- Scope : local
- Dragging : 0
- Disable release event after dragging: 0
- Send Component ID : disabled
- State : unpressed
- Text : 
- Max. Text Size : 10
-
- Events
- Touch Press Event
- tSend.txt="event,buttonPress2,"+entn.txt+",down"
- //send calc crc
- btlen tSend.txt,sys0
- crcrest 1,0xffff // reset CRC
- crcputh 55 bb
- crcputs sys0,2
- crcputs tSend.txt,0
- //send cmd
- printh 55 bb
- prints sys0,2
- prints tSend.txt,0
- prints crcval,2
-
Timer tmSleep
Attributes
Scope : local
@@ -505,18 +400,12 @@
tsw bDown1,1
bDown1.pco=65535
}
- // set tTiltHeading (localization)
- spstr strCommand.txt,tTiltHeading.txt,"~",11
}
if(tInstruction.txt=="dimmode")
{
// get value
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0
@@ -177,31 +404,3 @@ 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-06-06 12:47:19.783824935 +0000
+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-06-06 12:47:20.835832380 +0000
@@ -397,9 +397,6 @@
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0
dim=dimValue
- // get value normal
- spstr strCommand.txt,tTmp.txt,"~",2
- covx tTmp.txt,dimValueNormal,0,0
}
if(tInstruction.txt=="time")
{
@@ -501,14 +498,6 @@
spstr strCommand.txt,tIcon2.txt,"~",19
spstr strCommand.txt,tTmp.txt,"~",20
covx tTmp.txt,tIcon2.pco,0,0
- if(tNotifyHead.txt!="")
- {
- ref tNotifyHead
- }
- if(tNotifyText.txt!="")
- {
- ref tNotifyText
- }
}
if(tInstruction.txt=="color")
{

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

@@ -42,14 +42,14 @@ cardThermo
53 Component(s)
552 Line(s) of event code
290 Unique line(s) of event code
screensaver
38 Component(s)
319 Line(s) of event code
253 Unique line(s) of event code
cardEntities
65 Component(s)
1130 Line(s) of event code
494 Unique line(s) of event code
screensaver
37 Component(s)
305 Line(s) of event code
244 Unique line(s) of event code
cardAlarm
40 Component(s)
392 Line(s) of event code
@@ -57,6 +57,6 @@ cardAlarm
Total
13 Page(s)
405 Component(s)
4509 Line(s) of event code
1190 Unique line(s) of event code
406 Component(s)
4523 Line(s) of event code
1198 Unique line(s) of event code

63
HMI/US/landscape/n2t-out-visual/screensaver.txt
View File

@@ -91,9 +91,9 @@ Text tTime
Send Component ID : disabled
Opacity : 127
x coordinate : 52
y coordinate : 0
y coordinate : 18
Width : 376
Height : 154
Height : 112
Effect : load
Effect Priority : 0
Effect Time : 300
@@ -121,23 +121,23 @@ Text tDate
Send Component ID : disabled
Opacity : 127
x coordinate : 15
y coordinate : 154
y coordinate : 162
Width : 450
Height : 38
Height : 32
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 2
Font ID : 1
Back. Color : 0
Font Color : 65535
Horizontal Alignment : center
Vertical Alignment : center
Vertical Alignment : bottom
Input Type : character
Text : Tuesday, 08. March 2022
Max. Text Size : 35
Max. Text Size : 40
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
@@ -810,7 +810,7 @@ Text tIcon1
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 8
x coordinate : 15
y coordinate : 0
Width : 38
Height : 38
@@ -840,7 +840,7 @@ Text tIcon2
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 434
x coordinate : 428
y coordinate : 0
Width : 38
Height : 38
@@ -862,6 +862,36 @@ Text tIcon2
Horizontal Spacing : 0
Vertical Spacing : 0
Text tDateAdd
Attributes
ID : 37
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 15
y coordinate : 130
Width : 450
Height : 32
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 1
Back. Color : 0
Font Color : 65535
Horizontal Alignment : center
Vertical Alignment : bottom
Input Type : character
Text :
Max. Text Size : 40
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Picture p0
Attributes
ID : 1
@@ -942,6 +972,9 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0
dim=dimValue
// get value normal
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
}
if(tInstruction.txt=="time")
{
@@ -1043,6 +1076,15 @@ Timer tmSerial
spstr strCommand.txt,tIcon2.txt,"~",19
spstr strCommand.txt,tTmp.txt,"~",20
covx tTmp.txt,tIcon2.pco,0,0
spstr strCommand.txt,tDateAdd.txt,"~",21
if(tNotifyHead.txt!="")
{
ref tNotifyHead
}
if(tNotifyText.txt!="")
{
ref tNotifyText
}
}
if(tInstruction.txt=="color")
{
@@ -1072,6 +1114,7 @@ Timer tmSerial
tForecast4.bco=tTime.bco
tForecast4Val.bco=tTime.bco
tF4Icon.bco=tTime.bco
tDateAdd.bco=tTime.bco
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,tTime.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",3
@@ -1114,6 +1157,8 @@ Timer tmSerial
covx tTmp.txt,tMRIcon.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",21
covx tTmp.txt,tMR.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",22
covx tTmp.txt,tDateAdd.pco,0,0
}
if(tInstruction.txt=="notify")
{

27
HMI/US/landscape/n2t-out/screensaver.txt
View File

@@ -86,7 +86,7 @@ Text tDate
Send Component ID : disabled
Associated Keyboard : none
Text : Tuesday, 08. March 2022
Max. Text Size : 35
Max. Text Size : 40
Text tMainIcon
Attributes
@@ -328,6 +328,16 @@ Text tIcon2
Text :
Max. Text Size : 5
Text tDateAdd
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text :
Max. Text Size : 40
Picture p0
Attributes
Scope : local
@@ -397,6 +407,9 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0
dim=dimValue
// get value normal
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
}
if(tInstruction.txt=="time")
{
@@ -498,6 +511,15 @@ Timer tmSerial
spstr strCommand.txt,tIcon2.txt,"~",19
spstr strCommand.txt,tTmp.txt,"~",20
covx tTmp.txt,tIcon2.pco,0,0
spstr strCommand.txt,tDateAdd.txt,"~",21
if(tNotifyHead.txt!="")
{
ref tNotifyHead
}
if(tNotifyText.txt!="")
{
ref tNotifyText
}
}
if(tInstruction.txt=="color")
{
@@ -527,6 +549,7 @@ Timer tmSerial
tForecast4.bco=tTime.bco
tForecast4Val.bco=tTime.bco
tF4Icon.bco=tTime.bco
tDateAdd.bco=tTime.bco
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,tTime.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",3
@@ -569,6 +592,8 @@ Timer tmSerial
covx tTmp.txt,tMRIcon.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",21
covx tTmp.txt,tMR.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",22
covx tTmp.txt,tDateAdd.pco,0,0
}
if(tInstruction.txt=="notify")
{