h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2026-01-06 14:45:46 +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

282
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
--- HMI/n2t-out/Program.s.txt 2022-06-06 12:47:19.779824907 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-06 12:47:20.275828417 +0000
--- HMI/n2t-out/Program.s.txt 2022-06-06 17:10:41.745533696 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-06 17:10:42.165528115 +0000
@@ -11,6 +11,6 @@
// dim value
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
page pageStartup
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-06-06 12:47:19.783824935 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-06 12:47:20.279828445 +0000
--- HMI/n2t-out/cardEntities.txt 2022-06-06 17:10:41.749533643 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-06 17:10:42.169528062 +0000
@@ -63,6 +63,16 @@
vis bText4,0
vis hSlider4,0
@@ -468,8 +468,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
if(tInstruction.txt=="pageType")
{
diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
--- HMI/n2t-out/cardMedia.txt 2022-06-06 12:47:19.783824935 +0000
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-06 12:47:20.279828445 +0000
--- HMI/n2t-out/cardMedia.txt 2022-06-06 17:10:41.745533696 +0000
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-06 17:10:42.169528062 +0000
@@ -45,12 +45,6 @@
Scope: local
Value: 0
@@ -518,8 +518,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
if(tInstruction.txt=="time")
{
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-06-06 12:47:19.783824935 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-06 12:47:20.279828445 +0000
--- HMI/n2t-out/pageStartup.txt 2022-06-06 17:10:41.745533696 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-06 17:10:42.169528062 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
@@ -538,44 +538,234 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt
--- HMI/n2t-out/screensaver.txt 2022-06-06 12:47:19.783824935 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-06-06 12:47:20.279828445 +0000
@@ -474,22 +474,6 @@
vis tMainIconAlt,1
vis tMRIcon,1
vis tMR,1
- vis tForecast1,0
- vis tF1Icon,0
- vis tForecast1Val,0
- //move forecast values to the right
- tForecast4.txt=tForecast3.txt
- tForecast3.txt=tForecast2.txt
- tForecast2.txt=tForecast1.txt
- tForecast4Val.txt=tForecast3Val.txt
- tForecast3Val.txt=tForecast2Val.txt
- tForecast2Val.txt=tForecast1Val.txt
- tF4Icon.txt=tF3Icon.txt
- tF3Icon.txt=tF2Icon.txt
- tF2Icon.txt=tF1Icon.txt
- tF4Icon.pco=tF3Icon.pco
- tF3Icon.pco=tF2Icon.pco
- tF2Icon.pco=tF1Icon.pco
diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
--- HMI/n2t-out/popupShutter.txt 2022-06-06 17:10:41.745533696 +0000
+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-06-06 17:10:42.169528062 +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,8 +400,6 @@
tsw bDown1,1
bDown1.pco=65535
}
//tMR
spstr strCommand.txt,tMR.txt,"~",16
@@ -501,14 +485,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
- }
- // set tTiltHeading (localization)
- spstr strCommand.txt,tTiltHeading.txt,"~",11
}
if(tInstruction.txt=="color")
if(tInstruction.txt=="dimmode")
{