HAL renaming & relocation (#215)
Implemented more consistent naming: - Moved all HAL devices into their own namespace (and related folder) - Post-fixed all HAL device names with "Device"
This commit is contained in:
committed by
GitHub
parent
a7a3b17ff6
commit
2345ba6d13
@@ -1,10 +1,10 @@
|
||||
#include "Tactility/app/display/DisplaySettings.h"
|
||||
#include "Tactility/lvgl/LvglKeypad.h"
|
||||
|
||||
#include "Tactility/hal/display/DisplayDevice.h"
|
||||
#include "Tactility/hal/touch/TouchDevice.h"
|
||||
#include <Tactility/hal/Configuration.h>
|
||||
#include <Tactility/hal/Display.h>
|
||||
#include <Tactility/hal/Keyboard.h>
|
||||
#include <Tactility/hal/Touch.h>
|
||||
#include <Tactility/hal/keyboard/KeyboardDevice.h>
|
||||
#include <Tactility/kernel/SystemEvents.h>
|
||||
|
||||
#ifdef ESP_PLATFORM
|
||||
@@ -17,7 +17,7 @@ namespace tt::lvgl {
|
||||
|
||||
#define TAG "lvgl_init"
|
||||
|
||||
static std::shared_ptr<tt::hal::Display> initDisplay(const hal::Configuration& config) {
|
||||
static std::shared_ptr<tt::hal::display::DisplayDevice> initDisplay(const hal::Configuration& config) {
|
||||
assert(config.createDisplay);
|
||||
auto display = config.createDisplay();
|
||||
assert(display != nullptr);
|
||||
@@ -48,7 +48,7 @@ static std::shared_ptr<tt::hal::Display> initDisplay(const hal::Configuration& c
|
||||
return display;
|
||||
}
|
||||
|
||||
static bool initTouch(const std::shared_ptr<hal::Display>& display, const std::shared_ptr<hal::Touch>& touch) {
|
||||
static bool initTouch(const std::shared_ptr<hal::display::DisplayDevice>& display, const std::shared_ptr<hal::touch::TouchDevice>& touch) {
|
||||
TT_LOG_I(TAG, "Touch init");
|
||||
assert(display);
|
||||
assert(touch);
|
||||
@@ -60,7 +60,7 @@ static bool initTouch(const std::shared_ptr<hal::Display>& display, const std::s
|
||||
}
|
||||
}
|
||||
|
||||
static bool initKeyboard(const std::shared_ptr<hal::Display>& display, const std::shared_ptr<hal::Keyboard>& keyboard) {
|
||||
static bool initKeyboard(const std::shared_ptr<hal::display::DisplayDevice>& display, const std::shared_ptr<hal::keyboard::KeyboardDevice>& keyboard) {
|
||||
TT_LOG_I(TAG, "Keyboard init");
|
||||
assert(display);
|
||||
assert(keyboard);
|
||||
|
||||
Reference in New Issue
Block a user