Branch: master

256facf7 2019-05-09 00:56:41 Timothy Pearson 
Properly configured headers on TDS744A scopes before trying to establish communications
M servers/gpib_server_lin/src/scope_functions.cpp

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 a60ce3f..96030c4 100644
--- a/servers/gpib_server_lin/src/scope_functions.cpp
+++ b/servers/gpib_server_lin/src/scope_functions.cpp
@@ -775,26 +775,35 @@
 		return -1;
 	}
 	else if (strcmp("TDS744AOS", scopeType) == 0) {
-		sprintf(falpha,"DATA:ENCDG RIBINARY");
+		sprintf(falpha,"HEAD OFF");
 		#ifdef ENABLE_EXTRA_DEBUGGING
 		printf("[DEBG] Writing: %s\n\r", falpha);
 		#endif
 		if (gpib_write(gpibDevice, falpha) == 0) {
-			sprintf(falpha,"DATA:WIDTH 2");
+			sprintf(falpha,"DATA:ENCDG RIBINARY");
 			#ifdef ENABLE_EXTRA_DEBUGGING
 			printf("[DEBG] Writing: %s\n\r", falpha);
 			#endif
 			if (gpib_write(gpibDevice, falpha) == 0) {
-				sprintf(falpha,"DATA:START 1");
+				sprintf(falpha,"DATA:WIDTH 2");
 				#ifdef ENABLE_EXTRA_DEBUGGING
 				printf("[DEBG] Writing: %s\n\r", falpha);
 				#endif
 				if (gpib_write(gpibDevice, falpha) == 0) {
-					sprintf(falpha,"DATA:STOP %d", SCOPE_TRACE_MAX_POINTS-1);
+					sprintf(falpha,"DATA:START 1");
 					#ifdef ENABLE_EXTRA_DEBUGGING
 					printf("[DEBG] Writing: %s\n\r", falpha);
 					#endif
-					return 0;
+					if (gpib_write(gpibDevice, falpha) == 0) {
+						sprintf(falpha,"DATA:STOP %d", SCOPE_TRACE_MAX_POINTS-1);
+						#ifdef ENABLE_EXTRA_DEBUGGING
+						printf("[DEBG] Writing: %s\n\r", falpha);
+						#endif
+						return 0;
+					}
+					else {
+						return -2;
+					}
 				}
 				else {
 					return -2;
2e6027a5 2019-05-09 01:13:43 Timothy Pearson 
Build debug symbols for libtdekrb and libtqtrla on Debian systems
M lib/libtdekrb/debian/control
M lib/libtqtrla/debian/control

l

diff --git a/lib/libtdekrb/debian/control b/lib/libtdekrb/debian/control
index f453157..9ee0a91 100644
--- a/lib/libtdekrb/debian/control
+++ b/lib/libtdekrb/debian/control
@@ -20,3 +20,13 @@
  Kerberos network library for TDE.
  .
  libtdekrb-trinity-dev contains development files and documentation.
+
+Package: libtdekrb-trinity-dbg
+Section: devel
+Architecture: any
+Priority: extra
+Depends: libtdekrb-trinity (= ${binary:Version})
+Description: debugging symbols for the TDE Kerberos network library
+ This package contains the debugging symbols associated with libtdekrb-trinity.
+ They will automatically be used by gdb for debugging libtdekrb-trinity-related
+ issues.

l

diff --git a/lib/libtqtrla/debian/control b/lib/libtqtrla/debian/control
index 9f1d810..80e14d2 100644
--- a/lib/libtqtrla/debian/control
+++ b/lib/libtqtrla/debian/control
@@ -21,3 +21,13 @@
  Shared objects for the Remote Laboratory Access system
  .
  libtqtrla-dev contains development files and documentation.
+
+Package: libtqtrla-dbg
+Section: devel
+Architecture: any
+Priority: extra
+Depends: libtqtrla (= ${binary:Version})
+Description: debugging symbols for the Remote Laboratory Access shared library
+ This package contains the debugging symbols associated with libtqtrla.
+ They will automatically be used by gdb for debugging libtqtrla-related
+ issues.