Diff: source/TickerResourceObserver.cpp

Revision:

16:dffa38c3340f

Parent:

13:9edad7677211

Child:

31:2507e64fcc42

diff -r c11dbe4d354c -r dffa38c3340f source/TickerResourceObserver.cpp
--- a/source/TickerResourceObserver.cpp	Fri Jun 10 17:09:56 2016 +0000
+++ b/source/TickerResourceObserver.cpp	Fri Jun 10 18:53:01 2016 +0000
@@ -21,9 +21,6 @@
  */
  
  #include "TickerResourceObserver.h"
- 
- // DEBUG
- //DigitalOut __ticker_led(LED2);
   
  // constructor
  TickerResourceObserver::TickerResourceObserver(DynamicResource *resource,int sleep_time) : 
@@ -40,18 +37,8 @@
 
  // notifier
  void TickerResourceObserver::observationNotifier() {
-     if (this->isObserving() == true && this->getResource() != NULL && this->getResource()->isConnected() == true) {
-         //
-         // implementsObservation(): This switch denotes whether this ticker resource generates its own observations or relies on the ticker (time-based) mechanism.
-         //   -- if resource itself doesn't implement it, then we can call notify() with the get() on each heartbeat of the tickered resource (see note below)
-         //   -- otherwise, we let the resource itself call observe() as part of its observation implementation
-         //
-         // note: this is independent of whether the resource, when declared, is defined as an observable resource or not.  If not, then notify() wont be called 
-         //       as there will be no observations for this resource regardless of this switch value. 
-         //
-         bool do_notify = !(this->getResource()->implementsObservation());
+     if (this->isObserving() == true && this->getResource() != NULL && this->getResource()->isRegistered() == true) {
          this->getResource()->observe();
-         //__ticker_led = !__ticker_led;
      }
  }