From 9675a565be15f0b781f80b3ef07017640c8bd934 Mon Sep 17 00:00:00 2001 From: joBr99 Date: Sun, 16 Oct 2022 08:26:41 +0000 Subject: [PATCH] Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 42 ++ HMI/US/portrait/diff-eu-version.txt | 42 ++ HMI/US/portrait/diff-filtered.txt | 38 +- HMI/n2t-out-visual/cardThermo.txt | 52 +- HMI/n2t-out-visual/nspanel_Stats.txt | 18 +- HMI/n2t-out-visual/popupThermo.txt | 806 +++++++++++++++++++++++++++ HMI/n2t-out/cardThermo.txt | 16 + HMI/n2t-out/popupThermo.txt | 566 +++++++++++++++++++ 8 files changed, 1565 insertions(+), 15 deletions(-) create mode 100644 HMI/n2t-out-visual/popupThermo.txt create mode 100644 HMI/n2t-out/popupThermo.txt diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index cf4649ae..8c3489ed 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -1,5 +1,16 @@ --- HMI/n2t-out +++ HMI/US/landscape/n2t-out +├── file list +│ @@ -9,9 +9,8 @@ +│ pageIcons.txt +│ pageStartup.txt +│ pageTest.txt +│ popupFan.txt +│ popupLight.txt +│ popupNotify.txt +│ popupShutter.txt +│ -popupThermo.txt +│ screensaver.txt ├── Program.s.txt │ @@ -10,10 +10,7 @@ │ int sleepValue=0 @@ -12,6 +23,37 @@ │ - // fix touch offset │ - lcd_dev fffb 0002 0000 0020 │ - page pageStartup +├── cardThermo.txt +│ @@ -779,30 +779,14 @@ +│ crcputs tSend.txt,0 +│ //send cmd +│ printh 55 bb +│ prints sys0,2 +│ prints tSend.txt,0 +│ prints crcval,2 +│ +│ -Dual-state Button btDetail +│ - Attributes +│ - Scope : local +│ - Dragging : 0 +│ - Disable release event after dragging: 0 +│ - Send Component ID : disabled +│ - State : pressed +│ - Text :  +│ - Max. Text Size : 10 +│ - +│ - Events +│ - Touch Press Event +│ - pageIcons.tTmp1.txt=tHeading.txt +│ - pageIcons.tTmp2.txt=entn.txt +│ - page popupThermo +│ - +│ Hotspot mSwipeNext +│ Attributes +│ Scope : local +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled ├── pageStartup.txt │ @@ -173,15 +173,15 @@ │ Max. Text Size : 10 diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 3ce17716..3a76a2f9 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -1,5 +1,16 @@ --- HMI/n2t-out +++ HMI/US/portrait/n2t-out +├── file list +│ @@ -9,9 +9,8 @@ +│ pageIcons.txt +│ pageStartup.txt +│ pageTest.txt +│ popupFan.txt +│ popupLight.txt +│ popupNotify.txt +│ popupShutter.txt +│ -popupThermo.txt +│ screensaver.txt ├── Program.s.txt │ @@ -10,10 +10,10 @@ │ int sleepValue=0 @@ -532,6 +543,37 @@ │ //command format pageType,specialPageName │ //write name of speical page to tId │ spstr strCommand.txt,tId.txt,"~",1 +├── cardThermo.txt +│ @@ -779,30 +779,14 @@ +│ crcputs tSend.txt,0 +│ //send cmd +│ printh 55 bb +│ prints sys0,2 +│ prints tSend.txt,0 +│ prints crcval,2 +│ +│ -Dual-state Button btDetail +│ - Attributes +│ - Scope : local +│ - Dragging : 0 +│ - Disable release event after dragging: 0 +│ - Send Component ID : disabled +│ - State : pressed +│ - Text :  +│ - Max. Text Size : 10 +│ - +│ - Events +│ - Touch Press Event +│ - pageIcons.tTmp1.txt=tHeading.txt +│ - pageIcons.tTmp2.txt=entn.txt +│ - page popupThermo +│ - +│ Hotspot mSwipeNext +│ Attributes +│ Scope : local +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled ├── pageIcons.txt │ @@ -15,15 +15,15 @@ │ Scope : global diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 4c1cd6b8..61b9d5e2 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,4 +1,40 @@ -+++ /dev/fd/62 2022-10-16 07:58:08.397597578 +0000 ++++ /dev/fd/62 2022-10-16 08:26:34.101954953 +0000 +++9,8 @@ ++tify.txt ++utter.txt ++ermo.txt ++aver.txt ++rdThermo.txt ++30 +779,14 @@ ++ crcputs tSend.txt,0 ++ //send cmd ++ printh 55 bb ++ prints sys0,2 ++ prints tSend.txt,0 ++ prints crcval,2 ++ ++ate Button btDetail ++ributes ++ Scope : local ++ Dragging : 0 ++ Disable release event after dragging: 0 ++ Send Component ID : disabled ++ State : pressed ++ Text :  ++ Max. Text Size : 10 ++ ++nts ++ Touch Press Event ++ pageIcons.tTmp1.txt=tHeading.txt ++ pageIcons.tTmp2.txt=entn.txt ++ page popupThermo ++ ++ mSwipeNext ++ributes ++ Scope : local ++ Dragging : 0 ++ Disable release event after dragging: 0 ++ Send Component ID : disabled +geIcons.txt +5 +15,15 @@ + Scope : global diff --git a/HMI/n2t-out-visual/cardThermo.txt b/HMI/n2t-out-visual/cardThermo.txt index 8ea8472c..e253a829 100644 --- a/HMI/n2t-out-visual/cardThermo.txt +++ b/HMI/n2t-out-visual/cardThermo.txt @@ -203,7 +203,7 @@ XFloat xTempMin1 Opacity : 127 x coordinate : 383 y coordinate : 71 - Width : 50 + Width : 24 Height : 22 Effect : load Effect Priority : 0 @@ -231,10 +231,10 @@ XFloat xTempMax1 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 383 - y coordinate : 93 - Width : 45 - Height : 20 + x coordinate : 407 + y coordinate : 70 + Width : 23 + Height : 23 Effect : load Effect Priority : 0 Effect Time : 300 @@ -261,8 +261,8 @@ XFloat xTempStep1 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 384 - y coordinate : 181 + x coordinate : 385 + y coordinate : 91 Width : 45 Height : 20 Effect : load @@ -1453,6 +1453,44 @@ Dual-state Button btDown prints tSend.txt,0 prints crcval,2 +Dual-state Button btDetail + Attributes + ID : 52 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 391 + y coordinate : 200 + Width : 50 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Font ID : 3 + Back. Color (Unpressed) : 6371 + Back. Picture ID (Pressed) : 65535 + Back. Color (Pressed) : 6371 + Font Color (Unpressed) : 50712 + Font Color (Pressed) : 64512 + Horizontal Alignment : center + Vertical Alignment : center + State : pressed + Text :  + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + + Events + Touch Press Event + pageIcons.tTmp1.txt=tHeading.txt + pageIcons.tTmp2.txt=entn.txt + page popupThermo + Hotspot mSwipeNext Attributes ID : 34 diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index 9fbf0093..2cd54231 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -18,6 +18,10 @@ popupLight 27 Component(s) 391 Line(s) of event code 214 Unique line(s) of event code +popupThermo + 24 Component(s) + 294 Line(s) of event code + 175 Unique line(s) of event code pageStartup 19 Component(s) 172 Line(s) of event code @@ -51,9 +55,9 @@ cardPower 420 Line(s) of event code 292 Unique line(s) of event code cardThermo - 52 Component(s) - 585 Line(s) of event code - 306 Unique line(s) of event code + 53 Component(s) + 588 Line(s) of event code + 309 Unique line(s) of event code cardAlarm 40 Component(s) 427 Line(s) of event code @@ -64,7 +68,7 @@ cardEntities 522 Unique line(s) of event code Total - 15 Page(s) - 490 Component(s) - 5831 Line(s) of event code - 1580 Unique line(s) of event code + 16 Page(s) + 515 Component(s) + 6128 Line(s) of event code + 1588 Unique line(s) of event code diff --git a/HMI/n2t-out-visual/popupThermo.txt b/HMI/n2t-out-visual/popupThermo.txt new file mode 100644 index 00000000..f1ab9f33 --- /dev/null +++ b/HMI/n2t-out-visual/popupThermo.txt @@ -0,0 +1,806 @@ +Page popupThermo + Attributes + ID : 0 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + Width : 480 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Locked : no + Swide up page ID : disabled + Swide down page ID : disabled + Swide left page ID : disabled + Swide right page ID : disabled + Fill : solid color + Back. Color : 6371 + + Events + Preinitialize Event + dim=dimValueNormal + //get entitiy name + tEntity.txt=pageIcons.tTmp1.txt + //get entity id + entn.txt=pageIcons.tTmp2.txt + tIcon1.txt=pageIcons.tTmp3.txt + vis p0,0 + vis tSend,0 + vis tTmp,0 + vis tInstruction,0 + vis tId,0 + //page open event + // event,pageOpenDetail,typeOfPage,tEntityName + // craft command + tSend.txt="event,pageOpenDetail,popupThermo,"+entn.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 + popupThermo.bco=defaultBcoColor + for(sys0=0;sys0<24;sys0++) + { + if(b[sys0].type==98||b[sys0].type==116) + { + b[sys0].bco=defaultBcoColor + b[sys0].pco=defaultFontColor + } + if(b[sys0].type==53&&defaultBcoColor==0) + { + b[sys0].pic=10 + b[sys0].pic2=11 + } + } + +Variable (string) strCommand + Attributes + ID : 9 + Scope : local + Text : + Max. Text Size: 500 + +Variable (string) entn + Attributes + ID : 12 + Scope : local + Text : + Max. Text Size: 80 + +Variable (int32) mode + Attributes + ID : 13 + Scope: local + Value: 1 + +Variable (int32) mode_temp + Attributes + ID : 14 + Scope: local + Value: 0 + +Variable (int32) vaModePos + Attributes + ID : 20 + Scope: local + Value: 0 + +Variable (string) vaModeList + Attributes + ID : 21 + Scope : local + Text : + Max. Text Size: 400 + +Variable (string) vaModeCur + Attributes + ID : 22 + Scope : local + Text : + Max. Text Size: 400 + +Variable (string) tSend + Attributes + ID : 23 + Scope : local + Text : + Max. Text Size: 200 + +Text tEntity + Attributes + ID : 2 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 92 + y coordinate : 21 + Width : 263 + Height : 30 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 0 + Back. Color : 6371 + Font Color : 65535 + Horizontal Alignment : left + Vertical Alignment : center + Input Type : character + Text : + Max. Text Size : 25 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text tIcon1 + Attributes + ID : 3 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 11 + y coordinate : 21 + Width : 45 + Height : 30 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 1 + Back. Color : 6371 + Font Color : 17299 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text : + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text tTmp + Attributes + ID : 5 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 343 + y coordinate : 277 + Width : 97 + Height : 30 + 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 + Input Type : character + Text : + Max. Text Size : 80 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text tInstruction + Attributes + ID : 10 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 0 + y coordinate : 290 + Width : 100 + Height : 30 + 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 + Input Type : character + Text : + Max. Text Size : 20 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text tId + Attributes + ID : 11 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 100 + y coordinate : 290 + Width : 100 + Height : 30 + 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 + Input Type : character + Text : + Max. Text Size : 20 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Picture p0 + Attributes + ID : 1 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 0 + y coordinate : 0 + Width : 480 + Height : 320 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Picture ID : 0 + +Button b0 + Attributes + ID : 4 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 397 + y coordinate : 8 + Width : 50 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Font ID : 1 + Back. Color : 6371 + Back. Picture ID (Pressed) : 65535 + Back. Color (Pressed) : 14823 + Font Color (Unpressed) : 65535 + Font Color (Pressed) : 65535 + 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 + tSend.txt="event,buttonPress2,popupLight,bExit" + //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 bMode1 + Attributes + ID : 16 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 11 + y coordinate : 88 + Width : 120 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Font ID : 0 + Back. Color : 6371 + Back. Picture ID (Pressed) : 65535 + Back. Color (Pressed) : 14823 + Font Color (Unpressed) : 65535 + Font Color (Pressed) : 65535 + Horizontal Alignment : center + Vertical Alignment : center + State : unpressed + Text : + Max. Text Size : 40 + Word wrap : enabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + + Events + Touch Press Event + //craft command + tSend.txt="event,buttonPress2," + tSend.txt+=entn.txt+"," + sys2=vaModePos.val-3 + covx sys2,tTmp.txt,0,0 + tSend.txt+="mode-sel,"+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 bMode3 + Attributes + ID : 17 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 259 + y coordinate : 88 + Width : 120 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Font ID : 0 + Back. Color : 6371 + Back. Picture ID (Pressed) : 65535 + Back. Color (Pressed) : 14823 + Font Color (Unpressed) : 65535 + Font Color (Pressed) : 65535 + Horizontal Alignment : center + Vertical Alignment : center + State : unpressed + Text : + Max. Text Size : 40 + Word wrap : enabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + + Events + Touch Press Event + //craft command + tSend.txt="event,buttonPress2," + tSend.txt+=entn.txt+"," + sys2=vaModePos.val-1 + covx sys2,tTmp.txt,0,0 + tSend.txt+="mode-sel,"+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 bMode2 + Attributes + ID : 18 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 135 + y coordinate : 88 + Width : 120 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Font ID : 0 + Back. Color : 6371 + Back. Picture ID (Pressed) : 65535 + Back. Color (Pressed) : 14823 + Font Color (Unpressed) : 65535 + Font Color (Pressed) : 65535 + Horizontal Alignment : center + Vertical Alignment : center + State : unpressed + Text : + Max. Text Size : 40 + Word wrap : enabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + + Events + Touch Press Event + //craft command + tSend.txt="event,buttonPress2," + tSend.txt+=entn.txt+"," + sys2=vaModePos.val-2 + covx sys2,tTmp.txt,0,0 + tSend.txt+="mode-sel,"+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 bModeNext + Attributes + ID : 19 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 388 + y coordinate : 88 + Width : 50 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Font ID : 3 + Back. Color : 6371 + Back. Picture ID (Pressed) : 65535 + Back. Color (Pressed) : 14823 + Font Color (Unpressed) : 50712 + Font Color (Pressed) : 65535 + Horizontal Alignment : center + Vertical Alignment : center + State : unpressed + Text :  + Max. Text Size : 5 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + + Events + Touch Press Event + //if(bMode3.txt=="") + spstr vaModeList.txt,tTmp.txt,"?",vaModePos.val + if(tTmp.txt=="") + { + vaModePos.val=0 + spstr vaModeList.txt,bMode1.txt,"?",vaModePos.val + spstr vaModeList.txt,bMode2.txt,"?",vaModePos.val+1 + spstr vaModeList.txt,bMode3.txt,"?",vaModePos.val+2 + } + spstr vaModeList.txt,bMode1.txt,"?",vaModePos.val + spstr vaModeList.txt,bMode2.txt,"?",vaModePos.val+1 + spstr vaModeList.txt,bMode3.txt,"?",vaModePos.val+2 + vaModePos.val+=3 + spstr vaModeList.txt,tTmp.txt,"?",3 + if(tTmp.txt=="") + { + vis bModeNext,0 + }else + { + vis bModeNext,1 + } + bMode1.pco=defaultFontColor + bMode2.pco=defaultFontColor + bMode3.pco=defaultFontColor + if(bMode1.txt==vaModeCur.txt) + { + bMode1.pco=1374 + } + if(bMode2.txt==vaModeCur.txt) + { + bMode2.pco=1374 + } + if(bMode3.txt==vaModeCur.txt) + { + bMode3.pco=1374 + } + +Timer tmSleep + Attributes + ID : 7 + Scope : local + Period (ms): 1000 + Enabled : yes + + Events + Timer Event + if(sleepTimeout!=0) + { + sleepValue+=1 + if(sleepTimeout<=sleepValue) + { + sleepValue=0 + click b0,1 + click b0,0 + } + } + +Timer tmSerial + Attributes + ID : 8 + Scope : local + Period (ms): 50 + Enabled : yes + + Events + Timer Event + // data available + if(usize>1) + { + bufferPos=0 + while(bufferPos1) + { + bufferPos=0 + while(bufferPos