From e516a7fa05b0b84bae23837b7faf752635f9a2cc Mon Sep 17 00:00:00 2001 From: joBr99 Date: Sun, 23 Oct 2022 21:42:31 +0000 Subject: [PATCH] sync (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 28 ------------------- .../n2t-out-visual/nspanel_US_L_Stats.txt | 20 ++++++------- .../landscape/n2t-out-visual/screensaver.txt | 12 ++++++++ HMI/US/landscape/n2t-out/screensaver.txt | 12 ++++++++ HMI/US/portrait/diff-eu-version.txt | 25 +++-------------- HMI/US/portrait/diff-filtered.txt | 19 +------------ .../n2t-out-visual/nspanel_US_P_Stats.txt | 8 +++--- HMI/US/portrait/n2t-out-visual/popupFan.txt | 6 ++-- HMI/US/portrait/n2t-out/popupFan.txt | 6 ++-- 9 files changed, 49 insertions(+), 87 deletions(-) diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index eeebfb12..4c672940 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -58,31 +58,3 @@ │ crcputs sys0,2 │ crcputs tSend.txt,0 │ //send cmd -├── screensaver.txt -│ @@ -620,26 +620,14 @@ -│ vis tNotifyHead,1 -│ vis tNotifyText,1 -│ }else -│ { -│ vis tNotifyHead,0 -│ vis tNotifyText,0 -│ } -│ - tNotifyHead.bco=tTime.bco -│ - tNotifyText.bco=tTime.bco -│ - spstr strCommand.txt,tTmp.txt,"~",3 -│ - if(tTmp.txt!="") -│ - { -│ - covx tTmp.txt,tNotifyHead.pco,0,0 -│ - } -│ - spstr strCommand.txt,tTmp.txt,"~",4 -│ - if(tTmp.txt!="") -│ - { -│ - covx tTmp.txt,tNotifyText.pco,0,0 -│ - } -│ } -│ if(tInstruction.txt=="pageType") -│ { -│ dim=100 -│ //command format pageType,specialPageName -│ //write name of speical page to tId -│ spstr strCommand.txt,tId.txt,"~",1 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 56fe4c47..b93ce8eb 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 @@ -42,18 +42,18 @@ cardAlarm 40 Component(s) 427 Line(s) of event code 258 Unique line(s) of event code -cardPower - 43 Component(s) - 420 Line(s) of event code - 292 Unique line(s) of event code +screensaver + 38 Component(s) + 350 Line(s) of event code + 266 Unique line(s) of event code cardQR 32 Component(s) 409 Line(s) of event code 238 Unique line(s) of event code -screensaver - 38 Component(s) - 338 Line(s) of event code - 262 Unique line(s) of event code +cardPower + 43 Component(s) + 420 Line(s) of event code + 292 Unique line(s) of event code popupThermo 44 Component(s) 515 Line(s) of event code @@ -70,5 +70,5 @@ cardEntities Total 16 Page(s) 529 Component(s) - 6292 Line(s) of event code - 1670 Unique line(s) of event code + 6304 Line(s) of event code + 1674 Unique line(s) of event code diff --git a/HMI/US/landscape/n2t-out-visual/screensaver.txt b/HMI/US/landscape/n2t-out-visual/screensaver.txt index 5ceda39f..96df5606 100644 --- a/HMI/US/landscape/n2t-out-visual/screensaver.txt +++ b/HMI/US/landscape/n2t-out-visual/screensaver.txt @@ -1189,6 +1189,18 @@ Timer tmSerial vis tNotifyHead,0 vis tNotifyText,0 } + tNotifyHead.bco=tTime.bco + tNotifyText.bco=tTime.bco + spstr strCommand.txt,tTmp.txt,"~",3 + if(tTmp.txt!="") + { + covx tTmp.txt,tNotifyHead.pco,0,0 + } + spstr strCommand.txt,tTmp.txt,"~",4 + if(tTmp.txt!="") + { + covx tTmp.txt,tNotifyText.pco,0,0 + } } if(tInstruction.txt=="pageType") { diff --git a/HMI/US/landscape/n2t-out/screensaver.txt b/HMI/US/landscape/n2t-out/screensaver.txt index 01a8cc52..625daaf4 100644 --- a/HMI/US/landscape/n2t-out/screensaver.txt +++ b/HMI/US/landscape/n2t-out/screensaver.txt @@ -624,6 +624,18 @@ Timer tmSerial vis tNotifyHead,0 vis tNotifyText,0 } + tNotifyHead.bco=tTime.bco + tNotifyText.bco=tTime.bco + spstr strCommand.txt,tTmp.txt,"~",3 + if(tTmp.txt!="") + { + covx tTmp.txt,tNotifyHead.pco,0,0 + } + spstr strCommand.txt,tTmp.txt,"~",4 + if(tTmp.txt!="") + { + covx tTmp.txt,tNotifyText.pco,0,0 + } } if(tInstruction.txt=="pageType") { diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 7fc1d4e2..025412aa 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -568,6 +568,7 @@ │ crcputs tSend.txt,0 │ //send cmd ├── popupFan.txt +│┄ ordering differences only │ @@ -78,31 +78,31 @@ │ Value: 1 │ @@ -607,21 +608,7 @@ │ Max. Text Size: 200 │ │ Text tEntity -│ @@ -240,75 +240,75 @@ -│ 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-preset_modes,"+tTmp.txt -│ + tSend.txt+="mode-sel,"+tTmp.txt -│ //send calc crc -│ btlen tSend.txt,sys0 -│ crcrest 1,0xffff // reset CRC -│ crcputh 55 bb -│ crcputs sys0,2 +│ @@ -253,60 +253,60 @@ │ crcputs tSend.txt,0 │ //send cmd │ printh 55 bb @@ -648,8 +635,7 @@ │ - sys2=vaModePos.val-1 │ + sys2=vaModePos.val-2 │ covx sys2,tTmp.txt,0,0 -│ - tSend.txt+="mode-preset_modes,"+tTmp.txt -│ + tSend.txt+="mode-sel,"+tTmp.txt +│ tSend.txt+="mode-preset_modes,"+tTmp.txt │ //send calc crc │ btlen tSend.txt,sys0 │ crcrest 1,0xffff // reset CRC @@ -681,15 +667,12 @@ │ - sys2=vaModePos.val-2 │ + sys2=vaModePos.val-1 │ covx sys2,tTmp.txt,0,0 -│ - tSend.txt+="mode-preset_modes,"+tTmp.txt -│ + tSend.txt+="mode-sel,"+tTmp.txt +│ tSend.txt+="mode-preset_modes,"+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 ├── screensaver.txt │ @@ -71,15 +71,15 @@ │ Text tTime diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index fac10ebe..2b50f4ed 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,23 +1,6 @@ -+++ /dev/fd/62 2022-10-23 21:26:32.359041592 +0000 -+75 +240,75 @@ -+nts -+ 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-preset_modes,"+tTmp.txt -+ tSend.txt+="mode-sel,"+tTmp.txt -+ //send calc crc -+ btlen tSend.txt,sys0 -+ crcrest 1,0xffff // reset CRC -+ crcputh 55 bb -+ crcputs sys0,2 ++++ /dev/fd/62 2022-10-23 21:42:24.358169322 +0000 + tSend.txt+="mode-preset_modes,"+tTmp.txt + tSend.txt+="mode-preset_modes,"+tTmp.txt -+ crcputs tSend.txt,0 -+ //send cmd +reensaver.txt +5 +71,15 @@ +ime 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 c1b82fec..15066832 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 @@ -10,10 +10,6 @@ pageTest 14 Component(s) 14 Line(s) of event code 14 Unique line(s) of event code -popupFan - 27 Component(s) - 347 Line(s) of event code - 202 Unique line(s) of event code cardPower 43 Component(s) 423 Line(s) of event code @@ -50,6 +46,10 @@ screensaver 38 Component(s) 350 Line(s) of event code 266 Unique line(s) of event code +popupFan + 27 Component(s) + 347 Line(s) of event code + 202 Unique line(s) of event code cardAlarm 40 Component(s) 427 Line(s) of event code diff --git a/HMI/US/portrait/n2t-out-visual/popupFan.txt b/HMI/US/portrait/n2t-out-visual/popupFan.txt index 8f1f24d8..9487bf8d 100644 --- a/HMI/US/portrait/n2t-out-visual/popupFan.txt +++ b/HMI/US/portrait/n2t-out-visual/popupFan.txt @@ -449,7 +449,7 @@ Button bMode1 tSend.txt+=entn.txt+"," sys2=vaModePos.val-3 covx sys2,tTmp.txt,0,0 - tSend.txt+="mode-sel,"+tTmp.txt + tSend.txt+="mode-preset_modes,"+tTmp.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -501,7 +501,7 @@ Button bMode2 tSend.txt+=entn.txt+"," sys2=vaModePos.val-2 covx sys2,tTmp.txt,0,0 - tSend.txt+="mode-sel,"+tTmp.txt + tSend.txt+="mode-preset_modes,"+tTmp.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -553,7 +553,7 @@ Button bMode3 tSend.txt+=entn.txt+"," sys2=vaModePos.val-1 covx sys2,tTmp.txt,0,0 - tSend.txt+="mode-sel,"+tTmp.txt + tSend.txt+="mode-preset_modes,"+tTmp.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff --git a/HMI/US/portrait/n2t-out/popupFan.txt b/HMI/US/portrait/n2t-out/popupFan.txt index 346a6eb1..1334b4ae 100644 --- a/HMI/US/portrait/n2t-out/popupFan.txt +++ b/HMI/US/portrait/n2t-out/popupFan.txt @@ -244,7 +244,7 @@ Button bMode1 tSend.txt+=entn.txt+"," sys2=vaModePos.val-3 covx sys2,tTmp.txt,0,0 - tSend.txt+="mode-sel,"+tTmp.txt + tSend.txt+="mode-preset_modes,"+tTmp.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -274,7 +274,7 @@ Button bMode2 tSend.txt+=entn.txt+"," sys2=vaModePos.val-2 covx sys2,tTmp.txt,0,0 - tSend.txt+="mode-sel,"+tTmp.txt + tSend.txt+="mode-preset_modes,"+tTmp.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -304,7 +304,7 @@ Button bMode3 tSend.txt+=entn.txt+"," sys2=vaModePos.val-1 covx sys2,tTmp.txt,0,0 - tSend.txt+="mode-sel,"+tTmp.txt + tSend.txt+="mode-preset_modes,"+tTmp.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC