Important changes to repositories hosted on mbed.com
Mbed hosted mercurial repositories are deprecated and are due to be permanently deleted in July 2026.
To keep a copy of this software download the repository Zip archive or clone locally using Mercurial.
It is also possible to export all your personal repositories from the account settings page.
Dependencies: VL53L1X_mbed
Dependents: HelloWorld_53L1A1_Interrupts 53L1A1_Satellites_MbedOS 53L1A1_Interrupts_MbedOS 53L1A1_Polling_All_MbedOS ... more
Diff: Components/Display/Display.h
- Revision:
- 21:99c367e8a402
- Parent:
- 17:f8187a3fa36e
--- 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;