From 96d5181c99c9f6fb9c56158ff61e05aa8cff92b8 Mon Sep 17 00:00:00 2001 From: joBr99 <29555657+joBr99@users.noreply.github.com> Date: Sun, 23 Oct 2022 21:11:25 +0000 Subject: [PATCH] sync us-l (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 52 ------------------- .../n2t-out-visual/nspanel_US_L_Stats.txt | 8 +-- HMI/US/landscape/n2t-out-visual/popupFan.txt | 6 +-- HMI/US/landscape/n2t-out/popupFan.txt | 6 +-- HMI/US/portrait/diff-filtered.txt | 2 +- 5 files changed, 11 insertions(+), 63 deletions(-) diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index f667486d..eeebfb12 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -58,58 +58,6 @@ │ crcputs sys0,2 │ crcputs tSend.txt,0 │ //send cmd -├── popupFan.txt -│ @@ -240,15 +240,15 @@ -│ 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 -│ crcputs tSend.txt,0 -│ //send cmd -│ @@ -270,15 +270,15 @@ -│ 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-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 -│ crcputs tSend.txt,0 -│ //send cmd -│ @@ -300,15 +300,15 @@ -│ 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-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 -│ crcputs tSend.txt,0 -│ //send cmd ├── screensaver.txt │ @@ -620,26 +620,14 @@ │ vis tNotifyHead,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 e76f4059..fa2db927 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 @@ -18,10 +18,6 @@ cardMedia 34 Component(s) 394 Line(s) of event code 213 Unique line(s) of event code -popupFan - 27 Component(s) - 347 Line(s) of event code - 202 Unique line(s) of event code popupLight 27 Component(s) 391 Line(s) of event code @@ -30,6 +26,10 @@ popupShutter 25 Component(s) 394 Line(s) of event code 216 Unique line(s) of event code +popupFan + 27 Component(s) + 347 Line(s) of event code + 202 Unique line(s) of event code pageTest 14 Component(s) 14 Line(s) of event code diff --git a/HMI/US/landscape/n2t-out-visual/popupFan.txt b/HMI/US/landscape/n2t-out-visual/popupFan.txt index 1cf69bbd..25f6b9c6 100644 --- a/HMI/US/landscape/n2t-out-visual/popupFan.txt +++ b/HMI/US/landscape/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 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 @@ -553,7 +553,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 diff --git a/HMI/US/landscape/n2t-out/popupFan.txt b/HMI/US/landscape/n2t-out/popupFan.txt index 3512f075..dd78aca7 100644 --- a/HMI/US/landscape/n2t-out/popupFan.txt +++ b/HMI/US/landscape/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 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 @@ -304,7 +304,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 diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 446b6a25..d4e89571 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,4 +1,4 @@ -+++ /dev/fd/62 2022-10-23 19:22:42.287327915 +0000 ++++ /dev/fd/62 2022-10-23 21:11:18.696978352 +0000 +rdThermo.txt +15 +785,15 @@ +