Diff: DigitalInDebounced.h

Revision:

1:b59d305c4365

Parent:

0:76aea589cbdd

Child:

2:dabe90a0bdc1

--- a/DigitalInDebounced.h	Tue May 27 23:01:37 2014 +0000
+++ b/DigitalInDebounced.h	Mon Jun 02 14:09:31 2014 +0000
@@ -19,16 +19,16 @@
 public:
     DigitalInDebounced(PinName pin, unsigned int inDebounceTime=300);
     DigitalInDebounced(PinName pin, PinMode mode, unsigned int inDebounceTime=300);
+    virtual ~DigitalInDebounced();
     bool read(void);
     bool is_stable(void) {return stable;};
-    bool current_state(void) {return recent;};
+//    bool current_state(void) {return recent;};
+    bool current_state(void) {return Switch->read();};
     unsigned int rd_PreDivider (void) {return PreDivider;};
     unsigned int rd_Divider (void) {return Divider;};
     unsigned int rd_DebounceTime (void) {return DebounceTime;};
     unsigned int rd_DebounceCounter (void) {return DebounceCounter;};
-    virtual ~DigitalInDebounced();
     virtual void TimerEvent(void);
-    unsigned int xCounter;
 private:
     bool recent;
     bool stable;
@@ -37,7 +37,6 @@
     unsigned int Divider;
     unsigned int DebounceTime;
     unsigned int DebounceCounter;
-    
     void DigitalInDebounced_common(DigitalIn *SwitchIn, unsigned int inDebounceTime);
 };
   
\ No newline at end of file