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

diff --combined kokare.c
index b8ffcca,7419ad6..f98fd96
--- 1/kokare.c
--- 2/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;