Commit 8e82da43205d0e5a3d66d760ad1ae6c62c759753
2013-10-04T10:57:07
Klondike - extra zero value and range checking in temp conversion
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56
diff --git a/driver-klondike.c b/driver-klondike.c
index 955c1c6..523df43 100644
--- a/driver-klondike.c
+++ b/driver-klondike.c
@@ -120,6 +120,9 @@ static double cvtKlnToC(uint8_t temp)
{
double Rt, stein, celsius;
+ if (temp == 0)
+ return 0.0;
+
Rt = 1000.0 * 255.0 / (double)temp - 1000.0;
stein = log(Rt / 2200.0) / 3987.0;
@@ -128,13 +131,39 @@ static double cvtKlnToC(uint8_t temp)
celsius = (1.0 / stein) - 273.15;
+ // For display of bad data
+ if (celsius < 0.0)
+ celsius = 0.0;
+ if (celsius > 200.0)
+ celsius = 200.0;
+
return celsius;
}
static int cvtCToKln(double deg)
{
- double R = exp((1/(deg+273.15)-1/(273.15+25))*3987)*2200;
- return 256*R/(R+1000);
+ double Rt, stein, temp;
+
+ if (deg < 0.0)
+ deg = 0.0;
+
+ stein = 1.0 / (deg + 273.15);
+
+ stein -= 1.0 / (double)(25.0 + 273.15);
+
+ Rt = exp(stein * 3987.0) * 2200.0;
+
+ if (Rt == -1000.0)
+ Rt++;
+
+ temp = 1000.0 * 256.0 / (Rt + 1000.0);
+
+ if (temp > 255)
+ temp = 255;
+ if (temp < 0)
+ temp = 0;
+
+ return (int)temp;
}
static char *SendCmdGetReply(struct cgpu_info *klncgpu, char Cmd, int device, int datalen, void *data)