Merge branch 'master' of https://github.com/eez-open/modular-psu-firm…

…ware
eez-open · Nov 4, 2019 · 3038868 · 3038868
2 parents e2ec4ca + 3d199c3
commit 3038868
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 14 deletions.
diff --git a/docs/SCPI reference guide/Commands/EEZ BB3 SCPI reference 5.4 - DISPlay.html b/docs/SCPI reference guide/Commands/EEZ BB3 SCPI reference 5.4 - DISPlay.html
@@ -552,11 +552,11 @@
 				<td colspan="4" style="border-left: 0; border-right: 0; border-top: 0; border-bottom: 0; vertical-align: top; background: transparent; width: 87%;">
 					<p>Use this command to set front panel TFT display main page appearance. The following modes are available:</p>
 					<ul>
-						<li class="List_1_Start" style="text-indent: 0; list-style-type: disc;">1 – Digits</li>
+						<li class="List_1_Start" style="text-indent: 0; list-style-type: disc;">1 – Numerical</li>
 						<li class="List_1" style="text-indent: 0; list-style-type: disc;">2 – Bar graph horizontal</li>
 						<li class="List_1" style="text-indent: 0; list-style-type: disc;">3 – Bar graph vertical</li>
-						<li class="List_1" style="text-indent: 0; list-style-type: disc;">4 – YT view (scan line)</li>
-						<li class="List_1_End" style="text-indent: 0; list-style-type: disc;">5 – YT view (scroll)</li>
+						<li class="List_1" style="text-indent: 0; list-style-type: disc;">4 – YT view (scroll)</li>
+						<li class="List_1_End" style="text-indent: 0; list-style-type: disc;">5 – YT view (scan line)</li>
 					</ul>
 				</td>
 			</tr>

diff --git a/docs/SCPI reference guide/EEZ BB3 SCPI reference 5.4 - DISPlay.odt b/docs/SCPI reference guide/EEZ BB3 SCPI reference 5.4 - DISPlay.odt
diff --git a/docs/SCPI reference guide/EEZ BB3 SCPI reference guide.odm b/docs/SCPI reference guide/EEZ BB3 SCPI reference guide.odm
diff --git a/docs/SCPI reference guide/EEZ BB3 SCPI reference guide.pdf b/docs/SCPI reference guide/EEZ BB3 SCPI reference guide.pdf
diff --git a/modular-psu-firmware.eez-project b/modular-psu-firmware.eez-project
@@ -6189,7 +6189,8 @@
           {
             "type": "Text",
             "style": {
-              "inheritFrom": "edit_info_S",
+              "inheritFrom": "value_S",
+              "alignHorizontal": "center",
               "padding": 0
             },
             "activeStyle": {
@@ -6205,7 +6206,8 @@
           {
             "type": "Text",
             "style": {
-              "inheritFrom": "edit_info_S",
+              "inheritFrom": "value_S",
+              "alignHorizontal": "center",
               "padding": 0
             },
             "activeStyle": {
@@ -6646,7 +6648,8 @@
           {
             "type": "Text",
             "style": {
-              "inheritFrom": "edit_info_S",
+              "inheritFrom": "value_S",
+              "alignHorizontal": "center",
               "padding": 0
             },
             "activeStyle": {
@@ -8178,7 +8181,7 @@
           {
             "type": "DisplayData",
             "style": {
-              "inheritFrom": "edit_info_S",
+              "inheritFrom": "value_S",
               "padding": 0
             },
             "activeStyle": {
@@ -8600,8 +8603,7 @@
           {
             "type": "DisplayData",
             "style": {
-              "inheritFrom": "edit_info_S",
-              "color": "status_line_text",
+              "inheritFrom": "value_S",
               "padding": 0
             },
             "activeStyle": {
@@ -9153,8 +9155,7 @@
           {
             "type": "DisplayData",
             "style": {
-              "inheritFrom": "edit_info_S",
-              "color": "status_line_text",
+              "inheritFrom": "value_S",
               "padding": 0
             },
             "activeStyle": {
@@ -28257,6 +28258,7 @@
             "type": "MultilineText",
             "style": {
               "inheritFrom": "default_S",
+              "alignHorizontal": "left",
               "padding": 0
             },
             "activeStyle": {
@@ -28290,6 +28292,7 @@
             "type": "MultilineText",
             "style": {
               "inheritFrom": "default_S",
+              "alignHorizontal": "left",
               "color": "status_warning",
               "padding": 0
             },
@@ -29460,7 +29463,7 @@
                 "top": 0,
                 "width": 240,
                 "height": 71,
-                "text": "Coupling allows various power output combinations without need for additonal wiring."
+                "text": "Coupling allows various power output combinations without need for additional wiring."
               },
               {
                 "type": "Text",
@@ -51054,7 +51057,7 @@
         "font": "Oswald14",
         "alignHorizontal": "center",
         "alignVertical": "center",
-        "color": "popup_text_selected",
+        "color": "text_value",
         "backgroundColor": "Background",
         "borderSize": 0,
         "padding": 0
@@ -434499,7 +434502,7 @@
           "#404040",
           "#ffff00",
           "#359ebd",
-          "#303030",
+          "#55f2e6",
           "#f78000",
           "#008080",
           "#c8e7f0",