diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2014-04-25 01:46:44 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2014-04-25 01:46:44 -0500 |
| commit | 5bb4cd0a02e682d7567b8298c1d93e78e511e657 (patch) | |
| tree | 39c6a0506b3acf528c89a54a4ff9fcf38ee2febb /servers/gpib_server_lin/src/scope_functions.cpp | |
| parent | 15a8d153cc9cc40eff0fa5352f414f9b3a6246c6 (diff) | |
| download | ulab-5bb4cd0a02e682d7567b8298c1d93e78e511e657.tar.gz ulab-5bb4cd0a02e682d7567b8298c1d93e78e511e657.zip | |
Add trigger channel set to scope part
Diffstat (limited to 'servers/gpib_server_lin/src/scope_functions.cpp')
| -rw-r--r-- | servers/gpib_server_lin/src/scope_functions.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/servers/gpib_server_lin/src/scope_functions.cpp b/servers/gpib_server_lin/src/scope_functions.cpp index 81a31a5..6b6f61a 100644 --- a/servers/gpib_server_lin/src/scope_functions.cpp +++ b/servers/gpib_server_lin/src/scope_functions.cpp @@ -308,7 +308,7 @@ int scope_get_timebase(double * retval, const char * scopeType, int gpibDevice) } else { floatstring[ai]=0; - *retval = floatstring; + *retval = atoi(floatstring); } #ifdef ENABLE_EXTRA_DEBUGGING |