atrf-path: added pass/fail indication (in the GUI, accept the result with P/F)

- atrf-path.c (do_sweeps): return a pass/fail/undecided value
- gui.h (gui), gui.c (gui): return a pass/fail/undecided value
- gui.c (gui): return pass/fail when P or F is pressed; exit
  unconditionally if Q is pressed
- atrf-path.c (main): according to the decision of "gui" or "do_sweeps",
  print "#PASS", "#FAIL", or nothing

tools/atrf-path/atrf-path.c

@@ -169,18 +169,36 @@ static void print_sweep(const struct sweep *sweep, const struct sample *res)
 }
 
 
-static void do_sweeps(const struct sweep *sweep, int sweeps)
+static int do_sweeps(const struct sweep *sweep, int sweeps)
 {
 	struct sample res[N_CHAN*2];	/* 2 offsets per channel */
+	int decision = 0, fail, pass;
 	int i;
 
+	/*
+	 * The pass/fail logic here goes as follows:
+	 *
+	 * Pass if and only if all sweeps pass.
+	 * Fail if and only if all sweeps are below the minimum.
+	 * Make no decision if any sweeps were above the maximum or if there
+	 * was a mixture of pass and fail.
+	 */
+
 	for (i = 0; i != sweeps; i++) {
 		if (i)
 			putchar('\n');
-		do_sweep(sweep, res);
+		fail = do_sweep(sweep, res);
 		print_sweep(sweep, res);
+		pass = fail < 0 ? -1 : fail > 0 ? 0 : 1;
+		if (!i)
+			decision = pass;
+		else {
+			if (pass != decision)
+				decision = 0;
 		}
 	}
+	return decision;
+}
 
 
 static int do_read_profile(const char *name, struct sweep *sweep)
@@ -307,7 +325,7 @@ int main(int argc, char **argv)
 	int sweeps = 1;
 	unsigned long tmp;
 	char *end;
-	int c;
+	int c, decision;
 
 	while ((c = getopt(argc, argv, "gp:P:t:T:")) != EOF)
 		switch (c) {
@@ -384,9 +402,22 @@ int main(int argc, char **argv)
 	init_rx(sweep.rx, sweep.trim_rx);
 	init_tx(sweep.tx, sweep.trim_tx, sweep.power);
 	if (graphical)
-		gui(&sweep, sweeps);
+		decision = gui(&sweep, sweeps);
 	else
-		do_sweeps(&sweep, sweeps);
+		decision = do_sweeps(&sweep, sweeps);
+
+	switch (decision) {
+	case -1:
+		printf("#FAIL\n");
+		break;
+	case 0:
+		break;
+	case 1:
+		printf("#PASS\n");
+		break;
+	default:
+		abort();
+	}
 
 	atrf_reg_write(sweep.tx, REG_TRX_STATE, TRX_CMD_TRX_OFF);
 	atrf_reg_write(sweep.rx, REG_TRX_STATE, TRX_CMD_TRX_OFF);

tools/atrf-path/gui.c

@@ -169,12 +169,12 @@ static void tstop(void)
 }
 
 
-void gui(const struct sweep *sweep, int sweeps)
+int gui(const struct sweep *sweep, int sweeps)
 {
 	SDL_Surface *surf;
 	SDL_Event event;
 	int cycle;
-	int fail;
+	int fail = 0;
 
 	if (SDL_Init(SDL_INIT_VIDEO) < 0) {
 		fprintf(stderr, "SDL_init: %s\n", SDL_GetError());
@@ -191,10 +191,43 @@ void gui(const struct sweep *sweep, int sweeps)
 	for (cycle = 0; cycle != sweeps || !sweeps; cycle++) {
 		struct sample res[N_CHAN*2];
 
+		/*
+		 * Pass/fail logic:
+		 *
+		 * Quit  exit at any time, without making a pass/fail decision
+		 * Pass  exit if the current result is "pass"
+		 *       ignored if the current result is "over"/"under"
+		 * Fail  exit if the current result is "under"
+		 *       ignored if the current result is "pass"
+		 *	 ignored if the current result is "over", because this
+		 *         indicates an invalid measurement, not a defective
+		 *         device
+		 */
+
 		while (SDL_PollEvent(&event))
-			if (event.type == SDL_KEYDOWN ||
+			switch (event.type) {
-			    event.type == SDL_QUIT)
+			case SDL_KEYDOWN:
-				return;
+				switch (event.key.keysym.sym) {
+				case SDLK_f:
+					if (cycle && fail < 0)
+						return -1;
+					break;
+				case SDLK_p:
+					if (cycle && !fail)
+						return 1;
+					break;
+				case SDLK_q:
+					return 0;
+				default:
+					break;
+				}
+				break;
+			case SDL_QUIT:
+				return 0;
+			default:
+				break;
+			}
+
 		tstart();
 		fail = do_sweep(sweep, res);
 		tstop();
@@ -211,4 +244,6 @@ void gui(const struct sweep *sweep, int sweeps)
 		SDL_UnlockSurface(surf);
 		SDL_UpdateRect(surf, 0, 0, 0, 0);
 	}
+
+	return 0;
 }

tools/atrf-path/gui.h

@@ -18,10 +18,18 @@
 #include "sweep.h"
 
 
+/*
+ * gui returns one of the following values:
+ *
+ * -1	fail
+ *  0	no decision taken
+ *  1	pass
+ */
+
 #ifdef HAVE_GFX
-void gui(const struct sweep *sweep, int sweeps);
+int gui(const struct sweep *sweep, int sweeps);
 #else
-#define gui(sweep, sweeps) abort()
+#define gui(sweep, sweeps) ({ abort(); 0; })
 #endif
 
 #endif /* !GUI_H */