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 | |
| parent | 77ab205bdeedfb1825a685380ecdf9e0509ddb03 (diff) | |
| download | ulab-51daf08fdc7d5a51a37d1674a1bde63f50fd8208.tar.gz ulab-51daf08fdc7d5a51a37d1674a1bde63f50fd8208.zip | |
Fix handling of AUX and LINE trigger sources
| -rw-r--r-- | servers/gpib_server_lin/acinclude.m4 | 6 | ||||
| -rw-r--r-- | servers/gpib_server_lin/src/scope_functions.cpp | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/servers/gpib_server_lin/acinclude.m4 b/servers/gpib_server_lin/acinclude.m4 index ef6d4db..1132500 100644 --- a/servers/gpib_server_lin/acinclude.m4 +++ b/servers/gpib_server_lin/acinclude.m4 @@ -638,7 +638,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS], if test -n "$trinity14ornewer"; then KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)]) KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)]) - KDE_FIND_PATH(makekdewidgets, MAKEKDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(makekdewidgets)]) + KDE_FIND_PATH(maketdewidgets, MAKEKDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(maketdewidgets)]) AC_SUBST(MAKEKDEWIDGETS) fi KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""]) @@ -2319,7 +2319,7 @@ if test $kde_qtver = 4; then AC_SUBST(LIB_KJS, "-lkjs") AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_KAB, "-lkab") - AC_SUBST(LIB_KABC, "-lkabc") + AC_SUBST(LIB_TDEABC, "-ltdeabc") AC_SUBST(LIB_TDEHTML, "-ltdehtml") AC_SUBST(LIB_KSPELL, "-ltdespell") AC_SUBST(LIB_KPARTS, "-ltdeparts") @@ -2345,7 +2345,7 @@ elif test $kde_qtver = 3; then AC_SUBST(LIB_KJS, "-lkjs") AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_KAB, "-lkab") - AC_SUBST(LIB_KABC, "-lkabc") + AC_SUBST(LIB_TDEABC, "-ltdeabc") AC_SUBST(LIB_TDEHTML, "-ltdehtml") AC_SUBST(LIB_KSPELL, "-ltdespell") AC_SUBST(LIB_KPARTS, "-ltdeparts") 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; } } |