Merge develop into main (#337)
- Implement `UiScale` in `hal::Configuration`: small screens with no touch can now opt for a more optimized experience (e.g. Cardputer, Waveshare 1.47, Waveshare 1.3", etc.) - Fix for Cardputer UART configuration and added I2C configuration - Fix for software keyboard bug in Gui - Removed deprecated fields from `hal::Configuration` - Updated the simulator devices to use the new HAL config - add `bool tt::hal::hasDevice(Device::Type)` - Cleanup of `AppList` app code - Improve `Gpio` app for small screen devices - Added various ESP32 GCC wrappers to wrap LVGL functions (with manipulations for small screen devices) - Moved `Launcher` assets to `assets/` subfolder - Optimized `Toolbar` for small screen devices - Stop showing `system/` partition in `FileBrowser` because it's read-only and not very useful. Created `config::SHOW_SYSTEM_PARTITION` to override this behaviour. - Hide apps when their required hardware isn't available (I2C, UART, PowerDevice) - Fix for `CYD-2432S032C` DPI setting
This commit is contained in:
committed by
GitHub
parent
ce8ac61d42
commit
53b711584f
@@ -92,4 +92,13 @@ std::vector<std::shared_ptr<Device>> getDevices() {
|
||||
return devices;
|
||||
}
|
||||
|
||||
bool hasDevice(Device::Type type) {
|
||||
auto scoped_mutex = mutex.asScopedLock();
|
||||
scoped_mutex.lock();
|
||||
auto result_set = devices | std::views::filter([&type](auto& device) {
|
||||
return device->getType() == type;
|
||||
});
|
||||
return !result_set.empty();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -19,29 +19,6 @@ constexpr auto* TAG = "Hal";
|
||||
void registerDevices(const Configuration& configuration) {
|
||||
TT_LOG_I(TAG, "Registering devices");
|
||||
|
||||
if (configuration.sdcard != nullptr) {
|
||||
registerDevice(configuration.sdcard);
|
||||
}
|
||||
|
||||
if (configuration.power != nullptr) {
|
||||
std::shared_ptr<power::PowerDevice> power = configuration.power();
|
||||
registerDevice(power);
|
||||
}
|
||||
|
||||
if (configuration.createKeyboard) {
|
||||
auto keyboard = configuration.createKeyboard();
|
||||
if (keyboard != nullptr) {
|
||||
registerDevice(std::reinterpret_pointer_cast<Device>(keyboard));
|
||||
}
|
||||
}
|
||||
|
||||
if (configuration.createDisplay != nullptr) {
|
||||
auto display = configuration.createDisplay();
|
||||
if (display != nullptr) {
|
||||
registerDevice(display);
|
||||
}
|
||||
}
|
||||
|
||||
auto devices = configuration.createDevices();
|
||||
for (auto& device : devices) {
|
||||
registerDevice(device);
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
#include <ranges>
|
||||
#include <cstring>
|
||||
#include <Tactility/TactilityHeadless.h>
|
||||
#include <Tactility/Tactility.h>
|
||||
|
||||
#ifdef ESP_PLATFORM
|
||||
#include <Tactility/hal/uart/UartEsp.h>
|
||||
@@ -142,7 +142,7 @@ void close(uint32_t uartId) {
|
||||
std::vector<std::string> getNames() {
|
||||
std::vector<std::string> names;
|
||||
#ifdef ESP_PLATFORM
|
||||
for (auto& config : hal::getConfiguration()->uart) {
|
||||
for (auto& config : getConfiguration()->uart) {
|
||||
names.push_back(config.name);
|
||||
}
|
||||
#else
|
||||
|
||||
Reference in New Issue
Block a user