Improved display for averaging mode

myTonino · Feb 23, 2016 · 1a38890 · 1a38890
1 parent afdb6fa
commit 1a38890
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/Tonino/tonino_lcd.cpp b/Tonino/tonino_lcd.cpp
@@ -299,7 +299,7 @@ void LCD::clear() {
 
 // light up the dot of the first digit
 void LCD::averaged(boolean dot) {
-  writeDigitRaw(0, 0 | (dot << 7));
+  writeDigitRaw(0, (displaybuffer[0] & 0b01111111) | (dot << 7));
   writeDisplay();
 }
 

diff --git a/Tonino/tonino_tcs3200.cpp b/Tonino/tonino_tcs3200.cpp
@@ -110,13 +110,19 @@ int32_t TCS3200::fitValue(sensorData *sd, float* raw, uint8_t colorMode, boolean
   float v = (r / b) * _cal[0] + _cal[1];
 
   // averaging
-  if (raw != NULL && *raw != 0.0 && abs(v - *raw) < AVERAGE_THRESHOLD) { // 0,011 correspond to about 1 Tonino value)
-      WRITEDEBUGLN("averaged:");
-      WRITEDEBUG(v);
-      WRITEDEBUG(SEPARATOR);
-      WRITEDEBUGLN(*raw);
-      v = (v + *raw) / 2.0;
+  if (raw != NULL && *raw != 0.0 && abs(v - *raw) < AVERAGE_THRESHOLD) {
+    WRITEDEBUGLN("averaged:");
+    WRITEDEBUG(v);
+    WRITEDEBUG(SEPARATOR);
+    WRITEDEBUGLN(*raw);
+    v = (v + *raw) / 2.0;
+    if (averaged != NULL) {
       *averaged = true;
+    }
+  } else {
+    if (averaged != NULL) {
+      *averaged = false;
+    }
   }
 
   WRITEDEBUG(v);

diff --git a/Tonino/tonino_tcs3200.h b/Tonino/tonino_tcs3200.h
@@ -188,7 +188,7 @@ class TCS3200 {
     // convert raw sensor data (in sd) into T-value using calibration and scaling
     // return value is T-value
     // if raw is not NULL, it contains the calibrated single value
-    int32_t fitValue(sensorData *sd, float* raw, uint8_t colorMode = COLOR_FULL, boolean* averaged = NULL);
+    int32_t fitValue(sensorData *sd, float *raw, uint8_t colorMode = COLOR_FULL, boolean *averaged = NULL);
 };
 
 #endif