h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2025-12-20 22:47:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Johannes
2022-06-01 18:20:28 +02:00
parent 0d182ac018 053ff005f8
commit 60a5f3417d
6 changed files with 241 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
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-01 15:15:00.353979873 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-01 15:15:01.498019039 +0000
--- HMI/n2t-out/Program.s.txt 2022-06-01 15:45:46.816504716 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-01 15:45:47.756510818 +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-01 15:15:00.357980010 +0000
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-06-01 15:15:01.502019176 +0000
--- HMI/n2t-out/cardEntities.txt 2022-06-01 15:45:46.816504716 +0000
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-06-01 15:45:47.760510844 +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-01 15:15:00.357980010 +0000
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-06-01 15:15:01.502019176 +0000
--- HMI/n2t-out/cardGrid.txt 2022-06-01 15:45:46.816504716 +0000
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-06-01 15:45:47.756510818 +0000
@@ -846,10 +846,6 @@
// get value
spstr strCommand.txt,tTmp.txt,"~",1
@@ -37,9 +37,56 @@ 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-01 15:15:00.353979873 +0000
+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-06-01 15:15:01.502019176 +0000
@@ -636,10 +636,7 @@
--- HMI/n2t-out/cardMedia.txt 2022-06-01 15:45:46.816504716 +0000
+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-06-01 15:45:47.756510818 +0000
@@ -45,12 +45,6 @@
Scope: local
Value: 0
-Variable (string) vaMenu
- Attributes
- Scope : local
- Text :
- Max. Text Size: 50
-
Text tSend
Attributes
Scope : local
@@ -218,24 +212,6 @@
Text :
Max. Text Size : 10
- Events
- Touch Release Event
- if(vaMenu.txt!="")
- {
- tSend.txt="event,buttonPress2,"+vaMenu.txt+",button"
- //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
- }
-
Text t1
Attributes
Scope : local
@@ -644,8 +620,6 @@
vis t5,1
covx tTmp.txt,t5.pco,0,0
}
- //tIconBtnEntityName
- spstr strCommand.txt,vaMenu.txt,"~",12
}
if(tInstruction.txt=="time")
{
@@ -662,10 +636,7 @@
// get value
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0
@@ -52,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-01 15:15:00.357980010 +0000
+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-06-01 15:15:01.502019176 +0000
--- HMI/n2t-out/cardThermo.txt 2022-06-01 15:45:46.816504716 +0000
+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-06-01 15:45:47.760510844 +0000
@@ -1170,10 +1170,6 @@
// get value
spstr strCommand.txt,tTmp.txt,"~",1
@@ -66,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-01 15:15:00.357980010 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-01 15:15:01.502019176 +0000
--- HMI/n2t-out/pageStartup.txt 2022-06-01 15:45:46.816504716 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-01 15:45:47.756510818 +0000
@@ -177,7 +177,7 @@
recmod=1
bauds=115200
@@ -89,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-01 15:15:00.353979873 +0000
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-06-01 15:15:01.502019176 +0000
--- HMI/n2t-out/popupLight.txt 2022-06-01 15:45:46.816504716 +0000
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-06-01 15:45:47.756510818 +0000
@@ -561,10 +561,6 @@
// get value
spstr strCommand.txt,tTmp.txt,"~",1
@@ -103,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-01 15:15:00.353979873 +0000
+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-06-01 15:15:01.502019176 +0000
--- HMI/n2t-out/popupNotify.txt 2022-06-01 15:45:46.816504716 +0000
+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-06-01 15:45:47.756510818 +0000
@@ -311,10 +311,6 @@
// get value
spstr strCommand.txt,tTmp.txt,"~",1
@@ -117,8 +164,8 @@ 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-01 15:15:00.353979873 +0000
+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-06-01 15:15:01.502019176 +0000
--- HMI/n2t-out/popupShutter.txt 2022-06-01 15:45:46.816504716 +0000
+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-06-01 15:45:47.756510818 +0000
@@ -406,10 +406,6 @@
// get value
spstr strCommand.txt,tTmp.txt,"~",1
@@ -131,8 +178,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-06-01 15:15:00.353979873 +0000
+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-06-01 15:15:01.502019176 +0000
--- HMI/n2t-out/screensaver.txt 2022-06-01 15:45:46.816504716 +0000
+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-06-01 15:45:47.760510844 +0000
@@ -397,9 +397,6 @@
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0

66
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-01 15:15:00.353979873 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-01 15:15:00.909998908 +0000
--- HMI/n2t-out/Program.s.txt 2022-06-01 15:45:46.816504716 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-01 15:45:47.256507572 +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-01 15:15:00.357980010 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-01 15:15:00.913999045 +0000
--- HMI/n2t-out/cardEntities.txt 2022-06-01 15:45:46.816504716 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-01 15:45:47.256507572 +0000
@@ -63,6 +63,16 @@
vis bText4,0
vis hSlider4,0
@@ -467,9 +467,59 @@ 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-01 15:45:46.816504716 +0000
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-01 15:45:47.256507572 +0000
@@ -45,12 +45,6 @@
Scope: local
Value: 0
-Variable (string) vaMenu
- Attributes
- Scope : local
- Text :
- Max. Text Size: 50
-
Text tSend
Attributes
Scope : local
@@ -218,24 +212,6 @@
Text :
Max. Text Size : 10
- Events
- Touch Release Event
- if(vaMenu.txt!="")
- {
- tSend.txt="event,buttonPress2,"+vaMenu.txt+",button"
- //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
- }
-
Text t1
Attributes
Scope : local
@@ -644,8 +620,6 @@
vis t5,1
covx tTmp.txt,t5.pco,0,0
}
- //tIconBtnEntityName
- spstr strCommand.txt,vaMenu.txt,"~",12
}
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-01 15:15:00.357980010 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-01 15:15:00.913999045 +0000
--- HMI/n2t-out/pageStartup.txt 2022-06-01 15:45:46.816504716 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-01 15:45:47.256507572 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
@@ -489,8 +539,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
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-01 15:15:00.353979873 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-06-01 15:15:00.913999045 +0000
--- HMI/n2t-out/screensaver.txt 2022-06-01 15:45:46.816504716 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-06-01 15:45:47.256507572 +0000
@@ -474,22 +474,6 @@
vis tMainIconAlt,1
vis tMRIcon,1

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

@@ -1,8 +1,8 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-06-01 15:15:00.929999593 +0000
+--- HMI/n2t-out/Program.s.txt 2022-06-01 15:15:00.353979873 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-01 15:15:00.909998908 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-06-01 15:15:00.357980010 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-01 15:15:00.913999045 +0000
+++ HMI/US/portrait/diff-eu-version.txt 2022-06-01 15:45:47.308507910 +0000
+--- HMI/n2t-out/Program.s.txt 2022-06-01 15:45:46.816504716 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-01 15:45:47.256507572 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-06-01 15:45:46.816504716 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-01 15:45:47.256507572 +0000
+@@ -63,6 +63,16 @@
+@@ -120,6 +130,18 @@
+@@ -156,6 +178,15 @@
@@ -12,10 +12,57 @@
+@@ -970,6 +1149,33 @@
+@@ -1075,6 +1281,28 @@
+@@ -1850,6 +2078,169 @@
+--- HMI/n2t-out/pageStartup.txt 2022-06-01 15:15:00.357980010 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-01 15:15:00.913999045 +0000
+--- HMI/n2t-out/screensaver.txt 2022-06-01 15:15:00.353979873 +0000
++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-06-01 15:15:00.913999045 +0000
+diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
+--- HMI/n2t-out/cardMedia.txt 2022-06-01 15:45:46.816504716 +0000
++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-01 15:45:47.256507572 +0000
+@@ -45,12 +45,6 @@
+ Scope: local
+ Value: 0
+
+-Variable (string) vaMenu
+- Attributes
+- Scope : local
+- Text :
+- Max. Text Size: 50
+-
+ Text tSend
+ Scope : local
+@@ -218,24 +212,6 @@
+ Text :
+ Max. Text Size : 10
+- Events
+- Touch Release Event
+- if(vaMenu.txt!="")
+- {
+- tSend.txt="event,buttonPress2,"+vaMenu.txt+",button"
+- //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
+- }
+-
+ Text t1
+ Scope : local
+@@ -644,8 +620,6 @@
+ vis t5,1
+ covx tTmp.txt,t5.pco,0,0
+ }
+- //tIconBtnEntityName
+- spstr strCommand.txt,vaMenu.txt,"~",12
+ }
+ if(tInstruction.txt=="time")
+ {
+--- HMI/n2t-out/pageStartup.txt 2022-06-01 15:45:46.816504716 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-01 15:45:47.256507572 +0000
+--- HMI/n2t-out/screensaver.txt 2022-06-01 15:45:46.816504716 +0000
++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-06-01 15:45:47.256507572 +0000
+@@ -474,22 +474,6 @@
+@@ -501,14 +485,6 @@
+ spstr strCommand.txt,tIcon2.txt,"~",19

27
HMI/n2t-out-visual/cardMedia.txt
View File

@@ -57,6 +57,13 @@ Variable (int32) vaSpeakerPos
Scope: local
Value: 0
Variable (string) vaMenu
Attributes
ID : 33
Scope : local
Text :
Max. Text Size: 50
Text tSend
Attributes
ID : 2
@@ -444,6 +451,24 @@ Text tIcon
Horizontal Spacing : 0
Vertical Spacing : 0
Events
Touch Release Event
if(vaMenu.txt!="")
{
tSend.txt="event,buttonPress2,"+vaMenu.txt+",button"
//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
}
Text t1
Attributes
ID : 22
@@ -1069,6 +1094,8 @@ Timer tmSerial
vis t5,1
covx tTmp.txt,t5.pco,0,0
}
//tIconBtnEntityName
spstr strCommand.txt,vaMenu.txt,"~",12
}
if(tInstruction.txt=="time")
{

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

@@ -31,9 +31,9 @@ screensaver
315 Line(s) of event code
249 Unique line(s) of event code
cardMedia
33 Component(s)
349 Line(s) of event code
183 Unique line(s) of event code
34 Component(s)
363 Line(s) of event code
195 Unique line(s) of event code
pageStartup
19 Component(s)
157 Line(s) of event code
@@ -57,6 +57,6 @@ cardEntities
Total
13 Page(s)
408 Component(s)
4529 Line(s) of event code
1197 Unique line(s) of event code
409 Component(s)
4543 Line(s) of event code
1209 Unique line(s) of event code

26
HMI/n2t-out/cardMedia.txt
View File

@@ -45,6 +45,12 @@ Variable (int32) vaSpeakerPos
Scope: local
Value: 0
Variable (string) vaMenu
Attributes
Scope : local
Text :
Max. Text Size: 50
Text tSend
Attributes
Scope : local
@@ -212,6 +218,24 @@ Text tIcon
Text :
Max. Text Size : 10
Events
Touch Release Event
if(vaMenu.txt!="")
{
tSend.txt="event,buttonPress2,"+vaMenu.txt+",button"
//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
}
Text t1
Attributes
Scope : local
@@ -620,6 +644,8 @@ Timer tmSerial
vis t5,1
covx tTmp.txt,t5.pco,0,0
}
//tIconBtnEntityName
spstr strCommand.txt,vaMenu.txt,"~",12
}
if(tInstruction.txt=="time")
{