Further DirAx improvements

git-svn-id: svn://cook.msm.cam.ac.uk:745/diff-tomo/dtr@142 bf6ca9ba-c028-0410-8290-897cf20841d1

1 files changed, 69 insertions, 14 deletions

diff --git a/src/dirax.c b/src/dirax.c
index 4834ba3..12b68fe 100644
--- a/src/dirax.c
+++ b/src/dirax.c
@@ -106,59 +106,106 @@ static void dirax_sendline(const char *line, ControlContext *ctx) {
 	int i;
 	
 	write(ctx->dirax_pty, line, strlen(line));
-
+	
 	copy = strdup(line);
 	for ( i=0; i<strlen(copy); i++ ) {
 		if ( copy[i] == '\r' ) copy[i]='\0';
 		if ( copy[i] == '\n' ) copy[i]='\0';
 	}
-	printf("sent '%s'", copy);	/* No newline here */
+	printf("DX: Sent '%s'\n", copy);	/* No newline here */
 	free(copy);
 	
 }
+/* Send a "user" command to DirAx, failing if DirAx is not idle */
+static void dirax_sendline_if_idle(const char *line, ControlContext *ctx) {
+
+	if ( ctx->dirax_step != 0 ) {
+		printf("DX: DirAx not idle\n");
+		return;
+	}
+	
+	dirax_sendline(line, ctx);
+
+}
 
 static void dirax_send_next(ControlContext *ctx) {
 
 	switch ( ctx->dirax_step ) {
 	
-		case 0 : {
+		case 1 : {
 			dirax_sendline("read dtr.drx\n", ctx);
 			ctx->dirax_step++;
 			break;
 		}
 		
-		case 1 : {
-			dirax_sendline("dmax 50\n", ctx);
+		case 2 : {
+			dirax_sendline("dmax 10\n", ctx);
 			ctx->dirax_step++;
 			break;
 		}
 		
-		case 2 : {
-			dirax_sendline("indexfit 2\n", ctx);
+		case 3 : {
+			dirax_sendline("indexfit 6\n", ctx);
 			ctx->dirax_step++;
 			break;
 		}
 		
-		case 3 : {
+		case 4 : {
 			dirax_sendline("levelfit 300\n", ctx);
 			ctx->dirax_step++;
 			break;
 		}
 		
-		case 4 : {
+		case 5 : {
 			dirax_sendline("go\n", ctx);
 			ctx->dirax_step++;
 			break;
 		}
 		
-		case 5 : {
+		case 6 : {
+			dirax_sendline("cell\n", ctx);
+			ctx->dirax_step++;
+			break;
+		}
+		
+		case 7 : {
+			dirax_sendline("go\n", ctx);
+			ctx->dirax_step++;
+			break;
+		}
+		
+		case 8 : {
+			dirax_sendline("cell\n", ctx);
+			ctx->dirax_step++;
+			break;
+		}
+		
+		case 9 : {
+			dirax_sendline("go\n", ctx);
+			ctx->dirax_step++;
+			break;
+		}
+		
+		case 10 : {
+			dirax_sendline("cell\n", ctx);
+			ctx->dirax_step++;
+			break;
+		}
+		
+		case 11 : {
+			dirax_sendline("go\n", ctx);
+			ctx->dirax_step++;
+			break;
+		}
+		
+		case 12 : {
 			dirax_sendline("cell\n", ctx);
 			ctx->dirax_step++;
 			break;
 		}
 		
 		default: {
-			printf("idle");
+			ctx->dirax_step = 0;
 		}
 		
 	}
@@ -179,6 +226,7 @@ static gboolean dirax_readable(GIOChannel *dirax, GIOCondition condition, Contro
 		waitpid(ctx->dirax_pid, NULL, 0);
 		g_io_channel_shutdown(ctx->dirax, FALSE, NULL);
 		ctx->dirax = NULL;
+		displaywindow_update_dirax(ctx, ctx->dw);
 		return FALSE;
 		
 	} else {
@@ -250,9 +298,8 @@ static gboolean dirax_readable(GIOChannel *dirax, GIOCondition condition, Contro
 						
 						memmove(ctx->dirax_rbuffer+i, ctx->dirax_rbuffer+i+7, 7);
 						ctx->dirax_rbufpos -= 7;
-						printf("DX: Got prompt: ");
+						printf("DX: Prompt\n");
 						dirax_send_next(ctx);
-						printf("\n");
 						
 						break;
 					
@@ -287,6 +334,12 @@ static gboolean dirax_readable(GIOChannel *dirax, GIOCondition condition, Contro
 	
 }
 
+void dirax_stop(ControlContext *ctx) {
+
+	dirax_sendline_if_idle("end\n", ctx);
+	
+}
+
 void dirax_invoke(ControlContext *ctx) {
 
 	FILE *fh;
@@ -341,11 +394,13 @@ void dirax_invoke(ControlContext *ctx) {
 	opts = fcntl(ctx->dirax_pty, F_GETFL);
 	fcntl(ctx->dirax_pty, F_SETFL, opts | O_NONBLOCK);
 	
-	ctx->dirax_step = 0;
+	ctx->dirax_step = 1;	/* This starts the "initialisation" procedure */
 	ctx->dirax_read_cell = 0;
 	ctx->dirax = g_io_channel_unix_new(ctx->dirax_pty);
 	g_io_add_watch(ctx->dirax, G_IO_IN | G_IO_HUP, (GIOFunc)dirax_readable, ctx);
 	
+	displaywindow_update_dirax(ctx, ctx->dw);
+	
 	return;
 	
 }