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

Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text)

Browse Source
This commit is contained in:
joBr99
2022-04-17 18:33:13 +00:00
committed by github-actions[bot]
parent 374e3a57ef
commit 7654165670
6 changed files with 315 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

93
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-04-15 16:21:24.696789846 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-15 16:21:25.464799585 +0000
--- HMI/n2t-out/Program.s.txt 2022-04-17 18:33:11.488952559 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-17 18:33:12.456957856 +0000
@@ -11,6 +11,6 @@
// dim value
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
page pageStartup
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-04-15 16:21:24.696789846 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-15 16:21:25.464799585 +0000
--- HMI/n2t-out/pageStartup.txt 2022-04-17 18:33:11.492952581 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-17 18:33:12.460957878 +0000
@@ -177,7 +177,7 @@
recmod=1
bauds=115200
@@ -23,8 +23,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
--- HMI/n2t-out/popupLight.txt 2022-04-15 16:21:24.696789846 +0000
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-04-15 16:21:25.464799585 +0000
--- HMI/n2t-out/popupLight.txt 2022-04-17 18:33:11.492952581 +0000
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-04-17 18:33:12.460957878 +0000
@@ -570,43 +570,25 @@
//we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
udelete payloadLength-1
@@ -76,9 +76,18 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
if(tId.txt=="cardAlarm")
{
diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt
--- HMI/n2t-out/screensaver.txt 2022-04-15 16:21:24.696789846 +0000
+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-04-15 16:21:25.464799585 +0000
@@ -48,18 +48,6 @@
--- HMI/n2t-out/screensaver.txt 2022-04-17 18:33:11.492952581 +0000
+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-04-17 18:33:12.460957878 +0000
@@ -17,8 +17,6 @@
vis tInstruction,0
vis tTmp,0
vis p0,0
- vis tNotifyHead,0
- vis tNotifyText,0
//load gloabl time string from pageIcons
//tTime.txt=vaTime.txt
spstr pageIcons.vaTime.txt,tTime.txt,"?",0
@@ -50,18 +48,6 @@
Scope: local
Value: 0
@@ -97,30 +106,54 @@ diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt
Text tTime
Attributes
Scope : local
@@ -290,6 +278,26 @@
@@ -292,7 +278,7 @@
Text :
Max. Text Size : 10
-Text tNotifyHead
+Text tTmp
+ Attributes
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+ Associated Keyboard : none
+ Text :
+ Max. Text Size : 50
+
+Text tInstruction
+ Attributes
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+ Associated Keyboard : none
+ Text :
+ Max. Text Size : 50
+
Picture p0
Attributes
Scope : local
Dragging : 0
@@ -300,9 +286,9 @@
Send Component ID : disabled
Associated Keyboard : none
Text :
- Max. Text Size : 35
+ Max. Text Size : 50
-Text tNotifyText
+Text tInstruction
Attributes
Scope : local
Dragging : 0
@@ -310,7 +296,7 @@
Send Component ID : disabled
Associated Keyboard : none
Text :
- Max. Text Size : 35
+ Max. Text Size : 50
Picture p0
Attributes
@@ -543,20 +529,6 @@
spstr strCommand.txt,tTmp.txt,"~",23
covx tTmp.txt,tMR.pco,0,0
}
- if(tInstruction.txt=="notify")
- {
- spstr strCommand.txt,tNotifyHead.txt,"~",1
- spstr strCommand.txt,tNotifyText.txt,"~",2
- if(tNotifyHead.txt!=""||tNotifyText.txt!="")
- {
- vis tNotifyHead,1
- vis tNotifyText,1
- }else
- {
- vis tNotifyHead,0
- vis tNotifyText,0
- }
- }
if(tInstruction.txt=="pageType")
{
dim=100

72
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-04-15 16:21:24.696789846 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-15 16:21:25.032794102 +0000
--- HMI/n2t-out/Program.s.txt 2022-04-17 18:33:11.488952559 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-17 18:33:11.968955186 +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-04-15 16:21:24.696789846 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-15 16:21:25.032794102 +0000
--- HMI/n2t-out/cardEntities.txt 2022-04-17 18:33:11.492952581 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-17 18:33:11.968955186 +0000
@@ -62,6 +62,16 @@
vis bText4,0
vis hSlider4,0
@@ -427,8 +427,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
if(tInstruction.txt=="pageType")
{
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-04-15 16:21:24.696789846 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-15 16:21:25.032794102 +0000
--- HMI/n2t-out/pageStartup.txt 2022-04-17 18:33:11.492952581 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-17 18:33:11.968955186 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
@@ -447,3 +447,63 @@ 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-04-17 18:33:11.492952581 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-17 18:33:11.968955186 +0000
@@ -17,8 +17,6 @@
vis tInstruction,0
vis tTmp,0
vis p0,0
- vis tNotifyHead,0
- vis tNotifyText,0
//load gloabl time string from pageIcons
//tTime.txt=vaTime.txt
spstr pageIcons.vaTime.txt,tTime.txt,"?",0
@@ -292,26 +290,6 @@
Text :
Max. Text Size : 10
-Text tNotifyHead
- Attributes
- Scope : local
- Dragging : 0
- Disable release event after dragging: 0
- Send Component ID : disabled
- Associated Keyboard : none
- Text :
- Max. Text Size : 35
-
-Text tNotifyText
- Attributes
- Scope : local
- Dragging : 0
- Disable release event after dragging: 0
- Send Component ID : disabled
- Associated Keyboard : none
- Text :
- Max. Text Size : 35
-
Picture p0
Attributes
Scope : local
@@ -543,20 +521,6 @@
spstr strCommand.txt,tTmp.txt,"~",23
covx tTmp.txt,tMR.pco,0,0
}
- if(tInstruction.txt=="notify")
- {
- spstr strCommand.txt,tNotifyHead.txt,"~",1
- spstr strCommand.txt,tNotifyText.txt,"~",2
- if(tNotifyHead.txt!=""||tNotifyText.txt!="")
- {
- vis tNotifyHead,1
- vis tNotifyText,1
- }else
- {
- vis tNotifyHead,0
- vis tNotifyText,0
- }
- }
if(tInstruction.txt=="pageType")
{
dim=100

74
HMI/US/portrait/diff-filtered.txt
View File

@@ -1,8 +1,8 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-04-15 16:21:25.068794558 +0000
+--- HMI/n2t-out/Program.s.txt 2022-04-15 16:21:24.696789846 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-15 16:21:25.032794102 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-04-15 16:21:24.696789846 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-15 16:21:25.032794102 +0000
+++ HMI/US/portrait/diff-eu-version.txt 2022-04-17 18:33:11.980955251 +0000
+--- HMI/n2t-out/Program.s.txt 2022-04-17 18:33:11.488952559 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-17 18:33:11.968955186 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-04-17 18:33:11.492952581 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-17 18:33:11.968955186 +0000
+@@ -62,6 +62,16 @@
+@@ -117,6 +127,18 @@
+@@ -153,6 +175,15 @@
@@ -15,5 +15,65 @@
+ }
+ if(tInstruction.txt=="pageType")
+ {
+--- HMI/n2t-out/pageStartup.txt 2022-04-15 16:21:24.696789846 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-15 16:21:25.032794102 +0000
+--- HMI/n2t-out/pageStartup.txt 2022-04-17 18:33:11.492952581 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-17 18:33:11.968955186 +0000
+diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt
+--- HMI/n2t-out/screensaver.txt 2022-04-17 18:33:11.492952581 +0000
++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-17 18:33:11.968955186 +0000
+@@ -17,8 +17,6 @@
+ vis tInstruction,0
+ vis tTmp,0
+ vis p0,0
+- vis tNotifyHead,0
+- vis tNotifyText,0
+ //load gloabl time string from pageIcons
+ //tTime.txt=vaTime.txt
+ spstr pageIcons.vaTime.txt,tTime.txt,"?",0
+@@ -292,26 +290,6 @@
+ Text :
+ Max. Text Size : 10
+
+-Text tNotifyHead
+- Attributes
+- Scope : local
+- Dragging : 0
+- Disable release event after dragging: 0
+- Send Component ID : disabled
+- Associated Keyboard : none
+- Text :
+- Max. Text Size : 35
+-
+-Text tNotifyText
+- Attributes
+- Scope : local
+- Dragging : 0
+- Disable release event after dragging: 0
+- Send Component ID : disabled
+- Associated Keyboard : none
+- Text :
+- Max. Text Size : 35
+-
+ Picture p0
+ Attributes
+ Scope : local
+@@ -543,20 +521,6 @@
+ spstr strCommand.txt,tTmp.txt,"~",23
+ covx tTmp.txt,tMR.pco,0,0
+ }
+- if(tInstruction.txt=="notify")
+- {
+- spstr strCommand.txt,tNotifyHead.txt,"~",1
+- spstr strCommand.txt,tNotifyText.txt,"~",2
+- if(tNotifyHead.txt!=""||tNotifyText.txt!="")
+- {
+- vis tNotifyHead,1
+- vis tNotifyText,1
+- }else
+- {
+- vis tNotifyHead,0
+- vis tNotifyText,0
+- }
+- }
+ if(tInstruction.txt=="pageType")
+ {
+ dim=100