From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Thu, 21 Jun 2007 16:20:47 +0000 (+0000)
Subject: Merge branch 'master' of git.dolda2000.com:/srv/git/r/kokare
X-Git-Url: http://www.dolda2000.com/gitweb/?a=commitdiff_plain;h=8086be2927a8723f47e1fc5e46493185108d7af2;hp=3586d0961d8e0471ce1996436fef92eed7a2c521;p=kokare.git

Merge branch 'master' of git.dolda2000.com:/srv/git/r/kokare
---

diff --git a/kokare.c b/kokare.c
index 6635747..c475e80 100644
--- a/kokare.c
+++ b/kokare.c
@@ -228,7 +228,7 @@ int main(void)
 	calcavg();
 	triaccycle();
 
-#if 1
+#if 0
 	/*
 	 * User interface
 	 */
@@ -291,6 +291,17 @@ int main(void)
 	    display(ttimea / 1000);
 	}
 #endif
+#if 1
+#endif
+	/*
+	 * ZVD debug
+	 */
+	if(zok) {
+	    if(++cur > 99)
+		cur = 0;
+	    display(cur);
+	    zok = 0;
+	}
 #if 0
 	/*
 	  Phony Triac control