diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-07-18 16:33:39 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-07-18 16:33:39 -0500 |
| commit | 23eadbf9246280ce6473a4fe4d3605cd730eb8c8 (patch) | |
| tree | 99a742ea61a71eb7e65ad881acfa652b3030d096 /servers/gpib_server_lin/src/scope_functions.h | |
| parent | 3ce46cc90fa5c488f1c41cd4cace0b2a98f3d143 (diff) | |
| download | ulab-23eadbf9246280ce6473a4fe4d3605cd730eb8c8.tar.gz ulab-23eadbf9246280ce6473a4fe4d3605cd730eb8c8.zip | |
Add channel controls to scope
Diffstat (limited to 'servers/gpib_server_lin/src/scope_functions.h')
| -rw-r--r-- | servers/gpib_server_lin/src/scope_functions.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/servers/gpib_server_lin/src/scope_functions.h b/servers/gpib_server_lin/src/scope_functions.h index b38f821..a83ab9a 100644 --- a/servers/gpib_server_lin/src/scope_functions.h +++ b/servers/gpib_server_lin/src/scope_functions.h @@ -33,7 +33,7 @@ int scope_get_screenshot(const char * scopeType, int gpibDevice); int scope_get_screenshot_stage2(const char * scopeType, int gpibDevice); int scope_perform_initial_setup(const char * scopeType, int gpibDevice); int scope_set_timebase(float desired_timebase,const char * scopeType, int gpibDevice); -int scope_set_volts_div(int desired_channel, float desired_volts,const char * scopeType, int gpibDevice); +int scope_set_volts_div(int desired_channel, double desired_volts, const char * scopeType, int gpibDevice); int scope_set_acquisition(int status,const char * scopeType, int gpibDevice); int scope_set_channel_state(int desired_channel, int status,const char * scopeType, int gpibDevice); int scope_get_channel_state(int * retval, int desired_channel, const char * scopeType, int gpibDevice); @@ -48,4 +48,6 @@ int scope_get_trigger_channel(int * retval, const char * scopeType, int gpibDevi int scope_get_trigger_level(double * retval, const char * scopeType, int gpibDevice); int scope_get_channel_volts_div(double * retval, int desired_channel, const char * scopeType, int gpibDevice); int scope_get_channel_seconds_div(double * retval, int desired_channel, const char * scopeType, int gpibDevice); -int scope_get_channel_sample_count(unsigned long * retval, int desired_channel, const char * scopeType, int gpibDevice);
\ No newline at end of file +int scope_get_channel_sample_count(unsigned long * retval, int desired_channel, const char * scopeType, int gpibDevice); +int scope_get_probe_attenuation_multiplier(double * retval, int desired_channel, const char * scopeType, int gpibDevice); +int scope_get_permitted_volts_div_settings_at_1x(int * number_of_values, double ** retarray, const char * scopeType, int gpibDevice);
\ No newline at end of file |