diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2014-04-24 20:33:06 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2014-04-24 20:33:06 -0500 |
| commit | 55e9906b78d8d0d22359d67e8d98e8c8c49f5b28 (patch) | |
| tree | fc422798fd78315bfe51f044815457a7fa072b37 /servers/gpib_server_lin/src/scope_functions.cpp | |
| parent | 31f91d555b16487cc1670cbfa8c18b2f14993d57 (diff) | |
| download | ulab-55e9906b78d8d0d22359d67e8d98e8c8c49f5b28.tar.gz ulab-55e9906b78d8d0d22359d67e8d98e8c8c49f5b28.zip | |
Add timebase controls to scope part
Build debug symbols package
Diffstat (limited to 'servers/gpib_server_lin/src/scope_functions.cpp')
| -rw-r--r-- | servers/gpib_server_lin/src/scope_functions.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/servers/gpib_server_lin/src/scope_functions.cpp b/servers/gpib_server_lin/src/scope_functions.cpp index 1e7c4ae..81a31a5 100644 --- a/servers/gpib_server_lin/src/scope_functions.cpp +++ b/servers/gpib_server_lin/src/scope_functions.cpp @@ -253,7 +253,7 @@ int scope_set_timebase(float desired_timebase,const char * scopeType, int gpibDe } } else if (strcmp("TDS744AOS", scopeType) == 0) { - sprintf(falpha, "HORIZONTAL:MAIN:SCALE %E", desired_timebase/10); + sprintf(falpha, "HORIZONTAL:MAIN:SCALE %E", desired_timebase); #ifdef ENABLE_EXTRA_DEBUGGING printf("[DEBG] Writing: %s\n\r", falpha); #endif @@ -308,7 +308,7 @@ int scope_get_timebase(double * retval, const char * scopeType, int gpibDevice) } else { floatstring[ai]=0; - *retval = atof(floatstring)*10; + *retval = floatstring; } #ifdef ENABLE_EXTRA_DEBUGGING |