Diff: sensor.cpp

Revision:

4:46ad190e6328

Parent:

2:a3e5edf84f74

Child:

6:898c306f7990

--- a/sensor.cpp	Wed Sep 07 16:03:54 2011 +0000
+++ b/sensor.cpp	Fri Oct 07 14:55:17 2011 +0000
@@ -30,14 +30,14 @@
 float get_light (AnalogIn &ain) {
     float f;
     
-    f = ain * AREF / 1000; // A
-    return f / 0.0000026; // lx
+    f = ain * AREF / REG_LIGHT; // A
+    return f / 0.0026; // lx
 }
 
 float get_uv (AnalogIn &ain) {
     float f;
     
-    f = ain * AREF / 100000; // A
+    f = ain * AREF / REG_UV; // A
     f = f / 0.000384; // mW/cm2
     if (f < 0) f = 0;
     return f;
@@ -47,7 +47,7 @@
     float f;
     
     f = ain * AREF; // V
-    f = f / ((AREF - f) / 10.0); // k ohm
+    f = f / ((AREF - f) / REG_MOIST); // k ohm
     if (f < 0) f = 0;
     return f;
 }
@@ -197,7 +197,7 @@
                 flg = -1;
                 break;
             case 'm':
-                value = tim->tm_mon;
+                value = tim->tm_mon + 1;
                 flg = -1;
                 break;
             case 'd':