h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2026-02-23 13:02:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui (add nextion2text)

Browse Source
This commit is contained in:
joBr99
2023-08-20 12:42:36 +00:00
committed by github-actions[bot]
parent a1104b8f81
commit 291102971a
21 changed files with 155 additions and 394 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
HMI/US/portrait/diff-eu-version.txt
View File

@@ -1728,7 +1728,7 @@
│ }
│ --- HMI/n2t-out/popupLight.txt
├── +++ HMI/US/portrait/n2t-out/popupLight.txt
│ @@ -48,15 +48,15 @@
│ @@ -48,33 +48,33 @@
│ vis hTempSlider,0
│ //disable color wheel components by default
│ vis bColor,0
@@ -1745,13 +1745,17 @@
│ b[sys0].pco=defaultFontColor
│ }
│ if(b[sys0].type==53&&defaultBcoColor==0)
│ @@ -66,15 +66,15 @@
│ {
│ b[sys0].pic=10
│ b[sys0].pic2=11
│ }
│ }
│ if(defaultBcoColor==0)
│ {
│ hBrightness.pic=14
│ hBrightness.pic1=13
│ - hBrightness.pic=24
│ - hBrightness.pic1=25
│ + hBrightness.pic=14
│ + hBrightness.pic1=13
│ hBrightness.pic2=15
│ - hTempSlider.pic=16
│ + hTempSlider.pic=23
@@ -1877,36 +1881,6 @@
│ spstr strCommand.txt,tTmp.txt,"~",1
│ covx tTmp.txt,tTime.bco,0,0
│ if(tTime.bco!=screensaver.bco)
│ @@ -702,29 +673,14 @@
│ }
│ spstr strCommand.txt,tTmp.txt,"~",4
│ if(tTmp.txt!="")
│ {
│ covx tTmp.txt,tNotifyText.pco,0,0
│ }
│ }
│ - if(tInstruction.txt=="getBrightness")
│ - {
│ - tSend.txt="event,getBrightnessResponse,"
│ - //send calc crc
│ - btlen tSend.txt,sys0
│ - crcrest 1,0xffff // reset CRC
│ - crcputh 55 bb
│ - crcputs sys0,2
│ - crcputs dim,0
│ - //send cmd
│ - printh 55 bb
│ - prints sys0,2
│ - prints tSend.txt,0
│ - prints crcval,2
│ - }
│ if(tInstruction.txt=="pageType")
│ {
│ dim=100
│ //command format pageType,specialPageName
│ //write name of speical page to tId
│ spstr strCommand.txt,tId.txt,"~",1
│ //save second arg if there's one
│ --- HMI/n2t-out/screensaver2.txt
├── +++ HMI/US/portrait/n2t-out/screensaver2.txt
│ @@ -28,17 +28,14 @@

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

@@ -1,4 +1,4 @@
+++ /dev/fd/62 2023-08-20 12:32:07.109670758 +0000
+++ /dev/fd/62 2023-08-20 12:42:27.830750069 +0000
+I/n2t-out/Program.s.txt
++ HMI/US/portrait/n2t-out/Program.s.txt
+1 +12,11 @@
@@ -59,13 +59,13 @@
+ributes
+ Scope : local
+ Text :
+ Max. Text Size: 80
+ Max. Text Size: 38
+
+e (string) nent2
+ributes
+ Scope : local
+ Text :
+ Max. Text Size: 80
+ Max. Text Size: 38
+14 +185,26 @@
+e (string) type6
@@ -1270,7 +1270,7 @@
+ }
+I/n2t-out/popupLight.txt
++ HMI/US/portrait/n2t-out/popupLight.txt
+5 +48,15 @@
+3 +48,33 @@
+ vis hTempSlider,0
+ //disable color wheel components by default
+ vis bColor,0
@@ -1287,11 +1287,15 @@
+ b[sys0].pco=defaultFontColor
+ }
+ if(b[sys0].type==53&&defaultBcoColor==0)
+5 +66,15 @@
+ {
+ b[sys0].pic=10
+ b[sys0].pic2=11
+ }
+ }
+ if(defaultBcoColor==0)
+ {
+ hBrightness.pic=24
+ hBrightness.pic1=25
+ hBrightness.pic=14
+ hBrightness.pic1=13
+ hBrightness.pic2=15
@@ -1419,36 +1423,6 @@
+ spstr strCommand.txt,tTmp.txt,"~",1
+ covx tTmp.txt,tTime.bco,0,0
+ if(tTime.bco!=screensaver.bco)
+29 +673,14 @@
+ }
+ spstr strCommand.txt,tTmp.txt,"~",4
+ if(tTmp.txt!="")
+ {
+ covx tTmp.txt,tNotifyText.pco,0,0
+ }
+ }
+ if(tInstruction.txt=="getBrightness")
+ {
+ tSend.txt="event,getBrightnessResponse,"
+ //send calc crc
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+ crcputh 55 bb
+ crcputs sys0,2
+ crcputs dim,0
+ //send cmd
+ printh 55 bb
+ prints sys0,2
+ prints tSend.txt,0
+ prints crcval,2
+ }
+ if(tInstruction.txt=="pageType")
+ {
+ dim=100
+ //command format pageType,specialPageName
+ //write name of speical page to tId
+ spstr strCommand.txt,tId.txt,"~",1
+ //save second arg if there's one
+I/n2t-out/screensaver2.txt
++ HMI/US/portrait/n2t-out/screensaver2.txt
+7 +28,14 @@