added Combining Diacritical Marks to font (add nextion2text)

This commit is contained in:
joBr99
2022-07-03 21:07:09 +00:00
committed by github-actions[bot]
parent 920e8dbecf
commit b51ecb0351
3 changed files with 63 additions and 63 deletions

View File

@@ -1,6 +1,6 @@
diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
--- HMI/n2t-out/Program.s.txt 2022-06-28 19:24:02.299115463 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-28 19:24:03.391109187 +0000
--- HMI/n2t-out/Program.s.txt 2022-07-03 21:07:05.128220620 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-07-03 21:07:06.032233062 +0000
@@ -11,9 +11,4 @@
// dim value
int dimValue=40
@@ -12,8 +12,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
- lcd_dev fffb 0002 0000 0020
page pageStartup
diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt
--- HMI/n2t-out/cardAlarm.txt 2022-06-28 19:24:02.303115440 +0000
+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-06-28 19:24:03.395109164 +0000
--- HMI/n2t-out/cardAlarm.txt 2022-07-03 21:07:05.128220620 +0000
+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-07-03 21:07:06.032233062 +0000
@@ -12,21 +12,6 @@
Events
@@ -65,8 +65,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-06-28 19:24:02.303115440 +0000
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-06-28 19:24:03.395109164 +0000
--- HMI/n2t-out/cardEntities.txt 2022-07-03 21:07:05.128220620 +0000
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-07-03 21:07:06.032233062 +0000
@@ -12,22 +12,6 @@
Events
@@ -154,8 +154,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
--- HMI/n2t-out/cardGrid.txt 2022-06-28 19:24:02.303115440 +0000
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-06-28 19:24:03.391109187 +0000
--- HMI/n2t-out/cardGrid.txt 2022-07-03 21:07:05.128220620 +0000
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-07-03 21:07:06.032233062 +0000
@@ -12,11 +12,6 @@
Events
@@ -199,8 +199,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
TouchCap tc0
Attributes
diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt
--- HMI/n2t-out/cardMedia.txt 2022-06-28 19:24:02.299115463 +0000
+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-06-28 19:24:03.391109187 +0000
--- HMI/n2t-out/cardMedia.txt 2022-07-03 21:07:05.128220620 +0000
+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-07-03 21:07:06.032233062 +0000
@@ -12,17 +12,6 @@
Events
@@ -239,8 +239,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt
--- HMI/n2t-out/cardQR.txt 2022-06-28 19:24:02.299115463 +0000
+++ HMI/US/landscape/n2t-out/cardQR.txt 2022-06-28 19:24:03.391109187 +0000
--- HMI/n2t-out/cardQR.txt 2022-07-03 21:07:05.128220620 +0000
+++ HMI/US/landscape/n2t-out/cardQR.txt 2022-07-03 21:07:06.032233062 +0000
@@ -12,21 +12,6 @@
Events
@@ -283,8 +283,8 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
--- HMI/n2t-out/cardThermo.txt 2022-06-28 19:24:02.303115440 +0000
+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-06-28 19:24:03.395109164 +0000
--- HMI/n2t-out/cardThermo.txt 2022-07-03 21:07:05.128220620 +0000
+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-07-03 21:07:06.032233062 +0000
@@ -12,11 +12,6 @@
Events
@@ -317,8 +317,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-06-28 19:24:02.299115463 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-28 19:24:03.391109187 +0000
--- HMI/n2t-out/pageStartup.txt 2022-07-03 21:07:05.128220620 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-07-03 21:07:06.032233062 +0000
@@ -177,7 +177,7 @@
recmod=1
bauds=115200
@@ -348,8 +348,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/pageTest.txt HMI/US/landscape/n2t-out/pageTest.txt
--- HMI/n2t-out/pageTest.txt 2022-06-28 19:24:02.299115463 +0000
+++ HMI/US/landscape/n2t-out/pageTest.txt 2022-06-28 19:24:03.391109187 +0000
--- HMI/n2t-out/pageTest.txt 2022-07-03 21:07:05.128220620 +0000
+++ HMI/US/landscape/n2t-out/pageTest.txt 2022-07-03 21:07:06.032233062 +0000
@@ -13,46 +13,6 @@
Events
Preinitialize Event
@@ -399,8 +399,8 @@ diff -bur HMI/n2t-out/pageTest.txt HMI/US/landscape/n2t-out/pageTest.txt
Attributes
Only in HMI/n2t-out: popupFan.txt
diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
--- HMI/n2t-out/popupLight.txt 2022-06-28 19:24:02.299115463 +0000
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-06-28 19:24:03.391109187 +0000
--- HMI/n2t-out/popupLight.txt 2022-07-03 21:07:05.128220620 +0000
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-07-03 21:07:06.032233062 +0000
@@ -12,25 +12,6 @@
Events
@@ -447,8 +447,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt
--- HMI/n2t-out/popupNotify.txt 2022-06-28 19:24:02.299115463 +0000
+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-06-28 19:24:03.391109187 +0000
--- HMI/n2t-out/popupNotify.txt 2022-07-03 21:07:05.128220620 +0000
+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-07-03 21:07:06.032233062 +0000
@@ -18,17 +18,6 @@
vis tTmp,0
vis tInstruction,0
@@ -487,8 +487,8 @@ diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt
--- HMI/n2t-out/popupShutter.txt 2022-06-28 19:24:02.303115440 +0000
+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-06-28 19:24:03.395109164 +0000
--- HMI/n2t-out/popupShutter.txt 2022-07-03 21:07:05.128220620 +0000
+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-07-03 21:07:06.032233062 +0000
@@ -12,40 +12,6 @@
Events
@@ -638,8 +638,8 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt
if(tInstruction.txt=="time")
{
diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt
--- HMI/n2t-out/screensaver.txt 2022-06-28 19:24:02.299115463 +0000
+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-06-28 19:24:03.395109164 +0000
--- HMI/n2t-out/screensaver.txt 2022-07-03 21:07:05.128220620 +0000
+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-07-03 21:07:06.032233062 +0000
@@ -406,22 +406,10 @@
// get value
spstr strCommand.txt,tTmp.txt,"~",1