Browse Source

apllied reordered channel mapping

Thomas Thuemmler 3 months ago
parent
commit
94dc2959a2
1 changed files with 14 additions and 6 deletions
  1. 14 6
      SDS_status_main.php

+ 14 - 6
SDS_status_main.php

@@ -104,11 +104,11 @@ if ((substr($ip, 0, 13) == "141.52.12.158") | (substr($ip, 0, 13) == "141.52.12.
 	placeText(265, 274, "PS2", 70, 2, "#000000");
 
 	// Pinch
-	placeTextWithLink(240, 1420, sprintf('%.1F', $adeiValue[4][0] / 86.98 * 6.0) . " T", 70, 5, "#000000", "stand-alone center field PCH magnet", $adeiChannel[4][0]);
+	placeTextWithLink(240, 1420, sprintf('%.1F', $adeiValue[6][16] / 86.98 * 6.0) . " T", 70, 5, "#000000", "stand-alone center field PCH magnet", $adeiChannel[6][16]);
 	placeText(265, 1420, "PCH", 70, 2, "#000000");
 
 	// Detector
-	placeTextWithLink(240, 1495, sprintf('%.1F', $adeiValue[4][1] / 93.59 * 6.0) . " T", 70, 5, "#000000", "stand-alone center field DET magnet", $adeiChannel[4][1]);
+	placeTextWithLink(240, 1495, sprintf('%.1F', $adeiValue[6][17] / 93.59 * 6.0) . " T", 70, 5, "#000000", "stand-alone center field DET magnet", $adeiChannel[6][17]);
 	placeText(265, 1495, "DET", 70, 2, "#000000");
 
 
@@ -249,8 +249,8 @@ if ((substr($ip, 0, 13) == "141.52.12.158") | (substr($ip, 0, 13) == "141.52.12.
 	placeTextWithLink(217, 1455, $text, 70, 4, "#000000", "pressure [mbar] FPD cold cathode gauge", $adeiChannel[6][1]);
 
 	// Gauge Baffle
-	$value = $adeiValue[5][0];
-        $link = $adeiChannel[5][0];
+	$value = $adeiValue[4][0];
+        $link = $adeiChannel[4][0];
         $color = "#000000";
         $pic = "gauge";
 	$text = "---";
@@ -1115,13 +1115,21 @@ if ($PSmode == 5)
 	$text = "ON";
 	for ($id = 0; $id < 5; $id++)
 	{
-		$value = $adeiValue[6][4 + $id];
+	  if ($id = 4) // 120V channel is in FAST group, need exception here
+		  {
+		    $value = $adeiValue[5][0];
+		    $link = $link . $adeiChannel[5][0] . ",";
+		  }
+		else
+		  {
+		    $value = $adeiValue[6][4 + $id];
+		    $link = $link . $adeiChannel[6][4 + $id] . ",";
+		  }
 		if (!($value < $lowVoltage[$id] + $lowVoltageTol[$id] && $value > $lowVoltage[$id] - + $lowVoltageTol[$id]))
 		{
 			$pic = "fpdOff";
 			$text = "OFF";
 		}
-		$link = $link . $adeiChannel[6][4 + $id] . ",";
 	}
 	$link = substr($link, 0, strlen($link) - 1);
 	placePicWithLink(345, 1570, $pic . ".png", 30, "status FPD power&#10;green: on, red: off, grey: undefined", $link);