From 9f2c2f53fd3da6bd8eb819da9c9609d8b1768a63 Mon Sep 17 00:00:00 2001
From: Jan Michel <j.michel@gsi.de>
Date: Tue, 14 Apr 2015 16:39:02 +0200
Subject: [PATCH] updating power supply access for Instek PSP

---
 web/htdocs/tools/pwr/build_index.pl | 2 +-
 web/htdocs/tools/pwr/pwr.htm        | 3 ++-
 web/htdocs/tools/pwr/pwr.pl         | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/web/htdocs/tools/pwr/build_index.pl b/web/htdocs/tools/pwr/build_index.pl
index e0a10db..3c29691 100755
--- a/web/htdocs/tools/pwr/build_index.pl
+++ b/web/htdocs/tools/pwr/build_index.pl
@@ -26,7 +26,7 @@ while(defined(my $i = <LESEN>)) {
 if($type eq "PSP") {
 print <<EOF;
 <p>
-<iframe name="inlineframe" src="pwr.htm?device=$ser_dev&id=$dev_id&speed=$speed" frameborder="0" scrolling="auto" width="800" height="340" ></iframe>
+<iframe name="inlineframe" src="pwr.htm?device=$ser_dev&id=$dev_id&speed=$speed&type=$type" frameborder="0" scrolling="auto" width="800" height="340" ></iframe>
 </p>
 EOF
 }
diff --git a/web/htdocs/tools/pwr/pwr.htm b/web/htdocs/tools/pwr/pwr.htm
index e0f8079..e0ac58b 100644
--- a/web/htdocs/tools/pwr/pwr.htm
+++ b/web/htdocs/tools/pwr/pwr.htm
@@ -71,6 +71,7 @@ var new_commands = new Array();
 var ser_dev = getParameterByName("device");
 var dev_id = getParameterByName("id");
 var type = getParameterByName("type");
+var speed = getParameterByName("speed");
 
 function set_v() {
 	var value = parseFloat(document.getElementById("form_v").value);
@@ -120,7 +121,7 @@ function communication() {
   cmds = new_commands.join('&');
   if (cmds != "" || document.getElementById("showreadings").checked) {
     clearInterval(updateTask);
-    getdata('pwr.pl?'+ser_dev+'&'+type+'&'+cmds,update);
+    getdata('pwr.pl?'+ser_dev+'&'+type+"&"+speed+'&'+cmds,update);    
     }
 	new_commands = new Array();
 }
diff --git a/web/htdocs/tools/pwr/pwr.pl b/web/htdocs/tools/pwr/pwr.pl
index b85167d..8a57692 100755
--- a/web/htdocs/tools/pwr/pwr.pl
+++ b/web/htdocs/tools/pwr/pwr.pl
@@ -76,7 +76,7 @@ $port->lookclear;
 
 while ( my $command = shift(@new_command) ) {
     $command = uri_unescape($command);
-    $port->write("$command\r\n");
+    $port->write("$command\r");
     print "i sent the command: $command";
     #print "\n\nokay.\n";
     usleep 1E5;
-- 
2.43.0