Diff: main.cpp

Revision:

40:ba083993b481

Parent:

39:618ad21e2b34

Child:

41:d222c043c96d

--- a/main.cpp	Wed Apr 05 14:37:25 2017 +0000
+++ b/main.cpp	Wed Apr 05 14:48:21 2017 +0000
@@ -6,6 +6,7 @@
 #include <ctype.h>
 #include "hts221.h"
 #include "LPS25H.h"
+#include "LinkedList.h"
 
 #define SIGNAL_doMeasure 1
 #define SWITCH1_RELEASE 90
@@ -26,89 +27,11 @@
 
 int count= 0;
 
-//
-//   CLASSES
-//
-class Measure {
-public:    
-    float temperature;    
-    float humidity;
-    float pressure;
-    
-    //Constructor
-    Measure(float f, float h, float p) {
-        temperature = f;
-        humidity = h;
-        pressure = p;    
-    }
-    Measure()
-    {
-        temperature = 0;
-        humidity = 0;
-        pressure = 0;    
-    }
-};
  
 //Mail queue
 Mail<Measure, 16> mail_box;
  
-class LinkedList{
-    
-    struct Node {
-        Measure measure;
-        Node *next;
-    };
 
-public:
-    // constructor
-    LinkedList()
-            {
-
-        head = NULL; 
-            }
-   
-    void addValueFront(Measure _measure){
-        Node *n = new Node();   
-        n->measure = _measure;       
-        n->next = head;         
-                                
-        head = n;               
-    }
-        void addValueEnd(Measure _measure){
-                if(head == NULL)
-                {
-                    Node *aux = new Node();
-                    aux->measure = _measure;
-                    aux->next = NULL;
-                    head = aux;   
-                }
-                else
-                {
-                    Node *n = head;
-                    while(n->next != NULL)
-                    {
-                        n = n->next;
-                    }
-                    Node *aux = new Node();
-                    aux->measure = _measure;
-                    aux->next = NULL;
-                    n->next = aux;
-            }
-        }
-
-    Measure popValueFRONT(){
-        Node *n = head;
-        Measure _measure = n->measure;
-
-        head = head->next;
-        delete n;
-        return _measure;
-    }
-
-
-private:
-    Node *head; 
-};
 LinkedList *listBuffer;
  
 // Call this on precise intervals