h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2026-02-24 15:02:15 +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-13 20:17:08 +00:00
committed by github-actions[bot]
parent 66f4c85ee0
commit 380320da6b
6 changed files with 76 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
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-13 20:13:59.313209160 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-13 20:13:59.697213814 +0000
--- HMI/n2t-out/Program.s.txt 2022-04-13 20:17:06.882470529 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-13 20:17:07.278468356 +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-13 20:13:59.313209160 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-13 20:13:59.701213862 +0000
--- HMI/n2t-out/cardEntities.txt 2022-04-13 20:17:06.886470507 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-13 20:17:07.278468356 +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-13 20:13:59.313209160 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-13 20:13:59.697213814 +0000
--- HMI/n2t-out/pageStartup.txt 2022-04-13 20:17:06.886470507 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-13 20:17:07.278468356 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
@@ -447,62 +447,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
diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
--- HMI/n2t-out/popupLight.txt 2022-04-13 20:13:59.313209160 +0000
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-13 20:13:59.697213814 +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
bufferPos=0
- if(tId.txt=="pageStartup")
- {
- page pageStartup
- }
- if(tId.txt=="screensaver")
- {
- page screensaver
- }
if(tId.txt=="cardEntities")
{
page cardEntities
}
- if(tId.txt=="cardGrid")
- {
- page cardGrid
- }
- if(tId.txt=="popupLight")
+ if(tId.txt=="cardMedia")
{
- pageIcons.tTmp1.txt=tTmp.txt
- page popupLight
+ page cardMedia
}
- if(tId.txt=="popupShutter")
+ if(tId.txt=="pageStartup")
{
- pageIcons.tTmp1.txt=tTmp.txt
- page popupShutter
+ page pageStartup
}
if(tId.txt=="popupNotify")
{
page popupNotify
}
- if(tId.txt=="cardThermo")
- {
- page cardThermo
- }
- if(tId.txt=="cardMedia")
+ if(tId.txt=="cardGrid")
{
- page cardMedia
+ page cardGrid
}
if(tId.txt=="cardAlarm")
{
diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt
--- HMI/n2t-out/screensaver.txt 2022-04-13 20:13:59.313209160 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-13 20:13:59.697213814 +0000
--- HMI/n2t-out/screensaver.txt 2022-04-13 20:17:06.886470507 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-13 20:17:07.278468356 +0000
@@ -450,77 +450,6 @@
//tMR
spstr strCommand.txt,tMR.txt,"~",16