h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2026-02-24 02: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-05-21 11:16:10 +00:00
committed by github-actions[bot]
parent 372d6936aa
commit ba69e10bbb
6 changed files with 111 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
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-21 11:07:42.160888502 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-21 11:07:42.588896268 +0000
--- HMI/n2t-out/Program.s.txt 2022-05-21 11:16:08.810315927 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-21 11:16:09.234319021 +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-21 11:07:42.160888502 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-21 11:07:42.588896268 +0000
--- HMI/n2t-out/cardAlarm.txt 2022-05-21 11:16:08.814315956 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-21 11:16:09.238319050 +0000
@@ -788,10 +788,6 @@
{
page cardAlarm
@@ -25,8 +25,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
// end of user code
udelete payloadLength-1
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-05-21 11:07:42.160888502 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-21 11:07:42.592896340 +0000
--- HMI/n2t-out/cardEntities.txt 2022-05-21 11:16:08.814315956 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-21 11:16:09.238319050 +0000
@@ -62,6 +62,16 @@
vis bText4,0
vis hSlider4,0
@@ -568,8 +568,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
if(tInstruction.txt=="time")
{
diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
--- HMI/n2t-out/cardGrid.txt 2022-05-21 11:07:42.160888502 +0000
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-21 11:07:42.588896268 +0000
--- HMI/n2t-out/cardGrid.txt 2022-05-21 11:16:08.814315956 +0000
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-21 11:16:09.238319050 +0000
@@ -869,10 +869,6 @@
{
page cardAlarm
@@ -582,8 +582,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
if(tInstruction.txt=="time")
{
diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
--- HMI/n2t-out/cardMedia.txt 2022-05-21 11:07:42.160888502 +0000
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-21 11:07:42.588896268 +0000
--- HMI/n2t-out/cardMedia.txt 2022-05-21 11:16:08.814315956 +0000
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-21 11:16:09.234319021 +0000
@@ -740,10 +740,6 @@
{
page cardAlarm
@@ -596,9 +596,21 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
// end of user code
udelete payloadLength-1
diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
--- HMI/n2t-out/cardQR.txt 2022-05-21 11:07:42.160888502 +0000
+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-21 11:07:42.588896268 +0000
@@ -541,10 +541,6 @@
--- HMI/n2t-out/cardQR.txt 2022-05-21 11:16:08.814315956 +0000
+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-21 11:16:09.238319050 +0000
@@ -461,10 +461,8 @@
vis bNext,1
bNext.txt=""
}
- //text heading
- spstr strCommand.txt,tHeading.txt,"~",3
//text qrcode
- spstr strCommand.txt,qr0.txt,"~",4
+ spstr strCommand.txt,qr0.txt,"~",3
}
if(tInstruction.txt=="time")
{
@@ -543,10 +541,6 @@
{
page cardAlarm
}
@@ -610,8 +622,8 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
// end of user code
udelete payloadLength-1
diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
--- HMI/n2t-out/cardThermo.txt 2022-05-21 11:07:42.160888502 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-21 11:07:42.588896268 +0000
--- HMI/n2t-out/cardThermo.txt 2022-05-21 11:16:08.814315956 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-21 11:16:09.238319050 +0000
@@ -1192,10 +1192,6 @@
{
page cardAlarm
@@ -624,8 +636,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.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-05-21 11:07:42.160888502 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-21 11:07:42.588896268 +0000
--- HMI/n2t-out/pageStartup.txt 2022-05-21 11:16:08.814315956 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-21 11:16:09.234319021 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
@@ -665,8 +677,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
// end of user code
udelete payloadLength-1
diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
--- HMI/n2t-out/popupLight.txt 2022-05-21 11:07:42.160888502 +0000
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-21 11:07:42.592896340 +0000
--- HMI/n2t-out/popupLight.txt 2022-05-21 11:16:08.814315956 +0000
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-21 11:16:09.238319050 +0000
@@ -618,10 +618,6 @@
{
page cardAlarm
@@ -679,8 +691,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
// end of user code
udelete payloadLength-1
diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt
--- HMI/n2t-out/popupNotify.txt 2022-05-21 11:07:42.160888502 +0000
+++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-05-21 11:07:42.588896268 +0000
--- HMI/n2t-out/popupNotify.txt 2022-05-21 11:16:08.814315956 +0000
+++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-05-21 11:16:09.234319021 +0000
@@ -381,10 +381,6 @@
{
page cardAlarm
@@ -693,8 +705,8 @@ diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt
// end of user code
udelete payloadLength-1
diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
--- HMI/n2t-out/popupShutter.txt 2022-05-21 11:07:42.160888502 +0000
+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-21 11:07:42.588896268 +0000
--- HMI/n2t-out/popupShutter.txt 2022-05-21 11:16:08.814315956 +0000
+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-21 11:16:09.234319021 +0000
@@ -422,10 +422,6 @@
{
page cardAlarm
@@ -707,8 +719,8 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
// end of user code
udelete payloadLength-1
diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt
--- HMI/n2t-out/screensaver.txt 2022-05-21 11:07:42.160888502 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-21 11:07:42.588896268 +0000
--- HMI/n2t-out/screensaver.txt 2022-05-21 11:16:08.814315956 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-21 11:16:09.238319050 +0000
@@ -607,10 +607,6 @@
{
page cardAlarm