h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2026-02-15 09:26:58 +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-05-30 17:02:53 +00:00
committed by github-actions[bot]
parent db1d8a285b
commit eeb05a1e96
16 changed files with 129 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

112
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-05-30 16:19:33.814519820 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-30 16:19:34.246527918 +0000
--- HMI/n2t-out/Program.s.txt 2022-05-30 17:02:48.227713141 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-30 17:02:48.739741932 +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/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
--- HMI/n2t-out/cardAlarm.txt 2022-05-30 16:19:33.814519820 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-30 16:19:34.246527918 +0000
--- HMI/n2t-out/cardAlarm.txt 2022-05-30 17:02:48.227713141 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-30 17:02:48.739741932 +0000
@@ -683,10 +683,7 @@
// get value
spstr strCommand.txt,tTmp.txt,"~",1
@@ -26,8 +26,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-05-30 16:19:33.818519895 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-30 16:19:34.246527918 +0000
--- HMI/n2t-out/cardEntities.txt 2022-05-30 17:02:48.227713141 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-30 17:02:48.743742363 +0000
@@ -62,6 +62,16 @@
vis bText4,0
vis hSlider4,0
@@ -482,20 +482,9 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
}
if(tInstruction.txt=="pageType")
{
@@ -1924,10 +2315,6 @@
// get value
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0
- // get value normal
- spstr strCommand.txt,tTmp.txt,"~",2
- covx tTmp.txt,dimValueNormal,0,0
- dim=dimValueNormal
}
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
--- HMI/n2t-out/cardGrid.txt 2022-05-30 16:19:33.818519895 +0000
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-30 16:19:34.246527918 +0000
--- HMI/n2t-out/cardGrid.txt 2022-05-30 17:02:48.227713141 +0000
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-30 17:02:48.743742363 +0000
@@ -846,10 +846,6 @@
// get value
spstr strCommand.txt,tTmp.txt,"~",1
@@ -508,8 +497,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
--- HMI/n2t-out/cardMedia.txt 2022-05-30 16:19:33.818519895 +0000
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-30 16:19:34.246527918 +0000
--- HMI/n2t-out/cardMedia.txt 2022-05-30 17:02:48.227713141 +0000
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-30 17:02:48.743742363 +0000
@@ -635,10 +635,7 @@
// get value
spstr strCommand.txt,tTmp.txt,"~",1
@@ -523,8 +512,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
--- HMI/n2t-out/cardQR.txt 2022-05-30 16:19:33.818519895 +0000
+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-30 16:19:34.246527918 +0000
--- HMI/n2t-out/cardQR.txt 2022-05-30 17:02:48.227713141 +0000
+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-30 17:02:48.743742363 +0000
@@ -34,7 +34,7 @@
Attributes
Scope : local
@@ -546,23 +535,9 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
}
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
--- HMI/n2t-out/cardThermo.txt 2022-05-30 16:19:33.818519895 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-30 16:19:34.246527918 +0000
@@ -1169,10 +1169,6 @@
// get value
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0
- // get value normal
- spstr strCommand.txt,tTmp.txt,"~",2
- covx tTmp.txt,dimValueNormal,0,0
- dim=dimValueNormal
}
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-05-30 16:19:33.818519895 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-30 16:19:34.246527918 +0000
--- HMI/n2t-out/pageStartup.txt 2022-05-30 17:02:48.227713141 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-30 17:02:48.743742363 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
@@ -581,20 +556,9 @@ 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
@@ -273,10 +273,6 @@
// get value
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0
- // get value normal
- spstr strCommand.txt,tTmp.txt,"~",2
- covx tTmp.txt,dimValueNormal,0,0
- dim=dimValueNormal
}
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
--- HMI/n2t-out/popupLight.txt 2022-05-30 16:19:33.818519895 +0000
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-30 16:19:34.246527918 +0000
--- HMI/n2t-out/popupLight.txt 2022-05-30 17:02:48.227713141 +0000
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-30 17:02:48.743742363 +0000
@@ -560,10 +560,6 @@
// get value
spstr strCommand.txt,tTmp.txt,"~",1
@@ -606,48 +570,10 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
}
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt
--- HMI/n2t-out/popupNotify.txt 2022-05-30 16:19:33.814519820 +0000
+++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-05-30 16:19:34.246527918 +0000
@@ -310,10 +310,6 @@
// get value
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0
- // get value normal
- spstr strCommand.txt,tTmp.txt,"~",2
- covx tTmp.txt,dimValueNormal,0,0
- dim=dimValueNormal
}
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
--- HMI/n2t-out/popupShutter.txt 2022-05-30 16:19:33.814519820 +0000
+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-30 16:19:34.246527918 +0000
@@ -405,10 +405,6 @@
// get value
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0
- // get value normal
- spstr strCommand.txt,tTmp.txt,"~",2
- covx tTmp.txt,dimValueNormal,0,0
- dim=dimValueNormal
}
if(tInstruction.txt=="time")
{
diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt
--- HMI/n2t-out/screensaver.txt 2022-05-30 16:19:33.818519895 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-30 16:19:34.246527918 +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")
{
@@ -474,22 +471,6 @@
--- HMI/n2t-out/screensaver.txt 2022-05-30 17:02:48.227713141 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-30 17:02:48.743742363 +0000
@@ -474,22 +474,6 @@
vis tMainIconAlt,1
vis tMRIcon,1
vis tMR,1