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

diff --git a/kokare.c b/kokare.c
index 61e5213..35e5a01 100644
--- a/kokare.c
+++ b/kokare.c
@@ -1,6 +1,7 @@
 #include <avr/io.h>
 #include <avr/interrupt.h>
 #include <inttypes.h>
+#include <math.h>
 
 #define SEGA 4
 #define SEGB 2
@@ -30,38 +31,49 @@ uint8_t font[16] = {
     SEGA | SEGE | SEGF | SEGG,
 };
 /* LED */
+#define LCDELAY 1000
 uint8_t dsp[2] = {0, 0};
 char leda = 0;
 char ledc = 0;
 /* Timer */
-char of = 0;
-int oticks = 0;
+volatile char of = 0;
+volatile int oticks = 0;
 unsigned long mnow;
 /* Pulse counter */
-char pstate = 0;
+volatile char pstate = 0;
 char pval = 0;
 /* Switch */
-char sstate = 0;
+volatile char sstate = 0;
 int stime = 0;
 /* Temp sensor */
-char tstate = 0;
-char tlock = 0;
+volatile char tstate = 0;
+volatile char tlock = 0;
 unsigned long tstart;
 unsigned long ttime;
 unsigned long ttimea = 10000;
 char tavgok = 0;
+/* Conversion loop */
+int tempk;
+volatile ktok = 0;
 /* Zero-cross detector*/
-char zok = 0;
-unsigned long ztime;
+volatile char zok = 0;
+volatile char ztime = 0;
 /* Triac */
 char trstate = 0;
 char tron = 0;
-unsigned long trtime;
-unsigned short trdelay = 0;
+volatile char trtime;
+volatile char trdelay = 0;
 
 void init(void)
 {
-    /* Timer init */
+    /* Timer init
+     * Timer 0 cycles timing sensitive subsystems
+     * Timer 1 is used for global timing
+     */
+    OCR0A = 100;
+    TCCR0A = 2;
+    TCCR0B = 1;
+    TIMSK0 = 2;
     TCCR1A = 0;
     TCCR1B = 1;
     TIMSK1 = 1;
@@ -142,7 +154,7 @@ void ledcycle(void)
     static uint16_t last = 0;
     uint8_t c, d, v;
     
-    if(TCNT1 - last > 500) {
+    if(TCNT1 - last > LCDELAY) {
 	last = TCNT1;
 	if(++leda >= 8) {
 	    leda = 0;
@@ -161,8 +173,10 @@ void ledcycle(void)
 	} else {
 	    c = d = 0;
 	}
+	cli();
 	PORTC = c;
 	PORTD = (PORTD & 0x0f) | d;
+	sei();
     }
 }
 
@@ -170,13 +184,17 @@ void tempcycle(void)
 {
     if(tstate == 0) {
 	if((PIND & 8) && (tlock == 0)) {
+	    cli();
 	    PORTD |= 2;
+	    sei();
 	    tstart = mnow;
 	    tstate = 1;
 	}
     } else if(tstate == 1) {
 	if(mnow - tstart > 1000) {
+	    cli();
 	    PORTD &= ~2;
+	    sei();
 	    tstate = 0;
 	    tstart = mnow;
 	}
@@ -193,20 +211,47 @@ void calcavg(void)
     }
 }
 
-void triaccycle(void)
+void convcycle(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;
+    static char state = 0;
+    static unsigned long last = 0;
+    static float a, ra, l, t;
+    
+    /*
+     * Theoretically:
+     *  t = RC * ln(2) => R = t / (C * ln(2))
+     *  R = A * exp(B / T) => T = B / ln(R / A)
+     *  T = B / ln(R / (A * C * ln(2)))
+     * In the following: 
+     *  a = ttimea as float
+     *  C = 1e6 / (A * C * ln(2))
+     *  ra = a * C
+     *  l = ln(ra)
+     *  t = B / l
+     * Note, temperature is in Kelvin
+     */
+#define C 9.792934
+#define B 4020.0
+    if(state == 0) {
+	if((mnow - last > 200000) && tavgok) {
+	    a = (float)ttimea;
+	    state = 1;
+	    tavgok = 0;
+	    last = mnow;
 	}
+    } else if(state == 1) {
+	ra = a * C;
+	state = 2;
+    } else if(state == 2) {
+	l = log(ra);
+	state = 3;
+    } else if(state == 3) {
+	t = B / l;
+	state = 4;
+    } else if(state == 4) {
+	tempk = (int)t;
+	ktok = 1;
+	state = 0;
     }
 }
 
@@ -226,7 +271,7 @@ int main(void)
 	ledcycle();
 	tempcycle();
 	calcavg();
-	triaccycle();
+	convcycle();
 
 #if 1
 	/*
@@ -234,21 +279,26 @@ int main(void)
 	 */
 	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;
+	    if(ktok) {
+		ktok = 0;
+		if((tempk >= 273) && (tempk <= 372)) {
+		    display(tempk - 273);
 		} else {
-		    display(ttimea / 1000);
+		    dsp[0] = dsp[1] = SEGG;
 		}
 	    }
 	    if(pval != 0) {
 		state = 1;
 		utime = mnow;
 	    }
+	    if(sstate == 2) {
+		sstate = 0;
+		if(stime > 10) {
+		    state = 2;
+		} else {
+		    tron = !tron;
+		}
+	    }
 	} else if(state == 1) {
 	    /* Triac control */
 	    if(pval != 0) {
@@ -259,16 +309,29 @@ int main(void)
 		if(cur > 99)
 		    cur = 99;
 		display(cur);
-		trdelay = 10000 - ((unsigned short)cur * 100);
+		trdelay = 99 - cur;
 		utime = mnow;
 	    }
 	    if(mnow - utime > 1000000) {
 		state = 0;
 	    }
-	}
-	if(sstate == 2) {
-	    tron = !tron;
-	    sstate = 0;
+	    if(sstate == 2) {
+		tron = !tron;
+		sstate = 0;
+	    }
+	} else if(state == 2) {
+	    if(ttimea < 20000) {
+		display((ttimea / 100) % 100);
+		dsp[0] |= SEGP;
+		if(ttimea >= 10000)
+		    dsp[1] |= SEGP;
+	    } else {
+		display(ttimea / 1000);
+	    }
+	    if(sstate == 2) {
+		state = 0;
+		sstate = 0;
+	    }
 	}
 #endif
 	/*
@@ -313,7 +376,7 @@ int main(void)
 	    if(cur > 99)
 		cur = 99;
 	    display(cur);
-	    trdelay = 10000 - ((unsigned short)cur * 100);
+	    trdelay = 99 - cur;
 	    pval = 0;
 	}
 	if(sstate == 2) {
@@ -353,7 +416,7 @@ int main(void)
 
 ISR(SIG_INTERRUPT0)
 {
-    ztime = getticks();
+    ztime = 0;
     zok = 1;
 }
 
@@ -372,6 +435,24 @@ ISR(SIG_INTERRUPT1)
     }
 }
 
+ISR(SIG_OUTPUT_COMPARE0A)
+{
+    if(trstate == 0) {
+	ztime++;
+	if(tron && (ztime >= trdelay)) {
+	    PORTD |= 1;
+	    trstate = 1;
+	    trtime = 0;
+	}
+    } else if(trstate == 1) {
+	trtime++;
+	if(trtime >= 5) {
+	    PORTD &= ~1;
+	    trstate = 0;
+	}
+    }
+}
+
 ISR(SIG_OVERFLOW1)
 {
     of = 1;