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

Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui

Browse Source
This commit is contained in:
Johannes
2022-03-31 20:53:14 +02:00
parent 979c2587bb b24405e579
commit c17b95dca7
13 changed files with 266 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

108
HMI/US/landscape/diff-eu-version.txt
View File

@@ -1,6 +1,6 @@
diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt
--- HMI/n2t-out/cardAlarm.txt 2022-03-31 18:35:24.383440514 +0000
+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-03-31 18:35:25.187449610 +0000
--- HMI/n2t-out/cardAlarm.txt 2022-03-31 18:39:20.775930111 +0000
+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-03-31 18:39:21.711985254 +0000
@@ -17,6 +17,7 @@
vis tInstruction,0
vis tTmp,0
@@ -9,7 +9,21 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt
vis arm1,0
vis arm2,0
vis arm3,0
@@ -512,75 +513,48 @@
@@ -170,12 +171,7 @@
Events
Touch Press Event
- tSend.txt="event,buttonPress2,cardAlarm,"
- if(bPrev.txt=="")
- {
- tSend.txt+="bUp"
- }
- tSend.txt+="bPrev"
+ tSend.txt="event,buttonPress2,cardAlarm,bPrev"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -517,75 +513,48 @@
{
//entn
spstr strCommand.txt,entn.txt,",",1
@@ -96,7 +110,7 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt
if(tTmp.txt!="disable")
{
vis b0,1
@@ -595,23 +569,9 @@
@@ -600,23 +569,9 @@
vis b9,1
vis b10,1
vis tCode,1
@@ -122,9 +136,23 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt
{
tmFlash.en=1
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-03-31 18:35:24.387440559 +0000
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-03-31 18:35:25.187449610 +0000
@@ -1120,33 +1120,6 @@
--- HMI/n2t-out/cardEntities.txt 2022-03-31 18:39:20.775930111 +0000
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-03-31 18:39:21.711985254 +0000
@@ -714,12 +714,7 @@
Events
Touch Press Event
- tSend.txt="event,buttonPress2,cardEntities,"
- if(bPrev.txt=="")
- {
- tSend.txt+="bUp"
- }
- tSend.txt+="bPrev"
+ tSend.txt="event,buttonPress2,cardEntities,bPrev"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -1125,33 +1120,6 @@
{
// command format: entityUpd,heading,navigation,[,type,internalName,iconId,displayName,optionalValue]x4
spstr strCommand.txt,tHeading.txt,",",1
@@ -159,9 +187,23 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
spstr strCommand.txt,type1.txt,",",3
// get internal name
diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
--- HMI/n2t-out/cardGrid.txt 2022-03-31 18:35:24.383440514 +0000
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-03-31 18:35:25.187449610 +0000
@@ -568,33 +568,6 @@
--- HMI/n2t-out/cardGrid.txt 2022-03-31 18:39:20.775930111 +0000
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-03-31 18:39:21.711985254 +0000
@@ -242,12 +242,7 @@
Events
Touch Press Event
- tSend.txt="event,buttonPress2,cardGrid,"
- if(bPrev.txt=="")
- {
- tSend.txt+="bUp"
- }
- tSend.txt+="bPrev"
+ tSend.txt="event,buttonPress2,cardGrid,bPrev"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -573,33 +568,6 @@
{
// command format: entityUpd,heading,navigation,[,type,internalName,iconId,iconColor,displayName,optionalValue]x6
spstr strCommand.txt,tHeading.txt,",",1
@@ -196,9 +238,23 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
spstr strCommand.txt,type1.txt,",",3
// get internal name
diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt
--- HMI/n2t-out/cardMedia.txt 2022-03-31 18:35:24.387440559 +0000
+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-03-31 18:35:25.187449610 +0000
@@ -501,55 +501,28 @@
--- HMI/n2t-out/cardMedia.txt 2022-03-31 18:39:20.775930111 +0000
+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-03-31 18:39:21.711985254 +0000
@@ -435,12 +435,7 @@
Events
Touch Press Event
- tSend.txt="event,buttonPress2,cardMedia,"
- if(bPrev.txt=="")
- {
- tSend.txt+="bUp"
- }
- tSend.txt+="bPrev"
+ tSend.txt="event,buttonPress2,cardMedia,bPrev"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -506,55 +501,28 @@
spstr strCommand.txt,tInstruction.txt,",",0
if(tInstruction.txt=="entityUpd")
{
@@ -263,7 +319,7 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt
if(tSpeaker.txt!="")
{
tSpeaker.pco=1374
@@ -558,14 +531,14 @@
@@ -563,14 +531,14 @@
tSpeaker.pco=65535
}
//speaker list
@@ -281,9 +337,23 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt
{
vis t5,0
diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
--- HMI/n2t-out/cardThermo.txt 2022-03-31 18:35:24.383440514 +0000
+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-03-31 18:35:25.187449610 +0000
@@ -638,53 +638,26 @@
--- HMI/n2t-out/cardThermo.txt 2022-03-31 18:39:20.775930111 +0000
+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-03-31 18:39:21.711985254 +0000
@@ -329,12 +329,7 @@
Events
Touch Press Event
- tSend.txt="event,buttonPress2,cardThermo,"
- if(bPrev.txt=="")
- {
- tSend.txt+="bUp"
- }
- tSend.txt+="bPrev"
+ tSend.txt="event,buttonPress2,cardThermo,bPrev"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -643,53 +638,26 @@
spstr strCommand.txt,tInstruction.txt,",",0
if(tInstruction.txt=="entityUpd")
{
@@ -346,7 +416,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
covx tTmp.txt,xTempStep.val,0,0
// disable all buttons
vis bt0,0
@@ -697,160 +670,190 @@
@@ -702,160 +670,190 @@
vis bt7,0
vis bt8,0
//bt0
@@ -581,7 +651,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
if(tInstruction.txt=="pageType")
{
//command format pageType,specialPageName
@@ -906,28 +909,6 @@
@@ -911,28 +909,6 @@
page cardAlarm
}
}