Skip to content

Commit fe7fdd8

Browse files
Fix HAL init when touch isn't configured (#325)
1 parent f26266b commit fe7fdd8

File tree

1 file changed

+12
-7
lines changed

1 file changed

+12
-7
lines changed

Tactility/Source/hal/Hal.cpp

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -59,23 +59,28 @@ void registerDevices(const Configuration& configuration) {
5959
}
6060

6161
static void startDisplays() {
62-
TT_LOG_I(TAG, "Start displays");
62+
TT_LOG_I(TAG, "Starting displays & touch");
6363
auto displays = hal::findDevices<display::DisplayDevice>(Device::Type::Display);
6464
for (auto& display : displays) {
65+
TT_LOG_I(TAG, "%s starting", display->getName().c_str());
6566
if (!display->start()) {
66-
TT_LOG_E(TAG, "Display start failed");
67+
TT_LOG_E(TAG, "%s start failed", display->getName().c_str());
6768
} else {
68-
TT_LOG_I(TAG, "Started %s", display->getName().c_str());
69+
TT_LOG_I(TAG, "%s started", display->getName().c_str());
6970

7071
if (display->supportsBacklightDuty()) {
72+
TT_LOG_I(TAG, "Setting backlight");
7173
display->setBacklightDuty(0);
7274
}
7375

7476
auto touch = display->getTouchDevice();
75-
if (touch != nullptr && !touch->start()) {
76-
TT_LOG_E(TAG, "Touch start failed");
77-
} else {
78-
TT_LOG_I(TAG, "Started %s", touch->getName().c_str());
77+
if (touch != nullptr) {
78+
TT_LOG_I(TAG, "%s starting", touch->getName().c_str());
79+
if (!touch->start()) {
80+
TT_LOG_E(TAG, "%s start failed", touch->getName().c_str());
81+
} else {
82+
TT_LOG_I(TAG, "%s started", touch->getName().c_str());
83+
}
7984
}
8085
}
8186
}

0 commit comments

Comments
 (0)