Diff: Components/Display/Display_class.h

Revision:

15:44e6c9013bff

Parent:

14:8320b5ff96fa

--- a/Components/Display/Display_class.h	Mon Aug 07 14:30:21 2017 +0000
+++ b/Components/Display/Display_class.h	Tue Aug 08 14:41:03 2017 +0000
@@ -324,33 +324,33 @@
 class Display
 {
 private:
-    Stmpe1600 &stmpe1600_exp0;
-    Stmpe1600 &stmpe1600_exp1;
+    Stmpe1600 *stmpe1600_exp0;
+    Stmpe1600 *stmpe1600_exp1;
 public:
     /** Constructor
     * @param[in] &stmpe_1600 device handler to be used for display control
     */
-    Display(Stmpe1600 &stmpe_1600_exp0, Stmpe1600 &stmpe_1600_exp1) : stmpe1600_exp0(stmpe_1600_exp0),
-        stmpe1600_exp1(stmpe_1600_exp1)
+    Display(Stmpe1600 &stmpe_1600_exp0, Stmpe1600 &stmpe_1600_exp1) : stmpe1600_exp0(&stmpe_1600_exp0),
+        stmpe1600_exp1(&stmpe_1600_exp1)
     {
         uint16_t expander_data;
 
         // detect the extenders
-        stmpe1600_exp0.read_16bit_reg(0x00, &expander_data);
+        stmpe1600_exp0->read_16bit_reg(0x00, &expander_data);
 //        if (ExpanderData != 0x1600) {/* log - failed to find expander exp0 */ }
-        stmpe1600_exp1.read_16bit_reg(0x00, &expander_data);
+        stmpe1600_exp1->read_16bit_reg(0x00, &expander_data);
 //        if (ExpanderData != 0x1600) {/* log - failed to find expander exp1 */ }
 
         // configure all necessary GPIO pins as outputs
         expander_data = 0xFFFF;
-        stmpe1600_exp0.write_16bit_reg(GPDR, &expander_data);
+        stmpe1600_exp0->write_16bit_reg(GPDR, &expander_data);
         expander_data = 0xBFFF; // leave bit 14 as an input, for the pushbutton, PB1.
-        stmpe1600_exp1.write_16bit_reg(GPDR, &expander_data);
+        stmpe1600_exp1->write_16bit_reg(GPDR, &expander_data);
 
         // shut down all segment and all device
         expander_data = 0x7F + (0x7F << 7);
-        stmpe1600_exp0.write_16bit_reg(GPSR, &expander_data);
-        stmpe1600_exp1.write_16bit_reg(GPSR, &expander_data);
+        stmpe1600_exp0->write_16bit_reg(GPSR, &expander_data);
+        stmpe1600_exp1->write_16bit_reg(GPSR, &expander_data);
     }
 
     /*** Interface Methods ***/
@@ -386,10 +386,10 @@
 // ordered low-byte/high-byte!
         cur_io_val.bytes[1] |= 0xC0; // ensure highest bits are high, as these are xshutdown pins for left & right sensors!
         expander_data = (cur_io_val.bytes[1] << 8) + cur_io_val.bytes[0];
-        stmpe1600_exp0.write_16bit_reg(GPSR, &expander_data);
+        stmpe1600_exp0->write_16bit_reg(GPSR, &expander_data);
         cur_io_val.bytes[3] |= 0x80; // ensure highest bit is high, as this is xshutdown pin on central sensor!
         expander_data = (cur_io_val.bytes[3] << 8) + cur_io_val.bytes[2];
-        stmpe1600_exp1.write_16bit_reg(GPSR, &expander_data);
+        stmpe1600_exp1->write_16bit_reg(GPSR, &expander_data);
 
     }
 
@@ -398,8 +398,8 @@
         uint16_t expander_data;
 
         expander_data = 0x7F + (0x7F << 7);
-        stmpe1600_exp0.write_16bit_reg(GPSR, &expander_data);
-        stmpe1600_exp1.write_16bit_reg(GPSR, &expander_data);
+        stmpe1600_exp0->write_16bit_reg(GPSR, &expander_data);
+        stmpe1600_exp1->write_16bit_reg(GPSR, &expander_data);
     }
 
 };