diff --git a/HMI/US/landscape/n2t-out-visual/cardEntities.txt b/HMI/US/landscape/n2t-out-visual/cardEntities.txt index 1a1748b9..8d7cac4d 100644 --- a/HMI/US/landscape/n2t-out-visual/cardEntities.txt +++ b/HMI/US/landscape/n2t-out-visual/cardEntities.txt @@ -2460,7 +2460,7 @@ Timer tmSerial // get Text (optional Value) spstr strCommand.txt,bText2.txt,"~",14 } - if(type2.txt=="button"||type2.txt=="i") + if(type2.txt=="button"||type2.txt=="input_sel") { vis bUp2,0 vis bStop2,0 diff --git a/HMI/US/landscape/n2t-out/cardEntities.txt b/HMI/US/landscape/n2t-out/cardEntities.txt index 626383e0..cfec8999 100644 --- a/HMI/US/landscape/n2t-out/cardEntities.txt +++ b/HMI/US/landscape/n2t-out/cardEntities.txt @@ -1507,7 +1507,7 @@ Timer tmSerial // get Text (optional Value) spstr strCommand.txt,bText2.txt,"~",14 } - if(type2.txt=="button"||type2.txt=="i") + if(type2.txt=="button"||type2.txt=="input_sel") { vis bUp2,0 vis bStop2,0 diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 7f83eb05..e0a36508 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -372,23 +372,6 @@ │ Disable release event after dragging: 0 │ Send Component ID : disabled │ -│ @@ -1503,15 +1740,15 @@ -│ vis hSlider2,0 -│ vis nNum2,0 -│ bText2.pco=65535 -│ bText2.pco2=65535 -│ // get Text (optional Value) -│ spstr strCommand.txt,bText2.txt,"~",14 -│ } -│ - if(type2.txt=="button"||type2.txt=="i") -│ + if(type2.txt=="button"||type2.txt=="input_sel") -│ { -│ vis bUp2,0 -│ vis bStop2,0 -│ vis bDown2,0 -│ vis btOnOff2,0 -│ vis bText2,1 -│ tsw bText2,1 │ @@ -1842,14 +2079,163 @@ │ covx tTmp.txt,sys0,0,0 │ hSlider4.minval=sys0 diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index b6fcf533..f8f90d88 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,4 +1,4 @@ -+++ /dev/fd/62 2022-10-25 17:08:32.504898978 +0000 ++++ /dev/fd/62 2022-10-25 17:27:14.174175138 +0000 +,14 +1329,45 @@ + page popupFan + if(type4.txt=="input_sel") @@ -7,23 +7,6 @@ + { + page popupInSel + } -+,15 +1740,15 @@ -+ vis hSlider2,0 -+ vis nNum2,0 -+ bText2.pco=65535 -+ bText2.pco2=65535 -+ // get Text (optional Value) -+ spstr strCommand.txt,bText2.txt,"~",14 -+ } -+ if(type2.txt=="button"||type2.txt=="i") -+ if(type2.txt=="button"||type2.txt=="input_sel") -+ { -+ vis bUp2,0 -+ vis bStop2,0 -+ vis bDown2,0 -+ vis btOnOff2,0 -+ vis bText2,1 -+ tsw bText2,1 +,14 +2079,163 @@ + if(type5.txt=="button"||type5.txt=="input_sel") + tSend.txt+="mode-preset_modes,"+tTmp.txt diff --git a/HMI/n2t-out-visual/cardEntities.txt b/HMI/n2t-out-visual/cardEntities.txt index e4b97ac1..0540f108 100644 --- a/HMI/n2t-out-visual/cardEntities.txt +++ b/HMI/n2t-out-visual/cardEntities.txt @@ -2460,7 +2460,7 @@ Timer tmSerial // get Text (optional Value) spstr strCommand.txt,bText2.txt,"~",14 } - if(type2.txt=="button"||type2.txt=="i") + if(type2.txt=="button"||type2.txt=="input_sel") { vis bUp2,0 vis bStop2,0 diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index eea5cb1c..c3e79a4b 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -62,14 +62,14 @@ cardAlarm 40 Component(s) 427 Line(s) of event code 258 Unique line(s) of event code -cardEntities - 65 Component(s) - 1153 Line(s) of event code - 527 Unique line(s) of event code cardPower 43 Component(s) 423 Line(s) of event code 293 Unique line(s) of event code +cardEntities + 65 Component(s) + 1153 Line(s) of event code + 527 Unique line(s) of event code Total 17 Page(s) diff --git a/HMI/n2t-out/cardEntities.txt b/HMI/n2t-out/cardEntities.txt index 626383e0..cfec8999 100644 --- a/HMI/n2t-out/cardEntities.txt +++ b/HMI/n2t-out/cardEntities.txt @@ -1507,7 +1507,7 @@ Timer tmSerial // get Text (optional Value) spstr strCommand.txt,bText2.txt,"~",14 } - if(type2.txt=="button"||type2.txt=="i") + if(type2.txt=="button"||type2.txt=="input_sel") { vis bUp2,0 vis bStop2,0