Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ if (DEFINED ENV{ESP_IDF_VERSION})
"Modules"
"Platforms/platform-esp32"
"TactilityKernel"
"TactilityKernelCpp"
"Tactility"
"TactilityC"
"TactilityFreeRtos"
Expand Down Expand Up @@ -77,7 +78,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 ()
Expand All @@ -89,6 +90,7 @@ if (NOT DEFINED ENV{ESP_IDF_VERSION})
add_subdirectory(Tactility)
add_subdirectory(TactilityFreeRtos)
add_subdirectory(TactilityKernel)
add_subdirectory(TactilityKernelCpp)
add_subdirectory(Platforms/platform-posix)
add_subdirectory(Devices/simulator)
add_subdirectory(Libraries/cJSON)
Expand Down
2 changes: 1 addition & 1 deletion Devices/btt-panda-touch/device.properties
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion Devices/cl32/device.properties
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion Devices/cyd-2432s024c/device.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
general.vendor=CYD
general.name=2432S024C

apps.launcherAppId=Launcher
apps.launcherAppId=tactility.launcher

hardware.target=ESP32
hardware.flashSize=4MB
Expand Down
2 changes: 1 addition & 1 deletion Devices/cyd-2432s024r/device.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
general.vendor=CYD
general.name=2432S024R

apps.launcherAppId=Launcher
apps.launcherAppId=tactility.launcher

hardware.target=ESP32
hardware.flashSize=4MB
Expand Down
2 changes: 1 addition & 1 deletion Devices/cyd-2432s028r/device.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
general.vendor=CYD
general.name=2432S028R

apps.launcherAppId=Launcher
apps.launcherAppId=tactility.launcher

hardware.target=ESP32
hardware.flashSize=4MB
Expand Down
2 changes: 1 addition & 1 deletion Devices/cyd-2432s028rv3/device.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
general.vendor=CYD
general.name=2432S028R v3

apps.launcherAppId=Launcher
apps.launcherAppId=tactility.launcher

hardware.target=ESP32
hardware.flashSize=4MB
Expand Down
2 changes: 1 addition & 1 deletion Devices/cyd-2432s032c/device.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
general.vendor=CYD
general.name=2432S032C

apps.launcherAppId=Launcher
apps.launcherAppId=tactility.launcher

hardware.target=ESP32
hardware.flashSize=4MB
Expand Down
2 changes: 1 addition & 1 deletion Devices/cyd-3248s035c/device.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
general.vendor=CYD
general.name=3248S035C

apps.launcherAppId=Launcher
apps.launcherAppId=tactility.launcher

hardware.target=ESP32
hardware.flashSize=4MB
Expand Down
2 changes: 1 addition & 1 deletion Devices/cyd-4848s040c/device.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
general.vendor=CYD
general.name=4848S040C

apps.launcherAppId=Launcher
apps.launcherAppId=tactility.launcher

hardware.target=ESP32S3
hardware.flashSize=16MB
Expand Down
2 changes: 1 addition & 1 deletion Devices/cyd-8048s043c/device.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Devices/cyd-e32r28t/device.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
general.vendor=CYD
general.name=E32R28T

apps.launcherAppId=Launcher
apps.launcherAppId=tactility.launcher

hardware.target=ESP32
hardware.flashSize=4MB
Expand Down
2 changes: 1 addition & 1 deletion Devices/cyd-e32r32p/device.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
general.vendor=CYD
general.name=E32R32P

apps.launcherAppId=Launcher
apps.launcherAppId=tactility.launcher

hardware.target=ESP32
hardware.flashSize=4MB
Expand Down
2 changes: 1 addition & 1 deletion Devices/elecrow-crowpanel-advance-28/device.properties
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion Devices/elecrow-crowpanel-advance-35/device.properties
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion Devices/elecrow-crowpanel-advance-50/device.properties
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion Devices/elecrow-crowpanel-basic-28/device.properties
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion Devices/elecrow-crowpanel-basic-35/device.properties
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion Devices/elecrow-crowpanel-basic-50/device.properties
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion Devices/es3c28p/device.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
general.vendor=CYD
general.name=ES3C28P

apps.launcherAppId=Launcher
apps.launcherAppId=tactility.launcher

hardware.target=ESP32S3
hardware.flashSize=16MB
Expand Down
2 changes: 1 addition & 1 deletion Devices/generic-esp32/device.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
general.vendor=Generic
general.name=ESP32

apps.launcherAppId=Launcher
apps.launcherAppId=tactility.launcher

hardware.target=ESP32
hardware.flashSize=8MB
Expand Down
2 changes: 1 addition & 1 deletion Devices/generic-esp32c6/device.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
general.vendor=Generic
general.name=ESP32-C6

apps.launcherAppId=Launcher
apps.launcherAppId=tactility.launcher

hardware.target=ESP32C6
hardware.flashSize=8MB
Expand Down
2 changes: 1 addition & 1 deletion Devices/generic-esp32p4/device.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
general.vendor=Generic
general.name=ESP32-P4

apps.launcherAppId=Launcher
apps.launcherAppId=tactility.launcher

hardware.target=ESP32P4
hardware.flashSize=8MB
Expand Down
2 changes: 1 addition & 1 deletion Devices/generic-esp32s3/device.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
general.vendor=Generic
general.name=ESP32-S3

apps.launcherAppId=Launcher
apps.launcherAppId=tactility.launcher

hardware.target=ESP32S3
hardware.flashSize=8MB
Expand Down
2 changes: 1 addition & 1 deletion Devices/guition-jc1060p470ciwy/device.properties
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion Devices/guition-jc2432w328c/device.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
general.vendor=Guition
general.name=JC2432W328C

apps.launcherAppId=Launcher
apps.launcherAppId=tactility.launcher

hardware.target=ESP32
hardware.flashSize=4MB
Expand Down
2 changes: 1 addition & 1 deletion Devices/guition-jc8048w550c/device.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
general.vendor=Guition
general.name=JC8048W550C

apps.launcherAppId=Launcher
apps.launcherAppId=tactility.launcher

hardware.target=ESP32S3
hardware.flashSize=16MB
Expand Down
4 changes: 2 additions & 2 deletions Devices/heltec-wifi-lora-32-v3/device.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Devices/lilygo-tdeck-max/device.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Devices/lilygo-tdeck-plus/device.properties
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion Devices/lilygo-tdeck-pro/device.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Devices/lilygo-tdeck/device.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
general.vendor=LilyGO
general.name=T-Deck

apps.launcherAppId=Launcher
apps.launcherAppId=tactility.launcher

hardware.target=ESP32S3
hardware.flashSize=16MB
Expand Down
4 changes: 2 additions & 2 deletions Devices/lilygo-tdisplay-s3/device.properties
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions Devices/lilygo-tdisplay/device.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Devices/lilygo-tdongle-s3/device.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Devices/lilygo-thmi/device.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
general.vendor=LilyGO
general.name=T-HMI

apps.launcherAppId=Launcher
apps.launcherAppId=tactility.launcher

hardware.target=ESP32S3
hardware.flashSize=16MB
Expand Down
2 changes: 1 addition & 1 deletion Devices/lilygo-tlora-pager/device.properties
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion Devices/m5stack-cardputer-adv/device.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
general.vendor=M5Stack
general.name=Cardputer Adv

apps.launcherAppId=Launcher
apps.launcherAppId=tactility.launcher

hardware.target=ESP32S3
hardware.flashSize=8MB
Expand Down
2 changes: 1 addition & 1 deletion Devices/m5stack-cardputer/device.properties
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion Devices/m5stack-core2/device.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
general.vendor=M5Stack
general.name=Core2

apps.launcherAppId=Launcher
apps.launcherAppId=tactility.launcher

hardware.target=ESP32
hardware.flashSize=16MB
Expand Down
2 changes: 1 addition & 1 deletion Devices/m5stack-cores3/device.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
general.vendor=M5Stack
general.name=CoreS3

apps.launcherAppId=Launcher
apps.launcherAppId=tactility.launcher

hardware.target=ESP32S3
hardware.flashSize=16MB
Expand Down
Loading
Loading