mirror of
https://github.com/joBr99/nspanel-lovelace-ui.git
synced 2026-02-16 09:56:58 +01:00
Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui (add nextion2text)
This commit is contained in:
joBr99
committed by
github-actions[bot]
github-actions[bot]
parent
8b1f80296b
commit
e4adeb645a
@@ -1,5 +1,17 @@
|
||||
--- HMI/n2t-out
|
||||
+++ HMI/US/landscape/n2t-out
|
||||
├── file list
|
||||
│ @@ -12,9 +12,8 @@
|
||||
│ pageTest.txt
|
||||
│ popupFan.txt
|
||||
│ popupInSel.txt
|
||||
│ popupLight.txt
|
||||
│ popupNotify.txt
|
||||
│ popupShutter.txt
|
||||
│ popupThermo.txt
|
||||
│ -screensaver.txt
|
||||
│ -screensaver2.txt
|
||||
│ +screensaver.txt
|
||||
│ --- HMI/n2t-out/Program.s.txt
|
||||
├── +++ HMI/US/landscape/n2t-out/Program.s.txt
|
||||
│ @@ -10,10 +10,7 @@
|
||||
@@ -13,306 +25,27 @@
|
||||
│ - // fix touch offset
|
||||
│ - lcd_dev fffb 0002 0000 0020
|
||||
│ - page pageStartup
|
||||
│ --- HMI/n2t-out/cardThermo.txt
|
||||
├── +++ HMI/US/landscape/n2t-out/cardThermo.txt
|
||||
│ @@ -358,15 +358,36 @@
|
||||
│
|
||||
│ Events
|
||||
│ Touch Press Event
|
||||
│ if(xTempDest2.val>xTempMin1.val)
|
||||
│ {
|
||||
│ xTempDest2.val=xTempDest2.val-xTempStep1.val
|
||||
│ }
|
||||
│ - tmSendHighLow.en=1
|
||||
│ + // event,buttonPress2,entn,tempUpd,X
|
||||
│ + //craft command
|
||||
│ + tSend.txt="event,buttonPress2,"
|
||||
│ + tSend.txt+=entn.txt+","
|
||||
│ + tSend.txt+="tempUpdHighLow,"
|
||||
│ + //convert temperature
|
||||
│ + covx xTempDest1.val,tTmp.txt,0,0
|
||||
│ + tSend.txt+=tTmp.txt
|
||||
│ + tSend.txt+="|"
|
||||
│ + covx xTempDest2.val,tTmp.txt,0,0
|
||||
│ + tSend.txt+=tTmp.txt
|
||||
│ + //send calc crc
|
||||
│ + btlen tSend.txt,sys0
|
||||
│ + crcrest 1,0xffff // reset CRC
|
||||
│ + crcputh 55 bb
|
||||
│ + crcputs sys0,2
|
||||
│ + crcputs tSend.txt,0
|
||||
│ + //send cmd
|
||||
│ + printh 55 bb
|
||||
│ + prints sys0,2
|
||||
│ + prints tSend.txt,0
|
||||
│ + prints crcval,2
|
||||
│
|
||||
│ Dual-state Button bUp2
|
||||
│ Attributes
|
||||
│ Scope : local
|
||||
│ Dragging : 0
|
||||
│ Disable release event after dragging: 0
|
||||
│ Send Component ID : disabled
|
||||
│ @@ -376,15 +397,36 @@
|
||||
│
|
||||
│ Events
|
||||
│ Touch Press Event
|
||||
│ if(xTempDest2.val<xTempMax1.val)
|
||||
│ {
|
||||
│ xTempDest2.val=xTempDest2.val+xTempStep1.val
|
||||
│ }
|
||||
│ - tmSendHighLow.en=1
|
||||
│ + // event,buttonPress2,entn,tempUpd,X
|
||||
│ + //craft command
|
||||
│ + tSend.txt="event,buttonPress2,"
|
||||
│ + tSend.txt+=entn.txt+","
|
||||
│ + tSend.txt+="tempUpdHighLow,"
|
||||
│ + //convert temperature
|
||||
│ + covx xTempDest1.val,tTmp.txt,0,0
|
||||
│ + tSend.txt+=tTmp.txt
|
||||
│ + tSend.txt+="|"
|
||||
│ + covx xTempDest2.val,tTmp.txt,0,0
|
||||
│ + tSend.txt+=tTmp.txt
|
||||
│ + //send calc crc
|
||||
│ + btlen tSend.txt,sys0
|
||||
│ + crcrest 1,0xffff // reset CRC
|
||||
│ + crcputh 55 bb
|
||||
│ + crcputs sys0,2
|
||||
│ + crcputs tSend.txt,0
|
||||
│ + //send cmd
|
||||
│ + printh 55 bb
|
||||
│ + prints sys0,2
|
||||
│ + prints tSend.txt,0
|
||||
│ + prints crcval,2
|
||||
│
|
||||
│ Dual-state Button bt0
|
||||
│ Attributes
|
||||
│ Scope : local
|
||||
│ Dragging : 0
|
||||
│ Disable release event after dragging: 0
|
||||
│ Send Component ID : disabled
|
||||
│ @@ -626,15 +668,33 @@
|
||||
│
|
||||
│ Events
|
||||
│ Touch Press Event
|
||||
│ if(xTempDest.val>xTempMin1.val)
|
||||
│ {
|
||||
│ xTempDest.val=xTempDest.val-xTempStep1.val
|
||||
│ }
|
||||
│ - tmSendTemp.en=1
|
||||
│ + // event,buttonPress2,entn,tempUpd,X
|
||||
│ + //craft command
|
||||
│ + tSend.txt="event,buttonPress2,"
|
||||
│ + tSend.txt+=entn.txt+","
|
||||
│ + tSend.txt+="tempUpd,"
|
||||
│ + //convert temperature
|
||||
│ + covx xTempDest.val,tTmp.txt,0,0
|
||||
│ + tSend.txt+=tTmp.txt
|
||||
│ + //send calc crc
|
||||
│ + btlen tSend.txt,sys0
|
||||
│ + crcrest 1,0xffff // reset CRC
|
||||
│ + crcputh 55 bb
|
||||
│ + crcputs sys0,2
|
||||
│ + crcputs tSend.txt,0
|
||||
│ + //send cmd
|
||||
│ + printh 55 bb
|
||||
│ + prints sys0,2
|
||||
│ + prints tSend.txt,0
|
||||
│ + prints crcval,2
|
||||
│
|
||||
│ Dual-state Button btDown1
|
||||
│ Attributes
|
||||
│ Scope : local
|
||||
│ Dragging : 0
|
||||
│ Disable release event after dragging: 0
|
||||
│ Send Component ID : disabled
|
||||
│ @@ -644,15 +704,36 @@
|
||||
│
|
||||
│ Events
|
||||
│ Touch Press Event
|
||||
│ if(xTempDest1.val>xTempMin1.val)
|
||||
│ {
|
||||
│ xTempDest1.val=xTempDest1.val-xTempStep1.val
|
||||
│ }
|
||||
│ - tmSendHighLow.en=1
|
||||
│ + // event,buttonPress2,entn,tempUpd,X
|
||||
│ + //craft command
|
||||
│ + tSend.txt="event,buttonPress2,"
|
||||
│ + tSend.txt+=entn.txt+","
|
||||
│ + tSend.txt+="tempUpdHighLow,"
|
||||
│ + //convert temperature
|
||||
│ + covx xTempDest1.val,tTmp.txt,0,0
|
||||
│ + tSend.txt+=tTmp.txt
|
||||
│ + tSend.txt+="|"
|
||||
│ + covx xTempDest2.val,tTmp.txt,0,0
|
||||
│ + tSend.txt+=tTmp.txt
|
||||
│ + //send calc crc
|
||||
│ + btlen tSend.txt,sys0
|
||||
│ + crcrest 1,0xffff // reset CRC
|
||||
│ + crcputh 55 bb
|
||||
│ + crcputs sys0,2
|
||||
│ + crcputs tSend.txt,0
|
||||
│ + //send cmd
|
||||
│ + printh 55 bb
|
||||
│ + prints sys0,2
|
||||
│ + prints tSend.txt,0
|
||||
│ + prints crcval,2
|
||||
│
|
||||
│ Dual-state Button btUp
|
||||
│ Attributes
|
||||
│ Scope : local
|
||||
│ Dragging : 0
|
||||
│ Disable release event after dragging: 0
|
||||
│ Send Component ID : disabled
|
||||
│ @@ -662,15 +743,33 @@
|
||||
│
|
||||
│ Events
|
||||
│ Touch Press Event
|
||||
│ if(xTempDest.val<xTempMax1.val)
|
||||
│ {
|
||||
│ xTempDest.val=xTempDest.val+xTempStep1.val
|
||||
│ }
|
||||
│ - tmSendTemp.en=1
|
||||
│ + // event,buttonPress2,entn,tempUpd,X
|
||||
│ + //craft command
|
||||
│ + tSend.txt="event,buttonPress2,"
|
||||
│ + tSend.txt+=entn.txt+","
|
||||
│ + tSend.txt+="tempUpd,"
|
||||
│ + //convert temperature
|
||||
│ + covx xTempDest.val,tTmp.txt,0,0
|
||||
│ + tSend.txt+=tTmp.txt
|
||||
│ + //send calc crc
|
||||
│ + btlen tSend.txt,sys0
|
||||
│ + crcrest 1,0xffff // reset CRC
|
||||
│ + crcputh 55 bb
|
||||
│ + crcputs sys0,2
|
||||
│ + crcputs tSend.txt,0
|
||||
│ + //send cmd
|
||||
│ + printh 55 bb
|
||||
│ + prints sys0,2
|
||||
│ + prints tSend.txt,0
|
||||
│ + prints crcval,2
|
||||
│
|
||||
│ Dual-state Button btUp1
|
||||
│ Attributes
|
||||
│ Scope : local
|
||||
│ Dragging : 0
|
||||
│ Disable release event after dragging: 0
|
||||
│ Send Component ID : disabled
|
||||
│ @@ -680,15 +779,36 @@
|
||||
│
|
||||
│ Events
|
||||
│ Touch Press Event
|
||||
│ if(xTempDest1.val<xTempMax1.val)
|
||||
│ {
|
||||
│ xTempDest1.val=xTempDest1.val+xTempStep1.val
|
||||
│ }
|
||||
│ - tmSendHighLow.en=1
|
||||
│ + // event,buttonPress2,entn,tempUpd,X
|
||||
│ + //craft command
|
||||
│ + tSend.txt="event,buttonPress2,"
|
||||
│ + tSend.txt+=entn.txt+","
|
||||
│ + tSend.txt+="tempUpdHighLow,"
|
||||
│ + //convert temperature
|
||||
│ + covx xTempDest1.val,tTmp.txt,0,0
|
||||
│ + tSend.txt+=tTmp.txt
|
||||
│ + tSend.txt+="|"
|
||||
│ + covx xTempDest2.val,tTmp.txt,0,0
|
||||
│ + tSend.txt+=tTmp.txt
|
||||
│ + //send calc crc
|
||||
│ + btlen tSend.txt,sys0
|
||||
│ + crcrest 1,0xffff // reset CRC
|
||||
│ + crcputh 55 bb
|
||||
│ + crcputs sys0,2
|
||||
│ + crcputs tSend.txt,0
|
||||
│ + //send cmd
|
||||
│ + printh 55 bb
|
||||
│ + prints sys0,2
|
||||
│ + prints tSend.txt,0
|
||||
│ + prints crcval,2
|
||||
│
|
||||
│ Hotspot mSwipeNext
|
||||
│ Attributes
|
||||
│ Scope : local
|
||||
│ Dragging : 0
|
||||
│ Disable release event after dragging: 0
|
||||
│ Send Component ID : disabled
|
||||
│ @@ -715,75 +835,14 @@
|
||||
│ Disable release event after dragging: 0
|
||||
│ Send Component ID : disabled
|
||||
│
|
||||
│ Events
|
||||
│ Touch Press Event
|
||||
│ click bPrev,1
|
||||
│
|
||||
│ -Timer tmSendHighLow
|
||||
│ - Attributes
|
||||
│ - Scope : local
|
||||
│ - Period (ms): 800
|
||||
│ - Enabled : no
|
||||
│ -
|
||||
│ - Events
|
||||
│ - Timer Event
|
||||
│ - // event,buttonPress2,entn,tempUpd,X
|
||||
│ - //craft command
|
||||
│ - tSend.txt="event,buttonPress2,"
|
||||
│ - tSend.txt+=entn.txt+","
|
||||
│ - tSend.txt+="tempUpdHighLow,"
|
||||
│ - //convert temperature
|
||||
│ - covx xTempDest1.val,tTmp.txt,0,0
|
||||
│ - tSend.txt+=tTmp.txt
|
||||
│ - tSend.txt+="|"
|
||||
│ - covx xTempDest2.val,tTmp.txt,0,0
|
||||
│ - tSend.txt+=tTmp.txt
|
||||
│ - //send calc crc
|
||||
│ - btlen tSend.txt,sys0
|
||||
│ - crcrest 1,0xffff // reset CRC
|
||||
│ - crcputh 55 bb
|
||||
│ - crcputs sys0,2
|
||||
│ - crcputs tSend.txt,0
|
||||
│ - //send cmd
|
||||
│ - printh 55 bb
|
||||
│ - prints sys0,2
|
||||
│ - prints tSend.txt,0
|
||||
│ - prints crcval,2
|
||||
│ - tmSendHighLow.en=0
|
||||
│ -
|
||||
│ -Timer tmSendTemp
|
||||
│ - Attributes
|
||||
│ - Scope : local
|
||||
│ - Period (ms): 800
|
||||
│ - Enabled : no
|
||||
│ -
|
||||
│ - Events
|
||||
│ - Timer Event
|
||||
│ - // event,buttonPress2,entn,tempUpd,X
|
||||
│ - //craft command
|
||||
│ - tSend.txt="event,buttonPress2,"
|
||||
│ - tSend.txt+=entn.txt+","
|
||||
│ - tSend.txt+="tempUpd,"
|
||||
│ - //convert temperature
|
||||
│ - covx xTempDest.val,tTmp.txt,0,0
|
||||
│ - tSend.txt+=tTmp.txt
|
||||
│ - //send calc crc
|
||||
│ - btlen tSend.txt,sys0
|
||||
│ - crcrest 1,0xffff // reset CRC
|
||||
│ - crcputh 55 bb
|
||||
│ - crcputs sys0,2
|
||||
│ - crcputs tSend.txt,0
|
||||
│ - //send cmd
|
||||
│ - printh 55 bb
|
||||
│ - prints sys0,2
|
||||
│ - prints tSend.txt,0
|
||||
│ - prints crcval,2
|
||||
│ - tmSendTemp.en=0
|
||||
│ -
|
||||
│ Timer tmSerial
|
||||
│ Attributes
|
||||
│ Scope : local
|
||||
│ Period (ms): 50
|
||||
│ Enabled : yes
|
||||
│
|
||||
│ Events
|
||||
│ --- HMI/n2t-out/cardGrid.txt
|
||||
├── +++ HMI/US/landscape/n2t-out/cardGrid.txt
|
||||
│ @@ -854,18 +854,14 @@
|
||||
│ {
|
||||
│ page pageStartup
|
||||
│ }
|
||||
│ if(tId.txt=="screensaver")
|
||||
│ {
|
||||
│ page screensaver
|
||||
│ }
|
||||
│ - if(tId.txt=="screensaver2")
|
||||
│ - {
|
||||
│ - page screensaver2
|
||||
│ - }
|
||||
│ if(tId.txt=="cardEntities")
|
||||
│ {
|
||||
│ page cardEntities
|
||||
│ }
|
||||
│ if(tId.txt=="cardGrid")
|
||||
│ {
|
||||
│ page cardGrid
|
||||
│ --- HMI/n2t-out/pageStartup.txt
|
||||
├── +++ HMI/US/landscape/n2t-out/pageStartup.txt
|
||||
│ @@ -173,15 +173,15 @@
|
||||
@@ -332,6 +65,25 @@
|
||||
│ crcputs sys0,2
|
||||
│ crcputs tSend.txt,0
|
||||
│ //send cmd
|
||||
│ @@ -314,18 +314,14 @@
|
||||
│ {
|
||||
│ page pageStartup
|
||||
│ }
|
||||
│ if(tId.txt=="screensaver")
|
||||
│ {
|
||||
│ page screensaver
|
||||
│ }
|
||||
│ - if(tId.txt=="screensaver2")
|
||||
│ - {
|
||||
│ - page screensaver2
|
||||
│ - }
|
||||
│ if(tId.txt=="cardEntities")
|
||||
│ {
|
||||
│ page cardEntities
|
||||
│ }
|
||||
│ if(tId.txt=="cardGrid")
|
||||
│ {
|
||||
│ page cardGrid
|
||||
│ --- HMI/n2t-out/screensaver.txt
|
||||
├── +++ HMI/US/landscape/n2t-out/screensaver.txt
|
||||
│ @@ -29,29 +29,20 @@
|
||||
@@ -364,7 +116,7 @@
|
||||
│ Max. Text Size: 25
|
||||
│
|
||||
│ Variable (string) tInstruction
|
||||
│ @@ -103,34 +94,14 @@
|
||||
│ @@ -103,24 +94,14 @@
|
||||
│ Value: 0
|
||||
│
|
||||
│ Variable (int32) ycR
|
||||
@@ -382,16 +134,6 @@
|
||||
│ - Text :
|
||||
│ - Max. Text Size : 10
|
||||
│ -
|
||||
│ - Events
|
||||
│ - Touch Press Event
|
||||
│ - if(tDate.x==0)
|
||||
│ - {
|
||||
│ - vis m0,1
|
||||
│ - }else
|
||||
│ - {
|
||||
│ - vis m0,1
|
||||
│ - }
|
||||
│ -
|
||||
│ Text t10
|
||||
│ Attributes
|
||||
│ Scope : local
|
||||
@@ -399,7 +141,7 @@
|
||||
│ Disable release event after dragging: 0
|
||||
│ Send Component ID : disabled
|
||||
│ Associated Keyboard : none
|
||||
│ @@ -380,15 +351,15 @@
|
||||
│ @@ -370,15 +351,15 @@
|
||||
│ Text tTime
|
||||
│ Attributes
|
||||
│ Scope : local
|
||||
|
||||
Reference in New Issue
Block a user