]> jspc29.x-matter.uni-frankfurt.de Git - labtools.git/commitdiff
jspc29 / labtools.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 3076327)
updated remote functions
authorhadaq <hadaq@hades33.gsi.de>
Mon, 12 Apr 2021 10:10:24 +0000 (12:10 +0200)
committerhadaq <hadaq@hades33.gsi.de>
Mon, 12 Apr 2021 10:10:24 +0000 (12:10 +0200)
powersupplies/web/htdocs/index.html patch | blob | history
powersupplies/web/htdocs/pwr.pl patch | blob | history
powersupplies/web/htdocs/pwr_hmp.htm patch | blob | history
powersupplies/web/htdocs/pwr_psp.htm patch | blob | history
powersupplies/web/htdocs/pwr_remote.pl patch | blob | history

diff --git a/powersupplies/web/htdocs/index.html b/powersupplies/web/htdocs/index.html
index 4f167ec511e5952ea2380c630b969e8a7664ba40..eb2424f4109109a2ea4c5f2d615842cff3cecdd2 100644 (file)
--- a/powersupplies/web/htdocs/index.html
+++ b/powersupplies/web/htdocs/index.html
@@ -10,6 +10,7 @@
 
          <body>
 <h2>Basic power supply control</h2>
+<h3 style="color:red">Please don't keep any tabs open! Multi-user is not yet implemented for remote serial devices.</h3>
 <p id="content">
 Platzhalter
 </p>
diff --git a/powersupplies/web/htdocs/pwr.pl b/powersupplies/web/htdocs/pwr.pl
index 4dcd6311d8daad93617ffe3a1fb7db054438f9ef..e1fc87008d080a4b237c4592e7a1aecddf11464e 100755 (executable)
--- a/powersupplies/web/htdocs/pwr.pl
+++ b/powersupplies/web/htdocs/pwr.pl
@@ -43,6 +43,14 @@ my $file = $ser_dev;
 my $db;
 if(-e $file && -r $file) {
   $db = lock_retrieve($file);
+  my $waitcnt = 0;
+  while($db->{lock} && $waitcnt < 30) {
+    usleep(100000);
+    $waitcnt++;
+    $db = lock_retrieve($file);
+    }
+  $db->{lock} = 1;  
+  lock_store($db,$file) if $db;
   }
 
 
@@ -186,7 +194,7 @@ sub HMP_serial {
 sub HMP_ethernet {
   print strftime("%H:%M:%S &", localtime());
   
-  my $port = IO::Socket::INET->new(PeerAddr => $ser_dev, PeerPort => $ser_speed, Proto => "tcp", Type => SOCK_STREAM, Timeout => 1) 
+  my $port = IO::Socket::INET->new(PeerAddr => $ser_dev, PeerPort => $ser_speed, Proto => "tcp", Type => SOCK_STREAM, Timeout => 2) 
               or (print("Device not found") && return);  
   while ( my $command = shift(@new_command) ) {
     $command = uri_unescape($command);
@@ -223,11 +231,15 @@ sub serial_rw {
 
 sub getValue {
   my ($fh,$cmd,$cnt,$forceread) = @_;
-  if (0 && defined $db->{$cmd.$cnt}{tim} && $db->{$cmd.$cnt}{tim} > time()-10) {
+  if (defined $db->{$cmd.$cnt}{tim} && $db->{$cmd.$cnt}{tim} > time()-5) {
     return $db->{$cmd.$cnt}{val};
     }
   else {
+    usleep(10000);
     my $val = serial_rw($fh,$cmd,$forceread);
+    if($val eq "") {
+      return $db->{$cmd.$cnt}{val};
+      }
     addDB($cmd.$cnt,$val);
     return $val;
     }
@@ -239,8 +251,9 @@ sub addDB {
   $db->{$cmd}{val} = $val;
   $db->{$cmd}{tim} = time();
   }
-  
-#lock_store($db,$file);  
+
+$db->{lock} = 0;  
+lock_store($db,$file) if $db;  
 print "\n";
   
 exit 1;
diff --git a/powersupplies/web/htdocs/pwr_hmp.htm b/powersupplies/web/htdocs/pwr_hmp.htm
index 8b840dc236613e73b380857eb0938113656ec60d..639ccc8931a7ae38f53887c166cc7cb9f0faa7ec 100644 (file)
--- a/powersupplies/web/htdocs/pwr_hmp.htm
+++ b/powersupplies/web/htdocs/pwr_hmp.htm
@@ -23,10 +23,10 @@
   <td><input type="text" id="form_v4" name="voltage" value=""><td><input type="button" onClick="set_v(4)" value="set">
 
 <tr><td align="right">Actual[V/A]
-  <td> <input type="text" id="vol1" disabled>  <td> <input type="text" id="cur1" disabled>
-  <td> <input type="text" id="vol2" disabled>  <td> <input type="text" id="cur2" disabled>
-  <td> <input type="text" id="vol3" disabled>  <td> <input type="text" id="cur3" disabled>
-  <td> <input type="text" id="vol4" disabled>  <td> <input type="text" id="cur4" disabled>
+  <td> <input type="text" id="vol1" disabled style="color:black;">  <td> <input type="text" id="cur1" disabled style="color:black;">
+  <td> <input type="text" id="vol2" disabled style="color:black;">  <td> <input type="text" id="cur2" disabled style="color:black;">
+  <td> <input type="text" id="vol3" disabled style="color:black;">  <td> <input type="text" id="cur3" disabled style="color:black;">
+  <td> <input type="text" id="vol4" disabled style="color:black;">  <td> <input type="text" id="cur4" disabled style="color:black;">
 
 <tr><td align="right">Limits[V/A]
   <td><input type="text" id="form_v_lim1" name="voltage_limit" onChange="set_v_lim(1)" value=""><td><input type="text" id="form_c_lim1" name="current_limit" onChange="set_c_lim(1)" value="">
@@ -41,7 +41,7 @@
   <td class="state"><input type="button" onClick="turn_on(4)" value="on"><td class="state"><input type="button" onClick="turn_off(4)" value="off">
 <tr class="sep"><td id="master">Global Switch<td colspan=8><input type="button" onClick="globalOn()" value="ON">
 <input type="button" onClick="globalOff()" value="OFF">
-<tr class="sep"><td colspan=5><input type="checkbox" value="1" id="showreadings">Enable read-back of values<td colspan=4>
+<tr class="sep"><td colspan=5><input type="checkbox" value="1" id="showreadings" checked>Enable read-back of values<td colspan=4>
 Read settings<input type="button" onClick="readSettings()" value="Go">
 <tr><td colspan=9 id="info">&nbsp;
 </table>
@@ -49,7 +49,7 @@ Read settings<input type="button" onClick="readSettings()" value="Go">
 
 
 <script language="javascript">
-var updaterate = 2000;
+var updaterate = 5500;
 var updateTask;
 var new_commands = new Array();
 var ser_dev = getParameterByName("device");
@@ -60,6 +60,7 @@ var speed = getParameterByName("speed");
 var names = getParameterByName("names");
 var readSettingsRequest = 1;
 var forceShowReadings = 1;
+var notfirst = -1;
 var Vnames   = names.split(':');
 
 if (channels<2) {
@@ -132,7 +133,7 @@ function globalOff() {
 }
 
 function update(data) {
-  updateTask = setTimeout("communication()",updaterate);
+  updateTask = setTimeout("communication()",(notfirst++>0)?updaterate:10);
   }
 
   
@@ -159,7 +160,7 @@ function updatesettings(data) {
     document.getElementById("form_c_lim"+(i+1)).value=(+e[i*3+1]).toFixed(3);
     document.getElementById("form_v_lim"+(i+1)).value=(+e[i*3+2]).toFixed(3);
     }
-  updateTask = setTimeout("communication()",updaterate);
+  updateTask = setTimeout("communication()",(notfirst++>0)?updaterate:10);
   }    
   
 function communication() {
@@ -225,7 +226,7 @@ function readSettings() {
   readSettingsRequest = 1;
   }
 
-updateTask = setTimeout("update()",updaterate);
+updateTask = setTimeout("update()",500);
 //document.getElementById("headline").innerHTML  = "Power Supply "+'<b>'+dev_id+'</b>'+" [connected to "+'<b>'+ser_dev+'</b>'+"]" ;
 
 for(i=1;i<=channels;i++) {
diff --git a/powersupplies/web/htdocs/pwr_psp.htm b/powersupplies/web/htdocs/pwr_psp.htm
index 2dcb1e41540556d00591e2db7586e40b3d7aff91..7d17b04336885ad876d43d1942fe2feffb20f0f6 100644 (file)
--- a/powersupplies/web/htdocs/pwr_psp.htm
+++ b/powersupplies/web/htdocs/pwr_psp.htm
@@ -65,7 +65,7 @@
 
 
 <script language="javascript">
-var updaterate = 1000;
+var updaterate = 10000;
 var updateTask;
 var new_commands = new Array();
 var ser_dev = getParameterByName("device");
diff --git a/powersupplies/web/htdocs/pwr_remote.pl b/powersupplies/web/htdocs/pwr_remote.pl
index 679a71d9f2d77de6e113502653845cc4915ec219..7bd7c30390ed019ca0e82e12ce4a027f7304fcaa 100644 (file)
--- a/powersupplies/web/htdocs/pwr_remote.pl
+++ b/powersupplies/web/htdocs/pwr_remote.pl
@@ -7,6 +7,8 @@ use URI::Escape::XS qw(uri_unescape);
 use Time::HiRes qw( usleep);
 use Fcntl;
 use POSIX qw/floor ceil strftime/;
+use Storable qw(lock_store lock_retrieve retrieve);
+
 
 my $envstring = $ENV{'QUERY_STRING'};
 # print $envstring;
@@ -27,6 +29,26 @@ $ser_speed = "2400" unless defined $ser_speed;
 
 my $cnt = 0;
 
+# Load stored values
+my $file = $ser_dev; 
+  $file =~ s/\W//g;
+  $file = "/dev/shm/pwrsup-".$file.".dump";
+my $db;
+if(-e $file && -r $file) {
+  $db = lock_retrieve($file);
+  my $waitcnt = 0;
+  while($db->{lock} && $waitcnt < 30) {
+    usleep(100000);
+    $waitcnt++;
+    $db = lock_retrieve($file);
+    }
+  $db->{lock} = 1;  
+  lock_store($db,$file) if $db;
+  }
+
+
+
+
 my  $port = new Device::SerialPort($ser_dev);
   unless ($port)
   {
@@ -75,7 +97,7 @@ sub HMP_serial {
     my $x = getValue($fh,$command,$cnt++);
     $x =~ s/\&//;
     print $x."&" if $command =~ /\?/;
-    usleep(40000);# if $ser_type eq "PST";
+    usleep(1000);# if $ser_type eq "PST";
     }
   close $fh;  
   return;
@@ -164,7 +186,7 @@ sub serial_rw {
         chomp $x;
         last;
         }
-      usleep(1000);
+      usleep(5000);
       }
     }
   else {
@@ -176,15 +198,31 @@ sub serial_rw {
 
 sub getValue {
   my ($fh,$cmd,$cnt,$forceread) = @_;
-#   if (0 && defined $db->{$cmd.$cnt}{tim} && $db->{$cmd.$cnt}{tim} > time()-10) {
-#     return $db->{$cmd.$cnt}{val};
-#     }
-#   else {
+  if (defined $db->{$cmd.$cnt}{tim} && $db->{$cmd.$cnt}{tim} > time()-5) {
+    return $db->{$cmd.$cnt}{val};
+    }
+  else {
+    usleep(10000);
     my $val = serial_rw($fh,$cmd,$forceread);
-#     addDB($cmd.$cnt,$val);
+    if($val eq "") {
+      return $db->{$cmd.$cnt}{val};
+      }
+    addDB($cmd.$cnt,$val);
     return $val;
-#     }
+    }
   }
 
+    
+sub addDB {
+  my ($cmd,$val) = @_;
+  $db->{$cmd}{val} = $val;
+  $db->{$cmd}{tim} = time();
+    
+  }
+  
+$db->{lock} = 0;  
+lock_store($db,$file) if $db;
+# print "\n";
   
+# exit 1;
 
Tools to control and monitor lab devices