diff options
| author | daniel <danieruru@gmail.com> | 2013-01-23 13:20:31 +0900 |
|---|---|---|
| committer | daniel <danieruru@gmail.com> | 2013-01-23 13:20:31 +0900 |
| commit | 4172e1a125b1ede5b898580aaf9d0f5b1d788483 (patch) | |
| tree | 4601a176fa8f7df3f7f7ca38480a0f6c3f957caf | |
| parent | c53ea096ab5a656f93ad2aed8d50f5dd346f91c3 (diff) | |
| parent | f6725d15cc1d1543366137297e0d2f52afd3a598 (diff) | |
Merge branch 'vxi' of grenfell.avtechpulse.com:Instrument into vxi
Conflicts:
libvxi11client/perlbits/testscript.pl
| -rw-r--r-- | libvxi11client/perlbits/VXI11-Client.t | 2 | ||||
| -rw-r--r-- | libvxi11client/perlbits/testscript.pl | 4 | ||||
| -rw-r--r-- | vxi11_server.c | 3 |
3 files changed, 7 insertions, 2 deletions
diff --git a/libvxi11client/perlbits/VXI11-Client.t b/libvxi11client/perlbits/VXI11-Client.t index 243d8d9..3334d3c 100644 --- a/libvxi11client/perlbits/VXI11-Client.t +++ b/libvxi11client/perlbits/VXI11-Client.t @@ -18,7 +18,7 @@ BEGIN { use_ok('VXI11::Client') }; &VXI11::Client::vxi_startinterruptserver(); -my $instr = &VXI11::Client::vxi_open("roi", 0); +my $instr = &VXI11::Client::vxi_open("192.168.0.62", 0); is($instr->vxi_lock(0), 1, "Lock"); ok($instr->vxi_write("*IDN?", -1, 0, 0) > 0, "Write"); diff --git a/libvxi11client/perlbits/testscript.pl b/libvxi11client/perlbits/testscript.pl index 440035d..f588aaf 100644 --- a/libvxi11client/perlbits/testscript.pl +++ b/libvxi11client/perlbits/testscript.pl @@ -1,3 +1,5 @@ +#!/usr/bin/perl + use strict; use warnings; @@ -5,7 +7,7 @@ use VXI11::Client; vxi_startinterruptserver(); -my $instr = vxi_open("roi", 0); +my $instr = vxi_open("192.168.0.62", 0); $instr->vxi_lock(0); $instr->vxi_write("*IDN?", -1, 0, 0); diff --git a/vxi11_server.c b/vxi11_server.c index 1f0ac4f..1faa821 100644 --- a/vxi11_server.c +++ b/vxi11_server.c @@ -186,6 +186,9 @@ device_read_1_svc(Device_ReadParms *argp, struct svc_req *rqstp) { if (globals.Registers.pending_output_message != NULL) { result.data.data_val = globals.Registers.pending_output_message; result.data.data_len = strlen(result.data.data_val) + 1; +#ifdef DEBUG + printf("sending ---%s---\n", globals.Registers.pending_output_message); +#endif } else { result.data.data_val = NULL; |