diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-07-14 16:05:39 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-07-14 16:05:39 -0500 |
| commit | fe06492794c15013e4511d1fcd623b0234c21afe (patch) | |
| tree | ef6cc5128d33feb3fc73c218607d509a4c2a26e8 /servers/gpib_server_lin/src/scope_functions.h | |
| parent | e382ba1107906e9f6725fe7b4f15f62b5bb282c5 (diff) | |
| download | ulab-fe06492794c15013e4511d1fcd623b0234c21afe.tar.gz ulab-fe06492794c15013e4511d1fcd623b0234c21afe.zip | |
Can now grab initial scope traces
Diffstat (limited to 'servers/gpib_server_lin/src/scope_functions.h')
| -rw-r--r-- | servers/gpib_server_lin/src/scope_functions.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/servers/gpib_server_lin/src/scope_functions.h b/servers/gpib_server_lin/src/scope_functions.h index fbab514..2c0bcd1 100644 --- a/servers/gpib_server_lin/src/scope_functions.h +++ b/servers/gpib_server_lin/src/scope_functions.h @@ -22,18 +22,28 @@ extern unsigned char scope_raw_screenshot_data[4194304]; extern double scope_raw_trace_data[65535]; +extern double scope_raw_position_data[65535]; unsigned long scopeScreenSize (const char * scopeType); unsigned long scopeScreenWidth (const char * scopeType); unsigned long scopeScreenHeight (const char * scopeType); int gpib_read_binary(int ud, int max_num_bytes); +int scope_reset(const char * funcgenType, int gpibDevice); 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_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); int scope_set_trigger_channel(int desired_channel,const char * scopeType, int gpibDevice); int scope_set_trigger_level(float desired_level,const char * scopeType, int gpibDevice); int scope_set_channel_position(int desired_channel, float desired_level,const char * scopeType, int gpibDevice); -int scope_get_channel_trace(int desired_channel, const char * scopeType, int gpibDevice);
\ No newline at end of file +int scope_get_channel_trace(int desired_channel, const char * scopeType, int gpibDevice); +int scope_get_number_of_horizontal_divisions(const char * scopeType, int gpibDevice); +int scope_get_number_of_vertical_divisions(const char * scopeType, int gpibDevice); +int scope_get_number_of_channels(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 |