Browse Source

updated pressure display

Thomas Thümmler 2 years ago
parent
commit
62d6189d9c
1 changed files with 14 additions and 13 deletions
  1. 14 13
      SDS_status_main.php

+ 14 - 13
SDS_status_main.php

@@ -180,31 +180,31 @@ if (substr($ip, 0, 13) == "141.52.12.158")
 
 	// ########## PRESSURES ##########
 
-	// CC2320
-        $value = $adeiValue[7][0];
-	$pic = "cc";
+	// CC2320	
+    $value = $adeiValue[7][0];
+	$pic = "cc";	
 	$text = "---";
 	if ($value > 1E+2) { $pic = $pic; $text = "OFF"; }
 	else if ($value > 2E-5) { $pic = $pic . "Off"; $text = "high"; }
-	else if ($value <= 1E-4 && $value >= 1.334E-11) { $pic = $pic . "On"; $text = sprintf('%.1E', $value); }
-	else if ($value < 1.334E-11) { $text = "LOW"; }
+	else if ($value <= 1E-4 && $value >= 1E-11) { $pic = $pic . "On"; $text = sprintf('%.1E', $value); }
+	else if ($value < 1E-11) { $text = "LOW"; }
 	placePicWithLink(410, 1435, $pic . ".png", 30, "status cold cathode gauge CC2320&#10;green: on, red: off, grey: undefined", $adeiChannel[7][0]);
-	placeTextWithLink(439, 1415, $text, 70, 4, "#000000", "pressure [mbar] cold cathode gauge CC2320", $adeiChannel[7][0]);
+placeTextWithLink(439, 1415, $text, 70, 4, "#000000", "pressure [mbar] cold cathode gauge CC2320:&#010P = ".sprintf('%.3E mbar;', $value), $adeiChannel[7][0]);
+
+    $time_conversion_factor = 621355968000000000; // conversion for PCS7 .NET value;
+    $timestamp = ($adeiValue[7][8] - $time_conversion_factor) / 10000000;
+    echo '<h4 style="font-family: inherit; font-weight: plain; font-style: normal;">Vacuum timestamp: ' . date("r", $timestamp ) . '</h4>';
 
-        $time_conversion_factor = 621355968000000000; // conversion for PCS7 .NET value;
-        $timestamp = ($adeiValue[7][8] - $time_conversion_factor) / 10000000;
-        echo '<font size="4" color="#000000">&nbsp;Vacuum timestamp: ' . date("r", $timestamp ) . ' </font><br>';
 
 	// CC2345
 	$value = $adeiValue[7][7];
 	$pic = "cc";
 	$text = "---";
 	if ($value > 1E-4) { $pic = $pic . "Off"; $text = "OFF"; }
-	else if ($value <= 1E-4 && $value >= 1.334E-11) { $pic = $pic . "On"; $text = sprintf('%.1E', $value); }
-	else if ($value < 1.334E-11) { $text = "LOW"; }
+	else if ($value <= 1E-4 && $value >= 1E-11) { $pic = $pic . "On"; $text = sprintf('%.1E', $value); }
+	else if ($value < 1E-11) { $text = "LOW"; }
 	placePicWithLink(427, 1482, $pic . ".png", 30, "status cold cathode gauge CC2345&#10;green: on, red: off, grey: undefined", $adeiChannel[7][7]);
-	placeTextWithLink(406, 1462, $text, 70, 4, "#000000", "pressure [mbar] cold cathode gauge CC2345", $adeiChannel[7][7]);
-
+	placeTextWithLink(406, 1462, $text, 70, 4, "#000000", "pressure [mbar] cold cathode gauge CC2345:&#010P = ".sprintf('%.3E mbar;', $value), $adeiChannel[7][7]);
 	// Ex3110 
 	$value = $adeiValue[8][0];
 	$pic = "ex";
@@ -214,6 +214,7 @@ if (substr($ip, 0, 13) == "141.52.12.158")
 	placePicWithLink(510, 1435, $pic . ".png", 30, "status extractor ion gauge Ex3110&#10;green: on, red: off, grey: undefined", $adeiChannel[8][0]);
 	placeTextWithLink(539, 1415, $text, 70, 4, "#000000", "pressure [mbar] extractor ion gauge Ex3110", $adeiChannel[8][0]);
 
+
 	// Ex1110
 	$value = $adeiValue[28][0];
     $link = $adeiChannel[28][0];