Fixes and improvements (#616)

2026-08-18 20:43:07 +02:00
parent f943c4dd69
commit b03759a111
141 changed files with 899 additions and 221 deletions
@@ -329,7 +329,7 @@ std::shared_ptr<AudioService> findAudioService() {
 }

 extern const ServiceManifest manifest = {
-    .id = "Audio",
+    .id = "tactility.audio",
    .createService = create<AudioService>
 };

@@ -252,7 +252,7 @@ std::shared_ptr<DevelopmentService> findService() {
 }

 extern const ServiceManifest manifest = {
-    .id = "Development",
+    .id = "tactility.development",
    .createService = create<DevelopmentService>
 };

@@ -1,11 +1,11 @@
 #ifdef ESP_PLATFORM
-#include <Tactility/DeprecatedPaths.h>
 #include <Tactility/file/File.h>
 #include <Tactility/file/PropertiesFile.h>
 #include <Tactility/service/development/DevelopmentSettings.h>
 #include <map>
 #include <string>

+#include <app/paths.h>
 #include <tactility/log.h>

 namespace tt::service::development {
@@ -13,7 +13,11 @@ namespace tt::service::development {
 constexpr auto* TAG = "DevSettings";

 static std::string getSettingsFilePath() {
-    return getUserDataPath() + "/settings/development.properties";
+    char path[256];
+    if (app_paths_get_user_data_path("tactility.development", "development.properties", path, sizeof(path)) != ERROR_NONE) {
+        return "";
+    }
+    return path;
 }

 constexpr auto* SETTINGS_KEY_ENABLE_ON_BOOT = "enableOnBoot";
@@ -280,12 +280,12 @@ void DisplayIdleService::reloadSettings() {

 std::shared_ptr<DisplayIdleService> findService() {
    return std::static_pointer_cast<DisplayIdleService>(
-        findServiceById("DisplayIdle")
+        findServiceById("tactility.displayidle")
    );
 }

 extern const ServiceManifest manifest = {
-    .id = "DisplayIdle",
+    .id = "tactility.displayidle",
    .createService = create<DisplayIdleService>
 };

@@ -193,7 +193,7 @@ std::shared_ptr<EspNowService> findService() {
 }

 extern const ServiceManifest manifest = {
-    .id = "EspNow",
+    .id = "tactility.espnow",
    .createService = create<EspNowService>
 };

@@ -113,7 +113,7 @@ public:
 };

 extern const ServiceManifest manifest = {
-    .id = "KeyboardIdle",
+    .id = "tactility.keyboardidle",
    .createService = create<KeyboardIdleService>
 };

@@ -85,7 +85,7 @@ void MemoryCheckerService::onTimerUpdate() {
 }

 extern const ServiceManifest manifest = {
-    .id = "MemoryChecker",
+    .id = "tactility.memorychecker",
    .createService = create<MemoryCheckerService>
 };

@@ -140,7 +140,7 @@ void RtcTimeService::onStop(ServiceContext& serviceContext) {
 }

 extern const ServiceManifest manifest = {
-    .id = "RtcTime",
+    .id = "tactility.rtctime",
    .createService = create<RtcTimeService>
 };

@@ -97,7 +97,7 @@ bool ScreenshotService::isTaskStarted() {
 }

 extern const ServiceManifest manifest = {
-    .id = "Screenshot",
+    .id = "tactility.screenshot",
    .createService = create<ScreenshotService>
 };

@@ -359,7 +359,7 @@ public:
 };

 extern const ServiceManifest manifest = {
-    .id = "Statusbar",
+    .id = "tactility.statusbar",
    .createService = create<StatusbarService>
 };

@@ -1797,7 +1797,7 @@ esp_err_t WebServerService::handleAssets(httpd_req_t* request) {
 }

 extern const ServiceManifest manifest = {
-    .id = "WebServer",
+    .id = "tactility.webserver",
    .createService = create<WebServerService>
 };

@@ -551,7 +551,7 @@ public:
 } // namespace

 extern const ServiceManifest manifest = {
-    .id = "wifi",
+    .id = "tactility.wifi",
    .createService = create<WifiService>
 };