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

add navigation on alarm and thermo page (add nextion2text)

Browse Source
This commit is contained in:
joBr99
2022-03-31 18:20:57 +00:00
committed by GitHub Actions
parent 76d4006095
commit c7ebf1d09d
7 changed files with 546 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,105 @@
diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt
--- HMI/n2t-out/cardAlarm.txt 2022-03-31 18:20:56.082303075 +0000
+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-03-31 18:20:56.962304989 +0000
@@ -513,75 +513,48 @@
{
//entn
spstr strCommand.txt,entn.txt,",",1
- // navigation icons
- spstr strCommand.txt,tId.txt,",",2
- spstr tId.txt,tTmp.txt,"|",0
- if(tTmp.txt=="0")
- {
- vis bPrev,0
- }
- if(tTmp.txt=="1")
- {
- vis bPrev,1
- bPrev.txt=""
- }
- if(tTmp.txt=="2")
- {
- vis bPrev,1
- bPrev.txt=""
- }
- spstr tId.txt,tTmp.txt,"|",1
- if(tTmp.txt=="0")
- {
- vis bNext,0
- }
- if(tTmp.txt=="1")
- {
- vis bPrev,1
- bNext.txt=""
- }
//text arm1
- spstr strCommand.txt,arm1.txt,",",3
+ spstr strCommand.txt,arm1.txt,",",2
if(arm1.txt!="")
{
vis arm1,1
}
//id arm1
- spstr strCommand.txt,va1.txt,",",4
+ spstr strCommand.txt,va1.txt,",",3
//text arm2
- spstr strCommand.txt,arm2.txt,",",5
+ spstr strCommand.txt,arm2.txt,",",4
if(arm2.txt!="")
{
vis arm2,1
}
//id arm2
- spstr strCommand.txt,va2.txt,",",6
+ spstr strCommand.txt,va2.txt,",",5
//text arm3
- spstr strCommand.txt,arm3.txt,",",7
+ spstr strCommand.txt,arm3.txt,",",6
if(arm3.txt!="")
{
vis arm3,1
}
//id arm3
- spstr strCommand.txt,va3.txt,",",8
+ spstr strCommand.txt,va3.txt,",",7
//text arm4
- spstr strCommand.txt,arm4.txt,",",9
+ spstr strCommand.txt,arm4.txt,",",8
if(arm4.txt!="")
{
vis arm4,1
}
//id arm4
- spstr strCommand.txt,va4.txt,",",10
+ spstr strCommand.txt,va4.txt,",",9
//icon
- spstr strCommand.txt,tTmp.txt,",",11
+ spstr strCommand.txt,tTmp.txt,",",10
covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,tIcon.txt,sys0,1
//icon color
- spstr strCommand.txt,tTmp.txt,",",12
+ spstr strCommand.txt,tTmp.txt,",",11
covx tTmp.txt,sys0,0,0
tIcon.pco=sys0
//numpad status
- spstr strCommand.txt,tTmp.txt,",",13
+ spstr strCommand.txt,tTmp.txt,",",12
if(tTmp.txt!="disable")
{
vis b0,1
@@ -598,7 +571,7 @@
vis tCode,1
}
//flashing status
- spstr strCommand.txt,tTmp.txt,",",14
+ spstr strCommand.txt,tTmp.txt,",",13
if(tTmp.txt=="enable")
{
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 14:19:06.280373872 +0000
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-03-31 14:19:07.100374234 +0000
--- HMI/n2t-out/cardEntities.txt 2022-03-31 18:20:56.082303075 +0000
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-03-31 18:20:56.962304989 +0000
@@ -1120,33 +1120,6 @@
{
// command format: entityUpd,heading,navigation,[,type,internalName,iconId,displayName,optionalValue]x4
@@ -36,8 +135,8 @@ 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 14:19:06.276373870 +0000
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-03-31 14:19:07.100374234 +0000
--- HMI/n2t-out/cardGrid.txt 2022-03-31 18:20:56.082303075 +0000
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-03-31 18:20:56.962304989 +0000
@@ -568,33 +568,6 @@
{
// command format: entityUpd,heading,navigation,[,type,internalName,iconId,iconColor,displayName,optionalValue]x6
@@ -72,9 +171,94 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
// get Type
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:20:56.082303075 +0000
+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-03-31 18:20:56.962304989 +0000
@@ -501,55 +501,28 @@
spstr strCommand.txt,tInstruction.txt,",",0
if(tInstruction.txt=="entityUpd")
{
- //heading
- spstr strCommand.txt,tHeading.txt,"|",1
- // navigation icons
- spstr strCommand.txt,tId.txt,",",2
- spstr tId.txt,tTmp.txt,"|",0
- if(tTmp.txt=="0")
- {
- vis bPrev,0
- }
- if(tTmp.txt=="1")
- {
- vis bPrev,1
- bPrev.txt=""
- }
- if(tTmp.txt=="2")
- {
- vis bPrev,1
- bPrev.txt=""
- }
- spstr tId.txt,tTmp.txt,"|",1
- if(tTmp.txt=="0")
- {
- vis bNext,0
- }
- if(tTmp.txt=="1")
- {
- vis bPrev,1
- bNext.txt=""
- }
//entity name
- spstr strCommand.txt,entn.txt,"|",3
+ spstr strCommand.txt,entn.txt,"|",1
+ //heading
+ spstr strCommand.txt,tHeading.txt,"|",2
//icon
- spstr strCommand.txt,tTmp.txt,"|",4
+ spstr strCommand.txt,tTmp.txt,"|",3
covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,tIcon.txt,sys0,1
//title
- spstr strCommand.txt,tTitle.txt,"|",5
+ spstr strCommand.txt,tTitle.txt,"|",4
//author
- spstr strCommand.txt,tAuthor.txt,"|",6
+ spstr strCommand.txt,tAuthor.txt,"|",5
//volume
- spstr strCommand.txt,tTmp.txt,"|",7
+ spstr strCommand.txt,tTmp.txt,"|",6
covx tTmp.txt,sys0,0,0
hVolume.val=sys0
//icon
- spstr strCommand.txt,tTmp.txt,"|",8
+ spstr strCommand.txt,tTmp.txt,"|",7
covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,tPlayPause.txt,sys0,1
//speaker current
- spstr strCommand.txt,tSpeaker.txt,"|",9
+ spstr strCommand.txt,tSpeaker.txt,"|",8
if(tSpeaker.txt!="")
{
tSpeaker.pco=1374
@@ -558,14 +531,14 @@
tSpeaker.pco=65535
}
//speaker list
- spstr strCommand.txt,vaSpeakerList.txt,"|",10
+ spstr strCommand.txt,vaSpeakerList.txt,"|",9
if(vaSpeakerList.txt=="")
{
vis t6,0
}
vaSpeakerPos.val=0
// on off button
- spstr strCommand.txt,tTmp.txt,"|",11
+ spstr strCommand.txt,tTmp.txt,"|",10
if(tTmp.txt=="disable")
{
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 14:19:06.280373872 +0000
+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-03-31 14:19:07.100374234 +0000
--- HMI/n2t-out/cardThermo.txt 2022-03-31 18:20:56.082303075 +0000
+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-03-31 18:20:56.962304989 +0000
@@ -638,53 +638,26 @@
spstr strCommand.txt,tInstruction.txt,",",0
if(tInstruction.txt=="entityUpd")