updating power supply access for Instek PSP

diff --git a/web/htdocs/tools/pwr/build_index.pl b/web/htdocs/tools/pwr/build_index.pl
index e0a10dbecf7fd6b6db9b9104fe8985ba41c0c7c7..3c29691b9f6c62676f20db35c744a837f6602c73 100755 (executable)
--- 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 e0f8079dc0d6f6138e14cb590083fcadc9c20753..e0ac58bf277e76edebc9e13f2ac8c625a9520384 100644 (file)
--- 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 b85167d7cb93fdafac50b54aafc093a555cb55c3..8a57692a9d230aff4b964a1a16c81a8abba718bd 100755 (executable)
--- 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;