X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=kokare.c;h=61e52136dfd96514d668a41a56b6f8b0958f4e2e;hb=4f42f21300df867e72561cb61cd378b74e49c54d;hp=18379e9fc53a88f343caf6437bfc1f6e18c36898;hpb=314156469153a9cbf5a74660c1d69808ad35a924;p=kokare.git

diff --git a/kokare.c b/kokare.c
index 18379e9..61e5213 100644
--- a/kokare.c
+++ b/kokare.c
@@ -2,14 +2,14 @@
 #include <avr/interrupt.h>
 #include <inttypes.h>
 
-#define SEGA 128
-#define SEGB 64
-#define SEGC 4
-#define SEGD 16
-#define SEGE 32
-#define SEGF 2
-#define SEGG 1
-#define SEGP 8
+#define SEGA 4
+#define SEGB 2
+#define SEGC 1
+#define SEGD 32
+#define SEGE 64
+#define SEGF 16
+#define SEGG 8
+#define SEGP 128
 
 uint8_t font[16] = {
     SEGA | SEGB | SEGC | SEGD | SEGE | SEGF,
@@ -36,6 +36,7 @@ char ledc = 0;
 /* Timer */
 char of = 0;
 int oticks = 0;
+unsigned long mnow;
 /* Pulse counter */
 char pstate = 0;
 char pval = 0;
@@ -48,8 +49,15 @@ char tlock = 0;
 unsigned long tstart;
 unsigned long ttime;
 unsigned long ttimea = 10000;
+char tavgok = 0;
 /* Zero-cross detector*/
+char zok = 0;
+unsigned long ztime;
 /* Triac */
+char trstate = 0;
+char tron = 0;
+unsigned long trtime;
+unsigned short trdelay = 0;
 
 void init(void)
 {
@@ -63,7 +71,7 @@ void init(void)
      * B3..5 = ISP
      * B6..7 = CLK
      */
-    DDRB = 0x00;
+    DDRB = 0x38;
     PORTB = 0x07;
     PCMSK0 = 0x07;
     PCICR = 0x01;
@@ -160,20 +168,17 @@ void ledcycle(void)
 
 void tempcycle(void)
 {
-    unsigned long now;
-    
-    now = getticks();
     if(tstate == 0) {
 	if((PIND & 8) && (tlock == 0)) {
 	    PORTD |= 2;
-	    tstart = now;
+	    tstart = mnow;
 	    tstate = 1;
 	}
     } else if(tstate == 1) {
-	if(now - tstart > 1000) {
+	if(mnow - tstart > 1000) {
 	    PORTD &= ~2;
 	    tstate = 0;
-	    tstart = now;
+	    tstart = mnow;
 	}
     }
 }
@@ -184,22 +189,88 @@ void calcavg(void)
 	tlock = 2;
 	ttimea = ((ttimea * 15) + ttime) >> 4;
 	tlock = 0;
+	tavgok = 1;
+    }
+}
+
+void triaccycle(void)
+{
+    if(trstate == 0) {
+	if(tron && zok && (mnow > ztime + trdelay)) {
+	    PORTD |= 1;
+	    zok = 0;
+	    trstate = 1;
+	    trtime = mnow;
+	}
+    } else if(trstate == 1) {
+	if(mnow > trtime + 500) {
+	    PORTD &= ~1;
+	    trstate = 0;
+	}
     }
 }
 
 int main(void)
 {
-    int cur;
+    int state, cur;
+    unsigned long utime;
     
-    cur = 0;
+    state = 0;
+    cur = 99;
     init();
     sei();
     display(0);
+
     while(1) {
+	mnow = getticks();
 	ledcycle();
 	tempcycle();
 	calcavg();
+	triaccycle();
 
+#if 1
+	/*
+	 * User interface
+	 */
+	if(state == 0) {
+	    /* Display temperature */
+	    if(tavgok) {
+		tavgok = 0;
+		if(ttimea < 20000) {
+		    display((ttimea / 100) % 100);
+		    dsp[0] |= SEGP;
+		    if(ttimea >= 10000)
+			dsp[1] |= SEGP;
+		} else {
+		    display(ttimea / 1000);
+		}
+	    }
+	    if(pval != 0) {
+		state = 1;
+		utime = mnow;
+	    }
+	} else if(state == 1) {
+	    /* Triac control */
+	    if(pval != 0) {
+		cur += pval;
+		pval = 0;
+		if(cur < 0)
+		    cur = 0;
+		if(cur > 99)
+		    cur = 99;
+		display(cur);
+		trdelay = 10000 - ((unsigned short)cur * 100);
+		utime = mnow;
+	    }
+	    if(mnow - utime > 1000000) {
+		state = 0;
+	    }
+	}
+	if(sstate == 2) {
+	    tron = !tron;
+	    sstate = 0;
+	}
+#endif
 	/*
 	  dsp[0] = bindisp((ttimea & 0xff00) >> 8);
 	  dsp[1] = bindisp(ttimea & 0x00ff);
@@ -207,6 +278,10 @@ int main(void)
 	/*
 	  disphex((ttimea & 0xff000) >> 12);
 	*/
+#if 0
+	/*
+	  Temp display
+	*/
 	if(ttimea < 20000) {
 	    display((ttimea / 100) % 100);
 	    dsp[0] |= SEGP;
@@ -215,8 +290,45 @@ int main(void)
 	} else {
 	    display(ttimea / 1000);
 	}
-
+#endif
+#if 0
+	/*
+	 * ZVD debug
+	 */
+	if(zok) {
+	    if(++cur > 99)
+		cur = 0;
+	    display(cur);
+	    zok = 0;
+	}
+#endif
+#if 0
 	/*
+	  Phony Triac control
+	 */
+	if(pval != 0) {
+	    cur += pval;
+	    if(cur < 0)
+		cur = 0;
+	    if(cur > 99)
+		cur = 99;
+	    display(cur);
+	    trdelay = 10000 - ((unsigned short)cur * 100);
+	    pval = 0;
+	}
+	if(sstate == 2) {
+	    tron = !tron;
+	    sstate = 0;
+	}
+	if(tron)
+	    dsp[1] |= SEGP;
+	else
+	    dsp[1] &= ~SEGP;
+#endif
+#if 0
+	/*
+	  Pulse counter display
+	*/
 	cur += pval;
 	pval = 0;
 	if(sstate == 2) {
@@ -233,12 +345,16 @@ int main(void)
 	} else {
 	    display(cur);
 	}
-	*/
+	if(PINB & 4)
+	    dsp[1] |= SEGP;
+#endif
     }
 }
 
 ISR(SIG_INTERRUPT0)
 {
+    ztime = getticks();
+    zok = 1;
 }
 
 ISR(SIG_INTERRUPT1)
@@ -264,22 +380,22 @@ ISR(SIG_OVERFLOW1)
 
 ISR(SIG_PIN_CHANGE0)
 {
-    if((sstate == 0) & ((PINB & 1) == 0)) {
+    if((sstate == 0) && !(PINB & 4)) {
 	stime = oticks;
 	sstate = 1;
     }
-    if((sstate == 1) & ((PINB & 1) == 1)) {
+    if((sstate == 1) && (PINB & 4)) {
 	stime = oticks - stime;
 	sstate = 2;
     }
     if(pstate == 0) {
 	if((PINB & 2) == 0) {
 	    pstate = 1;
-	} else if((PINB & 4) == 0) {
+	} else if((PINB & 1) == 0) {
 	    pstate = 2;
 	}
     } else if(pstate == 1) {
-	if((PINB & 4) == 0) {
+	if((PINB & 1) == 0) {
 	    pval++;
 	    pstate = 3;
 	} else {
@@ -293,7 +409,7 @@ ISR(SIG_PIN_CHANGE0)
 	    pstate = 0;
 	}
     } else {
-	if((PINB & 2) && (PINB & 4))
+	if((PINB & 2) && (PINB & 1))
 	    pstate = 0;
     }
 }