diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 86a5a68f..18cf4acf 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-05-07 15:43:32.155996375 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-07 15:43:33.036000662 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-07 23:31:11.384705439 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-07 23:31:12.408706139 +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/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-05-07 15:43:32.155996375 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-07 15:43:33.036000662 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-07 23:31:11.384705439 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-07 23:31:12.412706142 +0000 @@ -177,7 +177,7 @@ recmod=1 bauds=115200 diff --git a/HMI/US/landscape/n2t-out-visual/cardThermo.txt b/HMI/US/landscape/n2t-out-visual/cardThermo.txt index b4ce3d7c..813a15aa 100644 --- a/HMI/US/landscape/n2t-out-visual/cardThermo.txt +++ b/HMI/US/landscape/n2t-out-visual/cardThermo.txt @@ -51,116 +51,86 @@ Variable (string) strCommand Variable (string) entn Attributes - ID : 21 + ID : 19 Scope : local Text : Max. Text Size: 80 Variable (string) va0 Attributes - ID : 32 + ID : 30 Scope : local Text : Max. Text Size: 10 Variable (string) va1 Attributes - ID : 33 + ID : 31 Scope : local Text : Max. Text Size: 10 Variable (string) va2 Attributes - ID : 34 + ID : 32 Scope : local Text : Max. Text Size: 10 Variable (string) va3 Attributes - ID : 35 + ID : 33 Scope : local Text : Max. Text Size: 10 Variable (string) va4 Attributes - ID : 36 + ID : 34 Scope : local Text : Max. Text Size: 10 Variable (string) va5 Attributes - ID : 37 + ID : 35 Scope : local Text : Max. Text Size: 10 Variable (string) va6 Attributes - ID : 38 + ID : 36 Scope : local Text : Max. Text Size: 10 Variable (string) va7 Attributes - ID : 39 + ID : 37 Scope : local Text : Max. Text Size: 10 Variable (string) va8 Attributes - ID : 40 + ID : 38 Scope : local Text : Max. Text Size: 10 XFloat xTempCurr Attributes - ID : 13 + ID : 11 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 171 - y coordinate : 79 - Width : 130 - Height : 70 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 4 - Back. Color : 6371 - Font Color : 65535 - 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 : 15 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 216 - y coordinate : 156 - Width : 50 - Height : 22 + x coordinate : 148 + y coordinate : 70 + Width : 90 + Height : 35 Effect : load Effect Priority : 0 Effect Time : 300 @@ -179,17 +149,47 @@ XFloat xTempDest Horizontal Spacing : 0 Vertical Spacing : 0 -XFloat xTempMin +XFloat xTempDest Attributes - ID : 16 + ID : 13 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 25 - y coordinate : 30 - Width : 100 + x coordinate : 301 + y coordinate : 97 + Width : 120 + Height : 60 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 4 + Back. Color : 6371 + Font Color : 65535 + 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 xTempMin + Attributes + ID : 14 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 269 + y coordinate : 0 + Width : 51 Height : 30 Effect : load Effect Priority : 0 @@ -211,15 +211,15 @@ XFloat xTempMin XFloat xTempMax Attributes - ID : 17 + ID : 15 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 23 - y coordinate : 62 - Width : 100 + x coordinate : 320 + y coordinate : 0 + Width : 45 Height : 30 Effect : load Effect Priority : 0 @@ -241,15 +241,15 @@ XFloat xTempMax XFloat xTempStep Attributes - ID : 18 + ID : 16 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 22 - y coordinate : 91 - Width : 100 + x coordinate : 366 + y coordinate : 0 + Width : 45 Height : 30 Effect : load Effect Priority : 0 @@ -397,9 +397,9 @@ Text tHeading Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 127 - y coordinate : 265 - Width : 228 + x coordinate : 5 + y coordinate : 257 + Width : 227 Height : 30 Effect : load Effect Priority : 0 @@ -427,9 +427,9 @@ Text tStatus Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 196 - y coordinate : 178 - Width : 88 + x coordinate : 148 + y coordinate : 115 + Width : 86 Height : 30 Effect : load Effect Priority : 0 @@ -451,14 +451,14 @@ Text tStatus Text t2 Attributes - ID : 14 + ID : 12 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 298 - y coordinate : 74 + x coordinate : 422 + y coordinate : 115 Width : 25 Height : 30 Effect : load @@ -543,117 +543,9 @@ Button bNext prints tSend.txt,0 prints crcval,2 -Button bDown - Attributes - ID : 11 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 83 - y coordinate : 124 - Width : 64 - Height : 64 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : image - Font ID : 0 - Background Picture ID (Unpressed) : 7 - Back. Picture ID (Pressed) : 7 - Horizontal Alignment : center - Vertical Alignment : center - State : unpressed - Text : - Max. Text Size : 10 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - - Events - Touch Press Event - if(xTempDest.val>xTempMin.val) - { - xTempDest.val=xTempDest.val-xTempStep.val - } - // event,buttonPress2,entn,tempUpd,X - //craft command - tSend.txt="event,buttonPress2," - tSend.txt+=entn.txt+"," - tSend.txt+="tempUpd," - //convert temperature - covx xTempDest.val,tTmp.txt,0,0 - tSend.txt+=tTmp.txt - //send calc crc - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb - crcputs sys0,2 - crcputs tSend.txt,0 - //send cmd - printh 55 bb - prints sys0,2 - prints tSend.txt,0 - prints crcval,2 - -Button bUp - Attributes - ID : 12 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 331 - y coordinate : 124 - Width : 64 - Height : 64 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : image - Font ID : 0 - Background Picture ID (Unpressed) : 9 - Back. Picture ID (Pressed) : 9 - Horizontal Alignment : center - Vertical Alignment : center - State : unpressed - Text : - Max. Text Size : 10 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - - Events - Touch Press Event - if(xTempDest.valxTempMin.val) + { + xTempDest.val=xTempDest.val-xTempStep.val + } + // event,buttonPress2,entn,tempUpd,X + //craft command + tSend.txt="event,buttonPress2," + tSend.txt+=entn.txt+"," + tSend.txt+="tempUpd," + //convert temperature + covx xTempDest.val,tTmp.txt,0,0 + tSend.txt+=tTmp.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + Timer tmSerial Attributes ID : 5 @@ -1485,7 +1493,7 @@ Timer tmSerial Timer tmSleep Attributes - ID : 19 + ID : 17 Scope : local Period (ms): 1000 Enabled : yes @@ -1516,7 +1524,7 @@ Timer tmSleep TouchCap tc0 Attributes - ID : 20 + ID : 18 Scope: local Value: 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 064c2189..7ed4eba2 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 @@ -10,6 +10,14 @@ pageTest 13 Component(s) 13 Line(s) of event code 13 Unique line(s) of event code +pageStartup + 19 Component(s) + 150 Line(s) of event code + 113 Unique line(s) of event code +popupNotify + 17 Component(s) + 196 Line(s) of event code + 123 Unique line(s) of event code popupShutter 20 Component(s) 193 Line(s) of event code @@ -18,18 +26,6 @@ popupLight 27 Component(s) 341 Line(s) of event code 185 Unique line(s) of event code -popupNotify - 17 Component(s) - 196 Line(s) of event code - 123 Unique line(s) of event code -pageStartup - 19 Component(s) - 150 Line(s) of event code - 113 Unique line(s) of event code -cardThermo - 41 Component(s) - 444 Line(s) of event code - 249 Unique line(s) of event code cardMedia 30 Component(s) 331 Line(s) of event code @@ -50,6 +46,10 @@ cardEntities 62 Component(s) 966 Line(s) of event code 412 Unique line(s) of event code +cardThermo + 41 Component(s) + 444 Line(s) of event code + 249 Unique line(s) of event code Total 12 Page(s) diff --git a/HMI/US/landscape/n2t-out-visual/pageStartup.txt b/HMI/US/landscape/n2t-out-visual/pageStartup.txt index 3051eb43..99094960 100644 --- a/HMI/US/landscape/n2t-out-visual/pageStartup.txt +++ b/HMI/US/landscape/n2t-out-visual/pageStartup.txt @@ -647,7 +647,7 @@ Timer tmSpinner Events Timer Event - xpic mSpinner.x,mSpinner.y,spinner_w.val,140,frame_ptr.val,0,11 // draw the current frame + xpic mSpinner.x,mSpinner.y,spinner_w.val,140,frame_ptr.val,0,9 // draw the current frame frame_ptr.val+=spinner_w.val%frapic_w.val // advance the pointer to the next frame in the pic resource and roll over at the end doevents // finish drawing before next timer event triggers if(frame_ptr.val==1820) diff --git a/HMI/US/landscape/n2t-out-visual/popupLight.txt b/HMI/US/landscape/n2t-out-visual/popupLight.txt index e164e931..02080052 100644 --- a/HMI/US/landscape/n2t-out-visual/popupLight.txt +++ b/HMI/US/landscape/n2t-out-visual/popupLight.txt @@ -537,8 +537,8 @@ Slider hTempSlider Fill : image Cursor width : auto Cursor height : 255 - Back. Picture ID : 8 - Slided Back. Picture ID : 10 + Back. Picture ID : 7 + Slided Back. Picture ID : 8 Position : 50 Upper range limit : 100 Lower range limit : 0 diff --git a/HMI/US/landscape/n2t-out-visual/popupNotify.txt b/HMI/US/landscape/n2t-out-visual/popupNotify.txt index a152ad19..86983fec 100644 --- a/HMI/US/landscape/n2t-out-visual/popupNotify.txt +++ b/HMI/US/landscape/n2t-out-visual/popupNotify.txt @@ -310,7 +310,7 @@ Button b2 Style : flat Font ID : 2 Back. Color : 6371 - Back. Picture ID (Pressed) : 9 + Back. Picture ID (Pressed) : 8 Back. Color (Pressed) : 1024 Font Color (Unpressed) : 65535 Font Color (Pressed) : 65535 @@ -359,7 +359,7 @@ Button b1 Style : flat Font ID : 2 Back. Color : 6371 - Back. Picture ID (Pressed) : 9 + Back. Picture ID (Pressed) : 8 Back. Color (Pressed) : 1024 Font Color (Unpressed) : 65535 Font Color (Pressed) : 65535 diff --git a/HMI/US/landscape/n2t-out/cardThermo.txt b/HMI/US/landscape/n2t-out/cardThermo.txt index b43c969e..a31b9c09 100644 --- a/HMI/US/landscape/n2t-out/cardThermo.txt +++ b/HMI/US/landscape/n2t-out/cardThermo.txt @@ -247,78 +247,6 @@ Button bNext prints tSend.txt,0 prints crcval,2 -Button bDown - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - State : unpressed - Text : - Max. Text Size : 10 - - Events - Touch Press Event - if(xTempDest.val>xTempMin.val) - { - xTempDest.val=xTempDest.val-xTempStep.val - } - // event,buttonPress2,entn,tempUpd,X - //craft command - tSend.txt="event,buttonPress2," - tSend.txt+=entn.txt+"," - tSend.txt+="tempUpd," - //convert temperature - covx xTempDest.val,tTmp.txt,0,0 - tSend.txt+=tTmp.txt - //send calc crc - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb - crcputs sys0,2 - crcputs tSend.txt,0 - //send cmd - printh 55 bb - prints sys0,2 - prints tSend.txt,0 - prints crcval,2 - -Button bUp - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - State : unpressed - Text : - Max. Text Size : 10 - - Events - Touch Press Event - if(xTempDest.valxTempMin.val) + { + xTempDest.val=xTempDest.val-xTempStep.val + } + // event,buttonPress2,entn,tempUpd,X + //craft command + tSend.txt="event,buttonPress2," + tSend.txt+=entn.txt+"," + tSend.txt+="tempUpd," + //convert temperature + covx xTempDest.val,tTmp.txt,0,0 + tSend.txt+=tTmp.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + Timer tmSerial Attributes Scope : local diff --git a/HMI/US/landscape/n2t-out/pageStartup.txt b/HMI/US/landscape/n2t-out/pageStartup.txt index 83223a12..bf6ed019 100644 --- a/HMI/US/landscape/n2t-out/pageStartup.txt +++ b/HMI/US/landscape/n2t-out/pageStartup.txt @@ -351,7 +351,7 @@ Timer tmSpinner Events Timer Event - xpic mSpinner.x,mSpinner.y,spinner_w.val,140,frame_ptr.val,0,11 // draw the current frame + xpic mSpinner.x,mSpinner.y,spinner_w.val,140,frame_ptr.val,0,9 // draw the current frame frame_ptr.val+=spinner_w.val%frapic_w.val // advance the pointer to the next frame in the pic resource and roll over at the end doevents // finish drawing before next timer event triggers if(frame_ptr.val==1820) diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index aa823c54..bd5ef5e2 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-05-07 15:43:32.155996375 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-07 15:43:32.583998460 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-07 23:31:11.384705439 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-07 23:31:11.864705767 +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-05-07 15:43:32.155996375 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-07 15:43:32.587998479 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-05-07 23:31:11.388705442 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-07 23:31:11.868705770 +0000 @@ -62,6 +62,16 @@ vis bText4,0 vis hSlider4,0 @@ -426,9 +426,330 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt } if(tInstruction.txt=="pageType") { +diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt +--- HMI/n2t-out/cardThermo.txt 2022-05-07 23:31:11.388705442 +0000 ++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-07 23:31:11.868705770 +0000 +@@ -247,26 +247,30 @@ + prints tSend.txt,0 + prints crcval,2 + +-Button bPrev ++Button bDown + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed +- Text :  ++ Text : + Max. Text Size : 10 + + Events + Touch Press Event +- tSend.txt="event,buttonPress2,cardThermo," +- if(bPrev.txt=="") +- { +- tSend.txt+="bUp" +- }else ++ if(xTempDest.val>xTempMin.val) + { +- tSend.txt+="bPrev" ++ xTempDest.val=xTempDest.val-xTempStep.val + } ++ // event,buttonPress2,entn,tempUpd,X ++ //craft command ++ tSend.txt="event,buttonPress2," ++ tSend.txt+=entn.txt+"," ++ tSend.txt+="tempUpd," ++ //convert temperature ++ covx xTempDest.val,tTmp.txt,0,0 ++ tSend.txt+=tTmp.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC +@@ -279,21 +283,30 @@ + prints tSend.txt,0 + prints crcval,2 + +-Dual-state Button bt0 ++Button bUp + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed +- Text :  ++ Text : + Max. Text Size : 10 + + Events + Touch Press Event ++ if(xTempDest.valxTempMin.val) +- { +- xTempDest.val=xTempDest.val-xTempStep.val +- } +- // event,buttonPress2,entn,tempUpd,X + //craft command +- tSend.txt="event,buttonPress2," +- tSend.txt+=entn.txt+"," +- tSend.txt+="tempUpd," +- //convert temperature +- covx xTempDest.val,tTmp.txt,0,0 +- tSend.txt+=tTmp.txt ++ tSend.txt="event,buttonPress2,"+entn.txt ++ tSend.txt+=",hvac_action,"+va8.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-05-07 15:43:32.155996375 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-07 15:43:32.583998460 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-07 23:31:11.384705439 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-07 23:31:11.864705767 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled @@ -447,3 +768,12 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC +@@ -351,7 +351,7 @@ + + Events + Timer Event +- xpic mSpinner.x,mSpinner.y,spinner_w.val,140,frame_ptr.val,0,9 // draw the current frame ++ xpic mSpinner.x,mSpinner.y,spinner_w.val,140,frame_ptr.val,0,11 // draw the current frame + frame_ptr.val+=spinner_w.val%frapic_w.val // advance the pointer to the next frame in the pic resource and roll over at the end + doevents // finish drawing before next timer event triggers + if(frame_ptr.val==1820) diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 14d4397c..c52976ff 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,7 +1,337 @@ -+++ HMI/US/portrait/diff-eu-version.txt 2022-05-07 15:43:32.599998538 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-05-07 15:43:32.155996375 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-07 15:43:32.583998460 +0000 -+--- HMI/n2t-out/cardEntities.txt 2022-05-07 15:43:32.155996375 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-07 15:43:32.587998479 +0000 -+--- HMI/n2t-out/pageStartup.txt 2022-05-07 15:43:32.155996375 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-07 15:43:32.583998460 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-05-07 23:31:11.916705803 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-05-07 23:31:11.384705439 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-07 23:31:11.864705767 +0000 ++--- HMI/n2t-out/cardEntities.txt 2022-05-07 23:31:11.388705442 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-07 23:31:11.868705770 +0000 ++diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt ++--- HMI/n2t-out/cardThermo.txt 2022-05-07 23:31:11.388705442 +0000 +++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-07 23:31:11.868705770 +0000 ++@@ -247,26 +247,30 @@ ++ prints tSend.txt,0 ++ prints crcval,2 ++ ++-Button bPrev +++Button bDown ++ Attributes ++ Scope : local ++ Dragging : 0 ++ Disable release event after dragging: 0 ++ Send Component ID : disabled ++ State : unpressed ++- Text :  +++ Text : ++ Max. Text Size : 10 ++ ++ Events ++ Touch Press Event ++- tSend.txt="event,buttonPress2,cardThermo," ++- if(bPrev.txt=="") ++- { ++- tSend.txt+="bUp" ++- }else +++ if(xTempDest.val>xTempMin.val) ++ { ++- tSend.txt+="bPrev" +++ xTempDest.val=xTempDest.val-xTempStep.val ++ } +++ // event,buttonPress2,entn,tempUpd,X +++ //craft command +++ tSend.txt="event,buttonPress2," +++ tSend.txt+=entn.txt+"," +++ tSend.txt+="tempUpd," +++ //convert temperature +++ covx xTempDest.val,tTmp.txt,0,0 +++ tSend.txt+=tTmp.txt ++ //send calc crc ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++@@ -279,21 +283,30 @@ ++ prints tSend.txt,0 ++ prints crcval,2 ++ ++-Dual-state Button bt0 +++Button bUp ++ Attributes ++ Scope : local ++ Dragging : 0 ++ Disable release event after dragging: 0 ++ Send Component ID : disabled ++ State : unpressed ++- Text :  +++ Text : ++ Max. Text Size : 10 ++ ++ Events ++ Touch Press Event +++ if(xTempDest.valxTempMin.val) ++- { ++- xTempDest.val=xTempDest.val-xTempStep.val ++- } ++- // event,buttonPress2,entn,tempUpd,X ++ //craft command ++- tSend.txt="event,buttonPress2," ++- tSend.txt+=entn.txt+"," ++- tSend.txt+="tempUpd," ++- //convert temperature ++- covx xTempDest.val,tTmp.txt,0,0 ++- tSend.txt+=tTmp.txt +++ tSend.txt="event,buttonPress2,"+entn.txt +++ tSend.txt+=",hvac_action,"+va8.txt ++ //send calc crc ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++--- HMI/n2t-out/pageStartup.txt 2022-05-07 23:31:11.384705439 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-07 23:31:11.864705767 +0000 ++@@ -351,7 +351,7 @@ ++ ++ Events ++ Timer Event ++- xpic mSpinner.x,mSpinner.y,spinner_w.val,140,frame_ptr.val,0,9 // draw the current frame +++ xpic mSpinner.x,mSpinner.y,spinner_w.val,140,frame_ptr.val,0,11 // draw the current frame ++ frame_ptr.val+=spinner_w.val%frapic_w.val // advance the pointer to the next frame in the pic resource and roll over at the end ++ doevents // finish drawing before next timer event triggers ++ if(frame_ptr.val==1820) diff --git a/HMI/n2t-out-visual/cardThermo.txt b/HMI/n2t-out-visual/cardThermo.txt index 17467a6b..813a15aa 100644 --- a/HMI/n2t-out-visual/cardThermo.txt +++ b/HMI/n2t-out-visual/cardThermo.txt @@ -51,116 +51,86 @@ Variable (string) strCommand Variable (string) entn Attributes - ID : 21 + ID : 19 Scope : local Text : Max. Text Size: 80 Variable (string) va0 Attributes - ID : 32 + ID : 30 Scope : local Text : Max. Text Size: 10 Variable (string) va1 Attributes - ID : 33 + ID : 31 Scope : local Text : Max. Text Size: 10 Variable (string) va2 Attributes - ID : 34 + ID : 32 Scope : local Text : Max. Text Size: 10 Variable (string) va3 Attributes - ID : 35 + ID : 33 Scope : local Text : Max. Text Size: 10 Variable (string) va4 Attributes - ID : 36 + ID : 34 Scope : local Text : Max. Text Size: 10 Variable (string) va5 Attributes - ID : 37 + ID : 35 Scope : local Text : Max. Text Size: 10 Variable (string) va6 Attributes - ID : 38 + ID : 36 Scope : local Text : Max. Text Size: 10 Variable (string) va7 Attributes - ID : 39 + ID : 37 Scope : local Text : Max. Text Size: 10 Variable (string) va8 Attributes - ID : 40 + ID : 38 Scope : local Text : Max. Text Size: 10 XFloat xTempCurr Attributes - ID : 13 + ID : 11 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 156 - y coordinate : 79 - Width : 130 - Height : 70 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 4 - Back. Color : 6371 - Font Color : 65535 - 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 : 15 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 201 - y coordinate : 156 - Width : 50 - Height : 22 + x coordinate : 148 + y coordinate : 70 + Width : 90 + Height : 35 Effect : load Effect Priority : 0 Effect Time : 300 @@ -179,17 +149,47 @@ XFloat xTempDest Horizontal Spacing : 0 Vertical Spacing : 0 -XFloat xTempMin +XFloat xTempDest Attributes - ID : 16 + ID : 13 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 10 - y coordinate : 30 - Width : 100 + x coordinate : 301 + y coordinate : 97 + Width : 120 + Height : 60 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 4 + Back. Color : 6371 + Font Color : 65535 + 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 xTempMin + Attributes + ID : 14 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 269 + y coordinate : 0 + Width : 51 Height : 30 Effect : load Effect Priority : 0 @@ -211,15 +211,15 @@ XFloat xTempMin XFloat xTempMax Attributes - ID : 17 + ID : 15 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 8 - y coordinate : 62 - Width : 100 + x coordinate : 320 + y coordinate : 0 + Width : 45 Height : 30 Effect : load Effect Priority : 0 @@ -241,15 +241,15 @@ XFloat xTempMax XFloat xTempStep Attributes - ID : 18 + ID : 16 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 7 - y coordinate : 91 - Width : 100 + x coordinate : 366 + y coordinate : 0 + Width : 45 Height : 30 Effect : load Effect Priority : 0 @@ -277,7 +277,7 @@ Text tSend Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 0 + x coordinate : 15 y coordinate : 0 Width : 230 Height : 23 @@ -307,7 +307,7 @@ Text tTmp Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 406 + x coordinate : 421 y coordinate : 277 Width : 34 Height : 30 @@ -337,7 +337,7 @@ Text tInstruction Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 0 + x coordinate : 15 y coordinate : 290 Width : 100 Height : 30 @@ -367,7 +367,7 @@ Text tId Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 99 + x coordinate : 114 y coordinate : 290 Width : 39 Height : 30 @@ -397,9 +397,9 @@ Text tHeading Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 112 - y coordinate : 265 - Width : 228 + x coordinate : 5 + y coordinate : 257 + Width : 227 Height : 30 Effect : load Effect Priority : 0 @@ -427,9 +427,9 @@ Text tStatus Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 181 - y coordinate : 178 - Width : 88 + x coordinate : 148 + y coordinate : 115 + Width : 86 Height : 30 Effect : load Effect Priority : 0 @@ -451,14 +451,14 @@ Text tStatus Text t2 Attributes - ID : 14 + ID : 12 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 283 - y coordinate : 74 + x coordinate : 422 + y coordinate : 115 Width : 25 Height : 30 Effect : load @@ -504,7 +504,7 @@ Button bNext Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 396 + x coordinate : 411 y coordinate : 16 Width : 50 Height : 50 @@ -543,123 +543,15 @@ Button bNext prints tSend.txt,0 prints crcval,2 -Button bDown - Attributes - ID : 11 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 68 - y coordinate : 124 - Width : 64 - Height : 64 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : image - Font ID : 0 - Background Picture ID (Unpressed) : 7 - Back. Picture ID (Pressed) : 7 - Horizontal Alignment : center - Vertical Alignment : center - State : unpressed - Text : - Max. Text Size : 10 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - - Events - Touch Press Event - if(xTempDest.val>xTempMin.val) - { - xTempDest.val=xTempDest.val-xTempStep.val - } - // event,buttonPress2,entn,tempUpd,X - //craft command - tSend.txt="event,buttonPress2," - tSend.txt+=entn.txt+"," - tSend.txt+="tempUpd," - //convert temperature - covx xTempDest.val,tTmp.txt,0,0 - tSend.txt+=tTmp.txt - //send calc crc - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb - crcputs sys0,2 - crcputs tSend.txt,0 - //send cmd - printh 55 bb - prints sys0,2 - prints tSend.txt,0 - prints crcval,2 - -Button bUp - Attributes - ID : 12 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 316 - y coordinate : 124 - Width : 64 - Height : 64 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : image - Font ID : 0 - Background Picture ID (Unpressed) : 9 - Back. Picture ID (Pressed) : 9 - Horizontal Alignment : center - Vertical Alignment : center - State : unpressed - Text : - Max. Text Size : 10 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - - Events - Touch Press Event - if(xTempDest.valxTempMin.val) + { + xTempDest.val=xTempDest.val-xTempStep.val + } + // event,buttonPress2,entn,tempUpd,X + //craft command + tSend.txt="event,buttonPress2," + tSend.txt+=entn.txt+"," + tSend.txt+="tempUpd," + //convert temperature + covx xTempDest.val,tTmp.txt,0,0 + tSend.txt+=tTmp.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + Timer tmSerial Attributes ID : 5 @@ -1485,7 +1493,7 @@ Timer tmSerial Timer tmSleep Attributes - ID : 19 + ID : 17 Scope : local Period (ms): 1000 Enabled : yes @@ -1516,7 +1524,7 @@ Timer tmSleep TouchCap tc0 Attributes - ID : 20 + ID : 18 Scope: local Value: 0 diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index a753404f..df2b1e9b 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -14,6 +14,10 @@ cardMedia 30 Component(s) 331 Line(s) of event code 171 Unique line(s) of event code +popupNotify + 17 Component(s) + 196 Line(s) of event code + 123 Unique line(s) of event code pageStartup 19 Component(s) 150 Line(s) of event code @@ -26,10 +30,6 @@ cardGrid 39 Component(s) 420 Line(s) of event code 246 Unique line(s) of event code -popupNotify - 17 Component(s) - 196 Line(s) of event code - 123 Unique line(s) of event code popupShutter 20 Component(s) 193 Line(s) of event code @@ -38,6 +38,10 @@ popupLight 27 Component(s) 341 Line(s) of event code 185 Unique line(s) of event code +cardThermo + 41 Component(s) + 444 Line(s) of event code + 249 Unique line(s) of event code cardAlarm 35 Component(s) 345 Line(s) of event code @@ -46,10 +50,6 @@ cardEntities 62 Component(s) 966 Line(s) of event code 412 Unique line(s) of event code -cardThermo - 41 Component(s) - 444 Line(s) of event code - 249 Unique line(s) of event code Total 12 Page(s) diff --git a/HMI/n2t-out-visual/pageStartup.txt b/HMI/n2t-out-visual/pageStartup.txt index 699293c3..e9156d7f 100644 --- a/HMI/n2t-out-visual/pageStartup.txt +++ b/HMI/n2t-out-visual/pageStartup.txt @@ -647,7 +647,7 @@ Timer tmSpinner Events Timer Event - xpic mSpinner.x,mSpinner.y,spinner_w.val,140,frame_ptr.val,0,11 // draw the current frame + xpic mSpinner.x,mSpinner.y,spinner_w.val,140,frame_ptr.val,0,9 // draw the current frame frame_ptr.val+=spinner_w.val%frapic_w.val // advance the pointer to the next frame in the pic resource and roll over at the end doevents // finish drawing before next timer event triggers if(frame_ptr.val==1820) diff --git a/HMI/n2t-out-visual/popupLight.txt b/HMI/n2t-out-visual/popupLight.txt index c0e6e77d..9612c841 100644 --- a/HMI/n2t-out-visual/popupLight.txt +++ b/HMI/n2t-out-visual/popupLight.txt @@ -537,8 +537,8 @@ Slider hTempSlider Fill : image Cursor width : auto Cursor height : 255 - Back. Picture ID : 8 - Slided Back. Picture ID : 10 + Back. Picture ID : 7 + Slided Back. Picture ID : 8 Position : 50 Upper range limit : 100 Lower range limit : 0 diff --git a/HMI/n2t-out-visual/popupNotify.txt b/HMI/n2t-out-visual/popupNotify.txt index 872f5921..b46c7bf0 100644 --- a/HMI/n2t-out-visual/popupNotify.txt +++ b/HMI/n2t-out-visual/popupNotify.txt @@ -310,7 +310,7 @@ Button b2 Style : flat Font ID : 2 Back. Color : 6371 - Back. Picture ID (Pressed) : 9 + Back. Picture ID (Pressed) : 8 Back. Color (Pressed) : 1024 Font Color (Unpressed) : 65535 Font Color (Pressed) : 65535 @@ -359,7 +359,7 @@ Button b1 Style : flat Font ID : 2 Back. Color : 6371 - Back. Picture ID (Pressed) : 9 + Back. Picture ID (Pressed) : 8 Back. Color (Pressed) : 1024 Font Color (Unpressed) : 65535 Font Color (Pressed) : 65535 diff --git a/HMI/n2t-out/cardThermo.txt b/HMI/n2t-out/cardThermo.txt index b43c969e..a31b9c09 100644 --- a/HMI/n2t-out/cardThermo.txt +++ b/HMI/n2t-out/cardThermo.txt @@ -247,78 +247,6 @@ Button bNext prints tSend.txt,0 prints crcval,2 -Button bDown - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - State : unpressed - Text : - Max. Text Size : 10 - - Events - Touch Press Event - if(xTempDest.val>xTempMin.val) - { - xTempDest.val=xTempDest.val-xTempStep.val - } - // event,buttonPress2,entn,tempUpd,X - //craft command - tSend.txt="event,buttonPress2," - tSend.txt+=entn.txt+"," - tSend.txt+="tempUpd," - //convert temperature - covx xTempDest.val,tTmp.txt,0,0 - tSend.txt+=tTmp.txt - //send calc crc - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb - crcputs sys0,2 - crcputs tSend.txt,0 - //send cmd - printh 55 bb - prints sys0,2 - prints tSend.txt,0 - prints crcval,2 - -Button bUp - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - State : unpressed - Text : - Max. Text Size : 10 - - Events - Touch Press Event - if(xTempDest.valxTempMin.val) + { + xTempDest.val=xTempDest.val-xTempStep.val + } + // event,buttonPress2,entn,tempUpd,X + //craft command + tSend.txt="event,buttonPress2," + tSend.txt+=entn.txt+"," + tSend.txt+="tempUpd," + //convert temperature + covx xTempDest.val,tTmp.txt,0,0 + tSend.txt+=tTmp.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + Timer tmSerial Attributes Scope : local diff --git a/HMI/n2t-out/pageStartup.txt b/HMI/n2t-out/pageStartup.txt index c033adf6..acdcef82 100644 --- a/HMI/n2t-out/pageStartup.txt +++ b/HMI/n2t-out/pageStartup.txt @@ -351,7 +351,7 @@ Timer tmSpinner Events Timer Event - xpic mSpinner.x,mSpinner.y,spinner_w.val,140,frame_ptr.val,0,11 // draw the current frame + xpic mSpinner.x,mSpinner.y,spinner_w.val,140,frame_ptr.val,0,9 // draw the current frame frame_ptr.val+=spinner_w.val%frapic_w.val // advance the pointer to the next frame in the pic resource and roll over at the end doevents // finish drawing before next timer event triggers if(frame_ptr.val==1820)