dominic/Tactility
1
0
Fork 0
mirror of https://github.com/ByteWelder/Tactility.git synced 2026-02-20 15:35:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix for build

Browse Source
This commit is contained in:
Ken Van Hoeylandt 2026-02-09 21:40:03 +01:00
parent a34e059c74
commit adb23a0e66
3 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Firmware/Kconfig
View File

@ -6,7 +6,13 @@ menu "Tactility App"
config TT_DEVICE_ID config TT_DEVICE_ID
string "Device Identifier" string "Device Identifier"
default "" default ""
config TT_SPLASH_DURATION # T-Deck device-related code was directly referenced from Tactility in a pull request.
# This breaks other devices because the code does not exist in those implementations.
# Until we move it out into a proper driver, we have to have pre-processor definition for that.
config TT_TDECK_WORKAROUND
bool "Temporary work-around until we fix the T-Deck keyboard and trackball settings"
default n
config TT_SPLASH_DURATION
int "Splash Duration (ms)" int "Splash Duration (ms)"
default 1000 default 1000
range 0 3000 range 0 3000

20
Tactility/Source/Tactility.cpp
View File

@ -111,9 +111,11 @@ namespace app {
#ifdef ESP_PLATFORM #ifdef ESP_PLATFORM
namespace crashdiagnostics { extern const AppManifest manifest; } namespace crashdiagnostics { extern const AppManifest manifest; }
namespace webserversettings { extern const AppManifest manifest; } namespace webserversettings { extern const AppManifest manifest; }
#if CONFIG_TT_TDECK_WORKAROUND == 1
namespace keyboardsettings { extern const AppManifest manifest; } // T-Deck only for now namespace keyboardsettings { extern const AppManifest manifest; } // T-Deck only for now
namespace trackballsettings { extern const AppManifest manifest; } // T-Deck only for now namespace trackballsettings { extern const AppManifest manifest; } // T-Deck only for now
#endif #endif
#endif
#if TT_FEATURE_SCREENSHOT_ENABLED #if TT_FEATURE_SCREENSHOT_ENABLED
namespace screenshot { extern const AppManifest manifest; } namespace screenshot { extern const AppManifest manifest; }
@ -158,13 +160,10 @@ static void registerInternalApps() {
addAppManifest(app::webserversettings::manifest); addAppManifest(app::webserversettings::manifest);
addAppManifest(app::crashdiagnostics::manifest); addAppManifest(app::crashdiagnostics::manifest);
addAppManifest(app::development::manifest); addAppManifest(app::development::manifest);
// T-Deck only: #if defined(CONFIG_TT_TDECK_WORKAROUND)
auto* root_device = device_find_by_name("/");
check(root_device);
if (root_is_model(root_device, "LilyGO T-Deck")) {
addAppManifest(app::keyboardsettings::manifest); addAppManifest(app::keyboardsettings::manifest);
addAppManifest(app::trackballsettings::manifest); addAppManifest(app::trackballsettings::manifest);
} #endif
#endif #endif
#if defined(CONFIG_TINYUSB_MSC_ENABLED) && CONFIG_TINYUSB_MSC_ENABLED #if defined(CONFIG_TINYUSB_MSC_ENABLED) && CONFIG_TINYUSB_MSC_ENABLED
@ -250,14 +249,11 @@ static void registerAndStartSecondaryServices() {
addService(service::gui::manifest); addService(service::gui::manifest);
addService(service::statusbar::manifest); addService(service::statusbar::manifest);
addService(service::memorychecker::manifest); addService(service::memorychecker::manifest);
#ifdef ESP_PLATFORM #if defined(ESP_PLATFORM)
addService(service::displayidle::manifest); addService(service::displayidle::manifest);
// T-Deck only: #if defined(CONFIG_TT_TDECK_WORKAROUND)
auto* root_device = device_find_by_name("/"); addService(service::keyboardidle::manifest);
check(root_device); #endif
if (root_is_model(root_device, "LilyGO T-Deck")) {
addService(service::keyboardidle::manifest);
}
#endif #endif
#if TT_FEATURE_SCREENSHOT_ENABLED #if TT_FEATURE_SCREENSHOT_ENABLED
addService(service::screenshot::manifest); addService(service::screenshot::manifest);

3
device.py
View File

@ -105,6 +105,9 @@ def write_tactility_variables(output_file, device_properties: ConfigParser, devi
else: else:
output_file.write(f"CONFIG_TT_DEVICE_NAME=\"{board_vendor} {board_name}\"\n") output_file.write(f"CONFIG_TT_DEVICE_NAME=\"{board_vendor} {board_name}\"\n")
output_file.write(f"CONFIG_TT_DEVICE_ID=\"{device_id}\"\n") output_file.write(f"CONFIG_TT_DEVICE_ID=\"{device_id}\"\n")
if device_id == "lilygo-tdeck":
output_file.write("CONFIG_TT_TDECK_WORKAROUND=y\n")
def write_core_variables(output_file, device_properties: ConfigParser): def write_core_variables(output_file, device_properties: ConfigParser):
idf_target = get_property_or_exit(device_properties, "hardware", "target").lower() idf_target = get_property_or_exit(device_properties, "hardware", "target").lower()