Diff: Measure.h

Revision:

8:81ed1135ba02

Parent:

3:688b62ff6474

--- a/Measure.h	Wed Jun 03 12:22:46 2015 +0000
+++ b/Measure.h	Wed Jun 03 16:37:21 2015 +0000
@@ -4,13 +4,8 @@
 
 class Measure: public Item {
     public:
-        //menu items - only 2 -> start and back
-        Item **items[2];
-        Item *next; //screen to go next
-        bool hasResult;
-        
-        //constructors
-        Measure(char * title, ST7565 *lcd, Item *back){
+        //constructor for thermometer
+        Measure(char * title, ST7565 *lcd, Item *back, DigitalOut *laser){
             this->title = title;
             this->st7565 = lcd;
             this->back = back;
@@ -18,8 +13,14 @@
             hasResult = false;
             selected = 1;
             current_line = 6;
+            isOn = false;
+            this->laser = laser;
         };
         
+        //Measure(char *title, ST7565, *lcd, Item *back, DigitalOut *laser);
+        //Measure(char * title, ST7565 *lcd, Item *back);
+        //constructor for thermometer
+        //Measure(char *title, ST7565 *lcd, Item *back, DigitalOut *gyro, DigitalOut *thermo);
         Measure();
         
         //inherited functions
@@ -43,6 +44,16 @@
         }
         
         private:
+            //digital outputs for controlling stuff
+            DigitalOut *laser;
+            
+            //menu items - only 2 -> start and back
+            Item **items[2];
+            Item *next; //screen to go next
+            
+            
+            bool hasResult, isOn;
+        
             int selected, current_line;
             char * description, *nextName, *backName;
             void display_description(char *r);