From a7d7d90a4d15ae7241a64494858b99d83d8dbba5 Mon Sep 17 00:00:00 2001 From: joBr99 Date: Mon, 27 Mar 2023 15:57:51 +0000 Subject: [PATCH] fixes #829 #830 (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 61 ++++++++++++++++++++++++++- HMI/US/portrait/diff-eu-version.txt | 61 ++++++++++++++++++++++++++- HMI/US/portrait/diff-filtered.txt | 62 +++++++++++++++++++++++++++- HMI/n2t-out-visual/Program.s.txt | 1 + HMI/n2t-out-visual/cardQR.txt | 6 +-- HMI/n2t-out-visual/nspanel_Stats.txt | 24 +++++------ HMI/n2t-out-visual/popupNotify.txt | 2 + HMI/n2t-out/Program.s.txt | 1 + HMI/n2t-out/cardQR.txt | 6 +-- HMI/n2t-out/popupNotify.txt | 2 + 10 files changed, 205 insertions(+), 21 deletions(-) diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index ed013200..cf668356 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -2,7 +2,7 @@ +++ HMI/US/landscape/n2t-out │ --- HMI/n2t-out/Program.s.txt ├── +++ HMI/US/landscape/n2t-out/Program.s.txt -│ @@ -11,9 +11,9 @@ +│ @@ -11,10 +11,9 @@ │ // dim value │ int dimValue=40 │ int dimValueNormal=100 @@ -11,10 +11,50 @@ │ int defaultBcoColor=6371 │ // fix touch offset │ - lcd_dev fffb 0002 0000 0020 +│ - printh 00 00 00 ff ff ff 88 ff ff ff//Output power on information to serial port │ + //lcd_dev fffb 0002 0000 0020 │ page pageStartup │ --- HMI/n2t-out/cardQR.txt ├── +++ HMI/US/landscape/n2t-out/cardQR.txt +│ @@ -124,15 +124,15 @@ +│ Text : +│ Max. Text Size: 10 +│ +│ Variable (string) vaQR +│ Attributes +│ Scope : local +│ Text : +│ - Max. Text Size: 70 +│ + Max. Text Size: 80 +│ +│ Text tEntity1 +│ Attributes +│ Scope : local +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ @@ -602,19 +602,19 @@ +│ // get Text (optional Value) +│ spstr strCommand.txt,bText2.txt,"~",26 +│ } +│ if(type2.txt=="delete"||type2.txt=="") +│ { +│ if(type1.txt=="delete"||type1.txt=="") +│ { +│ - qrcode m1.x,m1.y,200,65535,defaultBcoColor,-1,vaQR.txt +│ + qrcode m1.x,m1.y,200,defaultBcoColor,65535,-1,vaQR.txt +│ } +│ }else +│ { +│ - qrcode m0.x,m0.y,200,65535,defaultBcoColor,-1,vaQR.txt +│ + qrcode m0.x,m0.y,200,defaultBcoColor,65535,-1,vaQR.txt +│ } +│ } +│ if(tInstruction.txt=="time") +│ { +│ // get set time to global variable +│ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 +│ } │ @@ -751,15 +751,15 @@ │ if(sleepTimeout!=0&&dimValue!=dim) │ { @@ -51,6 +91,25 @@ │ crcputs sys0,2 │ crcputs tSend.txt,0 │ //send cmd +│ --- HMI/n2t-out/popupNotify.txt +├── +++ HMI/US/landscape/n2t-out/popupNotify.txt +│ @@ -15,16 +15,14 @@ +│ popupNotify.bco=defaultBcoColor +│ dim=dimValueNormal +│ vis p0,0 +│ vis tSend,0 +│ vis tTmp,0 +│ vis tInstruction,0 +│ vis tId,0 +│ - vis b1,0 +│ - vis b2,0 +│ popupNotify.bco=defaultBcoColor +│ tHeading.bco=defaultBcoColor +│ b0.bco=defaultBcoColor +│ tText.bco=defaultBcoColor +│ b1.bco=defaultBcoColor +│ b2.bco=defaultBcoColor +│ tIcon.bco=defaultBcoColor │ --- HMI/n2t-out/screensaver.txt ├── +++ HMI/US/landscape/n2t-out/screensaver.txt │ @@ -29,17 +29,14 @@ diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 37ac846e..5546e368 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -2,7 +2,7 @@ +++ HMI/US/portrait/n2t-out │ --- HMI/n2t-out/Program.s.txt ├── +++ HMI/US/portrait/n2t-out/Program.s.txt -│ @@ -10,10 +10,10 @@ +│ @@ -10,11 +10,10 @@ │ int sleepValue=0 │ // dim value │ int dimValue=40 @@ -12,6 +12,7 @@ │ int defaultBcoColor=6371 │ - // fix touch offset │ - lcd_dev fffb 0002 0000 0020 +│ - printh 00 00 00 ff ff ff 88 ff ff ff//Output power on information to serial port │ + // fix touch offset (Removed for US version) │ + //lcd_dev fffb 0002 0000 0020 │ page pageStartup @@ -1382,6 +1383,45 @@ │ Enabled : yes │ --- HMI/n2t-out/cardQR.txt ├── +++ HMI/US/portrait/n2t-out/cardQR.txt +│ @@ -124,15 +124,15 @@ +│ Text : +│ Max. Text Size: 10 +│ +│ Variable (string) vaQR +│ Attributes +│ Scope : local +│ Text : +│ - Max. Text Size: 70 +│ + Max. Text Size: 80 +│ +│ Text tEntity1 +│ Attributes +│ Scope : local +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ @@ -602,19 +602,19 @@ +│ // get Text (optional Value) +│ spstr strCommand.txt,bText2.txt,"~",26 +│ } +│ if(type2.txt=="delete"||type2.txt=="") +│ { +│ if(type1.txt=="delete"||type1.txt=="") +│ { +│ - qrcode m1.x,m1.y,200,65535,defaultBcoColor,-1,vaQR.txt +│ + qrcode m1.x,m1.y,200,defaultBcoColor,65535,-1,vaQR.txt +│ } +│ }else +│ { +│ - qrcode m0.x,m0.y,200,65535,defaultBcoColor,-1,vaQR.txt +│ + qrcode m0.x,m0.y,200,defaultBcoColor,65535,-1,vaQR.txt +│ } +│ } +│ if(tInstruction.txt=="time") +│ { +│ // get set time to global variable +│ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 +│ } │ @@ -751,15 +751,15 @@ │ if(sleepTimeout!=0&&dimValue!=dim) │ { @@ -1456,6 +1496,25 @@ │ crcputs sys0,2 │ crcputs tSend.txt,0 │ //send cmd +│ --- HMI/n2t-out/popupNotify.txt +├── +++ HMI/US/portrait/n2t-out/popupNotify.txt +│ @@ -15,16 +15,14 @@ +│ popupNotify.bco=defaultBcoColor +│ dim=dimValueNormal +│ vis p0,0 +│ vis tSend,0 +│ vis tTmp,0 +│ vis tInstruction,0 +│ vis tId,0 +│ - vis b1,0 +│ - vis b2,0 +│ popupNotify.bco=defaultBcoColor +│ tHeading.bco=defaultBcoColor +│ b0.bco=defaultBcoColor +│ tText.bco=defaultBcoColor +│ b1.bco=defaultBcoColor +│ b2.bco=defaultBcoColor +│ tIcon.bco=defaultBcoColor │ --- HMI/n2t-out/screensaver.txt ├── +++ HMI/US/portrait/n2t-out/screensaver.txt │ @@ -29,17 +29,14 @@ diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 398b01e4..a59c28d1 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,6 +1,8 @@ -+++ /dev/fd/62 2023-03-25 14:31:18.150326646 +0000 ++++ /dev/fd/62 2023-03-27 15:57:43.735088348 +0000 +I/n2t-out/Program.s.txt ++ HMI/US/portrait/n2t-out/Program.s.txt ++1 +10,10 @@ ++nth 00 00 00 ff ff ff 88 ff ff ff//Output power on information to serial port +I/n2t-out/cardEntities.txt ++ HMI/US/portrait/n2t-out/cardEntities.txt +6 +61,36 @@ @@ -802,6 +804,45 @@ + Enabled : yes +I/n2t-out/cardQR.txt ++ HMI/US/portrait/n2t-out/cardQR.txt ++15 +124,15 @@ ++ Text : ++ Max. Text Size: 10 ++ ++e (string) vaQR ++ributes ++ Scope : local ++ Text : ++ Max. Text Size: 70 ++ Max. Text Size: 80 ++ ++ntity1 ++ributes ++ Scope : local ++ Dragging : 0 ++ Disable release event after dragging: 0 ++ Send Component ID : disabled ++19 +602,19 @@ ++ // get Text (optional Value) ++ spstr strCommand.txt,bText2.txt,"~",26 ++ } ++ if(type2.txt=="delete"||type2.txt=="") ++ { ++ if(type1.txt=="delete"||type1.txt=="") ++ { ++ qrcode m1.x,m1.y,200,65535,defaultBcoColor,-1,vaQR.txt ++ qrcode m1.x,m1.y,200,defaultBcoColor,65535,-1,vaQR.txt ++ } ++ }else ++ { ++ qrcode m0.x,m0.y,200,65535,defaultBcoColor,-1,vaQR.txt ++ qrcode m0.x,m0.y,200,defaultBcoColor,65535,-1,vaQR.txt ++ } ++ } ++ if(tInstruction.txt=="time") ++ { ++ // get set time to global variable ++ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 ++ } +15 +751,15 @@ + if(sleepTimeout!=0&&dimValue!=dim) + { @@ -842,6 +883,25 @@ + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none ++I/n2t-out/popupNotify.txt +++ HMI/US/portrait/n2t-out/popupNotify.txt ++6 +15,14 @@ ++ popupNotify.bco=defaultBcoColor ++ dim=dimValueNormal ++ vis p0,0 ++ vis tSend,0 ++ vis tTmp,0 ++ vis tInstruction,0 ++ vis tId,0 ++ vis b1,0 ++ vis b2,0 ++ popupNotify.bco=defaultBcoColor ++ tHeading.bco=defaultBcoColor ++ b0.bco=defaultBcoColor ++ tText.bco=defaultBcoColor ++ b1.bco=defaultBcoColor ++ b2.bco=defaultBcoColor ++ tIcon.bco=defaultBcoColor +I/n2t-out/screensaver.txt ++ HMI/US/portrait/n2t-out/screensaver.txt +7 +29,14 @@ diff --git a/HMI/n2t-out-visual/Program.s.txt b/HMI/n2t-out-visual/Program.s.txt index 217dbf1f..1df3bb7f 100644 --- a/HMI/n2t-out-visual/Program.s.txt +++ b/HMI/n2t-out-visual/Program.s.txt @@ -16,4 +16,5 @@ Program.s int defaultBcoColor=6371 // fix touch offset lcd_dev fffb 0002 0000 0020 + printh 00 00 00 ff ff ff 88 ff ff ff//Output power on information to serial port page pageStartup diff --git a/HMI/n2t-out-visual/cardQR.txt b/HMI/n2t-out-visual/cardQR.txt index e2263b41..fcb9d713 100644 --- a/HMI/n2t-out-visual/cardQR.txt +++ b/HMI/n2t-out-visual/cardQR.txt @@ -149,7 +149,7 @@ Variable (string) vaQR ID : 31 Scope : local Text : - Max. Text Size: 80 + Max. Text Size: 70 Text tEntity1 Attributes @@ -907,11 +907,11 @@ Timer tmSerial { if(type1.txt=="delete"||type1.txt=="") { - qrcode m1.x,m1.y,200,defaultBcoColor,65535,-1,vaQR.txt + qrcode m1.x,m1.y,200,65535,defaultBcoColor,-1,vaQR.txt } }else { - qrcode m0.x,m0.y,200,defaultBcoColor,65535,-1,vaQR.txt + qrcode m0.x,m0.y,200,65535,defaultBcoColor,-1,vaQR.txt } } if(tInstruction.txt=="time") diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index 80b7e8c9..f2301975 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -1,15 +1,23 @@ Program.s 0 Component(s) - 13 Line(s) of event code - 13 Unique line(s) of event code + 14 Line(s) of event code + 14 Unique line(s) of event code pageIcons 7 Component(s) 0 Line(s) of event code 0 Unique line(s) of event code +popupNotify + 19 Component(s) + 263 Line(s) of event code + 170 Unique line(s) of event code 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 @@ -18,10 +26,6 @@ cardChart 33 Component(s) 433 Line(s) of event code 294 Unique line(s) of event code -popupNotify - 19 Component(s) - 261 Line(s) of event code - 168 Unique line(s) of event code pageTest 26 Component(s) 68 Line(s) of event code @@ -46,10 +50,6 @@ 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 @@ -90,5 +90,5 @@ screensaver2 Total 21 Page(s) 802 Component(s) - 9246 Line(s) of event code - 2341 Unique line(s) of event code + 9249 Line(s) of event code + 2342 Unique line(s) of event code diff --git a/HMI/n2t-out-visual/popupNotify.txt b/HMI/n2t-out-visual/popupNotify.txt index 6dbe8d98..deec407b 100644 --- a/HMI/n2t-out-visual/popupNotify.txt +++ b/HMI/n2t-out-visual/popupNotify.txt @@ -27,6 +27,8 @@ Page popupNotify vis tTmp,0 vis tInstruction,0 vis tId,0 + vis b1,0 + vis b2,0 popupNotify.bco=defaultBcoColor tHeading.bco=defaultBcoColor b0.bco=defaultBcoColor diff --git a/HMI/n2t-out/Program.s.txt b/HMI/n2t-out/Program.s.txt index 217dbf1f..1df3bb7f 100644 --- a/HMI/n2t-out/Program.s.txt +++ b/HMI/n2t-out/Program.s.txt @@ -16,4 +16,5 @@ Program.s int defaultBcoColor=6371 // fix touch offset lcd_dev fffb 0002 0000 0020 + printh 00 00 00 ff ff ff 88 ff ff ff//Output power on information to serial port page pageStartup diff --git a/HMI/n2t-out/cardQR.txt b/HMI/n2t-out/cardQR.txt index 29dc5560..13bfb5e2 100644 --- a/HMI/n2t-out/cardQR.txt +++ b/HMI/n2t-out/cardQR.txt @@ -128,7 +128,7 @@ Variable (string) vaQR Attributes Scope : local Text : - Max. Text Size: 80 + Max. Text Size: 70 Text tEntity1 Attributes @@ -606,11 +606,11 @@ Timer tmSerial { if(type1.txt=="delete"||type1.txt=="") { - qrcode m1.x,m1.y,200,defaultBcoColor,65535,-1,vaQR.txt + qrcode m1.x,m1.y,200,65535,defaultBcoColor,-1,vaQR.txt } }else { - qrcode m0.x,m0.y,200,defaultBcoColor,65535,-1,vaQR.txt + qrcode m0.x,m0.y,200,65535,defaultBcoColor,-1,vaQR.txt } } if(tInstruction.txt=="time") diff --git a/HMI/n2t-out/popupNotify.txt b/HMI/n2t-out/popupNotify.txt index 251b02b0..eaa0b219 100644 --- a/HMI/n2t-out/popupNotify.txt +++ b/HMI/n2t-out/popupNotify.txt @@ -19,6 +19,8 @@ Page popupNotify vis tTmp,0 vis tInstruction,0 vis tId,0 + vis b1,0 + vis b2,0 popupNotify.bco=defaultBcoColor tHeading.bco=defaultBcoColor b0.bco=defaultBcoColor