diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 3b11ea3b..f9316357 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -1047,51 +1047,6 @@ │ //command format pageType,specialPageName │ //write name of speical page to tId │ spstr strCommand.txt,tId.txt,"~",1 -│ --- HMI/n2t-out/cardPower.txt -├── +++ HMI/US/portrait/n2t-out/cardPower.txt -│ @@ -891,18 +891,14 @@ -│ { -│ page cardPower -│ } -│ if(tId.txt=="cardChart") -│ { -│ page cardChart -│ } -│ - if(tId.txt=="cardLChart") -│ - { -│ - page cardLChart -│ - } -│ } -│ if(tInstruction.txt=="time") -│ { -│ // get set time to global variable -│ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 -│ } -│ if(tInstruction.txt=="date") -│ --- HMI/n2t-out/cardQR.txt -├── +++ HMI/US/portrait/n2t-out/cardQR.txt -│ @@ -602,19 +602,19 @@ -│ // get Text (optional Value) -│ spstr strCommand.txt,bText2.txt,"~",26 -│ } -│ if(type2.txt=="delete"||type2.txt=="") -│ { -│ if(type1.txt=="delete"||type1.txt=="") -│ { -│ - qrcode m1.x,m1.y,200,defaultBcoColor,65535,-1,vaQR.txt -│ + qrcode m1.x,m1.y,200,6371,65535,-1,vaQR.txt -│ } -│ }else -│ { -│ - qrcode m0.x,m0.y,200,defaultBcoColor,65535,-1,vaQR.txt -│ + qrcode m0.x,m0.y,200,6371,65535,-1,vaQR.txt -│ } -│ } -│ if(tInstruction.txt=="time") -│ { -│ // get set time to global variable -│ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 -│ } │ --- HMI/n2t-out/pageStartup.txt ├── +++ HMI/US/portrait/n2t-out/pageStartup.txt │ @@ -35,20 +35,14 @@ @@ -1151,7 +1106,7 @@ │ //send cmd │ --- HMI/n2t-out/screensaver.txt ├── +++ HMI/US/portrait/n2t-out/screensaver.txt -│ @@ -29,22 +29,19 @@ +│ @@ -29,17 +29,14 @@ │ } │ tDate.txt=pageIcons.vaDate.txt │ dim=dimValue @@ -1166,15 +1121,9 @@ │ Attributes │ Scope : local │ Text : -│ - Max. Text Size: 400 -│ + Max. Text Size: 200 +│ Max. Text Size: 400 │ │ Variable (string) strTmp -│ Attributes -│ Scope : local -│ Text : -│ Max. Text Size: 2 -│ │ @@ -103,35 +100,14 @@ │ Value: 0 │ diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 3625fd9b..2297887a 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,4 +1,4 @@ -+++ /dev/fd/62 2023-01-24 17:39:56.497711621 +0000 ++++ /dev/fd/62 2023-01-24 18:23:47.994140804 +0000 +I/n2t-out/Program.s.txt ++ HMI/US/portrait/n2t-out/Program.s.txt +I/n2t-out/cardEntities.txt @@ -54,13 +54,13 @@ +ributes + Scope : local + Text : -+ Max. Text Size: 80 + Max. Text Size: 40 + +e (string) nent2 +ributes + Scope : local + Text : ++ Max. Text Size: 80 + Max. Text Size: 40 +14 +186,26 @@ +e (string) type6 @@ -466,51 +466,6 @@ + covx tTmp.txt,sys0,0,0 + hSlider6.maxval=sys0 + } -+I/n2t-out/cardPower.txt -++ HMI/US/portrait/n2t-out/cardPower.txt -+18 +891,14 @@ -+ { -+ page cardPower -+ } -+ if(tId.txt=="cardChart") -+ { -+ page cardChart -+ } -+ if(tId.txt=="cardLChart") -+ { -+ page cardLChart -+ } -+ } -+ if(tInstruction.txt=="time") -+ { -+ // get set time to global variable -+ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 -+ } -+ if(tInstruction.txt=="date") -+I/n2t-out/cardQR.txt -++ HMI/US/portrait/n2t-out/cardQR.txt -+19 +602,19 @@ -+ // get Text (optional Value) -+ spstr strCommand.txt,bText2.txt,"~",26 -+ } -+ if(type2.txt=="delete"||type2.txt=="") -+ { -+ if(type1.txt=="delete"||type1.txt=="") -+ { -+ qrcode m1.x,m1.y,200,defaultBcoColor,65535,-1,vaQR.txt -+ qrcode m1.x,m1.y,200,6371,65535,-1,vaQR.txt -+ } -+ }else -+ { -+ qrcode m0.x,m0.y,200,defaultBcoColor,65535,-1,vaQR.txt -+ qrcode m0.x,m0.y,200,6371,65535,-1,vaQR.txt -+ } -+ } -+ if(tInstruction.txt=="time") -+ { -+ // get set time to global variable -+ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 -+ } +I/n2t-out/pageStartup.txt ++ HMI/US/portrait/n2t-out/pageStartup.txt +0 +35,14 @@ @@ -536,7 +491,7 @@ + Associated Keyboard : none +I/n2t-out/screensaver.txt ++ HMI/US/portrait/n2t-out/screensaver.txt -+2 +29,19 @@ ++7 +29,14 @@ + } + tDate.txt=pageIcons.vaDate.txt + dim=dimValue @@ -552,14 +507,8 @@ + Scope : local + Text : + Max. Text Size: 400 -+ Max. Text Size: 200 + +e (string) strTmp -+ributes -+ Scope : local -+ Text : -+ Max. Text Size: 2 -+ +35 +100,14 @@ + Value: 0 + diff --git a/HMI/US/portrait/n2t-out-visual/cardPower.txt b/HMI/US/portrait/n2t-out-visual/cardPower.txt index 21e438c6..8e1bfae9 100644 --- a/HMI/US/portrait/n2t-out-visual/cardPower.txt +++ b/HMI/US/portrait/n2t-out-visual/cardPower.txt @@ -1463,6 +1463,10 @@ Timer tmSerial { page cardChart } + if(tId.txt=="cardLChart") + { + page cardLChart + } } if(tInstruction.txt=="time") { diff --git a/HMI/US/portrait/n2t-out-visual/cardQR.txt b/HMI/US/portrait/n2t-out-visual/cardQR.txt index 7ff9eaca..ccc6dfe2 100644 --- a/HMI/US/portrait/n2t-out-visual/cardQR.txt +++ b/HMI/US/portrait/n2t-out-visual/cardQR.txt @@ -907,11 +907,11 @@ Timer tmSerial { if(type1.txt=="delete"||type1.txt=="") { - qrcode m1.x,m1.y,200,6371,65535,-1,vaQR.txt + qrcode m1.x,m1.y,200,defaultBcoColor,65535,-1,vaQR.txt } }else { - qrcode m0.x,m0.y,200,6371,65535,-1,vaQR.txt + qrcode m0.x,m0.y,200,defaultBcoColor,65535,-1,vaQR.txt } } if(tInstruction.txt=="time") diff --git a/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt b/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt index dc930ab8..5e50319d 100644 --- a/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt +++ b/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt @@ -22,18 +22,14 @@ popupFan 27 Component(s) 351 Line(s) of event code 204 Unique line(s) of event code -cardQR - 34 Component(s) - 402 Line(s) of event code - 234 Unique line(s) of event code pageStartup 19 Component(s) 185 Line(s) of event code 131 Unique line(s) of event code -screensaver - 46 Component(s) - 418 Line(s) of event code - 299 Unique line(s) of event code +cardQR + 34 Component(s) + 402 Line(s) of event code + 234 Unique line(s) of event code cardGrid 44 Component(s) 515 Line(s) of event code @@ -62,6 +58,10 @@ cardLChart 33 Component(s) 408 Line(s) of event code 268 Unique line(s) of event code +screensaver + 46 Component(s) + 418 Line(s) of event code + 299 Unique line(s) of event code popupTimer 42 Component(s) 512 Line(s) of event code @@ -76,8 +76,8 @@ popupInSel 295 Unique line(s) of event code cardPower 48 Component(s) - 483 Line(s) of event code - 324 Unique line(s) of event code + 487 Line(s) of event code + 326 Unique line(s) of event code cardEntities 91 Component(s) 1622 Line(s) of event code @@ -86,5 +86,5 @@ cardEntities Total 20 Page(s) 747 Component(s) - 9215 Line(s) of event code + 9219 Line(s) of event code 2390 Unique line(s) of event code diff --git a/HMI/US/portrait/n2t-out-visual/screensaver.txt b/HMI/US/portrait/n2t-out-visual/screensaver.txt index f51de876..b47bd04c 100644 --- a/HMI/US/portrait/n2t-out-visual/screensaver.txt +++ b/HMI/US/portrait/n2t-out-visual/screensaver.txt @@ -46,7 +46,7 @@ Variable (string) strCommand ID : 4 Scope : local Text : - Max. Text Size: 200 + Max. Text Size: 400 Variable (string) strTmp Attributes diff --git a/HMI/US/portrait/n2t-out/cardPower.txt b/HMI/US/portrait/n2t-out/cardPower.txt index 99e977d4..adea13c4 100644 --- a/HMI/US/portrait/n2t-out/cardPower.txt +++ b/HMI/US/portrait/n2t-out/cardPower.txt @@ -895,6 +895,10 @@ Timer tmSerial { page cardChart } + if(tId.txt=="cardLChart") + { + page cardLChart + } } if(tInstruction.txt=="time") { diff --git a/HMI/US/portrait/n2t-out/cardQR.txt b/HMI/US/portrait/n2t-out/cardQR.txt index ebf2df3b..7855710f 100644 --- a/HMI/US/portrait/n2t-out/cardQR.txt +++ b/HMI/US/portrait/n2t-out/cardQR.txt @@ -606,11 +606,11 @@ Timer tmSerial { if(type1.txt=="delete"||type1.txt=="") { - qrcode m1.x,m1.y,200,6371,65535,-1,vaQR.txt + qrcode m1.x,m1.y,200,defaultBcoColor,65535,-1,vaQR.txt } }else { - qrcode m0.x,m0.y,200,6371,65535,-1,vaQR.txt + qrcode m0.x,m0.y,200,defaultBcoColor,65535,-1,vaQR.txt } } if(tInstruction.txt=="time") diff --git a/HMI/US/portrait/n2t-out/screensaver.txt b/HMI/US/portrait/n2t-out/screensaver.txt index 1a45ee61..217b04c1 100644 --- a/HMI/US/portrait/n2t-out/screensaver.txt +++ b/HMI/US/portrait/n2t-out/screensaver.txt @@ -37,7 +37,7 @@ Variable (string) strCommand Attributes Scope : local Text : - Max. Text Size: 200 + Max. Text Size: 400 Variable (string) strTmp Attributes