John Alexander / X_NUCLEO_53L1A1_mbed

initial release

Dependencies:   VL53L1X_mbed

Diff: Components/Display/Display.h

Revision:
21:99c367e8a402
Parent:
17:f8187a3fa36e
diff -r 1727c86ac63b -r 99c367e8a402 Components/Display/Display.h
--- a/Components/Display/Display.h	Fri Oct 13 22:04:16 2017 +0000
+++ b/Components/Display/Display.h	Mon Dec 18 09:52:09 2017 +0000
@@ -330,8 +330,13 @@
     /** Constructor
     * @param[in] &stmpe_1600 device handler to be used for display control
     */
+//<<<<<<< local
     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)
+//>>>>>>> other
     {
         uint16_t expander_data;