From c4634dc0b49096137f29b455cb9c28444662f953 Mon Sep 17 00:00:00 2001 From: Karl Anderson Date: Mon, 30 Jul 2012 19:37:35 -0700 Subject: [PATCH] cleanup --- effects/Metro/Metro.cpp- | 61 ---------------------------------------- effects/Metro/Metro.h- | 26 ----------------- 2 files changed, 87 deletions(-) delete mode 100644 effects/Metro/Metro.cpp- delete mode 100644 effects/Metro/Metro.h- diff --git a/effects/Metro/Metro.cpp- b/effects/Metro/Metro.cpp- deleted file mode 100644 index 896775b..0000000 --- a/effects/Metro/Metro.cpp- +++ /dev/null @@ -1,61 +0,0 @@ - -#include "WProgram.h" -#include "Metro.h" - - -Metro::Metro(unsigned long interval_millis) -{ - interval(interval_millis); - reset(); -} - -// New creator so I can use either the original check behavior or benjamin.soelberg's -// suggested one (see below) - -Metro::Metro(unsigned long interval_millis, uint8_t autoreset) -{ - this->autoreset = autoreset; - interval(interval_millis); - reset(); -} - -void Metro::interval(unsigned long interval_millis) -{ - this->interval_millis = interval_millis; -} - -char Metro::check() -{ - if (millis() - this->previous_millis >= this->interval_millis) { - // As suggested by benjamin.soelberg@gmail.com, the following line - // this->previous_millis = millis(); - // was changed to - // this->previous_millis += this->interval_millis; - - // But then a bug would sometimes occur when the interval was set with random, - // so I added the following check to reinstate the previous behavior, but I am - // not sure this fixes it - - if (this->interval_millis == 0 || this->autoreset ) { - this->previous_millis = millis(); - } else { - this->previous_millis += this->interval_millis; - } - - return 1; - } - - - - return 0; - -} - -void Metro::reset() -{ - - this->previous_millis = millis(); - -} - - diff --git a/effects/Metro/Metro.h- b/effects/Metro/Metro.h- deleted file mode 100644 index cb21776..0000000 --- a/effects/Metro/Metro.h- +++ /dev/null @@ -1,26 +0,0 @@ - - -#ifndef Metro_h -#define Metro_h - -#include - -class Metro -{ - -public: - Metro(unsigned long interval_millis); - Metro(unsigned long interval_millis, uint8_t autoreset); - void interval(unsigned long interval_millis); - char check(); - void reset(); - -private: - uint8_t autoreset; - unsigned long previous_millis, interval_millis; - -}; - -#endif - -