Diff: AnalogInFiltered.cpp

Revision:

2:ae7a31a3c618

Parent:

0:33bc88c4ab31

Child:

5:a0bb17c379ce

--- a/AnalogInFiltered.cpp	Wed Aug 28 13:12:39 2013 +0000
+++ b/AnalogInFiltered.cpp	Fri Aug 30 01:37:49 2013 +0000
@@ -1,9 +1,10 @@
 #include "AnalogInFiltered.h"
 
 
-AnalogInFiltered::AnalogInFiltered(AnalogFilterInterface *filter, PinName pin) {
+AnalogInFiltered::AnalogInFiltered(AnalogFilterInterface *filter, PinName pin, int fuzzyFactor) {
     _ain = new AnalogIn(pin);
     _filter = filter;
+    _fuzzyFactor = fuzzyFactor;
     _lastValue=0;
 }
 
@@ -12,21 +13,24 @@
     delete(_filter);
 }
 
-long AnalogInFiltered::getValue() {
-    return _filter->getData();
-}
-
 void AnalogInFiltered::measure () {
     _filter->setData(_ain->read_u16() - 32768);
 }
 
+long AnalogInFiltered::getData() {
+    return _filter->getData();
+}
 
-bool AnalogInFiltered::getIsChanged(int offSet) {
-    _filter->setData(_ain->read_u16() - 32768);
-    if (abs(_filter->getData() - _lastValue) > offSet) {
+
+bool AnalogInFiltered::getIsChanged() {
+//    _filter->setData(_ain->read_u16() - 32768);
+    if (abs(_filter->getData() - _lastValue) > _fuzzyFactor) {
         _lastValue = _filter->getData();
         return true;
     }
     return false;
 }
 
+int AnalogInFiltered::getFuzzyFactor() {
+    return _fuzzyFactor;
+}