summaryrefslogtreecommitdiff
path: root/src/systemtask
diff options
context:
space:
mode:
authorKieran Cawthray <kieranc@gmail.com>2021-11-15 19:38:29 +0100
committerKieran Cawthray <kieranc@gmail.com>2021-11-15 19:38:29 +0100
commit5a0cf8e3485dee193a86e8929233ecddb6711a94 (patch)
tree670c51ab64c465e4b198751fea800685066d7a1b /src/systemtask
parent2fa63c7f37f2441b7e126b83ed0da1896ca25fe9 (diff)
parenta57fda6ba4a29866083a1254ffdf92939d00e182 (diff)
Merge remote-tracking branch 'upstream/develop' into pts-settings
Diffstat (limited to 'src/systemtask')
-rw-r--r--src/systemtask/SystemTask.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/systemtask/SystemTask.cpp b/src/systemtask/SystemTask.cpp
index 0a3f9951..4b03f9ac 100644
--- a/src/systemtask/SystemTask.cpp
+++ b/src/systemtask/SystemTask.cpp
@@ -144,9 +144,15 @@ void SystemTask::Work() {
lcd.Init();
twiMaster.Init();
+ /*
+ * TODO We disable this warning message until we ensure it won't be displayed
+ * on legitimate PineTime equipped with a compatible touch controller.
+ * (some users reported false positive). See https://github.com/InfiniTimeOrg/InfiniTime/issues/763
if (!touchPanel.Init()) {
bootError = BootErrors::TouchController;
}
+ */
+ touchPanel.Init();
dateTimeController.Register(this);
batteryController.Register(this);
motorController.Init();