update power supply control to run commands remotely

diff --git a/web/htdocs/tools/pwr/pwr.htm b/web/htdocs/tools/pwr/pwr.htm
index e0ac58bf277e76edebc9e13f2ac8c625a9520384..004d682e4c819eb2548d96edf77f16fb3bdb8e54 100644 (file)
--- a/web/htdocs/tools/pwr/pwr.htm
+++ b/web/htdocs/tools/pwr/pwr.htm
@@ -65,7 +65,7 @@
 
 
 <script language="javascript">
-var updaterate = 500;
+var updaterate = 1000;
 var updateTask;
 var new_commands = new Array();
 var ser_dev = getParameterByName("device");

diff --git a/web/htdocs/tools/pwr/pwr.pl b/web/htdocs/tools/pwr/pwr.pl
index 140a16633a9a31182ef6e624ac4cc0b963253e48..3a8af83f7154211de901fd3def64ea90ec87624a 100755 (executable)
--- a/web/htdocs/tools/pwr/pwr.pl
+++ b/web/htdocs/tools/pwr/pwr.pl
@@ -33,6 +33,7 @@ $ser_speed = "2400" unless defined $ser_speed;
 
 my $port;
 my $isIP = 0;
+my $isRemote = undef;
 
 if($ser_dev =~ /^IP(.*)/) {
   $ser_dev = $1;
@@ -40,6 +41,11 @@ if($ser_dev =~ /^IP(.*)/) {
   $port = IO::Socket::INET->new(PeerAddr => $ser_dev, PeerPort => $ser_speed, Proto => "tcp", Type => SOCK_STREAM) 
               or die "ERROR: Cannot connect: $@";  
   }
+elsif($ser_dev =~ /^SER(.*)/) {
+  my $str = $1;
+  ($isRemote,$ser_dev) = split('/',$str,2);
+  $ser_dev = '/'.$ser_dev;
+  }
 else {  
   $port = new Device::SerialPort($ser_dev);
   unless ($port)
@@ -62,14 +68,22 @@ else {
 #print "attempting to communicate with power supply connected to interface:\n$ser_dev\n\n";
 
 
-transmit_command() if $ser_type eq "PSP"; #if new command, send it!
-receive_answer() if $ser_type eq "PSP"; # always called
-
-
-print receive_answer_HMP() if (($ser_type eq "HMP" or $ser_type eq "HMC") && $isIP == 0) or $ser_type eq "PST"; # always called
-print HMP_ethernet() if (($ser_type eq "HMP" or $ser_type eq "HMC") && $isIP == 1);
-# transmit_command(); # send relais off in case current maximum is reached!
+if(defined $isRemote) {
+  my $env = $ENV{'QUERY_STRING'};
+#   $env =~ s/%20/ /g;
+  $env =~ s/&/!/g;
+  my $cmd = "bash -c \"ssh $isRemote 'QUERY_STRING=".$env." perl'\" <htdocs/tools/pwr/pwr_remote.pl";
+#   system("ssh $isRemote 'QUERY_STRING=".$env." perl -v' ");
+#   print $cmd."\n";
+  print qx($cmd);
+  }
+else {
+  transmit_command() if $ser_type eq "PSP"; #if new command, send it!
+  receive_answer() if $ser_type eq "PSP"; # always called
 
+  print receive_answer_HMP() if (($ser_type eq "HMP" or $ser_type eq "HMC") && $isIP == 0) or $ser_type eq "PST"; # always called
+  print HMP_ethernet() if (($ser_type eq "HMP" or $ser_type eq "HMC") && $isIP == 1);
+  }
 
 
 

diff --git a/web/htdocs/tools/pwr/pwr_remote.pl b/web/htdocs/tools/pwr/pwr_remote.pl
new file mode 100644 (file)
index 0000000..8ca8dcd
--- /dev/null
+++ b/web/htdocs/tools/pwr/pwr_remote.pl
@@ -0,0 +1,134 @@
+use strict;
+use warnings;
+use Device::SerialPort;
+
+use feature 'state';
+use URI::Escape;
+use Time::HiRes qw( usleep);
+use POSIX qw/floor ceil strftime/;
+
+my $envstring = $ENV{'QUERY_STRING'};
+# print $envstring;
+
+(my $null,$envstring) = split('/',$envstring,2);
+$envstring = '/'.$envstring;
+$envstring =~ s/%20/ /g;
+
+my @new_command = split('!',$envstring); 
+my $ser_dev = shift(@new_command);
+$ser_dev = "/dev/ttyUSB0" unless defined $ser_dev;
+
+my $ser_type = shift(@new_command);
+$ser_type = "PSP" unless defined $ser_type;
+
+my $ser_speed = shift(@new_command);  #speed or port number
+$ser_speed = "2400" unless defined $ser_speed;
+
+
+
+my  $port = new Device::SerialPort($ser_dev);
+  unless ($port)
+  {
+    print "can't open serial interface $ser_dev\n";
+    exit;
+  }
+
+  $port->user_msg('ON'); 
+  $port->baudrate($ser_speed); 
+  $port->parity("none"); 
+  $port->databits(8); 
+  $port->stopbits(1); 
+  $port->handshake("xoff");
+  $port->handshake("none") if $ser_type eq "HMP" or $ser_type eq "HMC" or $ser_type eq "PST"; 
+  $port->write_settings;
+  
+  
+transmit_command() if $ser_type eq "PSP"; #if new command, send it!
+receive_answer() if $ser_type eq "PSP"; # always called
+
+
+
+sub transmit_command {
+
+$port->lookclear; 
+
+while ( my $command = shift(@new_command) ) {
+    $command = uri_unescape($command);
+    $port->write("$command\r");
+    print "i sent the command: $command";
+    #print "\n\nokay.\n";
+    usleep 1E5;
+  }
+}
+
+
+
+
+sub receive_answer {
+
+
+
+
+  my %state_lookup = (
+    0 => 'off',
+    1 => 'on' );
+
+  my $found = 0;
+
+
+
+  # clear buffers, then send the "list"-command to the power supply
+  $port->lookclear; 
+  $port->write("L\r");
+
+
+  # do polling for 5 seconds, break polling as soon as answer was received
+  my $i;
+  for ($i = 0; ($i<100) ;$i++) {
+    my $a = $port->lookfor;
+    #print $a."\n"; # debug output
+    if ($a =~ m/V(\d\d\.\d\d)A(\d\.\d\d\d)W(\d\d\d\.\d)U(\d\d)I(\d\.\d\d)P(\d\d\d)F(\d\d\d\d\d\d)/) {
+      $found = 1;
+       my $c_volt = $1;
+       my $c_cur = $2;
+       my $c_pwr = $3;
+       my $l_volt = $4;
+       my $l_cur = $5;
+       my $l_pwr = $6;
+      my $state_string = $7;
+       my $relais_state = $state_lookup{substr $state_string, 0,1}; 
+      printf("
+      <table>
+      <tr>
+      <td align=right>%2.2f<td align=left> V
+      <tr>
+      <td align=right>%1.3f<td align=left> A
+      <tr>
+      <td align=right>%3.1f<td align=left> W
+      <tr>
+      <tr>
+      <td align=right>voltage limit: %d<td align=left> V
+      <tr>
+      <td align=right>current limit: %1.2f<td align=left> A
+      <tr>
+      <td align=right>power limit: %d<td align=left> W
+      <tr>
+      <tr>
+      <td align=right>output relais:<td align=left> $relais_state </td>
+      </table>"
+      ,$c_volt,$c_cur,$c_pwr,$l_volt,$l_cur,$l_pwr);
+  
+#       if( $c_cur > 0) {
+#         if($c_cur > ($l_cur * 0.9) ) { # check if current limit reached, if so, turn power off!
+#           print "!!! current limit reached, power off !!!<br>";
+#           push(@new_command,"KOD");
+#         }
+#       }
+      
+      last;
+  
+    } else {
+      usleep 5E4; # 50 ms delay
+    }
+  }
+}
\ No newline at end of file