Browse Source

updated channel list for PR current reading and updated display with APR and PR alarms

Thomas Thümmler 2 years ago
parent
commit
4a17ae3e56
2 changed files with 16 additions and 10 deletions
  1. 3 1
      SDS_status_channels.php
  2. 13 9
      SDS_status_main.php

+ 3 - 1
SDS_status_channels.php

@@ -168,7 +168,9 @@ $adeiChannel = array(
 			   "hv__katrin-hv_rep__0__134",   // K35 regulated temperature actual value
 			   "hv__katrin-hv_rep__0__140",   // K65 regulated temperature actual value
 			   "hv__katrin-hv_rep__0__41",    // MS vessel I_IST  (#28)
-			   "hv__katrin-hv_rep__0__165"    // Post regulation PID running flag (#29)
+			   "hv__katrin-hv_rep__0__165",   // Post regulation PID running flag (#29)
+			   "hv__katrin-hv_rep__0__164",   // Post regulation PID set point (#30)
+			   "hv__katrin-hv_rep__0__162"    // Post regulation triode current (#31)
 			    ),
 		     array(
 			   "hv__katrin-hv_rep__1__3",

+ 13 - 9
SDS_status_main.php

@@ -196,7 +196,6 @@ if (substr($ip, 0, 13) == "141.52.12.52")
         $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";
@@ -211,7 +210,7 @@ if (substr($ip, 0, 13) == "141.52.12.52")
 	$value = $adeiValue[8][0];
 	$pic = "ex";
 	$text = "---";
-	if ($value > 2E-5) { $pic = $pic . "Off"; $text = "OFF"; }
+	if ($value > 2E-5) {$text = "OFF"; {if ($MSmode < 5) $pic = $pic . "Off"; else $pic = $pic;}}
 	else if ($value <= 2E-5 && $value > 1E-12) { $pic = $pic . "On"; $text = sprintf('%.1E', $value); }
 	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]);
@@ -221,7 +220,7 @@ if (substr($ip, 0, 13) == "141.52.12.52")
     $link = $adeiChannel[28][0];
     $pic = "ex";
 	$text = "---";
-	if ($value > 2E-5) { $pic = $pic . "Off"; $text = "OFF"; }
+	if ($value > 2E-5) {$text = "OFF"; {if ($MSmode < 5) $pic = $pic . "Off"; else $pic = $pic;}}
 	else if ($value <= 2E-5 && $value > 1E-12) { $pic = $pic . "On"; $text = sprintf('%.1E', $value);}
 	placePicWithLink(460, 1435, $pic.".png", 30, "status extractor ion gauge Ex1110&#10;green: off, blinking: on, grey: undefined", $link);
 	placeTextWithLink(489, 1415, $text, 70, 4, "#000000", "pressure [mbar] extractor ion gauge Ex1110", $link);
@@ -231,7 +230,7 @@ if (substr($ip, 0, 13) == "141.52.12.52")
     $link = $adeiChannel[9][2];
 	$pic = "ex";
 	$text = "---";
-    if ($value > 1E+2) { $pic = $pic; $text = "OFF"; }
+    if ($value > 1E+2) {$text = "OFF"; {if ($MSmode < 5) $pic = $pic . "Off"; else $pic = $pic;}}
     else if ($value > 2E-5) { $pic = $pic . "Off"; $text = "OFF"; }
 	else if ($value <= 2E-5 && $value > 1E-12) { $pic = $pic . "On"; $text = sprintf('%.1E', $value);}
     placePicWithLink(230, 1220, $pic.".png", 30, "status extractor ion gauge 0096&#10;green: off, blinking: on, grey: undefined", $link);
@@ -271,13 +270,12 @@ if (substr($ip, 0, 13) == "141.52.12.52")
         placePicWithLink(370, 240, $pic . ".png", 30, "status cold cathode gauge CC1232&#10;green: on, red: off, grey: undefined", $link);
 	placeTextWithLink(399, 220, $text, 70, 4, "#000000", "pressure [mbar] cold cathode gauge CC1232", $link);
 
-
 	// PS Ex1221 
 	$value = $adeiValue[27][5];
         $link = $adeiChannel[27][5];
 	$pic = "ex";
 	$text = "---";
-	if ($value >= 9.9E-5) { $pic = $pic . "Off"; $text = "OFF"; }
+        if ($value >= 9.9E-5) {$text = "OFF"; {if ($PSmode < 5) $pic = $pic . "Off"; else $pic = $pic;}}
 	else if ($value < 1E-4 && $value > 7E-13) { $pic = $pic . "On"; $text = sprintf('%.1E', $value); }
 	placePicWithLink(188, 141, $pic . ".png", 30, "status extractor ion gauge Ex1221&#10;green: on, red: off, grey: undefined", $link);
 	placeTextWithLink(217, 121, $text, 70, 4, "#000000", "pressure [mbar] extractor ion gauge Ex1221", $link);
@@ -318,7 +316,7 @@ if (substr($ip, 0, 13) == "141.52.12.52")
 
 			if ($value < 50)
 			{
-				$pic = $pic . "Off";
+			  If ($MSmode < 5) $pic = $pic . "Off";
 			}
 			else if ($value >= 50 && $value < 500)
 			{
@@ -355,7 +353,7 @@ if (substr($ip, 0, 13) == "141.52.12.52")
 
 		if ($value < 50)
 		{
-			$pic = $pic . "Off";
+		  If ($PSmode < 5) $pic = $pic . "Off";
 		}
 		else if ($value >= 50 && $value < 700)
 		{
@@ -727,6 +725,8 @@ if (($MSmode == 5) or ($MSmode == 4))
 
 	$U_ist = abs($adeiValue[10][0]);
 	$I_ist = abs($adeiValue[10][28]);
+	$PID_setpoint = abs($adeiValue[10][30]);
+	$PR_hw_current = abs($adeiValue[10][31]);
 	$hv_switch1102_k65 = $adeiValue[35][1];
 	$hv_switch1103_k35 = $adeiValue[35][2];
 	$R_K65 = 54.5e6;
@@ -784,8 +784,12 @@ if (($MSmode == 5) or ($MSmode == 4))
 	  {
 	    placeTextWithLink(466,325, sprintf('%.2F mA', $I_PR), 60, 2, $color, "Estimated current through post regulation triode shunt. 0.46-0.8 mA for optimal performance.", $adeiChannel[10][28]);
 	    placeTextWithLink(480,325, sprintf('%2.0F W', $P_PR), 60, 2, $color, "Estimated power consumption of post regulation triode shunt. Must be < 28 W.", $adeiChannel[10][28]);
-	    if ($APR_on) placeTextWithLink(491,335, "APR", 40, 0, "#40AA40", "Advanced Post Regulation (APR) status.", $adeiChannel[10][29]);
+	    if ($APR_on) placeTextWithLink(492,335, "APR ON", 40, 0, "#40AA40", "Advanced Post Regulation (APR) status.", $adeiChannel[10][29]);
 	  }
+
+	if ($PID_setpoint > 9.0) placeTextWithLink(501,285, "APR setpoint limit", 140, 0, "#FF0000", "APR setpoint at 90% of limit.", $adeiChannel[10][30]);
+
+	if (abs($I_PR - $PR_hw_current) > 0.05) placeTextWithLink(510,285, "PR current mismatch", 140, 0, "#FF0000", "Estimated and actual current of post regulation don't match.", $adeiChannel[10][31]);
 	
   }  // end of PCS7 mode switch