h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2026-02-16 18:06:59 +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-06-23 20:59:33 +00:00
committed by github-actions[bot]
parent 8bbb30a385
commit 847d7e5c2a
8 changed files with 112 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
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-23 20:36:03.525115067 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-23 20:36:04.001164408 +0000
--- HMI/n2t-out/Program.s.txt 2022-06-23 20:59:31.468041609 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-23 20:59:31.892044031 +0000
@@ -14,6 +14,6 @@
//color vars
int defaultFontColor=65535
@@ -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-06-23 20:36:03.525115067 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-06-23 20:36:04.001164408 +0000
--- HMI/n2t-out/cardAlarm.txt 2022-06-23 20:59:31.468041609 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-06-23 20:59:31.896044054 +0000
@@ -138,7 +138,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
@@ -23,8 +23,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
Text tIcon
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-06-23 20:36:03.525115067 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-23 20:36:04.005164823 +0000
--- HMI/n2t-out/cardEntities.txt 2022-06-23 20:59:31.468041609 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-23 20:59:31.896044054 +0000
@@ -136,6 +136,18 @@
Text :
Max. Text Size: 80
@@ -293,8 +293,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Attributes
Scope : local
diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
--- HMI/n2t-out/cardQR.txt 2022-06-23 20:36:03.525115067 +0000
+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-06-23 20:36:04.001164408 +0000
--- HMI/n2t-out/cardQR.txt 2022-06-23 20:59:31.468041609 +0000
+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-06-23 20:59:31.896044054 +0000
@@ -12,21 +12,6 @@
Events
@@ -318,8 +318,8 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
vis p0,0
vis tSend,0
diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
--- HMI/n2t-out/cardThermo.txt 2022-06-23 20:36:03.525115067 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-06-23 20:36:04.005164823 +0000
--- HMI/n2t-out/cardThermo.txt 2022-06-23 20:59:31.468041609 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-06-23 20:59:31.896044054 +0000
@@ -12,11 +12,6 @@
Events
@@ -333,8 +333,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
vis p0,0
vis tSend,0
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-06-23 20:36:03.525115067 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-23 20:36:04.001164408 +0000
--- HMI/n2t-out/pageStartup.txt 2022-06-23 20:59:31.468041609 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-23 20:59:31.896044054 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
@@ -354,8 +354,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/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt
--- HMI/n2t-out/pageTest.txt 2022-06-23 20:36:03.525115067 +0000
+++ HMI/US/portrait/n2t-out/pageTest.txt 2022-06-23 20:36:04.001164408 +0000
--- HMI/n2t-out/pageTest.txt 2022-06-23 20:59:31.468041609 +0000
+++ HMI/US/portrait/n2t-out/pageTest.txt 2022-06-23 20:59:31.892044031 +0000
@@ -13,46 +13,6 @@
Events
Preinitialize Event
@@ -403,38 +403,9 @@ diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt
Picture p0
Attributes
diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
--- HMI/n2t-out/popupLight.txt 2022-06-23 20:36:03.525115067 +0000
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-06-23 20:36:04.001164408 +0000
@@ -12,25 +12,6 @@
Events
Preinitialize Event
- for(sys0=0;sys0<40;sys0++)
- {
- b[sys0].bco=defaultBcoColor
- b[sys0].pco=defaultFontColor
- if(b[sys0].type==53&&defaultBcoColor==0)
- {
- b[sys0].pic=10
- b[sys0].pic2=11
- }
- }
- if(defaultBcoColor==0)
- {
- hBrightness.pic=14
- hBrightness.pic1=13
- hBrightness.pic2=15
- hTempSlider.pic=16
- hTempSlider.pic1=17
- hTempSlider.pic2=15
- }
dim=dimValueNormal
//get entitiy name
tEntity.txt=pageIcons.tTmp1.txt
diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt
--- HMI/n2t-out/popupNotify.txt 2022-06-23 20:36:03.525115067 +0000
+++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-06-23 20:36:04.001164408 +0000
--- HMI/n2t-out/popupNotify.txt 2022-06-23 20:59:31.468041609 +0000
+++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-06-23 20:59:31.892044031 +0000
@@ -12,11 +12,6 @@
Events
@@ -447,42 +418,3 @@ diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt
dim=dimValueNormal
vis p0,0
vis tSend,0
diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
--- HMI/n2t-out/popupShutter.txt 2022-06-23 20:36:03.525115067 +0000
+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-06-23 20:36:04.001164408 +0000
@@ -215,7 +215,7 @@
Touch Release Event
// event,buttonPress2,internalNameEntity,positionSlider,50
//craft command
- tSend.txt="event,buttonPress2,"+entn.txt+",tiltSlider,"
+ tSend.txt="event,buttonPress2,"+entn.txt+",positionSlider,"
covx hPosition.val,tTmp.txt,0,0
tSend.txt+=tTmp.txt
//send calc crc
@@ -342,7 +342,7 @@
Events
Touch Press Event
- tSend.txt="event,buttonPress2,"+entn.txt+",tiltOpen"
+ tSend.txt="event,buttonPress2,"+entn.txt+",up"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -367,7 +367,7 @@
Events
Touch Press Event
- tSend.txt="event,buttonPress2,"+entn.txt+",tiltStop"
+ tSend.txt="event,buttonPress2,"+entn.txt+",stop"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -392,7 +392,7 @@
Events
Touch Press Event
- tSend.txt="event,buttonPress2,"+entn.txt+",tiltClose"
+ tSend.txt="event,buttonPress2,"+entn.txt+",down"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC