From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Sat, 7 Jul 2007 02:58:40 +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=c97e331c3a64f2f4e24ed84b7cb0b52de2562f20;hp=-c;p=kokare.git

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

c97e331c3a64f2f4e24ed84b7cb0b52de2562f20
diff --combined kokare.c
index b8ffcca,7419ad6..f98fd96
--- a/kokare.c
+++ b/kokare.c
@@@ -237,7 -237,7 +237,7 @@@ void convcycle(void
       *  t = B / l
       * Note, temperature is in Kelvin
       */
- #define C 9.792934
+ #define C 9.361168
  #define B 4020.0
      if(state == 0) {
  	if((mnow - last > 200000) && tavgok) {
@@@ -364,7 -364,7 +364,7 @@@ int main(void
  			 * ms. */
  			trdelay = 7;
  		    } else {
 -			trdelay = 79 - (delta * 9);
 +			trdelay = 75 - (delta * 5);
  		    }
  		} else {
  		    tron = 0;