diff --git a/HMI/n2t-out/cardThermo.txt b/HMI/n2t-out/cardThermo.txt index 94840ecc..4f8cd330 100644 --- a/HMI/n2t-out/cardThermo.txt +++ b/HMI/n2t-out/cardThermo.txt @@ -185,7 +185,7 @@ XFloat xTempCurr Fill : solid color Style : flat Associated Keyboard : none - Font ID : 4 + Font ID : 3 Back. Color : 6371 Font Color : 65535 Horizontal Alignment : center @@ -614,7 +614,7 @@ Button bDown Effect Priority : 0 Effect Time : 300 Fill : image - Font ID : 3 + Font ID : 0 Background Picture ID (Unpressed) : 7 Back. Picture ID (Pressed) : 7 Horizontal Alignment : center @@ -670,7 +670,7 @@ Button bUp Effect Priority : 0 Effect Time : 300 Fill : image - Font ID : 3 + Font ID : 0 Background Picture ID (Unpressed) : 9 Back. Picture ID (Pressed) : 9 Horizontal Alignment : center diff --git a/HMI/n2t-out/nspanel_Stats.txt b/HMI/n2t-out/nspanel_Stats.txt index 36933664..bd4d6293 100644 --- a/HMI/n2t-out/nspanel_Stats.txt +++ b/HMI/n2t-out/nspanel_Stats.txt @@ -6,26 +6,18 @@ pageIcons 6 Component(s) 0 Line(s) of event code 0 Unique line(s) of event code -pageSerialTest - 13 Component(s) - 48 Line(s) of event code - 43 Unique line(s) of event code -screensaver - 25 Component(s) - 152 Line(s) of event code - 118 Unique line(s) of event code -pageSwipeTest - 18 Component(s) - 62 Line(s) of event code - 44 Unique line(s) of event code -popupNotify - 15 Component(s) - 143 Line(s) of event code - 95 Unique line(s) of event code pageTest 13 Component(s) 13 Line(s) of event code 13 Unique line(s) of event code +popupNotify + 15 Component(s) + 143 Line(s) of event code + 95 Unique line(s) of event code +pageSerialTest + 13 Component(s) + 48 Line(s) of event code + 43 Unique line(s) of event code cardMedia 22 Component(s) 219 Line(s) of event code @@ -42,6 +34,14 @@ popupLight 27 Component(s) 290 Line(s) of event code 149 Unique line(s) of event code +pageSwipeTest + 18 Component(s) + 62 Line(s) of event code + 44 Unique line(s) of event code +screensaver + 25 Component(s) + 152 Line(s) of event code + 118 Unique line(s) of event code cardThermo 42 Component(s) 450 Line(s) of event code diff --git a/HMI/n2t-out/pageSerialTest.txt b/HMI/n2t-out/pageSerialTest.txt index 91b57a42..f9eb65f7 100644 --- a/HMI/n2t-out/pageSerialTest.txt +++ b/HMI/n2t-out/pageSerialTest.txt @@ -42,7 +42,7 @@ Number nCrcRecv Fill : solid color Style : flat Associated Keyboard : none - Font ID : 5 + Font ID : 4 Back. Color : 65535 Font Color : 0 Horizontal Alignment : center @@ -72,7 +72,7 @@ Number nCrcCalc Fill : solid color Style : flat Associated Keyboard : none - Font ID : 5 + Font ID : 4 Back. Color : 65535 Font Color : 0 Horizontal Alignment : center @@ -102,7 +102,7 @@ Number nIt Fill : solid color Style : flat Associated Keyboard : none - Font ID : 5 + Font ID : 4 Back. Color : 65535 Font Color : 0 Horizontal Alignment : center @@ -162,7 +162,7 @@ Text tStatus Fill : solid color Style : flat Associated Keyboard : none - Font ID : 5 + Font ID : 4 Back. Color : 65535 Font Color : 0 Horizontal Alignment : center @@ -192,7 +192,7 @@ Text tCmd Fill : solid color Style : flat Associated Keyboard : none - Font ID : 5 + Font ID : 4 Back. Color : 65535 Font Color : 0 Horizontal Alignment : center @@ -222,7 +222,7 @@ Text tBuffer Fill : solid color Style : flat Associated Keyboard : none - Font ID : 5 + Font ID : 4 Back. Color : 65535 Font Color : 0 Horizontal Alignment : center @@ -252,7 +252,7 @@ Text tDesc Fill : solid color Style : flat Associated Keyboard : none - Font ID : 5 + Font ID : 4 Back. Color : 65535 Font Color : 0 Horizontal Alignment : center @@ -298,7 +298,7 @@ Button b0 Effect Time : 300 Fill : solid color Style : 3D auto - Font ID : 5 + Font ID : 4 Back. Color : 50712 Back. Picture ID (Pressed) : 0 Back. Color (Pressed) : 1024 @@ -335,7 +335,7 @@ Button b1 Effect Time : 300 Fill : solid color Style : 3D auto - Font ID : 5 + Font ID : 4 Back. Color : 50712 Back. Picture ID (Pressed) : 0 Back. Color (Pressed) : 1024 diff --git a/HMI/n2t-out/pageSwipeTest.txt b/HMI/n2t-out/pageSwipeTest.txt index fa6d3c92..be1b7486 100644 --- a/HMI/n2t-out/pageSwipeTest.txt +++ b/HMI/n2t-out/pageSwipeTest.txt @@ -36,7 +36,7 @@ Number nXS Fill : solid color Style : flat Associated Keyboard : none - Font ID : 5 + Font ID : 4 Back. Color : 65535 Font Color : 0 Horizontal Alignment : center @@ -66,7 +66,7 @@ Number nYE Fill : solid color Style : flat Associated Keyboard : none - Font ID : 5 + Font ID : 4 Back. Color : 65535 Font Color : 0 Horizontal Alignment : center @@ -96,7 +96,7 @@ Number nYS Fill : solid color Style : flat Associated Keyboard : none - Font ID : 5 + Font ID : 4 Back. Color : 65535 Font Color : 0 Horizontal Alignment : center @@ -126,7 +126,7 @@ Number nXE Fill : solid color Style : flat Associated Keyboard : none - Font ID : 5 + Font ID : 4 Back. Color : 65535 Font Color : 0 Horizontal Alignment : center @@ -156,7 +156,7 @@ Number nYR Fill : solid color Style : flat Associated Keyboard : none - Font ID : 5 + Font ID : 4 Back. Color : 65535 Font Color : 0 Horizontal Alignment : center @@ -186,7 +186,7 @@ Number nXR Fill : solid color Style : flat Associated Keyboard : none - Font ID : 5 + Font ID : 4 Back. Color : 65535 Font Color : 0 Horizontal Alignment : center @@ -216,7 +216,7 @@ Text tDesc1 Fill : solid color Style : flat Associated Keyboard : none - Font ID : 5 + Font ID : 4 Back. Color : 65535 Font Color : 0 Horizontal Alignment : center @@ -246,7 +246,7 @@ Text t2 Fill : solid color Style : flat Associated Keyboard : none - Font ID : 5 + Font ID : 4 Back. Color : 65535 Font Color : 0 Horizontal Alignment : center @@ -276,7 +276,7 @@ Text tDirection Fill : solid color Style : flat Associated Keyboard : none - Font ID : 5 + Font ID : 4 Back. Color : 65535 Font Color : 0 Horizontal Alignment : center @@ -306,7 +306,7 @@ Text t0 Fill : solid color Style : flat Associated Keyboard : none - Font ID : 5 + Font ID : 4 Back. Color : 65535 Font Color : 0 Horizontal Alignment : center @@ -336,7 +336,7 @@ Text tStatusNew Fill : solid color Style : flat Associated Keyboard : none - Font ID : 5 + Font ID : 4 Back. Color : 65535 Font Color : 0 Horizontal Alignment : center @@ -366,7 +366,7 @@ Text t3 Fill : solid color Style : flat Associated Keyboard : none - Font ID : 5 + Font ID : 4 Back. Color : 65535 Font Color : 0 Horizontal Alignment : center @@ -396,7 +396,7 @@ Text tDirNew Fill : solid color Style : flat Associated Keyboard : none - Font ID : 5 + Font ID : 4 Back. Color : 65535 Font Color : 0 Horizontal Alignment : center @@ -442,7 +442,7 @@ Button b8 Effect Time : 300 Fill : solid color Style : 3D auto - Font ID : 5 + Font ID : 4 Back. Color : 50712 Back. Picture ID (Pressed) : 65535 Back. Color (Pressed) : 1024 diff --git a/HMI/n2t-out/pageTest.txt b/HMI/n2t-out/pageTest.txt index bd26fbe0..56381cfd 100644 --- a/HMI/n2t-out/pageTest.txt +++ b/HMI/n2t-out/pageTest.txt @@ -56,7 +56,7 @@ Button b0 Effect Time : 300 Fill : solid color Style : 3D auto - Font ID : 5 + Font ID : 4 Back. Color : 50712 Back. Picture ID (Pressed) : 65535 Back. Color (Pressed) : 1024 @@ -92,7 +92,7 @@ Button b1 Effect Time : 300 Fill : solid color Style : 3D auto - Font ID : 5 + Font ID : 4 Back. Color : 50712 Back. Picture ID (Pressed) : 65535 Back. Color (Pressed) : 1024 @@ -128,7 +128,7 @@ Button b2 Effect Time : 300 Fill : solid color Style : 3D auto - Font ID : 5 + Font ID : 4 Back. Color : 50712 Back. Picture ID (Pressed) : 65535 Back. Color (Pressed) : 1024 @@ -164,7 +164,7 @@ Button b3 Effect Time : 300 Fill : solid color Style : 3D auto - Font ID : 5 + Font ID : 4 Back. Color : 50712 Back. Picture ID (Pressed) : 0 Back. Color (Pressed) : 1024 @@ -200,7 +200,7 @@ Button b6 Effect Time : 300 Fill : solid color Style : 3D auto - Font ID : 5 + Font ID : 4 Back. Color : 50712 Back. Picture ID (Pressed) : 65535 Back. Color (Pressed) : 1024 @@ -236,7 +236,7 @@ Button b4 Effect Time : 300 Fill : solid color Style : 3D auto - Font ID : 5 + Font ID : 4 Back. Color : 50712 Back. Picture ID (Pressed) : 65535 Back. Color (Pressed) : 1024 @@ -272,7 +272,7 @@ Button b5 Effect Time : 300 Fill : solid color Style : 3D auto - Font ID : 5 + Font ID : 4 Back. Color : 50712 Back. Picture ID (Pressed) : 65535 Back. Color (Pressed) : 1024 @@ -308,7 +308,7 @@ Button b7 Effect Time : 300 Fill : solid color Style : 3D auto - Font ID : 5 + Font ID : 4 Back. Color : 50712 Back. Picture ID (Pressed) : 65535 Back. Color (Pressed) : 1024 @@ -344,7 +344,7 @@ Button b8 Effect Time : 300 Fill : solid color Style : 3D auto - Font ID : 5 + Font ID : 4 Back. Color : 50712 Back. Picture ID (Pressed) : 65535 Back. Color (Pressed) : 1024 @@ -381,7 +381,7 @@ Button b9 Effect Time : 300 Fill : solid color Style : 3D auto - Font ID : 5 + Font ID : 4 Back. Color : 50712 Back. Picture ID (Pressed) : 65535 Back. Color (Pressed) : 1024 @@ -417,7 +417,7 @@ Button b10 Effect Time : 300 Fill : solid color Style : 3D auto - Font ID : 5 + Font ID : 4 Back. Color : 50712 Back. Picture ID (Pressed) : 65535 Back. Color (Pressed) : 1024 diff --git a/HMI/n2t-out/screensaver.txt b/HMI/n2t-out/screensaver.txt index e2fde4aa..6ba57854 100644 --- a/HMI/n2t-out/screensaver.txt +++ b/HMI/n2t-out/screensaver.txt @@ -193,7 +193,7 @@ Text tTime Fill : solid color Style : flat Associated Keyboard : none - Font ID : 6 + Font ID : 5 Back. Color : 0 Font Color : 65535 Horizontal Alignment : center @@ -283,7 +283,7 @@ Text tMainIcon Fill : solid color Style : flat Associated Keyboard : none - Font ID : 4 + Font ID : 3 Back. Color : 0 Font Color : 65535 Horizontal Alignment : center