diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 2f7e31e1..cb014af3 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -48,146 +48,6 @@ │ } │ } │ } -├── cardEntities.txt -│ @@ -782,15 +782,15 @@ -│ Attributes -│ Scope : local -│ Dragging : 0 -│ Disable release event after dragging: 0 -│ Send Component ID : disabled -│ State : unpressed -│ Text : -│ - Max. Text Size : 45 -│ + Max. Text Size : 40 -│ -│ Events -│ Touch Press Event -│ tSend.txt="event,buttonPress2,"+entn1.txt+",button" -│ //send calc crc -│ btlen tSend.txt,sys0 -│ crcrest 1,0xffff // reset CRC -│ @@ -807,15 +807,15 @@ -│ Attributes -│ Scope : local -│ Dragging : 0 -│ Disable release event after dragging: 0 -│ Send Component ID : disabled -│ State : unpressed -│ Text : -│ - Max. Text Size : 45 -│ + Max. Text Size : 40 -│ -│ Events -│ Touch Press Event -│ tSend.txt="event,buttonPress2,"+entn2.txt+",button" -│ //send calc crc -│ btlen tSend.txt,sys0 -│ crcrest 1,0xffff // reset CRC -│ @@ -832,15 +832,15 @@ -│ Attributes -│ Scope : local -│ Dragging : 0 -│ Disable release event after dragging: 0 -│ Send Component ID : disabled -│ State : unpressed -│ Text : -│ - Max. Text Size : 45 -│ + Max. Text Size : 40 -│ -│ Events -│ Touch Press Event -│ tSend.txt="event,buttonPress2,"+entn3.txt+",button" -│ //send calc crc -│ btlen tSend.txt,sys0 -│ crcrest 1,0xffff // reset CRC -│ @@ -857,15 +857,15 @@ -│ Attributes -│ Scope : local -│ Dragging : 0 -│ Disable release event after dragging: 0 -│ Send Component ID : disabled -│ State : unpressed -│ Text : -│ - Max. Text Size : 45 -│ + Max. Text Size : 40 -│ -│ Events -│ Touch Press Event -│ tSend.txt="event,buttonPress2,"+entn4.txt+",button" -│ //send calc crc -│ btlen tSend.txt,sys0 -│ crcrest 1,0xffff // reset CRC -│ @@ -1837,15 +1837,14 @@ -│ //command format pageType,specialPageName -│ //write name of speical page to tId -│ spstr strCommand.txt,tId.txt,"~",1 -│ //save second arg if there's one -│ spstr strCommand.txt,tTmp.txt,"~",2 -│ //save third arg if there's one -│ spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 -│ - spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4 -│ //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... -│ udelete payloadLength-1 -│ bufferPos=0 -│ if(tId.txt=="pageStartup") -│ { -│ page pageStartup -│ } -│ @@ -1887,18 +1886,14 @@ -│ { -│ page cardAlarm -│ } -│ if(tId.txt=="cardQR") -│ { -│ page cardQR -│ } -│ - if(tId.txt=="cardPower") -│ - { -│ - page cardPower -│ - } -│ } -│ if(tInstruction.txt=="time") -│ { -│ // get set time to global variable -│ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 -│ } -│ if(tInstruction.txt=="date") -├── cardGrid.txt -│ @@ -789,15 +789,14 @@ -│ //command format pageType,specialPageName -│ //write name of speical page to tId -│ spstr strCommand.txt,tId.txt,"~",1 -│ //save second arg if there's one -│ spstr strCommand.txt,tTmp.txt,"~",2 -│ //save third arg if there's one -│ spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 -│ - spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4 -│ //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... -│ udelete payloadLength-1 -│ bufferPos=0 -│ if(tId.txt=="pageStartup") -│ { -│ page pageStartup -│ } -│ @@ -839,18 +838,14 @@ -│ { -│ page cardAlarm -│ } -│ if(tId.txt=="cardQR") -│ { -│ page cardQR -│ } -│ - if(tId.txt=="cardPower") -│ - { -│ - page cardPower -│ - } -│ } -│ if(tInstruction.txt=="time") -│ { -│ // get set time to global variable -│ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 -│ } -│ if(tInstruction.txt=="date") ├── pageStartup.txt │ @@ -173,15 +173,15 @@ │ Max. Text Size : 10 diff --git a/HMI/US/landscape/n2t-out-visual/cardEntities.txt b/HMI/US/landscape/n2t-out-visual/cardEntities.txt index f633ff32..4ee581fb 100644 --- a/HMI/US/landscape/n2t-out-visual/cardEntities.txt +++ b/HMI/US/landscape/n2t-out-visual/cardEntities.txt @@ -1525,7 +1525,7 @@ Button bText1 Vertical Alignment : center State : unpressed Text : - Max. Text Size : 40 + Max. Text Size : 45 Word wrap : enabled Horizontal Spacing : 0 Vertical Spacing : 0 @@ -1572,7 +1572,7 @@ Button bText2 Vertical Alignment : center State : unpressed Text : - Max. Text Size : 40 + Max. Text Size : 45 Word wrap : enabled Horizontal Spacing : 0 Vertical Spacing : 0 @@ -1619,7 +1619,7 @@ Button bText3 Vertical Alignment : center State : unpressed Text : - Max. Text Size : 40 + Max. Text Size : 45 Word wrap : enabled Horizontal Spacing : 0 Vertical Spacing : 0 @@ -1666,7 +1666,7 @@ Button bText4 Vertical Alignment : center State : unpressed Text : - Max. Text Size : 40 + Max. Text Size : 45 Word wrap : enabled Horizontal Spacing : 0 Vertical Spacing : 0 @@ -2794,6 +2794,7 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",2 //save third arg if there's one spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 + spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4 //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... udelete payloadLength-1 bufferPos=0 @@ -2843,6 +2844,10 @@ Timer tmSerial { page cardQR } + if(tId.txt=="cardPower") + { + page cardPower + } } if(tInstruction.txt=="time") { diff --git a/HMI/US/landscape/n2t-out-visual/cardGrid.txt b/HMI/US/landscape/n2t-out-visual/cardGrid.txt index 3665beea..e6523fd6 100644 --- a/HMI/US/landscape/n2t-out-visual/cardGrid.txt +++ b/HMI/US/landscape/n2t-out-visual/cardGrid.txt @@ -1238,6 +1238,7 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",2 //save third arg if there's one spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 + spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4 //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... udelete payloadLength-1 bufferPos=0 @@ -1287,6 +1288,10 @@ Timer tmSerial { page cardQR } + if(tId.txt=="cardPower") + { + page cardPower + } } if(tInstruction.txt=="time") { diff --git a/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt b/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt index 452d73a6..363da6cb 100644 --- a/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt +++ b/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt @@ -36,8 +36,8 @@ pageTest 14 Unique line(s) of event code cardGrid 42 Component(s) - 469 Line(s) of event code - 278 Unique line(s) of event code + 474 Line(s) of event code + 281 Unique line(s) of event code cardPower 43 Component(s) 420 Line(s) of event code @@ -54,17 +54,17 @@ screensaver 38 Component(s) 338 Line(s) of event code 262 Unique line(s) of event code -cardEntities - 65 Component(s) - 1132 Line(s) of event code - 519 Unique line(s) of event code cardThermo 52 Component(s) 585 Line(s) of event code 306 Unique line(s) of event code +cardEntities + 65 Component(s) + 1137 Line(s) of event code + 522 Unique line(s) of event code Total 15 Page(s) 482 Component(s) - 5724 Line(s) of event code + 5734 Line(s) of event code 1546 Unique line(s) of event code diff --git a/HMI/US/landscape/n2t-out/cardEntities.txt b/HMI/US/landscape/n2t-out/cardEntities.txt index c6e48de5..b5bf9ad0 100644 --- a/HMI/US/landscape/n2t-out/cardEntities.txt +++ b/HMI/US/landscape/n2t-out/cardEntities.txt @@ -786,7 +786,7 @@ Button bText1 Send Component ID : disabled State : unpressed Text : - Max. Text Size : 40 + Max. Text Size : 45 Events Touch Press Event @@ -811,7 +811,7 @@ Button bText2 Send Component ID : disabled State : unpressed Text : - Max. Text Size : 40 + Max. Text Size : 45 Events Touch Press Event @@ -836,7 +836,7 @@ Button bText3 Send Component ID : disabled State : unpressed Text : - Max. Text Size : 40 + Max. Text Size : 45 Events Touch Press Event @@ -861,7 +861,7 @@ Button bText4 Send Component ID : disabled State : unpressed Text : - Max. Text Size : 40 + Max. Text Size : 45 Events Touch Press Event @@ -1841,6 +1841,7 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",2 //save third arg if there's one spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 + spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4 //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... udelete payloadLength-1 bufferPos=0 @@ -1890,6 +1891,10 @@ Timer tmSerial { page cardQR } + if(tId.txt=="cardPower") + { + page cardPower + } } if(tInstruction.txt=="time") { diff --git a/HMI/US/landscape/n2t-out/cardGrid.txt b/HMI/US/landscape/n2t-out/cardGrid.txt index 6e87d7b0..a88bb892 100644 --- a/HMI/US/landscape/n2t-out/cardGrid.txt +++ b/HMI/US/landscape/n2t-out/cardGrid.txt @@ -793,6 +793,7 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",2 //save third arg if there's one spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 + spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4 //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... udelete payloadLength-1 bufferPos=0 @@ -842,6 +843,10 @@ Timer tmSerial { page cardQR } + if(tId.txt=="cardPower") + { + page cardPower + } } if(tInstruction.txt=="time") { diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index ab7d76e4..231a5cf0 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,4 +1,4 @@ -+++ /dev/fd/62 2022-10-08 22:15:32.998264146 +0000 ++++ /dev/fd/62 2022-10-08 22:37:22.226531609 +0000 +rdAlarm.txt +15 +784,14 @@ + //command format pageType,specialPageName