diff --git a/CMakeLists.txt b/CMakeLists.txt index 6c6152f73..7e37634eb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -77,7 +77,7 @@ else () add_compile_definitions(CONFIG_TT_DEVICE_NAME="Simulator") add_compile_definitions(CONFIG_TT_DEVICE_VENDOR="") add_compile_definitions(CONFIG_TT_DEVICE_NAME_SIMPLE="Simulator") - add_compile_definitions(CONFIG_TT_LAUNCHER_APP_ID="Launcher") + add_compile_definitions(CONFIG_TT_LAUNCHER_APP_ID="tactility.launcher") add_compile_definitions(CONFIG_TT_AUTO_START_APP_ID="") add_compile_definitions(CONFIG_TT_USER_DATA_LOCATION_INTERNAL) endif () diff --git a/Devices/btt-panda-touch/device.properties b/Devices/btt-panda-touch/device.properties index 8e65fa6d2..4bab9a870 100644 --- a/Devices/btt-panda-touch/device.properties +++ b/Devices/btt-panda-touch/device.properties @@ -1,7 +1,7 @@ general.vendor=BigTreeTech general.name=Panda Touch,K Touch -apps.launcherAppId=Launcher +apps.launcherAppId=tactility.launcher hardware.target=ESP32S3 hardware.flashSize=16MB diff --git a/Devices/cl32/device.properties b/Devices/cl32/device.properties index 09ed3d8da..98ce693ff 100644 --- a/Devices/cl32/device.properties +++ b/Devices/cl32/device.properties @@ -1,7 +1,7 @@ general.vendor=CL-32 general.name=CL-32 -apps.launcherAppId=Launcher +apps.launcherAppId=tactility.launcher hardware.target=ESP32S3 hardware.flashSize=8MB diff --git a/Devices/cyd-2432s024c/device.properties b/Devices/cyd-2432s024c/device.properties index 0f2a5c1de..aac1bb88f 100644 --- a/Devices/cyd-2432s024c/device.properties +++ b/Devices/cyd-2432s024c/device.properties @@ -1,7 +1,7 @@ general.vendor=CYD general.name=2432S024C -apps.launcherAppId=Launcher +apps.launcherAppId=tactility.launcher hardware.target=ESP32 hardware.flashSize=4MB diff --git a/Devices/cyd-2432s024r/device.properties b/Devices/cyd-2432s024r/device.properties index b2e05d040..d9e22b351 100644 --- a/Devices/cyd-2432s024r/device.properties +++ b/Devices/cyd-2432s024r/device.properties @@ -1,7 +1,7 @@ general.vendor=CYD general.name=2432S024R -apps.launcherAppId=Launcher +apps.launcherAppId=tactility.launcher hardware.target=ESP32 hardware.flashSize=4MB diff --git a/Devices/cyd-2432s028r/device.properties b/Devices/cyd-2432s028r/device.properties index 847dc1fb0..4559a5c63 100644 --- a/Devices/cyd-2432s028r/device.properties +++ b/Devices/cyd-2432s028r/device.properties @@ -1,7 +1,7 @@ general.vendor=CYD general.name=2432S028R -apps.launcherAppId=Launcher +apps.launcherAppId=tactility.launcher hardware.target=ESP32 hardware.flashSize=4MB diff --git a/Devices/cyd-2432s028rv3/device.properties b/Devices/cyd-2432s028rv3/device.properties index 332e1ed11..303a2ad6c 100644 --- a/Devices/cyd-2432s028rv3/device.properties +++ b/Devices/cyd-2432s028rv3/device.properties @@ -1,7 +1,7 @@ general.vendor=CYD general.name=2432S028R v3 -apps.launcherAppId=Launcher +apps.launcherAppId=tactility.launcher hardware.target=ESP32 hardware.flashSize=4MB diff --git a/Devices/cyd-2432s032c/device.properties b/Devices/cyd-2432s032c/device.properties index e483bd8c2..ffcd24643 100644 --- a/Devices/cyd-2432s032c/device.properties +++ b/Devices/cyd-2432s032c/device.properties @@ -1,7 +1,7 @@ general.vendor=CYD general.name=2432S032C -apps.launcherAppId=Launcher +apps.launcherAppId=tactility.launcher hardware.target=ESP32 hardware.flashSize=4MB diff --git a/Devices/cyd-3248s035c/device.properties b/Devices/cyd-3248s035c/device.properties index c8fc929d1..7e468efc9 100644 --- a/Devices/cyd-3248s035c/device.properties +++ b/Devices/cyd-3248s035c/device.properties @@ -1,7 +1,7 @@ general.vendor=CYD general.name=3248S035C -apps.launcherAppId=Launcher +apps.launcherAppId=tactility.launcher hardware.target=ESP32 hardware.flashSize=4MB diff --git a/Devices/cyd-4848s040c/device.properties b/Devices/cyd-4848s040c/device.properties index 45c66c54e..ba432221a 100644 --- a/Devices/cyd-4848s040c/device.properties +++ b/Devices/cyd-4848s040c/device.properties @@ -1,7 +1,7 @@ general.vendor=CYD general.name=4848S040C -apps.launcherAppId=Launcher +apps.launcherAppId=tactility.launcher hardware.target=ESP32S3 hardware.flashSize=16MB diff --git a/Devices/cyd-8048s043c/device.properties b/Devices/cyd-8048s043c/device.properties index 8056421d5..d89583ac2 100644 --- a/Devices/cyd-8048s043c/device.properties +++ b/Devices/cyd-8048s043c/device.properties @@ -2,7 +2,7 @@ general.vendor=CYD general.name=8048S043C general.incubating=false -apps.launcherAppId=Launcher +apps.launcherAppId=tactility.launcher hardware.target=ESP32S3 hardware.flashSize=16MB diff --git a/Devices/cyd-e32r28t/device.properties b/Devices/cyd-e32r28t/device.properties index 097eaa62d..e97a5ef5b 100644 --- a/Devices/cyd-e32r28t/device.properties +++ b/Devices/cyd-e32r28t/device.properties @@ -1,7 +1,7 @@ general.vendor=CYD general.name=E32R28T -apps.launcherAppId=Launcher +apps.launcherAppId=tactility.launcher hardware.target=ESP32 hardware.flashSize=4MB diff --git a/Devices/cyd-e32r32p/device.properties b/Devices/cyd-e32r32p/device.properties index 27f2ad0a6..e2627342d 100644 --- a/Devices/cyd-e32r32p/device.properties +++ b/Devices/cyd-e32r32p/device.properties @@ -1,7 +1,7 @@ general.vendor=CYD general.name=E32R32P -apps.launcherAppId=Launcher +apps.launcherAppId=tactility.launcher hardware.target=ESP32 hardware.flashSize=4MB diff --git a/Devices/elecrow-crowpanel-advance-28/device.properties b/Devices/elecrow-crowpanel-advance-28/device.properties index c17ec1404..a94a9e8d0 100644 --- a/Devices/elecrow-crowpanel-advance-28/device.properties +++ b/Devices/elecrow-crowpanel-advance-28/device.properties @@ -1,7 +1,7 @@ general.vendor=Elecrow general.name=CrowPanel Advance 2.8" -apps.launcherAppId=Launcher +apps.launcherAppId=tactility.launcher hardware.target=ESP32S3 hardware.flashSize=16MB diff --git a/Devices/elecrow-crowpanel-advance-35/device.properties b/Devices/elecrow-crowpanel-advance-35/device.properties index 29851d8d2..4e4960227 100644 --- a/Devices/elecrow-crowpanel-advance-35/device.properties +++ b/Devices/elecrow-crowpanel-advance-35/device.properties @@ -1,7 +1,7 @@ general.vendor=Elecrow general.name=CrowPanel Advance 3.5" -apps.launcherAppId=Launcher +apps.launcherAppId=tactility.launcher hardware.target=ESP32S3 hardware.flashSize=16MB diff --git a/Devices/elecrow-crowpanel-advance-50/device.properties b/Devices/elecrow-crowpanel-advance-50/device.properties index 7b0e0246a..9840c228b 100644 --- a/Devices/elecrow-crowpanel-advance-50/device.properties +++ b/Devices/elecrow-crowpanel-advance-50/device.properties @@ -1,7 +1,7 @@ general.vendor=Elecrow general.name=CrowPanel Advance 5.0" -apps.launcherAppId=Launcher +apps.launcherAppId=tactility.launcher hardware.target=ESP32S3 hardware.flashSize=16MB diff --git a/Devices/elecrow-crowpanel-basic-28/device.properties b/Devices/elecrow-crowpanel-basic-28/device.properties index acc1405a4..58ee43716 100644 --- a/Devices/elecrow-crowpanel-basic-28/device.properties +++ b/Devices/elecrow-crowpanel-basic-28/device.properties @@ -1,7 +1,7 @@ general.vendor=Elecrow general.name=CrowPanel Basic 2.8" -apps.launcherAppId=Launcher +apps.launcherAppId=tactility.launcher hardware.target=ESP32 hardware.flashSize=4MB diff --git a/Devices/elecrow-crowpanel-basic-35/device.properties b/Devices/elecrow-crowpanel-basic-35/device.properties index cb07c7757..4f2471d28 100644 --- a/Devices/elecrow-crowpanel-basic-35/device.properties +++ b/Devices/elecrow-crowpanel-basic-35/device.properties @@ -1,7 +1,7 @@ general.vendor=Elecrow general.name=CrowPanel Basic 3.5" -apps.launcherAppId=Launcher +apps.launcherAppId=tactility.launcher hardware.target=ESP32 hardware.flashSize=4MB diff --git a/Devices/elecrow-crowpanel-basic-50/device.properties b/Devices/elecrow-crowpanel-basic-50/device.properties index 3d9425edf..7e0b5e18d 100644 --- a/Devices/elecrow-crowpanel-basic-50/device.properties +++ b/Devices/elecrow-crowpanel-basic-50/device.properties @@ -1,7 +1,7 @@ general.vendor=Elecrow general.name=CrowPanel Basic 5.0" -apps.launcherAppId=Launcher +apps.launcherAppId=tactility.launcher hardware.target=ESP32S3 hardware.flashSize=4MB diff --git a/Devices/es3c28p/device.properties b/Devices/es3c28p/device.properties index 51c42c137..7140e6178 100644 --- a/Devices/es3c28p/device.properties +++ b/Devices/es3c28p/device.properties @@ -1,7 +1,7 @@ general.vendor=CYD general.name=ES3C28P -apps.launcherAppId=Launcher +apps.launcherAppId=tactility.launcher hardware.target=ESP32S3 hardware.flashSize=16MB diff --git a/Devices/generic-esp32/device.properties b/Devices/generic-esp32/device.properties index 8b803a84d..d1d130b54 100644 --- a/Devices/generic-esp32/device.properties +++ b/Devices/generic-esp32/device.properties @@ -1,7 +1,7 @@ general.vendor=Generic general.name=ESP32 -apps.launcherAppId=Launcher +apps.launcherAppId=tactility.launcher hardware.target=ESP32 hardware.flashSize=8MB diff --git a/Devices/generic-esp32c6/device.properties b/Devices/generic-esp32c6/device.properties index bd332c250..07ce7ed4d 100644 --- a/Devices/generic-esp32c6/device.properties +++ b/Devices/generic-esp32c6/device.properties @@ -1,7 +1,7 @@ general.vendor=Generic general.name=ESP32-C6 -apps.launcherAppId=Launcher +apps.launcherAppId=tactility.launcher hardware.target=ESP32C6 hardware.flashSize=8MB diff --git a/Devices/generic-esp32p4/device.properties b/Devices/generic-esp32p4/device.properties index 4a050b399..815fac6e7 100644 --- a/Devices/generic-esp32p4/device.properties +++ b/Devices/generic-esp32p4/device.properties @@ -1,7 +1,7 @@ general.vendor=Generic general.name=ESP32-P4 -apps.launcherAppId=Launcher +apps.launcherAppId=tactility.launcher hardware.target=ESP32P4 hardware.flashSize=8MB diff --git a/Devices/generic-esp32s3/device.properties b/Devices/generic-esp32s3/device.properties index 8512a4506..cf04146bd 100644 --- a/Devices/generic-esp32s3/device.properties +++ b/Devices/generic-esp32s3/device.properties @@ -1,7 +1,7 @@ general.vendor=Generic general.name=ESP32-S3 -apps.launcherAppId=Launcher +apps.launcherAppId=tactility.launcher hardware.target=ESP32S3 hardware.flashSize=8MB diff --git a/Devices/guition-jc1060p470ciwy/device.properties b/Devices/guition-jc1060p470ciwy/device.properties index fcc7421ee..c126dc66b 100644 --- a/Devices/guition-jc1060p470ciwy/device.properties +++ b/Devices/guition-jc1060p470ciwy/device.properties @@ -1,7 +1,7 @@ general.vendor=Guition general.name=JC1060P470C-I-W-Y -apps.launcherAppId=Launcher +apps.launcherAppId=tactility.launcher hardware.target=ESP32P4 hardware.flashSize=16MB diff --git a/Devices/guition-jc2432w328c/device.properties b/Devices/guition-jc2432w328c/device.properties index 7ef40633b..f2c06450f 100644 --- a/Devices/guition-jc2432w328c/device.properties +++ b/Devices/guition-jc2432w328c/device.properties @@ -1,7 +1,7 @@ general.vendor=Guition general.name=JC2432W328C -apps.launcherAppId=Launcher +apps.launcherAppId=tactility.launcher hardware.target=ESP32 hardware.flashSize=4MB diff --git a/Devices/guition-jc8048w550c/device.properties b/Devices/guition-jc8048w550c/device.properties index 3cebf4d42..fb2540242 100644 --- a/Devices/guition-jc8048w550c/device.properties +++ b/Devices/guition-jc8048w550c/device.properties @@ -1,7 +1,7 @@ general.vendor=Guition general.name=JC8048W550C -apps.launcherAppId=Launcher +apps.launcherAppId=tactility.launcher hardware.target=ESP32S3 hardware.flashSize=16MB diff --git a/Devices/heltec-wifi-lora-32-v3/device.properties b/Devices/heltec-wifi-lora-32-v3/device.properties index b656de2e2..aa55fb021 100644 --- a/Devices/heltec-wifi-lora-32-v3/device.properties +++ b/Devices/heltec-wifi-lora-32-v3/device.properties @@ -2,8 +2,8 @@ general.vendor=Heltec general.name=WiFi LoRa 32 v3 general.incubating=true -apps.launcherAppId=Launcher -apps.autoStartAppId=ApWebServer +apps.launcherAppId=tactility.launcher +apps.autoStartAppId=tactility.apwebserver hardware.target=ESP32S3 hardware.flashSize=8MB diff --git a/Devices/lilygo-tdeck-max/device.properties b/Devices/lilygo-tdeck-max/device.properties index 379418968..2df9188c0 100644 --- a/Devices/lilygo-tdeck-max/device.properties +++ b/Devices/lilygo-tdeck-max/device.properties @@ -3,7 +3,7 @@ general.name=T-Deck Max # SD card support is not yet working, display driver is untested since refactoring; remove once it is functional. general.incubating=true -apps.launcherAppId=Launcher +apps.launcherAppId=tactility.launcher hardware.target=ESP32S3 hardware.flashSize=16MB diff --git a/Devices/lilygo-tdeck-plus/device.properties b/Devices/lilygo-tdeck-plus/device.properties index aa12e18ae..b9a460775 100644 --- a/Devices/lilygo-tdeck-plus/device.properties +++ b/Devices/lilygo-tdeck-plus/device.properties @@ -1,7 +1,7 @@ general.vendor=LilyGO general.name=T-Deck Plus -apps.launcherAppId=Launcher +apps.launcherAppId=tactility.launcher hardware.target=ESP32S3 hardware.flashSize=16MB diff --git a/Devices/lilygo-tdeck-pro/device.properties b/Devices/lilygo-tdeck-pro/device.properties index 63781264a..f7d383006 100644 --- a/Devices/lilygo-tdeck-pro/device.properties +++ b/Devices/lilygo-tdeck-pro/device.properties @@ -3,7 +3,7 @@ general.name=T-Deck Pro # The display driver is not reliable yet general.incubating=true -apps.launcherAppId=Launcher +apps.launcherAppId=tactility.launcher hardware.target=ESP32S3 hardware.flashSize=16MB diff --git a/Devices/lilygo-tdeck/device.properties b/Devices/lilygo-tdeck/device.properties index 8e84bd536..512c11681 100644 --- a/Devices/lilygo-tdeck/device.properties +++ b/Devices/lilygo-tdeck/device.properties @@ -1,7 +1,7 @@ general.vendor=LilyGO general.name=T-Deck -apps.launcherAppId=Launcher +apps.launcherAppId=tactility.launcher hardware.target=ESP32S3 hardware.flashSize=16MB diff --git a/Devices/lilygo-tdisplay-s3/device.properties b/Devices/lilygo-tdisplay-s3/device.properties index 6936ecbaf..8c1fd943d 100644 --- a/Devices/lilygo-tdisplay-s3/device.properties +++ b/Devices/lilygo-tdisplay-s3/device.properties @@ -1,8 +1,8 @@ general.vendor=LilyGO general.name=T-Display S3 -apps.launcherAppId=Launcher -apps.autoStartAppId=ApWebServer +apps.launcherAppId=tactility.launcher +apps.autoStartAppId=tactility.apwebserver hardware.target=ESP32S3 hardware.flashSize=16MB diff --git a/Devices/lilygo-tdisplay/device.properties b/Devices/lilygo-tdisplay/device.properties index 590086137..c303178b4 100644 --- a/Devices/lilygo-tdisplay/device.properties +++ b/Devices/lilygo-tdisplay/device.properties @@ -2,8 +2,8 @@ general.vendor=LilyGO general.name=T-Display general.incubating=true -apps.launcherAppId=Launcher -apps.autoStartAppId=ApWebServer +apps.launcherAppId=tactility.launcher +apps.autoStartAppId=tactility.apwebserver hardware.target=ESP32 hardware.flashSize=16MB diff --git a/Devices/lilygo-tdongle-s3/device.properties b/Devices/lilygo-tdongle-s3/device.properties index 4b68fa89c..6bdcf84d4 100644 --- a/Devices/lilygo-tdongle-s3/device.properties +++ b/Devices/lilygo-tdongle-s3/device.properties @@ -2,8 +2,8 @@ general.vendor=LilyGO general.name=T-Dongle S3 general.incubating=true -apps.launcherAppId=Launcher -apps.autoStartAppId=ApWebServer +apps.launcherAppId=tactility.launcher +apps.autoStartAppId=tactility.apwebserver hardware.target=ESP32S3 hardware.flashSize=16MB diff --git a/Devices/lilygo-thmi/device.properties b/Devices/lilygo-thmi/device.properties index 46fb227c7..b2676f753 100644 --- a/Devices/lilygo-thmi/device.properties +++ b/Devices/lilygo-thmi/device.properties @@ -1,7 +1,7 @@ general.vendor=LilyGO general.name=T-HMI -apps.launcherAppId=Launcher +apps.launcherAppId=tactility.launcher hardware.target=ESP32S3 hardware.flashSize=16MB diff --git a/Devices/lilygo-tlora-pager/device.properties b/Devices/lilygo-tlora-pager/device.properties index 0c820c81b..e9cfa96ee 100644 --- a/Devices/lilygo-tlora-pager/device.properties +++ b/Devices/lilygo-tlora-pager/device.properties @@ -1,7 +1,7 @@ general.vendor=LilyGO general.name=T-Lora Pager -apps.launcherAppId=Launcher +apps.launcherAppId=tactility.launcher hardware.target=ESP32S3 hardware.flashSize=16MB diff --git a/Devices/m5stack-cardputer-adv/device.properties b/Devices/m5stack-cardputer-adv/device.properties index ef8018f15..dcbe6a8bd 100644 --- a/Devices/m5stack-cardputer-adv/device.properties +++ b/Devices/m5stack-cardputer-adv/device.properties @@ -1,7 +1,7 @@ general.vendor=M5Stack general.name=Cardputer Adv -apps.launcherAppId=Launcher +apps.launcherAppId=tactility.launcher hardware.target=ESP32S3 hardware.flashSize=8MB diff --git a/Devices/m5stack-cardputer/device.properties b/Devices/m5stack-cardputer/device.properties index 96ba51432..6f4f0529a 100644 --- a/Devices/m5stack-cardputer/device.properties +++ b/Devices/m5stack-cardputer/device.properties @@ -1,7 +1,7 @@ general.vendor=M5Stack general.name=Cardputer,Cardputer v1.1 -apps.launcherAppId=Launcher +apps.launcherAppId=tactility.launcher hardware.target=ESP32S3 hardware.flashSize=8MB diff --git a/Devices/m5stack-core2/device.properties b/Devices/m5stack-core2/device.properties index 2bda9c380..0df414df0 100644 --- a/Devices/m5stack-core2/device.properties +++ b/Devices/m5stack-core2/device.properties @@ -1,7 +1,7 @@ general.vendor=M5Stack general.name=Core2 -apps.launcherAppId=Launcher +apps.launcherAppId=tactility.launcher hardware.target=ESP32 hardware.flashSize=16MB diff --git a/Devices/m5stack-cores3/device.properties b/Devices/m5stack-cores3/device.properties index a06fe84b9..d20fc67dd 100644 --- a/Devices/m5stack-cores3/device.properties +++ b/Devices/m5stack-cores3/device.properties @@ -1,7 +1,7 @@ general.vendor=M5Stack general.name=CoreS3 -apps.launcherAppId=Launcher +apps.launcherAppId=tactility.launcher hardware.target=ESP32S3 hardware.flashSize=16MB diff --git a/Devices/m5stack-papers3/device.properties b/Devices/m5stack-papers3/device.properties index edd194126..ab703f9d9 100644 --- a/Devices/m5stack-papers3/device.properties +++ b/Devices/m5stack-papers3/device.properties @@ -2,7 +2,7 @@ general.vendor=M5Stack general.name=PaperS3 general.incubating=true -apps.launcherAppId=Launcher +apps.launcherAppId=tactility.launcher hardware.target=esp32s3 hardware.flashSize=16MB diff --git a/Devices/m5stack-stackchan/device.properties b/Devices/m5stack-stackchan/device.properties index edd65a81c..e145ac025 100644 --- a/Devices/m5stack-stackchan/device.properties +++ b/Devices/m5stack-stackchan/device.properties @@ -1,7 +1,7 @@ general.vendor=M5Stack general.name=StackChan -apps.launcherAppId=Launcher +apps.launcherAppId=tactility.launcher hardware.target=ESP32S3 hardware.flashSize=16MB diff --git a/Devices/m5stack-stickc-plus2/device.properties b/Devices/m5stack-stickc-plus2/device.properties index 9178ad240..15cf14a13 100644 --- a/Devices/m5stack-stickc-plus2/device.properties +++ b/Devices/m5stack-stickc-plus2/device.properties @@ -1,7 +1,7 @@ general.vendor=M5Stack general.name=StickC Plus2 -apps.launcherAppId=Launcher +apps.launcherAppId=tactility.launcher hardware.target=ESP32 hardware.flashSize=8MB diff --git a/Devices/m5stack-sticks3/device.properties b/Devices/m5stack-sticks3/device.properties index f4d8df5db..afe3717c4 100644 --- a/Devices/m5stack-sticks3/device.properties +++ b/Devices/m5stack-sticks3/device.properties @@ -1,7 +1,7 @@ general.vendor=M5Stack general.name=StickS3 -apps.launcherAppId=Launcher +apps.launcherAppId=tactility.launcher hardware.target=ESP32S3 hardware.flashSize=8MB diff --git a/Devices/m5stack-tab5/device.properties b/Devices/m5stack-tab5/device.properties index 946c24842..38d7e4243 100644 --- a/Devices/m5stack-tab5/device.properties +++ b/Devices/m5stack-tab5/device.properties @@ -1,7 +1,7 @@ general.vendor=M5Stack general.name=Tab5 -apps.launcherAppId=Launcher +apps.launcherAppId=tactility.launcher hardware.target=ESP32P4 hardware.flashSize=16MB diff --git a/Devices/simulator/device.properties b/Devices/simulator/device.properties index 8406fffb3..1d1e7935f 100644 --- a/Devices/simulator/device.properties +++ b/Devices/simulator/device.properties @@ -1,7 +1,7 @@ general.vendor=Simulator general.name=Tab5Simulator -apps.launcherAppId=Launcher +apps.launcherAppId=tactility.launcher hardware.target=POSIX diff --git a/Devices/tulip-4r11/device.properties b/Devices/tulip-4r11/device.properties index c0ece6b84..9afa9cf72 100644 --- a/Devices/tulip-4r11/device.properties +++ b/Devices/tulip-4r11/device.properties @@ -1,7 +1,7 @@ general.vendor=Tulip general.name=Tulip Creative Computer (4r11) -apps.launcherAppId=Launcher +apps.launcherAppId=tactility.launcher hardware.target=ESP32S3 hardware.flashSize=32MB diff --git a/Devices/unphone/device.properties b/Devices/unphone/device.properties index 45de3205b..e49500535 100644 --- a/Devices/unphone/device.properties +++ b/Devices/unphone/device.properties @@ -1,7 +1,7 @@ general.vendor=unPhone general.name=unPhone -apps.launcherAppId=Launcher +apps.launcherAppId=tactility.launcher hardware.target=ESP32S3 hardware.flashSize=8MB diff --git a/Devices/waveshare-esp32-s3-geek/device.properties b/Devices/waveshare-esp32-s3-geek/device.properties index 63695d23e..685e389ca 100644 --- a/Devices/waveshare-esp32-s3-geek/device.properties +++ b/Devices/waveshare-esp32-s3-geek/device.properties @@ -2,8 +2,8 @@ general.vendor=Waveshare general.name=ESP32 S3 GEEK general.incubating=true -apps.launcherAppId=Launcher -apps.autoStartAppId=ApWebServer +apps.launcherAppId=tactility.launcher +apps.autoStartAppId=tactility.apwebserver hardware.target=ESP32S3 hardware.flashSize=16MB diff --git a/Devices/waveshare-s3-lcd-13/device.properties b/Devices/waveshare-s3-lcd-13/device.properties index 5e603fc40..e8752d276 100644 --- a/Devices/waveshare-s3-lcd-13/device.properties +++ b/Devices/waveshare-s3-lcd-13/device.properties @@ -2,8 +2,8 @@ general.vendor=WaveShare general.name=S3 LCD 1.3" general.incubating=true -apps.launcherAppId=Launcher -apps.autoStartAppId=ApWebServer +apps.launcherAppId=tactility.launcher +apps.autoStartAppId=tactility.apwebserver hardware.target=ESP32S3 hardware.flashSize=16MB diff --git a/Devices/waveshare-s3-touch-lcd-128/device.properties b/Devices/waveshare-s3-touch-lcd-128/device.properties index 58caf1d92..f73d29aa3 100644 --- a/Devices/waveshare-s3-touch-lcd-128/device.properties +++ b/Devices/waveshare-s3-touch-lcd-128/device.properties @@ -2,8 +2,8 @@ general.vendor=WaveShare general.name=S3 Touch LCD 1.28" general.incubating=true -apps.launcherAppId=Launcher -apps.autoStartAppId=ApWebServer +apps.launcherAppId=tactility.launcher +apps.autoStartAppId=tactility.apwebserver hardware.target=ESP32S3 hardware.flashSize=16MB diff --git a/Devices/waveshare-s3-touch-lcd-147/device.properties b/Devices/waveshare-s3-touch-lcd-147/device.properties index 92f228724..d1f59300e 100644 --- a/Devices/waveshare-s3-touch-lcd-147/device.properties +++ b/Devices/waveshare-s3-touch-lcd-147/device.properties @@ -2,7 +2,7 @@ general.vendor=WaveShare general.name=S3 Touch LCD 1.47" general.incubating=true -apps.launcherAppId=Launcher +apps.launcherAppId=tactility.launcher hardware.target=ESP32S3 hardware.flashSize=16MB diff --git a/Devices/waveshare-s3-touch-lcd-43/device.properties b/Devices/waveshare-s3-touch-lcd-43/device.properties index 63b432e04..7d326801a 100644 --- a/Devices/waveshare-s3-touch-lcd-43/device.properties +++ b/Devices/waveshare-s3-touch-lcd-43/device.properties @@ -1,7 +1,7 @@ general.vendor=WaveShare general.name=S3 Touch LCD 4.3" -apps.launcherAppId=Launcher +apps.launcherAppId=tactility.launcher hardware.target=ESP32S3 # Some models have 16MB flash, but some have 8MB. We only support the latter to avoid making more builds. diff --git a/Devices/wireless-tag-wt32-sc01-plus/device.properties b/Devices/wireless-tag-wt32-sc01-plus/device.properties index 5d797a0cd..1c70f0135 100644 --- a/Devices/wireless-tag-wt32-sc01-plus/device.properties +++ b/Devices/wireless-tag-wt32-sc01-plus/device.properties @@ -1,7 +1,7 @@ general.vendor=Wireless Tag general.name=WT32 SC01 Plus -apps.launcherAppId=Launcher +apps.launcherAppId=tactility.launcher hardware.target=ESP32S3 hardware.flashSize=16MB diff --git a/Firmware/Kconfig b/Firmware/Kconfig index dd3e2ad51..813bbb54d 100644 --- a/Firmware/Kconfig +++ b/Firmware/Kconfig @@ -23,7 +23,7 @@ menu "Tactility App" See https://docs.tactilityproject.org for formatting guidance. config TT_LAUNCHER_APP_ID string "Launcher App ID" - default "Launcher" + default "tactility.launcher" help The applications that gives access to other application. This is the first thing that starts after the boot screen. diff --git a/Tactility/Source/app/addgps/AddGps.cpp b/Tactility/Source/app/addgps/AddGps.cpp index 51979c57c..4d6cee6ab 100644 --- a/Tactility/Source/app/addgps/AddGps.cpp +++ b/Tactility/Source/app/addgps/AddGps.cpp @@ -237,7 +237,7 @@ int32_t appMain(uint32_t appInstanceId, int argc, char* argv[]) { } // namespace extern const ::AppManifest manifest = { - .id = "AddGps", + .id = "tactility.addgps", .name = "Add GPS", .category = APP_CATEGORY_SYSTEM, .location = { APP_LOCATION_MEMORY, reinterpret_cast(appMain) }, diff --git a/Tactility/Source/app/alertdialog/AlertDialog.cpp b/Tactility/Source/app/alertdialog/AlertDialog.cpp index eb8082ff5..6f143eddc 100644 --- a/Tactility/Source/app/alertdialog/AlertDialog.cpp +++ b/Tactility/Source/app/alertdialog/AlertDialog.cpp @@ -152,7 +152,7 @@ uint32_t start(uint32_t callerAppInstanceId, const std::string& title, const std } extern const ::AppManifest manifest = { - .id = "AlertDialog", + .id = "tactility.alertdialog", .name = "Alert Dialog", .category = APP_CATEGORY_SYSTEM, .location = { APP_LOCATION_MEMORY, reinterpret_cast(appMain) }, diff --git a/Tactility/Source/app/appdetails/AppDetails.cpp b/Tactility/Source/app/appdetails/AppDetails.cpp index 34d810f43..e6feb3eb0 100644 --- a/Tactility/Source/app/appdetails/AppDetails.cpp +++ b/Tactility/Source/app/appdetails/AppDetails.cpp @@ -162,7 +162,7 @@ void start(const std::string& appId) { } extern const ::AppManifest manifest = { - .id = "AppDetails", + .id = "tactility.appdetails", .name = "App Details", .category = APP_CATEGORY_SYSTEM, .location = { APP_LOCATION_MEMORY, reinterpret_cast(appMain) }, diff --git a/Tactility/Source/app/apphub/AppHubApp.cpp b/Tactility/Source/app/apphub/AppHubApp.cpp index 8ede11b52..dd9945edd 100644 --- a/Tactility/Source/app/apphub/AppHubApp.cpp +++ b/Tactility/Source/app/apphub/AppHubApp.cpp @@ -206,7 +206,7 @@ int32_t appMain(uint32_t appInstanceId, int argc, char* argv[]) { } // namespace extern const ::AppManifest manifest = { - .id = "AppHub", + .id = "tactility.apphub", .name = "App Hub", .category = APP_CATEGORY_SYSTEM, .location = { APP_LOCATION_MEMORY, reinterpret_cast(appMain) } diff --git a/Tactility/Source/app/apphubdetails/AppHubDetailsApp.cpp b/Tactility/Source/app/apphubdetails/AppHubDetailsApp.cpp index 6570798a7..1e3ca311c 100644 --- a/Tactility/Source/app/apphubdetails/AppHubDetailsApp.cpp +++ b/Tactility/Source/app/apphubdetails/AppHubDetailsApp.cpp @@ -308,7 +308,7 @@ void start(const apphub::AppHubEntry& entry) { } extern const ::AppManifest manifest = { - .id = "AppHubDetails", + .id = "tactility.apphubdetails", .name = "App Details", .category = APP_CATEGORY_SYSTEM, .location = { APP_LOCATION_MEMORY, reinterpret_cast(appMain) }, diff --git a/Tactility/Source/app/applist/AppList.cpp b/Tactility/Source/app/applist/AppList.cpp index d0ea68901..53896836c 100644 --- a/Tactility/Source/app/applist/AppList.cpp +++ b/Tactility/Source/app/applist/AppList.cpp @@ -106,7 +106,7 @@ int32_t appMain(uint32_t appInstanceId, int argc, char* argv[]) { } // namespace extern const ::AppManifest manifest = { - .id = "AppList", + .id = "tactility.applist", .name = "Apps", .category = APP_CATEGORY_SYSTEM, .location = { APP_LOCATION_MEMORY, reinterpret_cast(appMain) }, diff --git a/Tactility/Source/app/appsettings/AppSettings.cpp b/Tactility/Source/app/appsettings/AppSettings.cpp index 8f2c26bba..de6bad0ef 100644 --- a/Tactility/Source/app/appsettings/AppSettings.cpp +++ b/Tactility/Source/app/appsettings/AppSettings.cpp @@ -121,7 +121,7 @@ int32_t appMain(uint32_t appInstanceId, int argc, char* argv[]) { } // namespace extern const ::AppManifest manifest = { - .id = "AppSettings", + .id = "tactility.appsettings", .name = "Apps", .category = APP_CATEGORY_SETTINGS, .location = { APP_LOCATION_MEMORY, reinterpret_cast(appMain) } diff --git a/Tactility/Source/app/apwebserver/ApWebServer.cpp b/Tactility/Source/app/apwebserver/ApWebServer.cpp index dd1087295..6ad5bc06f 100644 --- a/Tactility/Source/app/apwebserver/ApWebServer.cpp +++ b/Tactility/Source/app/apwebserver/ApWebServer.cpp @@ -176,7 +176,7 @@ int32_t appMain(uint32_t appInstanceId, int argc, char* argv[]) { } // namespace extern const ::AppManifest manifest = { - .id = "ApWebServer", + .id = "tactility.apwebserver", .name = "AP Web Server", .category = APP_CATEGORY_SYSTEM, .location = { APP_LOCATION_MEMORY, reinterpret_cast(appMain) }, diff --git a/Tactility/Source/app/audiosettings/AudioSettings.cpp b/Tactility/Source/app/audiosettings/AudioSettings.cpp index 237e3f009..ebba08306 100644 --- a/Tactility/Source/app/audiosettings/AudioSettings.cpp +++ b/Tactility/Source/app/audiosettings/AudioSettings.cpp @@ -251,7 +251,7 @@ int32_t appMain(uint32_t appInstanceId, int argc, char* argv[]) { } // namespace extern const ::AppManifest manifest = { - .id = "AudioSettings", + .id = "tactility.audiosettings", .name = "Audio", .category = APP_CATEGORY_SETTINGS, .location = { APP_LOCATION_MEMORY, reinterpret_cast(appMain) } diff --git a/Tactility/Source/app/boot/Boot.cpp b/Tactility/Source/app/boot/Boot.cpp index 1f83331f6..f2bbaa84f 100644 --- a/Tactility/Source/app/boot/Boot.cpp +++ b/Tactility/Source/app/boot/Boot.cpp @@ -326,7 +326,7 @@ int32_t appMain(uint32_t appInstanceId, int argc, char* argv[]) { } // namespace extern const ::AppManifest manifest = { - .id = "Boot", + .id = "tactility.boot", .name = "Boot", .category = APP_CATEGORY_SYSTEM, .location = { APP_LOCATION_MEMORY, reinterpret_cast(appMain) }, diff --git a/Tactility/Source/app/btmanage/BtManage.cpp b/Tactility/Source/app/btmanage/BtManage.cpp index 4735fd984..c8e88e8a6 100644 --- a/Tactility/Source/app/btmanage/BtManage.cpp +++ b/Tactility/Source/app/btmanage/BtManage.cpp @@ -283,7 +283,7 @@ uint32_t start() { } extern const ::AppManifest manifest = { - .id = "BtManage", + .id = "tactility.btmanage", .name = "Bluetooth", .category = APP_CATEGORY_SETTINGS, .location = { APP_LOCATION_MEMORY, reinterpret_cast(appMain) } diff --git a/Tactility/Source/app/btpeersettings/BtPeerSettings.cpp b/Tactility/Source/app/btpeersettings/BtPeerSettings.cpp index 87c935ccd..b4f2c36c8 100644 --- a/Tactility/Source/app/btpeersettings/BtPeerSettings.cpp +++ b/Tactility/Source/app/btpeersettings/BtPeerSettings.cpp @@ -256,7 +256,7 @@ void start(const std::string& addrHex) { } extern const ::AppManifest manifest = { - .id = "BtPeerSettings", + .id = "tactility.btpeersettings", .name = "BT Device Settings", .category = APP_CATEGORY_SYSTEM, .location = { APP_LOCATION_MEMORY, reinterpret_cast(appMain) }, diff --git a/Tactility/Source/app/chat/ChatApp.cpp b/Tactility/Source/app/chat/ChatApp.cpp index 722662c38..d9b2cff3d 100644 --- a/Tactility/Source/app/chat/ChatApp.cpp +++ b/Tactility/Source/app/chat/ChatApp.cpp @@ -219,7 +219,7 @@ int32_t appMain(uint32_t appInstanceId, int argc, char* argv[]) { } // namespace extern const ::AppManifest manifest = { - .id = "Chat", + .id = "tactility.chat", .name = "Chat", .category = APP_CATEGORY_USER, .location = { APP_LOCATION_MEMORY, reinterpret_cast(appMain) } diff --git a/Tactility/Source/app/chat/ChatSettings.cpp b/Tactility/Source/app/chat/ChatSettings.cpp index e597fafad..0ea685fb2 100644 --- a/Tactility/Source/app/chat/ChatSettings.cpp +++ b/Tactility/Source/app/chat/ChatSettings.cpp @@ -29,7 +29,7 @@ constexpr auto* TAG = "ChatSettings"; static std::string getSettingsFilePath() { char path[256]; - if (app_paths_get_user_data_path("Chat", "chat.properties", path, sizeof(path)) != ERROR_NONE) { + if (app_paths_get_user_data_path("tactility.chat", "chat.properties", path, sizeof(path)) != ERROR_NONE) { return ""; } return path; diff --git a/Tactility/Source/app/crashdiagnostics/CrashDiagnostics.cpp b/Tactility/Source/app/crashdiagnostics/CrashDiagnostics.cpp index 1cb6a5371..b37dcb07e 100644 --- a/Tactility/Source/app/crashdiagnostics/CrashDiagnostics.cpp +++ b/Tactility/Source/app/crashdiagnostics/CrashDiagnostics.cpp @@ -199,7 +199,7 @@ void start() { } extern const ::AppManifest manifest = { - .id = "CrashDiagnostics", + .id = "tactility.crashdiagnostics", .name = "Crash Diagnostics", .category = APP_CATEGORY_SYSTEM, .location = { APP_LOCATION_MEMORY, reinterpret_cast(appMain) }, diff --git a/Tactility/Source/app/development/Development.cpp b/Tactility/Source/app/development/Development.cpp index acc4c0f63..60ed63e5b 100644 --- a/Tactility/Source/app/development/Development.cpp +++ b/Tactility/Source/app/development/Development.cpp @@ -226,7 +226,7 @@ int32_t appMain(uint32_t appInstanceId, int argc, char* argv[]) { } // namespace extern const ::AppManifest manifest = { - .id = "Development", + .id = "tactility.development", .name = "Development", .category = APP_CATEGORY_SETTINGS, .location = { APP_LOCATION_MEMORY, reinterpret_cast(appMain) } diff --git a/Tactility/Source/app/files/FilesApp.cpp b/Tactility/Source/app/files/FilesApp.cpp index 25594c2e0..12e39ae53 100644 --- a/Tactility/Source/app/files/FilesApp.cpp +++ b/Tactility/Source/app/files/FilesApp.cpp @@ -66,7 +66,7 @@ int32_t appMain(uint32_t appInstanceId, int argc, char* argv[]) { } // namespace extern const ::AppManifest manifest = { - .id = "Files", + .id = "tactility.files", .name = "Files", .category = APP_CATEGORY_SYSTEM, .location = { APP_LOCATION_MEMORY, reinterpret_cast(appMain) }, diff --git a/Tactility/Source/app/fileselection/FileSelection.cpp b/Tactility/Source/app/fileselection/FileSelection.cpp index 6f231e427..0e789d66a 100644 --- a/Tactility/Source/app/fileselection/FileSelection.cpp +++ b/Tactility/Source/app/fileselection/FileSelection.cpp @@ -106,7 +106,7 @@ uint32_t startForExistingOrNewFile(uint32_t callerAppInstanceId) { } extern const ::AppManifest manifest = { - .id = "FileSelection", + .id = "tactility.fileselection", .name = "File Selection", .category = APP_CATEGORY_SYSTEM, .location = { APP_LOCATION_MEMORY, reinterpret_cast(appMain) }, diff --git a/Tactility/Source/app/gpssettings/GpsSettings.cpp b/Tactility/Source/app/gpssettings/GpsSettings.cpp index 538381364..a351c9b73 100644 --- a/Tactility/Source/app/gpssettings/GpsSettings.cpp +++ b/Tactility/Source/app/gpssettings/GpsSettings.cpp @@ -320,7 +320,7 @@ int32_t appMain(uint32_t appInstanceId, int argc, char* argv[]) { } // namespace extern const ::AppManifest manifest = { - .id = "GpsSettings", + .id = "tactility.gpssettings", .name = "GPS", .category = APP_CATEGORY_SETTINGS, .location = { APP_LOCATION_MEMORY, reinterpret_cast(appMain) } diff --git a/Tactility/Source/app/grovesettings/GroveSettings.cpp b/Tactility/Source/app/grovesettings/GroveSettings.cpp index 445fd1c5c..ef512a4ed 100644 --- a/Tactility/Source/app/grovesettings/GroveSettings.cpp +++ b/Tactility/Source/app/grovesettings/GroveSettings.cpp @@ -124,7 +124,7 @@ int32_t appMain(uint32_t appInstanceId, int argc, char* argv[]) { } // namespace extern const ::AppManifest manifest = { - .id = "GroveSettings", + .id = "tactility.grovesettings", .name = "Grove", .category = APP_CATEGORY_SETTINGS, .location = { APP_LOCATION_MEMORY, reinterpret_cast(appMain) } diff --git a/Tactility/Source/app/i2cscanner/I2cScanner.cpp b/Tactility/Source/app/i2cscanner/I2cScanner.cpp index 6510436ff..1ab9b84d9 100644 --- a/Tactility/Source/app/i2cscanner/I2cScanner.cpp +++ b/Tactility/Source/app/i2cscanner/I2cScanner.cpp @@ -419,7 +419,7 @@ int32_t appMain(uint32_t appInstanceId, int argc, char* argv[]) { } // namespace extern const ::AppManifest manifest = { - .id = "I2cScanner", + .id = "tactility.i2cscanner", .name = "I2C Scanner", .category = APP_CATEGORY_SYSTEM, .location = { APP_LOCATION_MEMORY, reinterpret_cast(appMain) } diff --git a/Tactility/Source/app/imageviewer/ImageViewer.cpp b/Tactility/Source/app/imageviewer/ImageViewer.cpp index b3d3f9ff7..e2a819165 100644 --- a/Tactility/Source/app/imageviewer/ImageViewer.cpp +++ b/Tactility/Source/app/imageviewer/ImageViewer.cpp @@ -126,7 +126,7 @@ void start(const std::string& file) { } extern const ::AppManifest manifest = { - .id = "ImageViewer", + .id = "tactility.imageviewer", .name = "Image Viewer", .category = APP_CATEGORY_SYSTEM, .location = { APP_LOCATION_MEMORY, reinterpret_cast(appMain) }, diff --git a/Tactility/Source/app/inputdialog/InputDialog.cpp b/Tactility/Source/app/inputdialog/InputDialog.cpp index a0f223853..dbbb8d9bf 100644 --- a/Tactility/Source/app/inputdialog/InputDialog.cpp +++ b/Tactility/Source/app/inputdialog/InputDialog.cpp @@ -148,7 +148,7 @@ std::string getLastText() { } extern const ::AppManifest manifest = { - .id = "InputDialog", + .id = "tactility.inputdialog", .name = "Input Dialog", .category = APP_CATEGORY_SYSTEM, .location = { APP_LOCATION_MEMORY, reinterpret_cast(appMain) }, diff --git a/Tactility/Source/app/kerneldisplay/KernelDisplay.cpp b/Tactility/Source/app/kerneldisplay/KernelDisplay.cpp index efde0b130..d22ff4d68 100644 --- a/Tactility/Source/app/kerneldisplay/KernelDisplay.cpp +++ b/Tactility/Source/app/kerneldisplay/KernelDisplay.cpp @@ -340,7 +340,7 @@ int32_t appMain(uint32_t appInstanceId, int argc, char* argv[]) { } // namespace extern const ::AppManifest manifest = { - .id = "Display", + .id = "tactility.display", .name = "Display", .category = APP_CATEGORY_SETTINGS, .location = { APP_LOCATION_MEMORY, reinterpret_cast(appMain) } diff --git a/Tactility/Source/app/keyboard/KeyboardSettings.cpp b/Tactility/Source/app/keyboard/KeyboardSettings.cpp index 71f52a16f..40839908b 100644 --- a/Tactility/Source/app/keyboard/KeyboardSettings.cpp +++ b/Tactility/Source/app/keyboard/KeyboardSettings.cpp @@ -241,7 +241,7 @@ int32_t appMain(uint32_t appInstanceId, int argc, char* argv[]) { } // namespace extern const ::AppManifest manifest = { - .id = "KeyboardSettings", + .id = "tactility.keyboardsettings", .name = "Keyboard", .category = APP_CATEGORY_SETTINGS, .location = { APP_LOCATION_MEMORY, reinterpret_cast(appMain) } diff --git a/Tactility/Source/app/launcher/Launcher.cpp b/Tactility/Source/app/launcher/Launcher.cpp index ac83bcbe7..3b5f1fcba 100644 --- a/Tactility/Source/app/launcher/Launcher.cpp +++ b/Tactility/Source/app/launcher/Launcher.cpp @@ -168,9 +168,9 @@ void createWidgets(lv_obj_t* parent, void*) { ? computeButtonMargin(lv_display_get_horizontal_resolution(display), total_button_size) : computeButtonMargin(lv_display_get_vertical_resolution(display), total_button_size); - auto* app_list_button = createAppButton(buttons_wrapper, ui_density, LVGL_ICON_LAUNCHER_APPS, "AppList", margin, is_landscape_display); - createAppButton(buttons_wrapper, ui_density, LVGL_ICON_LAUNCHER_FOLDER, "Files", margin, is_landscape_display); - createAppButton(buttons_wrapper, ui_density, LVGL_ICON_LAUNCHER_SETTINGS, "Settings", margin, is_landscape_display); + auto* app_list_button = createAppButton(buttons_wrapper, ui_density, LVGL_ICON_LAUNCHER_APPS, "tactility.applist", margin, is_landscape_display); + createAppButton(buttons_wrapper, ui_density, LVGL_ICON_LAUNCHER_FOLDER, "tactility.files", margin, is_landscape_display); + createAppButton(buttons_wrapper, ui_density, LVGL_ICON_LAUNCHER_SETTINGS, "tactility.settings", margin, is_landscape_display); // The launcher's container is several levels below the screen, and LVGL only sends // LV_EVENT_SIZE_CHANGED to the screen object itself on a resolution change - so the @@ -184,7 +184,7 @@ void createWidgets(lv_obj_t* parent, void*) { auto* power_button = lv_button_create(parent); lv_obj_set_style_pad_all(power_button, 8, 0); lv_obj_align(power_button, LV_ALIGN_BOTTOM_MID, 0, -10); - lv_obj_add_event_cb(power_button, onAppPressed, LV_EVENT_SHORT_CLICKED, (void*)"PowerOff"); + lv_obj_add_event_cb(power_button, onAppPressed, LV_EVENT_SHORT_CLICKED, (void*)"tactility.poweroff"); lv_obj_set_style_shadow_width(power_button, 0, LV_STATE_DEFAULT); lv_obj_set_style_bg_opa(power_button, 0, LV_PART_MAIN); @@ -261,7 +261,7 @@ int32_t appMain(uint32_t appInstanceId, int argc, char* argv[]) { } // namespace extern const ::AppManifest manifest = { - .id = "Launcher", + .id = "tactility.launcher", .name = "Launcher", .category = APP_CATEGORY_SYSTEM, .location = { APP_LOCATION_MEMORY, reinterpret_cast(appMain) }, diff --git a/Tactility/Source/app/localesettings/LocaleSettings.cpp b/Tactility/Source/app/localesettings/LocaleSettings.cpp index 3e5373ed0..ca55678f1 100644 --- a/Tactility/Source/app/localesettings/LocaleSettings.cpp +++ b/Tactility/Source/app/localesettings/LocaleSettings.cpp @@ -176,7 +176,7 @@ int32_t appMain(uint32_t appInstanceId, int argc, char* argv[]) { } // namespace extern const ::AppManifest manifest = { - .id = "LocaleSettings", + .id = "tactility.localesettings", .name = "Region & Language", .category = APP_CATEGORY_SETTINGS, .location = { APP_LOCATION_MEMORY, reinterpret_cast(appMain) } diff --git a/Tactility/Source/app/notes/Notes.cpp b/Tactility/Source/app/notes/Notes.cpp index 5d8a80e49..a242f89d2 100644 --- a/Tactility/Source/app/notes/Notes.cpp +++ b/Tactility/Source/app/notes/Notes.cpp @@ -249,7 +249,7 @@ void start(const std::string& filePath) { } extern const ::AppManifest manifest = { - .id = "Notes", + .id = "tactility.notes", .name = "Notes", .category = APP_CATEGORY_USER, .location = { APP_LOCATION_MEMORY, reinterpret_cast(appMain) } diff --git a/Tactility/Source/app/power/Power.cpp b/Tactility/Source/app/power/Power.cpp index a007ac4ea..ca6b61419 100644 --- a/Tactility/Source/app/power/Power.cpp +++ b/Tactility/Source/app/power/Power.cpp @@ -273,7 +273,7 @@ int32_t appMain(uint32_t appInstanceId, int argc, char* argv[]) { } // namespace extern const ::AppManifest manifest = { - .id = "Power", + .id = "tactility.power", .name = "Power", .category = APP_CATEGORY_SETTINGS, .location = { APP_LOCATION_MEMORY, reinterpret_cast(appMain) } diff --git a/Tactility/Source/app/poweroff/PowerOff.cpp b/Tactility/Source/app/poweroff/PowerOff.cpp index 088aeb52f..d06df08f6 100644 --- a/Tactility/Source/app/poweroff/PowerOff.cpp +++ b/Tactility/Source/app/poweroff/PowerOff.cpp @@ -167,7 +167,7 @@ int32_t appMain(uint32_t appInstanceId, int argc, char* argv[]) { } // namespace extern const ::AppManifest manifest = { - .id = "PowerOff", + .id = "tactility.poweroff", .name = "Power Off", .category = APP_CATEGORY_SYSTEM, .location = { APP_LOCATION_MEMORY, reinterpret_cast(appMain) }, diff --git a/Tactility/Source/app/screenshot/Screenshot.cpp b/Tactility/Source/app/screenshot/Screenshot.cpp index 9f2377ec0..d832817d4 100644 --- a/Tactility/Source/app/screenshot/Screenshot.cpp +++ b/Tactility/Source/app/screenshot/Screenshot.cpp @@ -285,7 +285,7 @@ int32_t appMain(uint32_t appInstanceId, int argc, char* argv[]) { } // namespace extern const ::AppManifest manifest = { - .id = "Screenshot", + .id = "tactility.screenshot", .name = "Screenshot", .category = APP_CATEGORY_SYSTEM, .location = { APP_LOCATION_MEMORY, reinterpret_cast(appMain) } diff --git a/Tactility/Source/app/selectiondialog/SelectionDialog.cpp b/Tactility/Source/app/selectiondialog/SelectionDialog.cpp index ebd446e63..802d7d4ed 100644 --- a/Tactility/Source/app/selectiondialog/SelectionDialog.cpp +++ b/Tactility/Source/app/selectiondialog/SelectionDialog.cpp @@ -150,7 +150,7 @@ AppInstanceId start(AppInstanceId callerAppInstanceId, const std::string& title, } extern const AppManifest manifest = { - .id = "SelectionDialog", + .id = "tactility.selectiondialog", .name = "Selection Dialog", .category = APP_CATEGORY_SYSTEM, .location = { APP_LOCATION_MEMORY, reinterpret_cast(appMain) }, diff --git a/Tactility/Source/app/settings/Settings.cpp b/Tactility/Source/app/settings/Settings.cpp index e1e69f866..736bd6b10 100644 --- a/Tactility/Source/app/settings/Settings.cpp +++ b/Tactility/Source/app/settings/Settings.cpp @@ -104,7 +104,7 @@ int32_t appMain(uint32_t appInstanceId, int argc, char* argv[]) { } // namespace extern const ::AppManifest manifest = { - .id = "Settings", + .id = "tactility.settings", .name = "Settings", .category = APP_CATEGORY_SYSTEM, .location = { APP_LOCATION_MEMORY, reinterpret_cast(appMain) }, diff --git a/Tactility/Source/app/setup/Setup.cpp b/Tactility/Source/app/setup/Setup.cpp index 1a0ca97e1..9bbf7c858 100644 --- a/Tactility/Source/app/setup/Setup.cpp +++ b/Tactility/Source/app/setup/Setup.cpp @@ -271,7 +271,7 @@ void start() { } extern const ::AppManifest manifest = { - .id = "Setup", + .id = "tactility.setup", .name = "Setup", .category = APP_CATEGORY_SYSTEM, .location = { APP_LOCATION_MEMORY, reinterpret_cast(appMain) }, diff --git a/Tactility/Source/app/systeminfo/SystemInfo.cpp b/Tactility/Source/app/systeminfo/SystemInfo.cpp index e63cf9105..81d84418a 100644 --- a/Tactility/Source/app/systeminfo/SystemInfo.cpp +++ b/Tactility/Source/app/systeminfo/SystemInfo.cpp @@ -452,7 +452,7 @@ int32_t appMain(uint32_t appInstanceId, int argc, char* argv[]) { } // namespace extern const ::AppManifest manifest = { - .id = "SystemInfo", + .id = "tactility.systeminfo", .name = "System Info", .category = APP_CATEGORY_SYSTEM, .location = { APP_LOCATION_MEMORY, reinterpret_cast(appMain) } diff --git a/Tactility/Source/app/timedatesettings/TimeDateSettings.cpp b/Tactility/Source/app/timedatesettings/TimeDateSettings.cpp index 9df8bcbaf..9886f9253 100644 --- a/Tactility/Source/app/timedatesettings/TimeDateSettings.cpp +++ b/Tactility/Source/app/timedatesettings/TimeDateSettings.cpp @@ -209,7 +209,7 @@ uint32_t start() { } extern const ::AppManifest manifest = { - .id = "TimeDateSettings", + .id = "tactility.timedatesettings", .name = "Time & Date", .category = APP_CATEGORY_SETTINGS, .location = { APP_LOCATION_MEMORY, reinterpret_cast(appMain) } diff --git a/Tactility/Source/app/timezone/TimeZone.cpp b/Tactility/Source/app/timezone/TimeZone.cpp index 1429aac21..36e42e412 100644 --- a/Tactility/Source/app/timezone/TimeZone.cpp +++ b/Tactility/Source/app/timezone/TimeZone.cpp @@ -283,7 +283,7 @@ std::string getLastCode() { } extern const ::AppManifest manifest = { - .id = "TimeZone", + .id = "tactility.timezone", .name = "Select Time zone", .category = APP_CATEGORY_SYSTEM, .location = { APP_LOCATION_MEMORY, reinterpret_cast(appMain) }, diff --git a/Tactility/Source/app/touchcalibration/TouchCalibration.cpp b/Tactility/Source/app/touchcalibration/TouchCalibration.cpp index fba9994f2..8bbe4fd4f 100644 --- a/Tactility/Source/app/touchcalibration/TouchCalibration.cpp +++ b/Tactility/Source/app/touchcalibration/TouchCalibration.cpp @@ -288,7 +288,7 @@ uint32_t start(uint32_t callerAppInstanceId) { } extern const ::AppManifest manifest = { - .id = "TouchCalibration", + .id = "tactility.touchcalibration", .name = "Touch Calibration", .category = APP_CATEGORY_SETTINGS, .location = { APP_LOCATION_MEMORY, reinterpret_cast(appMain) } diff --git a/Tactility/Source/app/trackball/TrackballSettings.cpp b/Tactility/Source/app/trackball/TrackballSettings.cpp index 56095db98..a01fd990c 100644 --- a/Tactility/Source/app/trackball/TrackballSettings.cpp +++ b/Tactility/Source/app/trackball/TrackballSettings.cpp @@ -304,7 +304,7 @@ int32_t appMain(uint32_t appInstanceId, int argc, char* argv[]) { } // namespace extern const ::AppManifest manifest = { - .id = "TrackballSettings", + .id = "tactility.trackballsettings", .name = "Trackball", .category = APP_CATEGORY_SETTINGS, .location = { APP_LOCATION_MEMORY, reinterpret_cast(appMain) } diff --git a/Tactility/Source/app/usbsettings/UsbSettings.cpp b/Tactility/Source/app/usbsettings/UsbSettings.cpp index fcac088b6..f3dbee948 100644 --- a/Tactility/Source/app/usbsettings/UsbSettings.cpp +++ b/Tactility/Source/app/usbsettings/UsbSettings.cpp @@ -116,7 +116,7 @@ int32_t appMain(uint32_t appInstanceId, int argc, char* argv[]) { } // namespace extern const ::AppManifest manifest = { - .id = "UsbSettings", + .id = "tactility.usbsettings", .name = "USB", .category = APP_CATEGORY_SETTINGS, .location = { APP_LOCATION_MEMORY, reinterpret_cast(appMain) } diff --git a/Tactility/Source/app/webserversettings/WebServerSettings.cpp b/Tactility/Source/app/webserversettings/WebServerSettings.cpp index c2fd0e184..66978733a 100644 --- a/Tactility/Source/app/webserversettings/WebServerSettings.cpp +++ b/Tactility/Source/app/webserversettings/WebServerSettings.cpp @@ -431,7 +431,7 @@ int32_t appMain(uint32_t appInstanceId, int argc, char* argv[]) { } // namespace extern const ::AppManifest manifest = { - .id = "WebServerSettings", + .id = "tactility.webserversettings", .name = "Web Server", .category = APP_CATEGORY_SYSTEM, .location = { APP_LOCATION_MEMORY, reinterpret_cast(appMain) } diff --git a/Tactility/Source/app/wifiapsettings/WifiApSettings.cpp b/Tactility/Source/app/wifiapsettings/WifiApSettings.cpp index 7c5a81527..1d38449ff 100644 --- a/Tactility/Source/app/wifiapsettings/WifiApSettings.cpp +++ b/Tactility/Source/app/wifiapsettings/WifiApSettings.cpp @@ -272,7 +272,7 @@ void start(const std::string& ssid) { } extern const ::AppManifest manifest = { - .id = "WifiApSettings", + .id = "tactility.wifiapsettings", .name = "Wi-Fi AP Settings", .category = APP_CATEGORY_SYSTEM, .location = { APP_LOCATION_MEMORY, reinterpret_cast(appMain) }, diff --git a/Tactility/Source/app/wificonnect/WifiConnect.cpp b/Tactility/Source/app/wificonnect/WifiConnect.cpp index 0b4c74c44..3ad15cded 100644 --- a/Tactility/Source/app/wificonnect/WifiConnect.cpp +++ b/Tactility/Source/app/wificonnect/WifiConnect.cpp @@ -360,7 +360,7 @@ void start(const std::string& ssid, const std::string& password) { } extern const ::AppManifest manifest = { - .id = "WifiConnect", + .id = "tactility.wificonnect", .name = "Wi-Fi Connect", .category = APP_CATEGORY_SYSTEM, .location = { APP_LOCATION_MEMORY, reinterpret_cast(appMain) }, diff --git a/Tactility/Source/app/wifimanage/WifiManage.cpp b/Tactility/Source/app/wifimanage/WifiManage.cpp index 006335146..5bae6c6b4 100644 --- a/Tactility/Source/app/wifimanage/WifiManage.cpp +++ b/Tactility/Source/app/wifimanage/WifiManage.cpp @@ -188,7 +188,7 @@ uint32_t start(uint32_t callerAppInstanceId) { } extern const ::AppManifest manifest = { - .id = "WifiManage", + .id = "tactility.wifimanage", .name = "Wi-Fi", .category = APP_CATEGORY_SETTINGS, .location = { APP_LOCATION_MEMORY, reinterpret_cast(appMain) } diff --git a/Tactility/Source/service/development/DevelopmentSettings.cpp b/Tactility/Source/service/development/DevelopmentSettings.cpp index b863b2b3d..13da6082b 100644 --- a/Tactility/Source/service/development/DevelopmentSettings.cpp +++ b/Tactility/Source/service/development/DevelopmentSettings.cpp @@ -14,7 +14,7 @@ constexpr auto* TAG = "DevSettings"; static std::string getSettingsFilePath() { char path[256]; - if (app_paths_get_user_data_path("Development", "development.properties", path, sizeof(path)) != ERROR_NONE) { + if (app_paths_get_user_data_path("tactility.development", "development.properties", path, sizeof(path)) != ERROR_NONE) { return ""; } return path; diff --git a/Tactility/Source/settings/DisplaySettings.cpp b/Tactility/Source/settings/DisplaySettings.cpp index 25d7e192f..dbcbd2667 100644 --- a/Tactility/Source/settings/DisplaySettings.cpp +++ b/Tactility/Source/settings/DisplaySettings.cpp @@ -13,7 +13,7 @@ namespace tt::settings::display { static std::string getSettingsFilePath() { char path[256]; - if (app_paths_get_user_data_path("Display", "display.properties", path, sizeof(path)) != ERROR_NONE) { + if (app_paths_get_user_data_path("tactility.display", "display.properties", path, sizeof(path)) != ERROR_NONE) { return ""; } return path; diff --git a/Tactility/Source/settings/TrackballSettings.cpp b/Tactility/Source/settings/TrackballSettings.cpp index d5e8c0d56..f992114cb 100644 --- a/Tactility/Source/settings/TrackballSettings.cpp +++ b/Tactility/Source/settings/TrackballSettings.cpp @@ -12,7 +12,7 @@ namespace tt::settings::trackball { static std::string getSettingsFilePath() { char path[256]; - if (app_paths_get_user_data_path("TrackballSettings", "trackball.properties", path, sizeof(path)) != ERROR_NONE) { + if (app_paths_get_user_data_path("tactility.trackballsettings", "trackball.properties", path, sizeof(path)) != ERROR_NONE) { return ""; } return path; diff --git a/Tactility/Source/settings/WebServerSettings.cpp b/Tactility/Source/settings/WebServerSettings.cpp index 09312e539..91560b169 100644 --- a/Tactility/Source/settings/WebServerSettings.cpp +++ b/Tactility/Source/settings/WebServerSettings.cpp @@ -23,7 +23,7 @@ constexpr auto* TAG = "WebServerSettings"; static std::string getSettingsFilePath() { char path[256]; - if (app_paths_get_user_data_path("WebServerSettings", "webserver.properties", path, sizeof(path)) != ERROR_NONE) { + if (app_paths_get_user_data_path("tactility.webserversettings", "webserver.properties", path, sizeof(path)) != ERROR_NONE) { return ""; } return path;