jeans/openHASP
jeans/openHASP
1
0
Fork 0
mirror of https://github.com/HASwitchPlate/openHASP.git synced 2025-07-28 05:36:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix lovyan driver issue

Browse Source
This commit is contained in:
fvanroie 2022-10-22 01:33:44 +02:00
parent 0b5eb9bb41
commit e973fe2b16
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/drv/tft/tft_driver_lovyangfx.cpp
View File

@ -492,22 +492,21 @@ void LovyanGfx::init(int w, int h)
Preferences preferences; Preferences preferences;
preferences.begin("tft", false); preferences.begin("tft", false);
this->tft_driver = preferences.getUInt("DRIVER", get_tft_driver());
lgfx::IBus* _bus_instance = _init_bus(&preferences); lgfx::IBus* _bus_instance = _init_bus(&preferences);
this->tft_driver = preferences.getUInt("DRIVER", get_tft_driver());
lgfx::Panel_Device* _panel_instance = _init_panel(_bus_instance); lgfx::Panel_Device* _panel_instance = _init_panel(_bus_instance);
lgfx::ITouch* _touch_instance = _init_touch(&preferences);
if(_panel_instance != nullptr) { if(_panel_instance != nullptr) {
_panel_instance->setBus(_bus_instance); _panel_instance->setBus(_bus_instance);
configure_panel(_panel_instance, &preferences); configure_panel(_panel_instance, &preferences);
} }
lgfx::ITouch* touch = _init_touch(&preferences);
#endif #endif
tft.setPanel(_panel_instance); tft.setPanel(_panel_instance);
lgfx::v1::ITouch* touch = _panel_instance->getTouch(); if(_touch_instance) {
if(touch) {
LOG_INFO(TAG_TFT, F("Touch " D_SERVICE_STARTED)); LOG_INFO(TAG_TFT, F("Touch " D_SERVICE_STARTED));
} else { } else {
LOG_WARNING(TAG_TFT, F("Touch " D_SERVICE_START_FAILED)); LOG_WARNING(TAG_TFT, F("Touch " D_SERVICE_START_FAILED));
@ -692,7 +691,7 @@ bool LovyanGfx::is_driver_pin(uint8_t pin)
pin == cfg.pin_d11 || pin == cfg.pin_d12 || pin == cfg.pin_d13 || pin == cfg.pin_d14 || pin == cfg.pin_d11 || pin == cfg.pin_d12 || pin == cfg.pin_d13 || pin == cfg.pin_d14 ||
pin == cfg.pin_d15) pin == cfg.pin_d15)
return true; return true;
#endif #endif
} else if(bus_type == lgfx::v1::bus_spi) { } else if(bus_type == lgfx::v1::bus_spi) {
auto bus = (lgfx::Bus_SPI*)panel->getBus(); auto bus = (lgfx::Bus_SPI*)panel->getBus();