Diff: MQTTmbed.h

Revision:

50:c37c8236e84a

Parent:

48:187c6d4d7812

Child:

52:3f9919941b86

diff -r 08571008b958 -r c37c8236e84a MQTTmbed.h
--- a/MQTTmbed.h	Thu Sep 07 09:55:54 2017 +0100
+++ b/MQTTmbed.h	Mon Sep 11 16:43:10 2017 +0200
@@ -8,46 +8,42 @@
 public:
     Countdown()
     {
-        t = new Timer();
+        t = Timer();   
     }
-
+    
     Countdown(int ms)
     {
-        t = new Timer();
-        countdown_ms(ms);
+        t = Timer();
+        countdown_ms(ms);   
     }
-
-    ~Countdown()
-    {
-        delete t;
-    }
-
+    
+    
     bool expired()
     {
-        return t->read_ms() >= interval_end_ms;
+        return t.read_ms() >= interval_end_ms;
     }
-
-    void countdown_ms(unsigned long ms)
+    
+    void countdown_ms(unsigned long ms)  
     {
-        t->stop();
+        t.stop();
         interval_end_ms = ms;
-        t->reset();
-        t->start();
+        t.reset();
+        t.start();
     }
-
+    
     void countdown(int seconds)
     {
         countdown_ms((unsigned long)seconds * 1000L);
     }
-
+    
     int left_ms()
     {
-        return interval_end_ms - t->read_ms();
+        return interval_end_ms - t.read_ms();
     }
-
+    
 private:
-    Timer *t;
-    unsigned long interval_end_ms;
+    Timer t;
+    unsigned long interval_end_ms; 
 };
 
 #endif
\ No newline at end of file