--- embedtools/src/butz.c	2014/02/08 17:07:40	1.1.2.5
+++ embedtools/src/butz.c	2014/02/08 18:56:50	1.1.2.7
@@ -3,7 +3,7 @@
 
 cfg_root_t cfg;
 sched_root_task_t *root;
-int Kill, gpio, maxpins, defact, resbut, led = -1;
+int Kill, gpio, flg, maxpins, defact, resbut, led = -1;
 extern char compiled[], compiledby[], compilehost[];
 char szCfgName[PATH_MAX] = BUTZ_CFG;
 char szDevName[PATH_MAX] = _PATH_DEVGPIOC"0";
@@ -97,6 +97,7 @@ execReset(sched_task_t *task)
 		_exit(127);
 	}
 
+	flg ^= flg;
 	taskExit(task, NULL);
 }
 
@@ -118,6 +119,7 @@ execDefault(sched_task_t *task)
 		_exit(127);
 	}
 
+	flg ^= flg;
 	taskExit(task, NULL);
 }
 
@@ -126,14 +128,7 @@ butReset(sched_task_t *task)
 {
 	struct timespec ts = { 1, 0 };
 	struct gpio_req req;
-	static int flg = 0;
 
-	/* toggle led pin */
-	if (led != -1) {
-		req.gp_pin = led;
-		if (ioctl(gpio, GPIOTOGGLE, &req) == -1)
-			ESYSERR(0);
-	}
 	/* check reset button */
 	req.gp_pin = resbut;
 	if (ioctl(gpio, GPIOGET, &req) == -1) {
@@ -141,17 +136,24 @@ butReset(sched_task_t *task)
 		goto end;
 	}
 	/* switch on */
-	if (!req.gp_value)
+	if (flg != -1 && !req.gp_value)
 		if (++flg == 1)
 			schedSuspend(TASK_ROOT(task), execReset, NULL, flg, NULL, 0);
 	if (defact && flg >= defact) {
 		schedCancelby(TASK_ROOT(task), taskSUSPEND, CRITERIA_CALL, execReset, NULL);
 		schedEvent(TASK_ROOT(task), execDefault, NULL, flg, NULL, 0);
-		flg ^= flg;
+		flg = -1;
 		goto end;
 	}
-	if (flg && req.gp_value)
+	if (flg > 0 && req.gp_value)
 		schedResumeby(TASK_ROOT(task), CRITERIA_ID, (void*) 1);
+
+	/* toggle led pin */
+	if (flg != -1 && led != -1) {
+		req.gp_pin = led;
+		if (ioctl(gpio, GPIOTOGGLE, &req) == -1)
+			ESYSERR(0);
+	}
 end:
 	schedTimer(TASK_ROOT(task), TASK_FUNC(task), TASK_ARG(task), 
 			ts, TASK_DATA(task), TASK_DATLEN(task));