Power Supply Channels can have names in the GUI

diff --git a/web/htdocs/tools/pwr/build_index.pl b/web/htdocs/tools/pwr/build_index.pl
index 8c6fa8f23d3bc2295d241c81dbfee8410488b021..0a449ef8347facfb8a287ecbdac58127afc22f99 100755 (executable)
--- a/web/htdocs/tools/pwr/build_index.pl
+++ b/web/htdocs/tools/pwr/build_index.pl
@@ -22,11 +22,14 @@ open(LESEN,$file)
 while(defined(my $i = <LESEN>)) {
 
        if( $i =~ /^PWRSPLY:([^:]+):([^:]+):([^:]+):([^:]+):([^:]+)/g ) {
-               my $ser_dev=$1;
-    my $speed=$2;
-               my $dev_id=$3;
-               my $type=$4;
-               my $channels=$5;
+         my @arr = split(':',$i);
+         shift @arr;
+               my $ser_dev  = shift @arr;
+    my $speed    = shift @arr;
+               my $dev_id   = shift @arr;
+               my $type     = shift @arr;
+               my $channels = shift @arr;
+               my $names = join(':',@arr);
 
 if($type eq "PSP") {
 print <<EOF;
@@ -39,7 +42,7 @@ EOF
 if($type =~ /HMP/ or $type =~ /HMC/ or $type =~ /PST/) {
 print <<EOF;
 <p>
-<iframe name="inlineframe" src="pwr_hmp.htm?device=$ser_dev&id=$dev_id&type=$type&channels=$channels&speed=$speed" frameborder="0" scrolling="auto" width="800" height="340" ></iframe>
+<iframe name="inlineframe" src="pwr_hmp.htm?device=$ser_dev&id=$dev_id&type=$type&channels=$channels&speed=$speed&names=$names" frameborder="0" scrolling="auto" width="800" height="340" ></iframe>
 </p>
 EOF
 }
@@ -47,7 +50,7 @@ EOF
 if($type =~ /PWRSW/) {
 print <<EOF;
 <p>
-<iframe name="inlineframe" src="pwr_switch.htm?device=$ser_dev&id=$dev_id&type=$type&channels=$channels&speed=$speed" frameborder="0" scrolling="auto" width="800" height="340" ></iframe>
+<iframe name="inlineframe" src="pwr_switch.htm?device=$ser_dev&id=$dev_id&type=$type&channels=$channels&speed=$speed&names=$names" frameborder="0" scrolling="auto" width="800" height="340" ></iframe>
 </p>
 EOF
 }

diff --git a/web/htdocs/tools/pwr/pwr_hmp.htm b/web/htdocs/tools/pwr/pwr_hmp.htm
index 76dc1bae9814bd68e9c10e36160099fb96c06dcf..8a59298234bf5826006d56e6fa545009ac8a6174 100644 (file)
--- a/web/htdocs/tools/pwr/pwr_hmp.htm
+++ b/web/htdocs/tools/pwr/pwr_hmp.htm
@@ -57,8 +57,10 @@ var dev_id = getParameterByName("id");
 var type = getParameterByName("type");
 var channels = getParameterByName("channels");
 var speed = getParameterByName("speed");
+var names = getParameterByName("names");
 var readSettingsRequest = 1;
 var forceShowReadings = 1;
+var Vnames   = names.split(':');
 
 if (channels<2) {
   document.getElementById("chan2").style.color = "#eee";
@@ -224,7 +226,11 @@ function readSettings() {
 
 updateTask = setTimeout("update()",updaterate);
 document.getElementById("headline").innerHTML  = "Power Supply "+'<b>'+dev_id+'</b>'+" [connected to "+'<b>'+ser_dev+'</b>'+"]" ;
-  
+
+for(i=1;i<=channels;i++) {
+  if(typeof Vnames[i-1] !== 'undefined')
+    document.getElementById("chan"+i).innerHTML = i+' - '+Vnames[i-1];
+  }
   
 </script>
 </body></html>

diff --git a/web/htdocs/tools/pwr/pwr_switch.htm b/web/htdocs/tools/pwr/pwr_switch.htm
index 9ff228da1d02af9f23e0e2385cabf61d78445295..8ec0aeac06da4b66410050c0e0bb397d8b33c96d 100644 (file)
--- a/web/htdocs/tools/pwr/pwr_switch.htm
+++ b/web/htdocs/tools/pwr/pwr_switch.htm
@@ -15,11 +15,12 @@
 
 <form acion="">
 <table id="settings" class="smallboxes">
-<tr><th>Channel<th colspan='2'>Status<th>Current<th>Average<th>Limit
+<tr><th colspan='2'>Channel<th colspan='2'>Status<th>Current<th>Average<th>Limit
 
 <tfoot>
-<tr class="sep"><td colspan=5><input type="checkbox" checked="1" id="showreadings">Enable read-back of values<td colspan=4 id="date">
-
+<tr class="sep">
+<td colspan=5><input type="checkbox" checked="1" id="showreadings">Enable read-back of values
+<td colspan=4 id="date">
 <tr><td colspan=9 id="info">&nbsp;
 </tfoot>
 <tbody id="display"></tbody>
@@ -36,6 +37,7 @@ var dev_id = getParameterByName("id");
 var type = getParameterByName("type");
 var channels = getParameterByName("channels");
 var speed = getParameterByName("speed");
+var names = getParameterByName("names");
 var readSettingsRequest = 1;
 var forceUpdate = 1;
 
@@ -44,11 +46,13 @@ var Vcurrent = new Array();
 var Vaverage = new Array();
 var Vlimit   = new Array();
 var Vdate    = "x";
+var Vnames   = names.split(':');
 
 function maketable() {
   out = "";
   for(i=0;i<channels;i++) {
-     out += "<tr><td>"+i;
+    out += "<tr><td>"+i+"<td>";
+    if(typeof Vnames[i] !== 'undefined') out += Vnames[i];
     if (Vstatus[i] == 1) {
       out += '<td class="status" style="background:limegreen">&nbsp;';
       }