diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-03-08 22:43:47 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-03-08 22:43:47 -0600 |
| commit | 51daf08fdc7d5a51a37d1674a1bde63f50fd8208 (patch) | |
| tree | ff5b066c92b10ec7f7bc93cf24cdc6bfab6d8e92 /servers/gpib_server_lin/src/scope_functions.cpp | |
| parent | 77ab205bdeedfb1825a685380ecdf9e0509ddb03 (diff) | |
| download | ulab-51daf08fdc7d5a51a37d1674a1bde63f50fd8208.tar.gz ulab-51daf08fdc7d5a51a37d1674a1bde63f50fd8208.zip | |
Fix handling of AUX and LINE trigger sources
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, 3 insertions, 1 deletions
diff --git a/servers/gpib_server_lin/src/scope_functions.cpp b/servers/gpib_server_lin/src/scope_functions.cpp index 3385a1e..2cedf45 100644 --- a/servers/gpib_server_lin/src/scope_functions.cpp +++ b/servers/gpib_server_lin/src/scope_functions.cpp @@ -575,8 +575,10 @@ int scope_get_trigger_channel(int * retval, const char * scopeType, int gpibDevi else if (retchan.startsWith("CH2")) *retval = 2; else if (retchan.startsWith("CH3")) *retval = 3; else if (retchan.startsWith("CH4")) *retval = 4; + else if (retchan.startsWith("AUX")) *retval = -1; + else if (retchan.startsWith("LINE")) *retval = -2; else { - *retval = -1; + *retval = 0; return -1; } } |