From 51daf08fdc7d5a51a37d1674a1bde63f50fd8208 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 8 Mar 2013 22:43:47 -0600 Subject: Fix handling of AUX and LINE trigger sources --- servers/gpib_server_lin/src/scope_functions.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'servers/gpib_server_lin/src/scope_functions.cpp') 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; } } -- cgit v1.2.3