add support for Rigol DP932 power supply

diff --git a/powersupplies/web/htdocs/build_index.pl b/powersupplies/web/htdocs/build_index.pl
index 4151fea6e911094516b9ac810a65ec050646e7cb..40725925f3a3afe3203faff780c26888f00f0cb0 100755 (executable)
--- a/powersupplies/web/htdocs/build_index.pl
+++ b/powersupplies/web/htdocs/build_index.pl
@@ -39,7 +39,7 @@ print <<EOF;
 EOF
 }
 
-if($type =~ /HMP/ or $type =~ /HMC/ or $type =~ /PST/) {
+if($type =~ /HMP/ or $type =~ /HMC/ or $type =~ /PST/ or $type =~ /DP/) {
 print <<EOF;
 <h3 onClick="Enable($j)" id="$j">Power Supply <b>$dev_id</b> [connected to <b>$ser_dev</b>]</h3>
 <iframe id="iframe$j"  name="inlineframe" data-src="pwr_hmp.htm?device=$ser_dev&id=$dev_id&type=$type&channels=$channels&speed=$speed&names=$names" frameborder="0" scrolling="auto" width="800" data-height="340" height="0"></iframe>

diff --git a/powersupplies/web/htdocs/pwr.conf b/powersupplies/web/htdocs/pwr.conf
index bb515a2dd1b6acc679b724d576ac8990c91d6e61..1a53612d27d285377bb14f31e2f506f717f432b7 100644 (file)
--- a/powersupplies/web/htdocs/pwr.conf
+++ b/powersupplies/web/htdocs/pwr.conf
@@ -1,5 +1,5 @@
 //PWRSPLY:/path/to/device:speed:Name:Type:Channels
-//type can be HMP, HMC, PSP, PST
+//type can be HMP, HMC, PSP, PST, KA3000
 
 //PWRSPLY:/dev/ttyUSB0:9600:PST3202:PST:3
 //PWRSPLY:/dev/ttyUSB0:115200:HMP4030:HMP:3
@@ -11,7 +11,14 @@
 //PWRSPLY:/dev/TRB3_Power48_00002:0:Rack48:PWRSW:4:Desk:::
 
 PWRSPLY:/dev/FTDI_FT232R_USB_UART_AH02HFZW:2400:PSP2010:PSP:1
-PWRSPLY:/dev/FTDI_Xmatter_TTL_ALR1AJS:57600:Desk:PWRSW:6:TestAdrian:Pulser:::TrgDistr:ADC
-PWRSPLY:/dev/HAMEG_HO732_VCP023842636:0:HMP4040:HMP:4
-PWRSPLY:IP192.168.0.56:5050:HMP4040 DiRich:HMP:4:LP1:LP2:LP3:DCDC
+PWRSPLY:/dev/FTDI_Xmatter_TTL_ALR1AJS:57600:Desk:PWRSW:4:::Trb160:TrgDistr
+PWRSPLY:IP192.168.0.56:5050:HMP4040 OEP:HMP:4:MBO1:MBO2:Trb3sc:DCDC
+PWRSPLY:IP192.168.0.57:5025:HMP4040 Trigger:HMP:4
+PWRSPLY:IP192.168.0.58:5025:HMP4040 MVD:HMP:4
 PWRSPLY:IP192.168.0.139:5025:HMC8043:HMC:3:::
+PWRSPLY:/dev/HAMEG_HAMEG_HO720_018442435:0:HMP4030_TRB:HMP:3:TRB:TRB:
+PWRSPLY:/dev/Nuvoton_USB_Virtual_COM_A02014090305:9600:KA3000:KA3000:1
+PWRSPLY:SERhadaq@jspc76/dev/FTDI_FT232R_USB_UART_AH18PT33:2400:PSP405:PSP:1
+
+
+//PWRSPLY:/dev/HAMEG_HO732_VCP023842636:0:HMP4040:HMP:4

diff --git a/powersupplies/web/htdocs/pwr.pl b/powersupplies/web/htdocs/pwr.pl
index 268fcc6c733ee6d93ef7c90687e526510c9cb98a..64f8e3e1f3e257a393e58b40d287b791e472b40b 100755 (executable)
--- a/powersupplies/web/htdocs/pwr.pl
+++ b/powersupplies/web/htdocs/pwr.pl
@@ -83,10 +83,10 @@ else {
   print qx($cmd);
   }
  else {
-  print HMP_serial() if (($ser_type eq "HMP" or $ser_type eq "HMC") && $isIP == 0) or $ser_type eq "PST";
+  print HMP_serial() if (($ser_type eq "HMP" or $ser_type eq "HMC" or $ser_type eq "DP") && $isIP == 0) or $ser_type eq "PST";
   print PWRSW_serial() if $ser_type eq "PWRSW";
   print KA3000_serial() if $ser_type eq "KA3000";
-  print HMP_ethernet() if (($ser_type eq "HMP" or $ser_type eq "HMC") && $isIP == 1);
+  print HMP_ethernet() if (($ser_type eq "HMP" or $ser_type eq "HMC" or $ser_type eq "DP") && $isIP == 1);
   print PSP() if $ser_type eq 'PSP';
   }
 

diff --git a/powersupplies/web/htdocs/pwr_hmp.htm b/powersupplies/web/htdocs/pwr_hmp.htm
index 639ccc8931a7ae38f53887c166cc7cb9f0faa7ec..be482bc8a3ce27b95d086b613484bfc16de4d0d4 100644 (file)
--- a/powersupplies/web/htdocs/pwr_hmp.htm
+++ b/powersupplies/web/htdocs/pwr_hmp.htm
@@ -77,8 +77,10 @@ function set_v(chan) {
   if (chan > channels) return;
        var value = parseFloat(document.getElementById("form_v"+chan).value);
        var command;
-  if(type=="HMP" || type=="HMC") command = "INST OUT"+chan+"&VOLT "+value.toFixed(3);
+  if(type=="HMP" || type=="HMC") 
+                  command = "INST OUT"+chan+"&VOLT "+value.toFixed(3);
   if(type=="PST") command = ":CHAN"+chan+":VOLT "+value.toFixed(3);
+  if(type=="DP")  command = ":SOUR"+chan+":VOLT "+value.toFixed(3);
        new_commands.push(command);
   forceShowReadings = 1;
 }
@@ -90,6 +92,7 @@ function set_v_lim(chan) {
   if(type=="HMP") command = "INST OUT"+chan+"&VOLT:PROT "+value.toFixed(3);
   if(type=="HMC") command = "INST OUT"+chan+"&VOLT:PROT ON&VOLT:PROT:LEV "+value.toFixed(3);
   if(type=="PST") command = ":CHAN"+chan+":PROT:VOLT "+value.toFixed(3);
+  if(type=="DP")  command = ":OUTP:OVP:VAL CH"+chan+","+value.toFixed(3);
        new_commands.push(command);
   forceShowReadings = 1;
 }
@@ -98,8 +101,10 @@ function set_c_lim(chan) {
   if (chan > channels) return;
        var value = parseFloat(document.getElementById("form_c_lim"+chan).value);
        var command;
-  if(type=="HMP" || type=="HMC") command = "INST OUT"+chan+"&CURR "+value.toFixed(3);
+  if(type=="HMP" || type=="HMC") 
+                  command = "INST OUT"+chan+"&CURR "+value.toFixed(3);
   if(type=="PST") command = ":CHAN"+chan+":PROT:CURR "+value.toFixed(3);
+  if(type=="DP")  command = ":OUTP:OCP:VAL CH"+chan+","+value.toFixed(3);
        new_commands.push(command);
   forceShowReadings = 1;
 }
@@ -109,6 +114,7 @@ function turn_on(chan) {
   if(type=="HMP") new_commands.push("INST OUT"+chan+"&OUTP:SEL ON");
   if(type=="HMC") new_commands.push("INST OUT"+chan+"&OUTP:CHAN ON");
   if(type=="PST") new_commands.push(":OUTP:STAT ON");
+  if(type=="DP")  new_commands.push(":OUTP CH"+chan+",ON");
   forceShowReadings = 1;
 }
 
@@ -117,18 +123,21 @@ function turn_off(chan) {
   if(type=="HMP") new_commands.push("INST OUT"+chan+"&OUTP:SEL OFF");
   if(type=="HMC") new_commands.push("INST OUT"+chan+"&OUTP:CHAN OFF");
   if(type=="PST") new_commands.push(":OUTP:STAT OFF");
+  if(type=="DP")  new_commands.push(":OUTP CH"+chan+",OFF");
   forceShowReadings = 1;
 }
 
 function globalOn() {
   if(type=="HMP") new_commands.push("OUTP:GEN ON");
   if(type=="HMC") new_commands.push("OUTP:MAST ON");
+  if(type=="DP")  new_commands.push(":OUTP ALL,ON");
   forceShowReadings = 1;
 }
 
 function globalOff() {
   if(type=="HMP") new_commands.push("OUTP:GEN OFF");
   if(type=="HMC") new_commands.push("OUTP:MAST OFF");
+  if(type=="DP")  new_commands.push(":OUTP ALL,OFF");
   forceShowReadings = 1;
 }
 
@@ -140,11 +149,13 @@ function update(data) {
 function updatereads(data) {
   var e = data.split("&");
   document.getElementById("info").innerHTML = e.shift();
-  document.getElementById("master").style.background=(e.shift()=='1')?"limegreen":"#C00";
+  if(type!="DP")
+    document.getElementById("master").style.background=(e.shift()=='1')?"limegreen":"#C00";
   for(i=0;i<channels;i++) {
     document.getElementById("vol"+(i+1)).value=(+e[i*3+0]).toFixed(3);
     document.getElementById("cur"+(i+1)).value=(+e[i*3+1]).toFixed(3);
-    document.getElementById("chan"+(i+1)).style.background=(e[i*3+2]=="1")?"limegreen":"#C00";
+    document.getElementById("chan"+(i+1)).style.background=(+e[i*3+2]==1)?"limegreen":"#C00";
+    console.log(e[i*3+2]);
     }
   updateTask = setTimeout("communication()",updaterate);
   }  
@@ -154,7 +165,8 @@ function updatesettings(data) {
 //   var id = e.shift();
 //   e.shift();
   document.getElementById("info").innerHTML = e.shift()+" Device Info: "+e.shift();
-  document.getElementById("master").style.background=(e.shift()=='1')?"limegreen":"#C00";
+  if(type!="DP")
+    document.getElementById("master").style.background=(e.shift()=='1')?"limegreen":"#C00";
   for(i=0;i<channels;i++) {
     document.getElementById("form_v"+(i+1)).value=(+e[i*3+0]).toFixed(3);
     document.getElementById("form_c_lim"+(i+1)).value=(+e[i*3+1]).toFixed(3);
@@ -171,7 +183,7 @@ function communication() {
   else if(readSettingsRequest == 1) {
     readSettingsRequest = 0;
     if(type=="HMP" || type=="HMC") {
-      cmds = "&SYST:MIX&%2AIDN%3F";
+                    cmds = "&SYST:MIX&%2AIDN%3F";
     if(type=="HMP") cmds += '&OUTP:GEN%3F';
     if(type=="HMC") cmds += '&OUTP:MAST%3F';
       for(i=1;i<=channels;i++){
@@ -184,6 +196,11 @@ function communication() {
       for(i=1;i<=channels;i++)
         cmds +="&:CHAN"+i+":VOLT%3F&:CHAN"+i+":CURR%3F&:CHAN"+i+":PROT:VOLT%3F";
       }
+    if(type=="DP") {
+      cmds="&%2AIDN%3F";
+      for(i=1;i<=channels;i++)
+        cmds += "&:SOUR"+i+":VOLT%3F&:OUTP:OCP:VAL%3F CH"+i+"&:OUTP:OVP:VAL%3F CH"+i;
+      }
     getdata('pwr.pl?'+ser_dev+'&'+type+"&"+speed+cmds,updatesettings);
     }
   else if(document.getElementById("showreadings").checked || forceShowReadings) {
@@ -199,6 +216,10 @@ function communication() {
       for(i=1;i<=channels;i++)
         cmds +="&:CHAN"+i+":MEAS:VOLT%3F&:CHAN"+i+":MEAS:CURR%3F&OUTP:STAT%3F";
       }
+    if(type=="DP") {    
+      for(i=1;i<=channels;i++)
+        cmds +="&:MEAS:VOLT%3F CH"+i+"&:MEAS:CURR%3F CH"+i+"&:OUTP%3F CH"+i;
+      }      
     getdata('pwr.pl?'+ser_dev+'&'+type+"&"+speed+cmds,updatereads);
     }
   else {