diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 33513534..ed013200 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -13,6 +13,25 @@ │ - lcd_dev fffb 0002 0000 0020 │ + //lcd_dev fffb 0002 0000 0020 │ page pageStartup +│ --- HMI/n2t-out/cardQR.txt +├── +++ HMI/US/landscape/n2t-out/cardQR.txt +│ @@ -751,15 +751,15 @@ +│ if(sleepTimeout!=0&&dimValue!=dim) +│ { +│ sleepValue+=1 +│ if(sleepTimeout<=sleepValue) +│ { +│ sleepValue=0 +│ dim=dimValue +│ - tSend.txt="event,sleepReached,cardQR" +│ + tSend.txt="event,sleepReached,cardAlarm" +│ //send calc crc +│ btlen tSend.txt,sys0 +│ crcrest 1,0xffff // reset CRC +│ crcputh 55 bb +│ crcputs sys0,2 +│ crcputs tSend.txt,0 +│ //send cmd │ --- HMI/n2t-out/pageStartup.txt ├── +++ HMI/US/landscape/n2t-out/pageStartup.txt │ @@ -179,15 +179,15 @@ @@ -163,6 +182,34 @@ │ Disable release event after dragging: 0 │ Send Component ID : disabled │ Associated Keyboard : none +│ @@ -442,25 +418,25 @@ +│ Attributes +│ Scope : local +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ Associated Keyboard : none +│ Text : +│ - Max. Text Size : 16 +│ + Max. Text Size : 10 +│ +│ Text tIcon2 +│ Attributes +│ Scope : local +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ Associated Keyboard : none +│ Text : +│ - Max. Text Size : 16 +│ + Max. Text Size : 10 +│ +│ Text tMainIcon +│ Attributes +│ Scope : local +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled │ @@ -614,15 +590,14 @@ │ if(tTmp.txt!="") │ { diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 3824b254..37ac846e 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -1380,6 +1380,25 @@ │ Scope : local │ Period (ms): 50 │ Enabled : yes +│ --- HMI/n2t-out/cardQR.txt +├── +++ HMI/US/portrait/n2t-out/cardQR.txt +│ @@ -751,15 +751,15 @@ +│ if(sleepTimeout!=0&&dimValue!=dim) +│ { +│ sleepValue+=1 +│ if(sleepTimeout<=sleepValue) +│ { +│ sleepValue=0 +│ dim=dimValue +│ - tSend.txt="event,sleepReached,cardQR" +│ + tSend.txt="event,sleepReached,cardAlarm" +│ //send calc crc +│ btlen tSend.txt,sys0 +│ crcrest 1,0xffff // reset CRC +│ crcputh 55 bb +│ crcputs sys0,2 +│ crcputs tSend.txt,0 +│ //send cmd │ --- HMI/n2t-out/pageStartup.txt ├── +++ HMI/US/portrait/n2t-out/pageStartup.txt │ @@ -35,20 +35,14 @@ @@ -1549,6 +1568,34 @@ │ Disable release event after dragging: 0 │ Send Component ID : disabled │ Associated Keyboard : none +│ @@ -442,25 +418,25 @@ +│ Attributes +│ Scope : local +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ Associated Keyboard : none +│ Text : +│ - Max. Text Size : 16 +│ + Max. Text Size : 10 +│ +│ Text tIcon2 +│ Attributes +│ Scope : local +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ Associated Keyboard : none +│ Text : +│ - Max. Text Size : 16 +│ + Max. Text Size : 10 +│ +│ Text tMainIcon +│ Attributes +│ Scope : local +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled │ @@ -614,15 +590,14 @@ │ if(tTmp.txt!="") │ { diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index a5919935..398b01e4 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,4 +1,4 @@ -+++ /dev/fd/62 2023-02-27 18:57:41.462287194 +0000 ++++ /dev/fd/62 2023-03-25 14:31:18.150326646 +0000 +I/n2t-out/Program.s.txt ++ HMI/US/portrait/n2t-out/Program.s.txt +I/n2t-out/cardEntities.txt @@ -800,6 +800,25 @@ + Scope : local + Period (ms): 50 + Enabled : yes ++I/n2t-out/cardQR.txt +++ HMI/US/portrait/n2t-out/cardQR.txt ++15 +751,15 @@ ++ if(sleepTimeout!=0&&dimValue!=dim) ++ { ++ sleepValue+=1 ++ if(sleepTimeout<=sleepValue) ++ { ++ sleepValue=0 ++ dim=dimValue ++ tSend.txt="event,sleepReached,cardQR" ++ tSend.txt="event,sleepReached,cardAlarm" ++ //send calc crc ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++ crcputs sys0,2 ++ crcputs tSend.txt,0 ++ //send cmd +I/n2t-out/pageStartup.txt ++ HMI/US/portrait/n2t-out/pageStartup.txt +0 +35,14 @@ @@ -935,6 +954,34 @@ + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none ++25 +418,25 @@ ++ributes ++ Scope : local ++ Dragging : 0 ++ Disable release event after dragging: 0 ++ Send Component ID : disabled ++ Associated Keyboard : none ++ Text : ++ Max. Text Size : 16 ++ Max. Text Size : 10 ++ ++con2 ++ributes ++ Scope : local ++ Dragging : 0 ++ Disable release event after dragging: 0 ++ Send Component ID : disabled ++ Associated Keyboard : none ++ Text : ++ Max. Text Size : 16 ++ Max. Text Size : 10 ++ ++ainIcon ++ributes ++ Scope : local ++ Dragging : 0 ++ Disable release event after dragging: 0 ++ Send Component ID : disabled +15 +590,14 @@ + if(tTmp.txt!="") + { diff --git a/HMI/n2t-out-visual/cardQR.txt b/HMI/n2t-out-visual/cardQR.txt index c50d2eb3..e2263b41 100644 --- a/HMI/n2t-out-visual/cardQR.txt +++ b/HMI/n2t-out-visual/cardQR.txt @@ -1057,7 +1057,7 @@ Timer tmSleep { sleepValue=0 dim=dimValue - tSend.txt="event,sleepReached,cardAlarm" + tSend.txt="event,sleepReached,cardQR" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index c59a98aa..80b7e8c9 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -10,10 +10,6 @@ popupThermo 44 Component(s) 519 Line(s) of event code 274 Unique line(s) of event code -cardQR - 34 Component(s) - 406 Line(s) of event code - 236 Unique line(s) of event code pageStartup 20 Component(s) 189 Line(s) of event code @@ -50,6 +46,10 @@ cardThermo 57 Component(s) 536 Line(s) of event code 317 Unique line(s) of event code +cardQR + 34 Component(s) + 406 Line(s) of event code + 236 Unique line(s) of event code popupInSel 34 Component(s) 617 Line(s) of event code @@ -66,10 +66,6 @@ cardMedia 59 Component(s) 645 Line(s) of event code 320 Unique line(s) of event code -screensaver2 - 59 Component(s) - 354 Line(s) of event code - 251 Unique line(s) of event code cardPower 54 Component(s) 523 Line(s) of event code @@ -86,9 +82,13 @@ cardEntities 67 Component(s) 1166 Line(s) of event code 530 Unique line(s) of event code +screensaver2 + 59 Component(s) + 354 Line(s) of event code + 251 Unique line(s) of event code Total 21 Page(s) 802 Component(s) 9246 Line(s) of event code - 2340 Unique line(s) of event code + 2341 Unique line(s) of event code diff --git a/HMI/n2t-out-visual/screensaver2.txt b/HMI/n2t-out-visual/screensaver2.txt index 74b15096..47be6e94 100644 --- a/HMI/n2t-out-visual/screensaver2.txt +++ b/HMI/n2t-out-visual/screensaver2.txt @@ -1124,7 +1124,7 @@ Text tIcon1 Vertical Alignment : top Input Type : character Text : - Max. Text Size : 10 + Max. Text Size : 16 Word wrap : disabled Horizontal Spacing : 0 Vertical Spacing : 0 @@ -1154,7 +1154,7 @@ Text tIcon2 Vertical Alignment : top Input Type : character Text : - Max. Text Size : 10 + Max. Text Size : 16 Word wrap : disabled Horizontal Spacing : 0 Vertical Spacing : 0 diff --git a/HMI/n2t-out/cardQR.txt b/HMI/n2t-out/cardQR.txt index e7e72c41..29dc5560 100644 --- a/HMI/n2t-out/cardQR.txt +++ b/HMI/n2t-out/cardQR.txt @@ -755,7 +755,7 @@ Timer tmSleep { sleepValue=0 dim=dimValue - tSend.txt="event,sleepReached,cardAlarm" + tSend.txt="event,sleepReached,cardQR" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff --git a/HMI/n2t-out/screensaver2.txt b/HMI/n2t-out/screensaver2.txt index 97cec7c3..25169335 100644 --- a/HMI/n2t-out/screensaver2.txt +++ b/HMI/n2t-out/screensaver2.txt @@ -446,7 +446,7 @@ Text tIcon1 Send Component ID : disabled Associated Keyboard : none Text : - Max. Text Size : 10 + Max. Text Size : 16 Text tIcon2 Attributes @@ -456,7 +456,7 @@ Text tIcon2 Send Component ID : disabled Associated Keyboard : none Text : - Max. Text Size : 10 + Max. Text Size : 16 Text tMainIcon Attributes