From 4e303e2fdb445fd8fb19d10a588a9a1341677468 Mon Sep 17 00:00:00 2001 From: joBr99 Date: Tue, 14 Feb 2023 22:03:14 +0000 Subject: [PATCH] Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui (add nextion2text) --- HMI/US/portrait/diff-eu-version.txt | 12 ++---------- HMI/US/portrait/diff-filtered.txt | 12 ++---------- HMI/US/portrait/n2t-out-visual/cardPower.txt | 6 +++--- HMI/US/portrait/n2t-out/cardPower.txt | 2 +- 4 files changed, 8 insertions(+), 24 deletions(-) diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 44f37678..18fa5942 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -1080,16 +1080,8 @@ │ │ Variable (string) nent1 │ Attributes -│ @@ -69,46 +69,82 @@ -│ Text : -│ Max. Text Size: 80 -│ -│ Variable (string) strCommand -│ Attributes -│ Scope : local -│ Text : -│ - Max. Text Size: 1000 -│ + Max. Text Size: 275 +│ @@ -76,39 +76,75 @@ +│ Max. Text Size: 1000 │ │ Variable (int32) t0Speed │ Attributes diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index d20f55f6..017c7ef6 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,4 +1,4 @@ -+++ /dev/fd/62 2023-02-14 21:29:44.298399725 +0000 ++++ /dev/fd/62 2023-02-14 22:03:05.879411129 +0000 +I/n2t-out/Program.s.txt ++ HMI/US/portrait/n2t-out/Program.s.txt +I/n2t-out/cardEntities.txt @@ -499,16 +499,8 @@ + +e (string) nent1 +ributes -+6 +69,82 @@ -+ Text : -+ Max. Text Size: 80 -+ -+e (string) strCommand -+ributes -+ Scope : local -+ Text : ++9 +76,75 @@ + Max. Text Size: 1000 -+ Max. Text Size: 275 + +e (int32) t0Speed +ributes diff --git a/HMI/US/portrait/n2t-out-visual/cardPower.txt b/HMI/US/portrait/n2t-out-visual/cardPower.txt index 5ef79339..089c6a04 100644 --- a/HMI/US/portrait/n2t-out-visual/cardPower.txt +++ b/HMI/US/portrait/n2t-out-visual/cardPower.txt @@ -84,7 +84,7 @@ Variable (string) strCommand ID : 5 Scope : local Text : - Max. Text Size: 275 + Max. Text Size: 1000 Variable (int32) t0Speed Attributes @@ -635,7 +635,7 @@ Text tHome Send Component ID : disabled Opacity : 127 x coordinate : 178 - y coordinate : 245 + y coordinate : 247 Width : 60 Height : 55 Effect : load @@ -665,7 +665,7 @@ Text tHome2 Send Component ID : disabled Opacity : 127 x coordinate : 239 - y coordinate : 246 + y coordinate : 247 Width : 35 Height : 55 Effect : load diff --git a/HMI/US/portrait/n2t-out/cardPower.txt b/HMI/US/portrait/n2t-out/cardPower.txt index 5f219fcc..ff2c99c2 100644 --- a/HMI/US/portrait/n2t-out/cardPower.txt +++ b/HMI/US/portrait/n2t-out/cardPower.txt @@ -73,7 +73,7 @@ Variable (string) strCommand Attributes Scope : local Text : - Max. Text Size: 275 + Max. Text Size: 1000 Variable (int32) t0Speed Attributes