diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index e95daf0d..e71cdc7a 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -1,6 +1,6 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt ---- HMI/n2t-out/Program.s.txt 2022-06-05 14:52:19.480211048 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-05 14:52:20.324222977 +0000 +--- HMI/n2t-out/Program.s.txt 2022-06-06 12:47:19.779824907 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-06 12:47:20.835832380 +0000 @@ -11,6 +11,4 @@ // dim value int dimValue=40 @@ -9,8 +9,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt - lcd_dev fffb 0002 0000 0020 page pageStartup diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-06-05 14:52:19.480211048 +0000 -+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-06-05 14:52:20.324222977 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-06-06 12:47:19.783824935 +0000 ++++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-06-06 12:47:20.835832380 +0000 @@ -1925,10 +1925,6 @@ // get value spstr strCommand.txt,tTmp.txt,"~",1 @@ -23,8 +23,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt ---- HMI/n2t-out/cardGrid.txt 2022-06-05 14:52:19.480211048 +0000 -+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-06-05 14:52:20.324222977 +0000 +--- HMI/n2t-out/cardGrid.txt 2022-06-06 12:47:19.783824935 +0000 ++++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-06-06 12:47:20.835832380 +0000 @@ -846,10 +846,6 @@ // get value spstr strCommand.txt,tTmp.txt,"~",1 @@ -37,8 +37,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt ---- HMI/n2t-out/cardMedia.txt 2022-06-05 14:52:19.480211048 +0000 -+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-06-05 14:52:20.324222977 +0000 +--- HMI/n2t-out/cardMedia.txt 2022-06-06 12:47:19.783824935 +0000 ++++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-06-06 12:47:20.835832380 +0000 @@ -45,12 +45,6 @@ Scope: local Value: 0 @@ -99,9 +99,9 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt ---- HMI/n2t-out/cardThermo.txt 2022-06-05 14:52:19.480211048 +0000 -+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-06-05 14:52:20.324222977 +0000 -@@ -1170,10 +1170,6 @@ +--- HMI/n2t-out/cardThermo.txt 2022-06-06 12:47:19.783824935 +0000 ++++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-06-06 12:47:20.835832380 +0000 +@@ -1152,10 +1152,6 @@ // get value spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,dimValue,0,0 @@ -113,8 +113,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-06-05 14:52:19.480211048 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-05 14:52:20.324222977 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-06-06 12:47:19.783824935 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-06 12:47:20.835832380 +0000 @@ -177,7 +177,7 @@ recmod=1 bauds=115200 @@ -136,8 +136,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt ---- HMI/n2t-out/popupLight.txt 2022-06-05 14:52:19.480211048 +0000 -+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-06-05 14:52:20.324222977 +0000 +--- HMI/n2t-out/popupLight.txt 2022-06-06 12:47:19.783824935 +0000 ++++ HMI/US/landscape/n2t-out/popupLight.txt 2022-06-06 12:47:20.835832380 +0000 @@ -561,10 +561,6 @@ // get value spstr strCommand.txt,tTmp.txt,"~",1 @@ -150,8 +150,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt ---- HMI/n2t-out/popupNotify.txt 2022-06-05 14:52:19.480211048 +0000 -+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-06-05 14:52:20.324222977 +0000 +--- HMI/n2t-out/popupNotify.txt 2022-06-06 12:47:19.783824935 +0000 ++++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-06-06 12:47:20.835832380 +0000 @@ -311,10 +311,6 @@ // get value spstr strCommand.txt,tTmp.txt,"~",1 @@ -164,8 +164,8 @@ diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt ---- HMI/n2t-out/popupShutter.txt 2022-06-05 14:52:19.480211048 +0000 -+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-06-05 14:52:20.324222977 +0000 +--- HMI/n2t-out/popupShutter.txt 2022-06-06 12:47:19.783824935 +0000 ++++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-06-06 12:47:20.835832380 +0000 @@ -406,10 +406,6 @@ // get value spstr strCommand.txt,tTmp.txt,"~",1 @@ -178,8 +178,8 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt if(tInstruction.txt=="time") { diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt ---- HMI/n2t-out/screensaver.txt 2022-06-05 14:52:19.480211048 +0000 -+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-06-05 14:52:20.324222977 +0000 +--- HMI/n2t-out/screensaver.txt 2022-06-06 12:47:19.783824935 +0000 ++++ HMI/US/landscape/n2t-out/screensaver.txt 2022-06-06 12:47:20.835832380 +0000 @@ -397,9 +397,6 @@ spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,dimValue,0,0 diff --git a/HMI/US/landscape/n2t-out-visual/cardThermo.txt b/HMI/US/landscape/n2t-out-visual/cardThermo.txt index 2c49011a..36f95ffc 100644 --- a/HMI/US/landscape/n2t-out-visual/cardThermo.txt +++ b/HMI/US/landscape/n2t-out-visual/cardThermo.txt @@ -29,9 +29,6 @@ Page cardThermo vis xTempMin1,0 vis xTempMax1,0 vis xTempStep1,0 - vis xTempMin2,0 - vis xTempMax2,0 - vis xTempStep2,0 //tEntity.txt=tHeading.txt // disable all buttons vis bt0,0 @@ -125,28 +122,28 @@ Variable (string) va7 Variable (string) tInstruction Attributes - ID : 46 + ID : 43 Scope : local Text : Max. Text Size: 20 Variable (string) tId Attributes - ID : 47 + ID : 44 Scope : local Text : Max. Text Size: 20 Variable (string) tTmp Attributes - ID : 48 + ID : 45 Scope : local Text : Max. Text Size: 10 Variable (string) tSend Attributes - ID : 49 + ID : 46 Scope : local Text : Max. Text Size: 100 @@ -301,99 +298,9 @@ XFloat xTempDest2 Horizontal Spacing : 0 Vertical Spacing : 0 -XFloat xTempMin2 - Attributes - ID : 43 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 246 - y coordinate : 69 - Width : 50 - Height : 21 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 0 - Back. Color : 65535 - Font Color : 0 - Horizontal Alignment : center - Vertical Alignment : center - Value : 0 - Significant digits left : 0 - Significant digits right : 1 - Word wrap : enabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - -XFloat xTempMax2 - Attributes - ID : 44 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 246 - y coordinate : 91 - Width : 45 - Height : 20 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 0 - Back. Color : 65535 - Font Color : 0 - Horizontal Alignment : center - Vertical Alignment : center - Value : 0 - Significant digits left : 0 - Significant digits right : 1 - Word wrap : enabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - -XFloat xTempStep2 - Attributes - ID : 45 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 247 - y coordinate : 179 - Width : 45 - Height : 20 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 0 - Back. Color : 65535 - Font Color : 0 - Horizontal Alignment : center - Vertical Alignment : center - Value : 0 - Significant digits left : 0 - Significant digits right : 1 - Word wrap : enabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - XFloat xTempDest Attributes - ID : 52 + ID : 49 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -603,7 +510,7 @@ Text tCF2 Text tALbl Attributes - ID : 50 + ID : 47 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -633,7 +540,7 @@ Text tALbl Text tCF Attributes - ID : 54 + ID : 51 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -663,7 +570,7 @@ Text tCF Text tCurTemp Attributes - ID : 55 + ID : 52 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1243,10 +1150,13 @@ Dual-state Button btUp1 //craft command tSend.txt="event,buttonPress2," tSend.txt+=entn.txt+"," - tSend.txt+="tempUpdHigh," + tSend.txt+="tempUpdHighLow," //convert temperature covx xTempDest1.val,tTmp.txt,0,0 tSend.txt+=tTmp.txt + tSend.txt+="|" + covx xTempDest2.val,tTmp.txt,0,0 + tSend.txt+=tTmp.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -1301,10 +1211,13 @@ Dual-state Button btDown1 //craft command tSend.txt="event,buttonPress2," tSend.txt+=entn.txt+"," - tSend.txt+="tempUpdHigh," + tSend.txt+="tempUpdHighLow," //convert temperature covx xTempDest1.val,tTmp.txt,0,0 tSend.txt+=tTmp.txt + tSend.txt+="|" + covx xTempDest2.val,tTmp.txt,0,0 + tSend.txt+=tTmp.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -1339,7 +1252,7 @@ Dual-state Button bUp2 Back. Picture ID (Pressed) : 65535 Back. Color (Pressed) : 6371 Font Color (Unpressed) : 50712 - Font Color (Pressed) : 64512 + Font Color (Pressed) : 50712 Horizontal Alignment : center Vertical Alignment : center State : unpressed @@ -1351,16 +1264,19 @@ Dual-state Button bUp2 Events Touch Press Event - if(xTempDest2.valxTempMin2.val) + if(xTempDest2.val>xTempMin1.val) { - xTempDest2.val=xTempDest2.val-xTempStep2.val + xTempDest2.val=xTempDest2.val-xTempStep1.val } // event,buttonPress2,entn,tempUpd,X //craft command tSend.txt="event,buttonPress2," tSend.txt+=entn.txt+"," - tSend.txt+="tempUpdLow," + tSend.txt+="tempUpdHighLow," //convert temperature + covx xTempDest1.val,tTmp.txt,0,0 + tSend.txt+=tTmp.txt + tSend.txt+="|" covx xTempDest2.val,tTmp.txt,0,0 tSend.txt+=tTmp.txt //send calc crc @@ -1435,7 +1354,7 @@ Dual-state Button bDown2 Dual-state Button btUp Attributes - ID : 51 + ID : 48 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1493,7 +1412,7 @@ Dual-state Button btUp Dual-state Button btDown Attributes - ID : 53 + ID : 50 Scope : local Dragging : 0 Disable release event after dragging: 0 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 3aa631be..53ef3a6a 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 @@ -39,9 +39,9 @@ popupShutter 245 Line(s) of event code 139 Unique line(s) of event code cardThermo - 56 Component(s) - 543 Line(s) of event code - 293 Unique line(s) of event code + 53 Component(s) + 552 Line(s) of event code + 290 Unique line(s) of event code cardEntities 65 Component(s) 1130 Line(s) of event code @@ -57,6 +57,6 @@ cardAlarm Total 13 Page(s) - 408 Component(s) - 4500 Line(s) of event code - 1194 Unique line(s) of event code + 405 Component(s) + 4509 Line(s) of event code + 1190 Unique line(s) of event code diff --git a/HMI/US/landscape/n2t-out/cardThermo.txt b/HMI/US/landscape/n2t-out/cardThermo.txt index a0043c63..827bb378 100644 --- a/HMI/US/landscape/n2t-out/cardThermo.txt +++ b/HMI/US/landscape/n2t-out/cardThermo.txt @@ -21,9 +21,6 @@ Page cardThermo vis xTempMin1,0 vis xTempMax1,0 vis xTempStep1,0 - vis xTempMin2,0 - vis xTempMax2,0 - vis xTempStep2,0 //tEntity.txt=tHeading.txt // disable all buttons vis bt0,0 @@ -174,33 +171,6 @@ XFloat xTempDest2 Associated Keyboard : none Value : 0 -XFloat xTempMin2 - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Value : 0 - -XFloat xTempMax2 - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Value : 0 - -XFloat xTempStep2 - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Value : 0 - XFloat xTempDest Attributes Scope : local @@ -600,10 +570,13 @@ Dual-state Button btUp1 //craft command tSend.txt="event,buttonPress2," tSend.txt+=entn.txt+"," - tSend.txt+="tempUpdHigh," + tSend.txt+="tempUpdHighLow," //convert temperature covx xTempDest1.val,tTmp.txt,0,0 tSend.txt+=tTmp.txt + tSend.txt+="|" + covx xTempDest2.val,tTmp.txt,0,0 + tSend.txt+=tTmp.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -636,10 +609,13 @@ Dual-state Button btDown1 //craft command tSend.txt="event,buttonPress2," tSend.txt+=entn.txt+"," - tSend.txt+="tempUpdHigh," + tSend.txt+="tempUpdHighLow," //convert temperature covx xTempDest1.val,tTmp.txt,0,0 tSend.txt+=tTmp.txt + tSend.txt+="|" + covx xTempDest2.val,tTmp.txt,0,0 + tSend.txt+=tTmp.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -664,16 +640,19 @@ Dual-state Button bUp2 Events Touch Press Event - if(xTempDest2.valxTempMin2.val) + if(xTempDest2.val>xTempMin1.val) { - xTempDest2.val=xTempDest2.val-xTempStep2.val + xTempDest2.val=xTempDest2.val-xTempStep1.val } // event,buttonPress2,entn,tempUpd,X //craft command tSend.txt="event,buttonPress2," tSend.txt+=entn.txt+"," - tSend.txt+="tempUpdLow," + tSend.txt+="tempUpdHighLow," //convert temperature + covx xTempDest1.val,tTmp.txt,0,0 + tSend.txt+=tTmp.txt + tSend.txt+="|" covx xTempDest2.val,tTmp.txt,0,0 tSend.txt+=tTmp.txt //send calc crc diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index ee62fa12..b5877763 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -1,6 +1,6 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt ---- HMI/n2t-out/Program.s.txt 2022-06-05 14:52:19.480211048 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-05 14:52:19.924217323 +0000 +--- HMI/n2t-out/Program.s.txt 2022-06-06 12:47:19.779824907 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-06 12:47:20.275828417 +0000 @@ -11,6 +11,6 @@ // dim value int dimValue=40 @@ -11,8 +11,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt + //lcd_dev fffb 0002 0000 0020 page pageStartup diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-06-05 14:52:19.480211048 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-05 14:52:19.924217323 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-06-06 12:47:19.783824935 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-06 12:47:20.279828445 +0000 @@ -63,6 +63,16 @@ vis bText4,0 vis hSlider4,0 @@ -468,8 +468,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt if(tInstruction.txt=="pageType") { diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt ---- HMI/n2t-out/cardMedia.txt 2022-06-05 14:52:19.480211048 +0000 -+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-05 14:52:19.924217323 +0000 +--- HMI/n2t-out/cardMedia.txt 2022-06-06 12:47:19.783824935 +0000 ++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-06 12:47:20.279828445 +0000 @@ -45,12 +45,6 @@ Scope: local Value: 0 @@ -518,8 +518,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt if(tInstruction.txt=="time") { diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-06-05 14:52:19.480211048 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-05 14:52:19.924217323 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-06-06 12:47:19.783824935 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-06 12:47:20.279828445 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled @@ -539,8 +539,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt ---- HMI/n2t-out/screensaver.txt 2022-06-05 14:52:19.480211048 +0000 -+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-06-05 14:52:19.924217323 +0000 +--- HMI/n2t-out/screensaver.txt 2022-06-06 12:47:19.783824935 +0000 ++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-06-06 12:47:20.279828445 +0000 @@ -474,22 +474,6 @@ vis tMainIconAlt,1 vis tMRIcon,1 diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index ad613564..18163134 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,8 +1,8 @@ -+++ HMI/US/portrait/diff-eu-version.txt 2022-06-05 14:52:19.936217493 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-06-05 14:52:19.480211048 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-05 14:52:19.924217323 +0000 -+--- HMI/n2t-out/cardEntities.txt 2022-06-05 14:52:19.480211048 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-05 14:52:19.924217323 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-06-06 12:47:20.327828785 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-06-06 12:47:19.779824907 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-06 12:47:20.275828417 +0000 ++--- HMI/n2t-out/cardEntities.txt 2022-06-06 12:47:19.783824935 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-06 12:47:20.279828445 +0000 +@@ -63,6 +63,16 @@ +@@ -120,6 +130,18 @@ +@@ -156,6 +178,15 @@ @@ -13,8 +13,8 @@ +@@ -1075,6 +1281,28 @@ +@@ -1850,6 +2078,169 @@ +diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt -+--- HMI/n2t-out/cardMedia.txt 2022-06-05 14:52:19.480211048 +0000 -++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-05 14:52:19.924217323 +0000 ++--- HMI/n2t-out/cardMedia.txt 2022-06-06 12:47:19.783824935 +0000 +++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-06 12:47:20.279828445 +0000 +@@ -45,12 +45,6 @@ + Scope: local + Value: 0 @@ -59,10 +59,10 @@ + } + if(tInstruction.txt=="time") + { -+--- HMI/n2t-out/pageStartup.txt 2022-06-05 14:52:19.480211048 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-05 14:52:19.924217323 +0000 -+--- HMI/n2t-out/screensaver.txt 2022-06-05 14:52:19.480211048 +0000 -++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-06-05 14:52:19.924217323 +0000 ++--- HMI/n2t-out/pageStartup.txt 2022-06-06 12:47:19.783824935 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-06 12:47:20.279828445 +0000 ++--- HMI/n2t-out/screensaver.txt 2022-06-06 12:47:19.783824935 +0000 +++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-06-06 12:47:20.279828445 +0000 +@@ -474,22 +474,6 @@ +@@ -501,14 +485,6 @@ + spstr strCommand.txt,tIcon2.txt,"~",19 diff --git a/HMI/US/portrait/n2t-out-visual/cardThermo.txt b/HMI/US/portrait/n2t-out-visual/cardThermo.txt index 88365b4b..60be2e98 100644 --- a/HMI/US/portrait/n2t-out-visual/cardThermo.txt +++ b/HMI/US/portrait/n2t-out-visual/cardThermo.txt @@ -29,9 +29,6 @@ Page cardThermo vis xTempMin1,0 vis xTempMax1,0 vis xTempStep1,0 - vis xTempMin2,0 - vis xTempMax2,0 - vis xTempStep2,0 //tEntity.txt=tHeading.txt // disable all buttons vis bt0,0 @@ -125,28 +122,28 @@ Variable (string) va7 Variable (string) tInstruction Attributes - ID : 43 + ID : 40 Scope : local Text : Max. Text Size: 20 Variable (string) tId Attributes - ID : 44 + ID : 41 Scope : local Text : Max. Text Size: 20 Variable (string) tTmp Attributes - ID : 45 + ID : 42 Scope : local Text : Max. Text Size: 10 Variable (string) tSend Attributes - ID : 46 + ID : 43 Scope : local Text : Max. Text Size: 100 @@ -301,99 +298,9 @@ XFloat xTempDest2 Horizontal Spacing : 0 Vertical Spacing : 0 -XFloat xTempMin2 - Attributes - ID : 40 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 110 - y coordinate : 178 - Width : 50 - Height : 21 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 0 - Back. Color : 65535 - Font Color : 0 - Horizontal Alignment : center - Vertical Alignment : center - Value : 0 - Significant digits left : 0 - Significant digits right : 1 - Word wrap : enabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - -XFloat xTempMax2 - Attributes - ID : 41 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 110 - y coordinate : 200 - Width : 45 - Height : 20 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 0 - Back. Color : 65535 - Font Color : 0 - Horizontal Alignment : center - Vertical Alignment : center - Value : 0 - Significant digits left : 0 - Significant digits right : 1 - Word wrap : enabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - -XFloat xTempStep2 - Attributes - ID : 42 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 111 - y coordinate : 288 - Width : 45 - Height : 20 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 0 - Back. Color : 65535 - Font Color : 0 - Horizontal Alignment : center - Vertical Alignment : center - Value : 0 - Significant digits left : 0 - Significant digits right : 1 - Word wrap : enabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - XFloat xTempDest Attributes - ID : 49 + ID : 46 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -603,7 +510,7 @@ Text tCF2 Text tALbl Attributes - ID : 47 + ID : 44 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -633,7 +540,7 @@ Text tALbl Text tCF Attributes - ID : 51 + ID : 48 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -663,7 +570,7 @@ Text tCF Text tCurTemp Attributes - ID : 52 + ID : 49 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1243,10 +1150,13 @@ Dual-state Button btUp1 //craft command tSend.txt="event,buttonPress2," tSend.txt+=entn.txt+"," - tSend.txt+="tempUpdHigh," + tSend.txt+="tempUpdHighLow," //convert temperature covx xTempDest1.val,tTmp.txt,0,0 tSend.txt+=tTmp.txt + tSend.txt+="|" + covx xTempDest2.val,tTmp.txt,0,0 + tSend.txt+=tTmp.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -1301,10 +1211,13 @@ Dual-state Button btDown1 //craft command tSend.txt="event,buttonPress2," tSend.txt+=entn.txt+"," - tSend.txt+="tempUpdHigh," + tSend.txt+="tempUpdHighLow," //convert temperature covx xTempDest1.val,tTmp.txt,0,0 tSend.txt+=tTmp.txt + tSend.txt+="|" + covx xTempDest2.val,tTmp.txt,0,0 + tSend.txt+=tTmp.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -1351,16 +1264,19 @@ Dual-state Button bUp2 Events Touch Press Event - if(xTempDest2.valxTempMin2.val) + if(xTempDest2.val>xTempMin1.val) { - xTempDest2.val=xTempDest2.val-xTempStep2.val + xTempDest2.val=xTempDest2.val-xTempStep1.val } // event,buttonPress2,entn,tempUpd,X //craft command tSend.txt="event,buttonPress2," tSend.txt+=entn.txt+"," - tSend.txt+="tempUpdLow," + tSend.txt+="tempUpdHighLow," //convert temperature + covx xTempDest1.val,tTmp.txt,0,0 + tSend.txt+=tTmp.txt + tSend.txt+="|" covx xTempDest2.val,tTmp.txt,0,0 tSend.txt+=tTmp.txt //send calc crc @@ -1435,7 +1354,7 @@ Dual-state Button bDown2 Dual-state Button btUp Attributes - ID : 48 + ID : 45 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1493,7 +1412,7 @@ Dual-state Button btUp Dual-state Button btDown Attributes - ID : 50 + ID : 47 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1551,7 +1470,7 @@ Dual-state Button btDown Hotspot mSwipeNext Attributes - ID : 53 + ID : 50 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1571,7 +1490,7 @@ Hotspot mSwipeNext Hotspot mSwipeUp Attributes - ID : 54 + ID : 51 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1591,7 +1510,7 @@ Hotspot mSwipeUp Hotspot mSwipePrev Attributes - ID : 55 + ID : 52 Scope : local Dragging : 0 Disable release event after dragging: 0 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 69fc7adf..d6290a5a 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 @@ -27,9 +27,9 @@ popupNotify 204 Line(s) of event code 128 Unique line(s) of event code cardThermo - 56 Component(s) - 546 Line(s) of event code - 295 Unique line(s) of event code + 53 Component(s) + 555 Line(s) of event code + 292 Unique line(s) of event code cardEntities 77 Component(s) 1363 Line(s) of event code @@ -57,6 +57,6 @@ screensaver Total 13 Page(s) - 420 Component(s) - 4740 Line(s) of event code - 1251 Unique line(s) of event code + 417 Component(s) + 4749 Line(s) of event code + 1247 Unique line(s) of event code diff --git a/HMI/US/portrait/n2t-out/cardThermo.txt b/HMI/US/portrait/n2t-out/cardThermo.txt index d97902c7..49596016 100644 --- a/HMI/US/portrait/n2t-out/cardThermo.txt +++ b/HMI/US/portrait/n2t-out/cardThermo.txt @@ -21,9 +21,6 @@ Page cardThermo vis xTempMin1,0 vis xTempMax1,0 vis xTempStep1,0 - vis xTempMin2,0 - vis xTempMax2,0 - vis xTempStep2,0 //tEntity.txt=tHeading.txt // disable all buttons vis bt0,0 @@ -174,33 +171,6 @@ XFloat xTempDest2 Associated Keyboard : none Value : 0 -XFloat xTempMin2 - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Value : 0 - -XFloat xTempMax2 - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Value : 0 - -XFloat xTempStep2 - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Value : 0 - XFloat xTempDest Attributes Scope : local @@ -600,10 +570,13 @@ Dual-state Button btUp1 //craft command tSend.txt="event,buttonPress2," tSend.txt+=entn.txt+"," - tSend.txt+="tempUpdHigh," + tSend.txt+="tempUpdHighLow," //convert temperature covx xTempDest1.val,tTmp.txt,0,0 tSend.txt+=tTmp.txt + tSend.txt+="|" + covx xTempDest2.val,tTmp.txt,0,0 + tSend.txt+=tTmp.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -636,10 +609,13 @@ Dual-state Button btDown1 //craft command tSend.txt="event,buttonPress2," tSend.txt+=entn.txt+"," - tSend.txt+="tempUpdHigh," + tSend.txt+="tempUpdHighLow," //convert temperature covx xTempDest1.val,tTmp.txt,0,0 tSend.txt+=tTmp.txt + tSend.txt+="|" + covx xTempDest2.val,tTmp.txt,0,0 + tSend.txt+=tTmp.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -664,16 +640,19 @@ Dual-state Button bUp2 Events Touch Press Event - if(xTempDest2.valxTempMin2.val) + if(xTempDest2.val>xTempMin1.val) { - xTempDest2.val=xTempDest2.val-xTempStep2.val + xTempDest2.val=xTempDest2.val-xTempStep1.val } // event,buttonPress2,entn,tempUpd,X //craft command tSend.txt="event,buttonPress2," tSend.txt+=entn.txt+"," - tSend.txt+="tempUpdLow," + tSend.txt+="tempUpdHighLow," //convert temperature + covx xTempDest1.val,tTmp.txt,0,0 + tSend.txt+=tTmp.txt + tSend.txt+="|" covx xTempDest2.val,tTmp.txt,0,0 tSend.txt+=tTmp.txt //send calc crc diff --git a/HMI/n2t-out-visual/cardThermo.txt b/HMI/n2t-out-visual/cardThermo.txt index 52865532..b5de4991 100644 --- a/HMI/n2t-out-visual/cardThermo.txt +++ b/HMI/n2t-out-visual/cardThermo.txt @@ -29,9 +29,6 @@ Page cardThermo vis xTempMin1,0 vis xTempMax1,0 vis xTempStep1,0 - vis xTempMin2,0 - vis xTempMax2,0 - vis xTempStep2,0 //tEntity.txt=tHeading.txt // disable all buttons vis bt0,0 @@ -125,28 +122,28 @@ Variable (string) va7 Variable (string) tInstruction Attributes - ID : 46 + ID : 43 Scope : local Text : Max. Text Size: 20 Variable (string) tId Attributes - ID : 47 + ID : 44 Scope : local Text : Max. Text Size: 20 Variable (string) tTmp Attributes - ID : 48 + ID : 45 Scope : local Text : Max. Text Size: 10 Variable (string) tSend Attributes - ID : 49 + ID : 46 Scope : local Text : Max. Text Size: 100 @@ -301,99 +298,9 @@ XFloat xTempDest2 Horizontal Spacing : 0 Vertical Spacing : 0 -XFloat xTempMin2 - Attributes - ID : 43 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 231 - y coordinate : 69 - Width : 50 - Height : 21 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 0 - Back. Color : 65535 - Font Color : 0 - Horizontal Alignment : center - Vertical Alignment : center - Value : 0 - Significant digits left : 0 - Significant digits right : 1 - Word wrap : enabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - -XFloat xTempMax2 - Attributes - ID : 44 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 231 - y coordinate : 91 - Width : 45 - Height : 20 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 0 - Back. Color : 65535 - Font Color : 0 - Horizontal Alignment : center - Vertical Alignment : center - Value : 0 - Significant digits left : 0 - Significant digits right : 1 - Word wrap : enabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - -XFloat xTempStep2 - Attributes - ID : 45 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 232 - y coordinate : 179 - Width : 45 - Height : 20 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 0 - Back. Color : 65535 - Font Color : 0 - Horizontal Alignment : center - Vertical Alignment : center - Value : 0 - Significant digits left : 0 - Significant digits right : 1 - Word wrap : enabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - XFloat xTempDest Attributes - ID : 52 + ID : 49 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -603,7 +510,7 @@ Text tCF2 Text tALbl Attributes - ID : 50 + ID : 47 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -633,7 +540,7 @@ Text tALbl Text tCF Attributes - ID : 54 + ID : 51 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -663,7 +570,7 @@ Text tCF Text tCurTemp Attributes - ID : 55 + ID : 52 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1243,10 +1150,13 @@ Dual-state Button btUp1 //craft command tSend.txt="event,buttonPress2," tSend.txt+=entn.txt+"," - tSend.txt+="tempUpdHigh," + tSend.txt+="tempUpdHighLow," //convert temperature covx xTempDest1.val,tTmp.txt,0,0 tSend.txt+=tTmp.txt + tSend.txt+="|" + covx xTempDest2.val,tTmp.txt,0,0 + tSend.txt+=tTmp.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -1301,10 +1211,13 @@ Dual-state Button btDown1 //craft command tSend.txt="event,buttonPress2," tSend.txt+=entn.txt+"," - tSend.txt+="tempUpdHigh," + tSend.txt+="tempUpdHighLow," //convert temperature covx xTempDest1.val,tTmp.txt,0,0 tSend.txt+=tTmp.txt + tSend.txt+="|" + covx xTempDest2.val,tTmp.txt,0,0 + tSend.txt+=tTmp.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -1339,7 +1252,7 @@ Dual-state Button bUp2 Back. Picture ID (Pressed) : 65535 Back. Color (Pressed) : 6371 Font Color (Unpressed) : 50712 - Font Color (Pressed) : 64512 + Font Color (Pressed) : 50712 Horizontal Alignment : center Vertical Alignment : center State : unpressed @@ -1351,16 +1264,19 @@ Dual-state Button bUp2 Events Touch Press Event - if(xTempDest2.valxTempMin2.val) + if(xTempDest2.val>xTempMin1.val) { - xTempDest2.val=xTempDest2.val-xTempStep2.val + xTempDest2.val=xTempDest2.val-xTempStep1.val } // event,buttonPress2,entn,tempUpd,X //craft command tSend.txt="event,buttonPress2," tSend.txt+=entn.txt+"," - tSend.txt+="tempUpdLow," + tSend.txt+="tempUpdHighLow," //convert temperature + covx xTempDest1.val,tTmp.txt,0,0 + tSend.txt+=tTmp.txt + tSend.txt+="|" covx xTempDest2.val,tTmp.txt,0,0 tSend.txt+=tTmp.txt //send calc crc @@ -1435,7 +1354,7 @@ Dual-state Button bDown2 Dual-state Button btUp Attributes - ID : 51 + ID : 48 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1493,7 +1412,7 @@ Dual-state Button btUp Dual-state Button btDown Attributes - ID : 53 + ID : 50 Scope : local Dragging : 0 Disable release event after dragging: 0 diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index cc8a88ea..30253ae5 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -47,9 +47,9 @@ cardAlarm 392 Line(s) of event code 239 Unique line(s) of event code cardThermo - 56 Component(s) - 546 Line(s) of event code - 295 Unique line(s) of event code + 53 Component(s) + 555 Line(s) of event code + 292 Unique line(s) of event code cardEntities 65 Component(s) 1133 Line(s) of event code @@ -57,6 +57,6 @@ cardEntities Total 13 Page(s) - 409 Component(s) - 4548 Line(s) of event code - 1211 Unique line(s) of event code + 406 Component(s) + 4557 Line(s) of event code + 1207 Unique line(s) of event code diff --git a/HMI/n2t-out/cardThermo.txt b/HMI/n2t-out/cardThermo.txt index d97902c7..49596016 100644 --- a/HMI/n2t-out/cardThermo.txt +++ b/HMI/n2t-out/cardThermo.txt @@ -21,9 +21,6 @@ Page cardThermo vis xTempMin1,0 vis xTempMax1,0 vis xTempStep1,0 - vis xTempMin2,0 - vis xTempMax2,0 - vis xTempStep2,0 //tEntity.txt=tHeading.txt // disable all buttons vis bt0,0 @@ -174,33 +171,6 @@ XFloat xTempDest2 Associated Keyboard : none Value : 0 -XFloat xTempMin2 - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Value : 0 - -XFloat xTempMax2 - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Value : 0 - -XFloat xTempStep2 - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Value : 0 - XFloat xTempDest Attributes Scope : local @@ -600,10 +570,13 @@ Dual-state Button btUp1 //craft command tSend.txt="event,buttonPress2," tSend.txt+=entn.txt+"," - tSend.txt+="tempUpdHigh," + tSend.txt+="tempUpdHighLow," //convert temperature covx xTempDest1.val,tTmp.txt,0,0 tSend.txt+=tTmp.txt + tSend.txt+="|" + covx xTempDest2.val,tTmp.txt,0,0 + tSend.txt+=tTmp.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -636,10 +609,13 @@ Dual-state Button btDown1 //craft command tSend.txt="event,buttonPress2," tSend.txt+=entn.txt+"," - tSend.txt+="tempUpdHigh," + tSend.txt+="tempUpdHighLow," //convert temperature covx xTempDest1.val,tTmp.txt,0,0 tSend.txt+=tTmp.txt + tSend.txt+="|" + covx xTempDest2.val,tTmp.txt,0,0 + tSend.txt+=tTmp.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -664,16 +640,19 @@ Dual-state Button bUp2 Events Touch Press Event - if(xTempDest2.valxTempMin2.val) + if(xTempDest2.val>xTempMin1.val) { - xTempDest2.val=xTempDest2.val-xTempStep2.val + xTempDest2.val=xTempDest2.val-xTempStep1.val } // event,buttonPress2,entn,tempUpd,X //craft command tSend.txt="event,buttonPress2," tSend.txt+=entn.txt+"," - tSend.txt+="tempUpdLow," + tSend.txt+="tempUpdHighLow," //convert temperature + covx xTempDest1.val,tTmp.txt,0,0 + tSend.txt+=tTmp.txt + tSend.txt+="|" covx xTempDest2.val,tTmp.txt,0,0 tSend.txt+=tTmp.txt //send calc crc