diff --git a/CMakeLists.txt b/CMakeLists.txt index 0ab914383..55fb75e0e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -72,7 +72,6 @@ else () # Devices/simulator/Source/Simulator.cpp always defines its own hardwareConfiguration; without # this, Firmware/Source/Main.cpp's #else branch also defines an empty one (its ESP32-only # fallback for devices migrated off the deprecated HAL), causing a duplicate-definition link error. - add_compile_definitions(CONFIG_TT_USE_DEPRECATED_HAL) add_compile_definitions(CONFIG_TT_DEVICE_ID="simulator") add_compile_definitions(CONFIG_TT_DEVICE_NAME="Simulator") add_compile_definitions(CONFIG_TT_DEVICE_VENDOR="") diff --git a/Devices/btt-panda-touch/CMakeLists.txt b/Devices/btt-panda-touch/CMakeLists.txt index b82863775..09a2fdee3 100644 --- a/Devices/btt-panda-touch/CMakeLists.txt +++ b/Devices/btt-panda-touch/CMakeLists.txt @@ -3,5 +3,5 @@ file(GLOB_RECURSE SOURCE_FILES source/*.c*) idf_component_register( SRCS ${SOURCE_FILES} INCLUDE_DIRS "source" - REQUIRES Tactility + REQUIRES TactilityKernel ) diff --git a/Devices/btt-panda-touch/device.properties b/Devices/btt-panda-touch/device.properties index e9e58bfc9..8e65fa6d2 100644 --- a/Devices/btt-panda-touch/device.properties +++ b/Devices/btt-panda-touch/device.properties @@ -12,8 +12,6 @@ hardware.esptoolFlashFreq=120M hardware.bluetooth=true hardware.usbHostEnabled=true -dependencies.useDeprecatedHal=false - storage.userDataLocation=Internal display.size=5" diff --git a/Devices/cyd-2432s024c/device.properties b/Devices/cyd-2432s024c/device.properties index 2b710227f..0f2a5c1de 100644 --- a/Devices/cyd-2432s024c/device.properties +++ b/Devices/cyd-2432s024c/device.properties @@ -7,8 +7,6 @@ hardware.target=ESP32 hardware.flashSize=4MB hardware.spiRam=false -dependencies.useDeprecatedHal=false - storage.userDataLocation=SD display.size=2.4" diff --git a/Devices/cyd-2432s024r/device.properties b/Devices/cyd-2432s024r/device.properties index 57b8d394a..b2e05d040 100644 --- a/Devices/cyd-2432s024r/device.properties +++ b/Devices/cyd-2432s024r/device.properties @@ -7,8 +7,6 @@ hardware.target=ESP32 hardware.flashSize=4MB hardware.spiRam=false -dependencies.useDeprecatedHal=false - storage.userDataLocation=SD display.size=2.4" diff --git a/Devices/cyd-2432s028r/device.properties b/Devices/cyd-2432s028r/device.properties index 05598a702..847dc1fb0 100644 --- a/Devices/cyd-2432s028r/device.properties +++ b/Devices/cyd-2432s028r/device.properties @@ -7,8 +7,6 @@ hardware.target=ESP32 hardware.flashSize=4MB hardware.spiRam=false -dependencies.useDeprecatedHal=false - storage.userDataLocation=SD display.size=2.8" diff --git a/Devices/cyd-2432s028rv3/device.properties b/Devices/cyd-2432s028rv3/device.properties index 683b2f35f..332e1ed11 100644 --- a/Devices/cyd-2432s028rv3/device.properties +++ b/Devices/cyd-2432s028rv3/device.properties @@ -7,8 +7,6 @@ hardware.target=ESP32 hardware.flashSize=4MB hardware.spiRam=false -dependencies.useDeprecatedHal=false - storage.userDataLocation=SD display.size=2.8" diff --git a/Devices/cyd-2432s032c/device.properties b/Devices/cyd-2432s032c/device.properties index dc563dae6..e483bd8c2 100644 --- a/Devices/cyd-2432s032c/device.properties +++ b/Devices/cyd-2432s032c/device.properties @@ -7,8 +7,6 @@ hardware.target=ESP32 hardware.flashSize=4MB hardware.spiRam=false -dependencies.useDeprecatedHal=false - storage.userDataLocation=SD display.size=3.2" diff --git a/Devices/cyd-3248s035c/device.properties b/Devices/cyd-3248s035c/device.properties index b166661c7..c8fc929d1 100644 --- a/Devices/cyd-3248s035c/device.properties +++ b/Devices/cyd-3248s035c/device.properties @@ -7,8 +7,6 @@ hardware.target=ESP32 hardware.flashSize=4MB hardware.spiRam=false -dependencies.useDeprecatedHal=false - storage.userDataLocation=SD display.size=3.5" diff --git a/Devices/cyd-4848s040c/CMakeLists.txt b/Devices/cyd-4848s040c/CMakeLists.txt index a832a83a2..a7d3e6712 100644 --- a/Devices/cyd-4848s040c/CMakeLists.txt +++ b/Devices/cyd-4848s040c/CMakeLists.txt @@ -2,5 +2,5 @@ file(GLOB_RECURSE SOURCE_FILES source/*.c*) idf_component_register( SRCS ${SOURCE_FILES} - REQUIRES TactilityKernel driver + REQUIRES TactilityKernel ) diff --git a/Devices/cyd-4848s040c/device.properties b/Devices/cyd-4848s040c/device.properties index 1a8c9a739..45c66c54e 100644 --- a/Devices/cyd-4848s040c/device.properties +++ b/Devices/cyd-4848s040c/device.properties @@ -10,8 +10,6 @@ hardware.spiRamMode=OCT hardware.spiRamSpeed=80M hardware.bluetooth=true -dependencies.useDeprecatedHal=false - storage.userDataLocation=SD display.size=4" diff --git a/Devices/cyd-8048s043c/CMakeLists.txt b/Devices/cyd-8048s043c/CMakeLists.txt index a832a83a2..a7d3e6712 100644 --- a/Devices/cyd-8048s043c/CMakeLists.txt +++ b/Devices/cyd-8048s043c/CMakeLists.txt @@ -2,5 +2,5 @@ file(GLOB_RECURSE SOURCE_FILES source/*.c*) idf_component_register( SRCS ${SOURCE_FILES} - REQUIRES TactilityKernel driver + REQUIRES TactilityKernel ) diff --git a/Devices/cyd-8048s043c/device.properties b/Devices/cyd-8048s043c/device.properties index 6b9a7b3e7..8056421d5 100644 --- a/Devices/cyd-8048s043c/device.properties +++ b/Devices/cyd-8048s043c/device.properties @@ -12,8 +12,6 @@ hardware.spiRamSpeed=80M hardware.esptoolFlashFreq=80M hardware.bluetooth=true -dependencies.useDeprecatedHal=false - storage.userDataLocation=SD display.size=4.3" diff --git a/Devices/cyd-e32r28t/device.properties b/Devices/cyd-e32r28t/device.properties index a60fd82db..097eaa62d 100644 --- a/Devices/cyd-e32r28t/device.properties +++ b/Devices/cyd-e32r28t/device.properties @@ -7,8 +7,6 @@ hardware.target=ESP32 hardware.flashSize=4MB hardware.spiRam=false -dependencies.useDeprecatedHal=false - storage.userDataLocation=SD display.size=2.8" diff --git a/Devices/cyd-e32r32p/device.properties b/Devices/cyd-e32r32p/device.properties index 1a60af40c..27f2ad0a6 100644 --- a/Devices/cyd-e32r32p/device.properties +++ b/Devices/cyd-e32r32p/device.properties @@ -7,8 +7,6 @@ hardware.target=ESP32 hardware.flashSize=4MB hardware.spiRam=false -dependencies.useDeprecatedHal=false - storage.userDataLocation=SD display.size=2.8" diff --git a/Devices/elecrow-crowpanel-advance-28/device.properties b/Devices/elecrow-crowpanel-advance-28/device.properties index 99ae3f7d9..9d2fd7949 100644 --- a/Devices/elecrow-crowpanel-advance-28/device.properties +++ b/Devices/elecrow-crowpanel-advance-28/device.properties @@ -12,8 +12,6 @@ hardware.tinyUsb=true hardware.esptoolFlashFreq=120M hardware.bluetooth=true -dependencies.useDeprecatedHal=false - storage.userDataLocation=SD display.size=2.8" diff --git a/Devices/elecrow-crowpanel-advance-35/device.properties b/Devices/elecrow-crowpanel-advance-35/device.properties index 537a4838a..833744397 100644 --- a/Devices/elecrow-crowpanel-advance-35/device.properties +++ b/Devices/elecrow-crowpanel-advance-35/device.properties @@ -12,8 +12,6 @@ hardware.tinyUsb=true hardware.esptoolFlashFreq=120M hardware.bluetooth=true -dependencies.useDeprecatedHal=false - storage.userDataLocation=SD display.size=3.5" diff --git a/Devices/elecrow-crowpanel-advance-50/CMakeLists.txt b/Devices/elecrow-crowpanel-advance-50/CMakeLists.txt index b82863775..09a2fdee3 100644 --- a/Devices/elecrow-crowpanel-advance-50/CMakeLists.txt +++ b/Devices/elecrow-crowpanel-advance-50/CMakeLists.txt @@ -3,5 +3,5 @@ file(GLOB_RECURSE SOURCE_FILES source/*.c*) idf_component_register( SRCS ${SOURCE_FILES} INCLUDE_DIRS "source" - REQUIRES Tactility + REQUIRES TactilityKernel ) diff --git a/Devices/elecrow-crowpanel-advance-50/device.properties b/Devices/elecrow-crowpanel-advance-50/device.properties index 8ef94df07..9fa787d6a 100644 --- a/Devices/elecrow-crowpanel-advance-50/device.properties +++ b/Devices/elecrow-crowpanel-advance-50/device.properties @@ -12,8 +12,6 @@ hardware.tinyUsb=true hardware.esptoolFlashFreq=120M hardware.bluetooth=true -dependencies.useDeprecatedHal=false - storage.userDataLocation=SD display.size=5" diff --git a/Devices/elecrow-crowpanel-basic-28/device.properties b/Devices/elecrow-crowpanel-basic-28/device.properties index 770406ae2..acc1405a4 100644 --- a/Devices/elecrow-crowpanel-basic-28/device.properties +++ b/Devices/elecrow-crowpanel-basic-28/device.properties @@ -7,8 +7,6 @@ hardware.target=ESP32 hardware.flashSize=4MB hardware.spiRam=false -dependencies.useDeprecatedHal=false - storage.userDataLocation=SD display.size=2.8" diff --git a/Devices/elecrow-crowpanel-basic-35/device.properties b/Devices/elecrow-crowpanel-basic-35/device.properties index 0e1800e26..cb07c7757 100644 --- a/Devices/elecrow-crowpanel-basic-35/device.properties +++ b/Devices/elecrow-crowpanel-basic-35/device.properties @@ -7,8 +7,6 @@ hardware.target=ESP32 hardware.flashSize=4MB hardware.spiRam=false -dependencies.useDeprecatedHal=false - storage.userDataLocation=SD display.size=3.5" diff --git a/Devices/elecrow-crowpanel-basic-50/CMakeLists.txt b/Devices/elecrow-crowpanel-basic-50/CMakeLists.txt index b82863775..09a2fdee3 100644 --- a/Devices/elecrow-crowpanel-basic-50/CMakeLists.txt +++ b/Devices/elecrow-crowpanel-basic-50/CMakeLists.txt @@ -3,5 +3,5 @@ file(GLOB_RECURSE SOURCE_FILES source/*.c*) idf_component_register( SRCS ${SOURCE_FILES} INCLUDE_DIRS "source" - REQUIRES Tactility + REQUIRES TactilityKernel ) diff --git a/Devices/elecrow-crowpanel-basic-50/device.properties b/Devices/elecrow-crowpanel-basic-50/device.properties index 75d39c8a6..69633d2ae 100644 --- a/Devices/elecrow-crowpanel-basic-50/device.properties +++ b/Devices/elecrow-crowpanel-basic-50/device.properties @@ -12,8 +12,6 @@ hardware.tinyUsb=true hardware.esptoolFlashFreq=120M hardware.bluetooth=true -dependencies.useDeprecatedHal=false - storage.userDataLocation=SD display.size=5.0" diff --git a/Devices/es3c28p/device.properties b/Devices/es3c28p/device.properties index ee33074ab..1d90476b8 100644 --- a/Devices/es3c28p/device.properties +++ b/Devices/es3c28p/device.properties @@ -19,5 +19,3 @@ display.dpi=143 lvgl.colorDepth=16 storage.userDataLocation=SD - -dependencies.useDeprecatedHal=false diff --git a/Devices/generic-esp32/device.properties b/Devices/generic-esp32/device.properties index 03f143e8b..8b803a84d 100644 --- a/Devices/generic-esp32/device.properties +++ b/Devices/generic-esp32/device.properties @@ -7,6 +7,4 @@ hardware.target=ESP32 hardware.flashSize=8MB hardware.spiRam=false -dependencies.useDeprecatedHal=false - storage.userDataLocation=Internal diff --git a/Devices/generic-esp32c6/device.properties b/Devices/generic-esp32c6/device.properties index 310bae863..bd332c250 100644 --- a/Devices/generic-esp32c6/device.properties +++ b/Devices/generic-esp32c6/device.properties @@ -7,6 +7,4 @@ hardware.target=ESP32C6 hardware.flashSize=8MB hardware.spiRam=false -dependencies.useDeprecatedHal=false - storage.userDataLocation=Internal diff --git a/Devices/generic-esp32p4/device.properties b/Devices/generic-esp32p4/device.properties index d2641c1fb..4a050b399 100644 --- a/Devices/generic-esp32p4/device.properties +++ b/Devices/generic-esp32p4/device.properties @@ -7,6 +7,4 @@ hardware.target=ESP32P4 hardware.flashSize=8MB hardware.spiRam=false -dependencies.useDeprecatedHal=false - storage.userDataLocation=Internal diff --git a/Devices/generic-esp32s3/device.properties b/Devices/generic-esp32s3/device.properties index 132ea86ce..8512a4506 100644 --- a/Devices/generic-esp32s3/device.properties +++ b/Devices/generic-esp32s3/device.properties @@ -7,6 +7,4 @@ hardware.target=ESP32S3 hardware.flashSize=8MB hardware.spiRam=false -dependencies.useDeprecatedHal=false - storage.userDataLocation=Internal diff --git a/Devices/guition-jc1060p470ciwy/device.properties b/Devices/guition-jc1060p470ciwy/device.properties index 6f4a69087..fcc7421ee 100644 --- a/Devices/guition-jc1060p470ciwy/device.properties +++ b/Devices/guition-jc1060p470ciwy/device.properties @@ -11,8 +11,6 @@ hardware.spiRamSpeed=200M hardware.esptoolFlashFreq=80M hardware.bluetooth=true -dependencies.useDeprecatedHal=false - storage.userDataLocation=SD display.size=7" diff --git a/Devices/guition-jc2432w328c/CMakeLists.txt b/Devices/guition-jc2432w328c/CMakeLists.txt index a832a83a2..a7d3e6712 100644 --- a/Devices/guition-jc2432w328c/CMakeLists.txt +++ b/Devices/guition-jc2432w328c/CMakeLists.txt @@ -2,5 +2,5 @@ file(GLOB_RECURSE SOURCE_FILES source/*.c*) idf_component_register( SRCS ${SOURCE_FILES} - REQUIRES TactilityKernel driver + REQUIRES TactilityKernel ) diff --git a/Devices/guition-jc2432w328c/device.properties b/Devices/guition-jc2432w328c/device.properties index f0d9ead2d..7ef40633b 100644 --- a/Devices/guition-jc2432w328c/device.properties +++ b/Devices/guition-jc2432w328c/device.properties @@ -7,8 +7,6 @@ hardware.target=ESP32 hardware.flashSize=4MB hardware.spiRam=false -dependencies.useDeprecatedHal=false - storage.userDataLocation=SD display.size=2.8" diff --git a/Devices/guition-jc8048w550c/CMakeLists.txt b/Devices/guition-jc8048w550c/CMakeLists.txt index a832a83a2..a7d3e6712 100644 --- a/Devices/guition-jc8048w550c/CMakeLists.txt +++ b/Devices/guition-jc8048w550c/CMakeLists.txt @@ -2,5 +2,5 @@ file(GLOB_RECURSE SOURCE_FILES source/*.c*) idf_component_register( SRCS ${SOURCE_FILES} - REQUIRES TactilityKernel driver + REQUIRES TactilityKernel ) diff --git a/Devices/guition-jc8048w550c/device.properties b/Devices/guition-jc8048w550c/device.properties index 4ad495a8a..3cebf4d42 100644 --- a/Devices/guition-jc8048w550c/device.properties +++ b/Devices/guition-jc8048w550c/device.properties @@ -11,8 +11,6 @@ hardware.spiRamSpeed=80M hardware.esptoolFlashFreq=80M hardware.bluetooth=true -dependencies.useDeprecatedHal=false - storage.userDataLocation=SD display.size=5" diff --git a/Devices/heltec-wifi-lora-32-v3/device.properties b/Devices/heltec-wifi-lora-32-v3/device.properties index 2fe658dda..729c48738 100644 --- a/Devices/heltec-wifi-lora-32-v3/device.properties +++ b/Devices/heltec-wifi-lora-32-v3/device.properties @@ -12,8 +12,6 @@ hardware.tinyUsb=true hardware.esptoolFlashFreq=120M hardware.bluetooth=true -dependencies.useDeprecatedHal=false - storage.userDataLocation=Internal display.size=0.96" diff --git a/Devices/lilygo-tdeck-max/device.properties b/Devices/lilygo-tdeck-max/device.properties index 5d1d02635..50604bb16 100644 --- a/Devices/lilygo-tdeck-max/device.properties +++ b/Devices/lilygo-tdeck-max/device.properties @@ -18,8 +18,6 @@ hardware.bluetooth=true # Internal until the SD card is verified working on this board; switch to SD then. storage.userDataLocation=Internal -dependencies.useDeprecatedHal=false - display.size=3.1" display.shape=rectangle display.dpi=128 diff --git a/Devices/lilygo-tdeck-plus/device.properties b/Devices/lilygo-tdeck-plus/device.properties index 2734ad476..3aaf6fbba 100644 --- a/Devices/lilygo-tdeck-plus/device.properties +++ b/Devices/lilygo-tdeck-plus/device.properties @@ -12,8 +12,6 @@ hardware.tinyUsb=true hardware.esptoolFlashFreq=120M hardware.bluetooth=true -dependencies.useDeprecatedHal=false - storage.userDataLocation=SD display.size=2.8" diff --git a/Devices/lilygo-tdeck-plus/source/module.cpp b/Devices/lilygo-tdeck-plus/source/module.cpp index 50e0dc27a..1c5d29aeb 100644 --- a/Devices/lilygo-tdeck-plus/source/module.cpp +++ b/Devices/lilygo-tdeck-plus/source/module.cpp @@ -1,14 +1,14 @@ #include #include #include -#include #include - #include #include #include +#include + #include #include diff --git a/Devices/lilygo-tdeck-pro/device.properties b/Devices/lilygo-tdeck-pro/device.properties index 2ffa8f658..3688af82b 100644 --- a/Devices/lilygo-tdeck-pro/device.properties +++ b/Devices/lilygo-tdeck-pro/device.properties @@ -17,8 +17,6 @@ hardware.bluetooth=true storage.userDataLocation=SD -dependencies.useDeprecatedHal=false - display.size=3.1" display.shape=rectangle display.dpi=128 diff --git a/Devices/lilygo-tdeck/device.properties b/Devices/lilygo-tdeck/device.properties index 7153bf982..7f4b9e457 100644 --- a/Devices/lilygo-tdeck/device.properties +++ b/Devices/lilygo-tdeck/device.properties @@ -12,8 +12,6 @@ hardware.tinyUsb=true hardware.esptoolFlashFreq=120M hardware.bluetooth=true -dependencies.useDeprecatedHal=false - storage.userDataLocation=SD display.size=2.8" diff --git a/Devices/lilygo-tdisplay-s3/device.properties b/Devices/lilygo-tdisplay-s3/device.properties index 009ff559f..759018c91 100644 --- a/Devices/lilygo-tdisplay-s3/device.properties +++ b/Devices/lilygo-tdisplay-s3/device.properties @@ -13,8 +13,6 @@ hardware.tinyUsb=true hardware.esptoolFlashFreq=120M hardware.bluetooth=true -dependencies.useDeprecatedHal=false - storage.userDataLocation=Internal display.size=1.9" diff --git a/Devices/lilygo-tdisplay/CMakeLists.txt b/Devices/lilygo-tdisplay/CMakeLists.txt index a832a83a2..a7d3e6712 100644 --- a/Devices/lilygo-tdisplay/CMakeLists.txt +++ b/Devices/lilygo-tdisplay/CMakeLists.txt @@ -2,5 +2,5 @@ file(GLOB_RECURSE SOURCE_FILES source/*.c*) idf_component_register( SRCS ${SOURCE_FILES} - REQUIRES TactilityKernel driver + REQUIRES TactilityKernel ) diff --git a/Devices/lilygo-tdisplay/device.properties b/Devices/lilygo-tdisplay/device.properties index b9c6c7060..590086137 100644 --- a/Devices/lilygo-tdisplay/device.properties +++ b/Devices/lilygo-tdisplay/device.properties @@ -10,8 +10,6 @@ hardware.flashSize=16MB hardware.spiRam=false hardware.esptoolFlashFreq=80M -dependencies.useDeprecatedHal=false - storage.userDataLocation=Internal display.size=1.14" diff --git a/Devices/lilygo-tdongle-s3/CMakeLists.txt b/Devices/lilygo-tdongle-s3/CMakeLists.txt index a832a83a2..a7d3e6712 100644 --- a/Devices/lilygo-tdongle-s3/CMakeLists.txt +++ b/Devices/lilygo-tdongle-s3/CMakeLists.txt @@ -2,5 +2,5 @@ file(GLOB_RECURSE SOURCE_FILES source/*.c*) idf_component_register( SRCS ${SOURCE_FILES} - REQUIRES TactilityKernel driver + REQUIRES TactilityKernel ) diff --git a/Devices/lilygo-tdongle-s3/device.properties b/Devices/lilygo-tdongle-s3/device.properties index 4b674248d..f92ed6ebe 100644 --- a/Devices/lilygo-tdongle-s3/device.properties +++ b/Devices/lilygo-tdongle-s3/device.properties @@ -12,8 +12,6 @@ hardware.tinyUsb=true hardware.esptoolFlashFreq=120M hardware.bluetooth=true -dependencies.useDeprecatedHal=false - storage.userDataLocation=SD display.size=0.96" diff --git a/Devices/lilygo-thmi/CMakeLists.txt b/Devices/lilygo-thmi/CMakeLists.txt index a832a83a2..a7d3e6712 100644 --- a/Devices/lilygo-thmi/CMakeLists.txt +++ b/Devices/lilygo-thmi/CMakeLists.txt @@ -2,5 +2,5 @@ file(GLOB_RECURSE SOURCE_FILES source/*.c*) idf_component_register( SRCS ${SOURCE_FILES} - REQUIRES TactilityKernel driver + REQUIRES TactilityKernel ) diff --git a/Devices/lilygo-thmi/device.properties b/Devices/lilygo-thmi/device.properties index 6c348116c..5d32e381b 100644 --- a/Devices/lilygo-thmi/device.properties +++ b/Devices/lilygo-thmi/device.properties @@ -12,8 +12,6 @@ hardware.tinyUsb=true hardware.esptoolFlashFreq=120M hardware.bluetooth=true -dependencies.useDeprecatedHal=false - storage.userDataLocation=SD display.size=2.8" diff --git a/Devices/lilygo-tlora-pager/device.properties b/Devices/lilygo-tlora-pager/device.properties index 9e985e17d..1e363302f 100644 --- a/Devices/lilygo-tlora-pager/device.properties +++ b/Devices/lilygo-tlora-pager/device.properties @@ -13,8 +13,6 @@ hardware.tinyUsb=true hardware.esptoolFlashFreq=40M hardware.bluetooth=true -dependencies.useDeprecatedHal=false - storage.userDataLocation=SD display.size=2.33" diff --git a/Devices/m5stack-cardputer-adv/device.properties b/Devices/m5stack-cardputer-adv/device.properties index cd1340bc2..ab63ce706 100644 --- a/Devices/m5stack-cardputer-adv/device.properties +++ b/Devices/m5stack-cardputer-adv/device.properties @@ -10,8 +10,6 @@ hardware.tinyUsb=true hardware.esptoolFlashFreq=120M hardware.bluetooth=true -dependencies.useDeprecatedHal=false - storage.userDataLocation=SD display.size=1.14" diff --git a/Devices/m5stack-cardputer/device.properties b/Devices/m5stack-cardputer/device.properties index a59bb26e0..afcb648f0 100644 --- a/Devices/m5stack-cardputer/device.properties +++ b/Devices/m5stack-cardputer/device.properties @@ -10,8 +10,6 @@ hardware.tinyUsb=true hardware.esptoolFlashFreq=120M hardware.bluetooth=true -dependencies.useDeprecatedHal=false - storage.userDataLocation=SD display.size=1.14" diff --git a/Devices/m5stack-core2/device.properties b/Devices/m5stack-core2/device.properties index cfaaf47d0..2bda9c380 100644 --- a/Devices/m5stack-core2/device.properties +++ b/Devices/m5stack-core2/device.properties @@ -12,8 +12,6 @@ hardware.esptoolFlashFreq=80M storage.userDataLocation=SD -dependencies.useDeprecatedHal=false - display.size=2" display.shape=rectangle display.dpi=200 diff --git a/Devices/m5stack-cores3/device.properties b/Devices/m5stack-cores3/device.properties index 8f3c1245b..5af2a482d 100644 --- a/Devices/m5stack-cores3/device.properties +++ b/Devices/m5stack-cores3/device.properties @@ -14,8 +14,6 @@ hardware.bluetooth=true storage.userDataLocation=Internal -dependencies.useDeprecatedHal=false - display.size=2" display.shape=rectangle display.dpi=200 diff --git a/Devices/m5stack-papers3/device.properties b/Devices/m5stack-papers3/device.properties index ba55255a1..7ca2752e7 100644 --- a/Devices/m5stack-papers3/device.properties +++ b/Devices/m5stack-papers3/device.properties @@ -15,8 +15,6 @@ hardware.bluetooth=true storage.userDataLocation=SD -dependencies.useDeprecatedHal=false - display.size=4.7" display.shape=rectangle display.dpi=235 diff --git a/Devices/m5stack-stackchan/device.properties b/Devices/m5stack-stackchan/device.properties index 2602f423d..fa5fcaf99 100644 --- a/Devices/m5stack-stackchan/device.properties +++ b/Devices/m5stack-stackchan/device.properties @@ -12,8 +12,6 @@ hardware.tinyUsb=true hardware.esptoolFlashFreq=120M hardware.bluetooth=true -dependencies.useDeprecatedHal=false - storage.userDataLocation=SD display.size=2" diff --git a/Devices/m5stack-stickc-plus2/device.properties b/Devices/m5stack-stickc-plus2/device.properties index d6bd399ff..9178ad240 100644 --- a/Devices/m5stack-stickc-plus2/device.properties +++ b/Devices/m5stack-stickc-plus2/device.properties @@ -10,8 +10,6 @@ hardware.spiRamMode=QUAD hardware.spiRamSpeed=80M hardware.esptoolFlashFreq=80M -dependencies.useDeprecatedHal=false - storage.userDataLocation=Internal display.size=1.14" diff --git a/Devices/m5stack-sticks3/device.properties b/Devices/m5stack-sticks3/device.properties index ac16de421..057115eca 100644 --- a/Devices/m5stack-sticks3/device.properties +++ b/Devices/m5stack-sticks3/device.properties @@ -12,8 +12,6 @@ hardware.esptoolFlashFreq=80M hardware.tinyUsb=true hardware.bluetooth=true -dependencies.useDeprecatedHal=false - storage.userDataLocation=Internal display.size=1.14" diff --git a/Devices/m5stack-tab5/CMakeLists.txt b/Devices/m5stack-tab5/CMakeLists.txt index 61450f7bb..8d013f13a 100644 --- a/Devices/m5stack-tab5/CMakeLists.txt +++ b/Devices/m5stack-tab5/CMakeLists.txt @@ -3,5 +3,5 @@ file(GLOB_RECURSE SOURCE_FILES Source/*.c*) idf_component_register( SRCS ${SOURCE_FILES} INCLUDE_DIRS "Source" - REQUIRES Tactility esp_lvgl_port esp_lcd esp_lcd_ili9881c esp_lcd_st7123 esp_lcd_touch_st7123 esp_lcd_touch_gt911 driver esp_driver_i2c vfs fatfs ina226-module ili9881c-module st7123-module gt911-module + REQUIRES TactilityKernel lvgl-module ina226-module ili9881c-module st7123-module gt911-module ) diff --git a/Devices/unphone/device.properties b/Devices/unphone/device.properties index 3d443791e..45de3205b 100644 --- a/Devices/unphone/device.properties +++ b/Devices/unphone/device.properties @@ -10,8 +10,6 @@ hardware.spiRamMode=OCT hardware.spiRamSpeed=80M hardware.bluetooth=true -dependencies.useDeprecatedHal=false - storage.userDataLocation=SD display.size=3.5" diff --git a/Devices/waveshare-esp32-s3-geek/CMakeLists.txt b/Devices/waveshare-esp32-s3-geek/CMakeLists.txt index 38c007833..09a2fdee3 100644 --- a/Devices/waveshare-esp32-s3-geek/CMakeLists.txt +++ b/Devices/waveshare-esp32-s3-geek/CMakeLists.txt @@ -3,5 +3,5 @@ file(GLOB_RECURSE SOURCE_FILES source/*.c*) idf_component_register( SRCS ${SOURCE_FILES} INCLUDE_DIRS "source" - REQUIRES TactilityKernel driver + REQUIRES TactilityKernel ) diff --git a/Devices/waveshare-esp32-s3-geek/device.properties b/Devices/waveshare-esp32-s3-geek/device.properties index e9af77607..19b06a31b 100644 --- a/Devices/waveshare-esp32-s3-geek/device.properties +++ b/Devices/waveshare-esp32-s3-geek/device.properties @@ -14,8 +14,6 @@ hardware.tinyUsb=true hardware.esptoolFlashFreq=120M hardware.bluetooth=true -dependencies.useDeprecatedHal=false - storage.userDataLocation=SD display.size=1.14" diff --git a/Devices/waveshare-s3-lcd-13/CMakeLists.txt b/Devices/waveshare-s3-lcd-13/CMakeLists.txt index a832a83a2..a7d3e6712 100644 --- a/Devices/waveshare-s3-lcd-13/CMakeLists.txt +++ b/Devices/waveshare-s3-lcd-13/CMakeLists.txt @@ -2,5 +2,5 @@ file(GLOB_RECURSE SOURCE_FILES source/*.c*) idf_component_register( SRCS ${SOURCE_FILES} - REQUIRES TactilityKernel driver + REQUIRES TactilityKernel ) diff --git a/Devices/waveshare-s3-lcd-13/device.properties b/Devices/waveshare-s3-lcd-13/device.properties index 656d0e0d4..ed6889941 100644 --- a/Devices/waveshare-s3-lcd-13/device.properties +++ b/Devices/waveshare-s3-lcd-13/device.properties @@ -14,8 +14,6 @@ hardware.tinyUsb=true hardware.esptoolFlashFreq=120M hardware.bluetooth=true -dependencies.useDeprecatedHal=false - storage.userDataLocation=SD display.size=1.3" diff --git a/Devices/waveshare-s3-touch-lcd-128/device.properties b/Devices/waveshare-s3-touch-lcd-128/device.properties index d9fe86382..a000dbbae 100644 --- a/Devices/waveshare-s3-touch-lcd-128/device.properties +++ b/Devices/waveshare-s3-touch-lcd-128/device.properties @@ -14,8 +14,6 @@ hardware.tinyUsb=true hardware.esptoolFlashFreq=120M hardware.bluetooth=true -dependencies.useDeprecatedHal=false - storage.userDataLocation=Internal display.size=1.28" diff --git a/Devices/waveshare-s3-touch-lcd-147/device.properties b/Devices/waveshare-s3-touch-lcd-147/device.properties index f115c77f1..0cb988252 100644 --- a/Devices/waveshare-s3-touch-lcd-147/device.properties +++ b/Devices/waveshare-s3-touch-lcd-147/device.properties @@ -13,8 +13,6 @@ hardware.tinyUsb=true hardware.esptoolFlashFreq=120M hardware.bluetooth=true -dependencies.useDeprecatedHal=false - storage.userDataLocation=SD display.size=1.47" diff --git a/Devices/waveshare-s3-touch-lcd-43/device.properties b/Devices/waveshare-s3-touch-lcd-43/device.properties index c6241af7f..cafbaffdf 100644 --- a/Devices/waveshare-s3-touch-lcd-43/device.properties +++ b/Devices/waveshare-s3-touch-lcd-43/device.properties @@ -13,8 +13,6 @@ hardware.tinyUsb=true hardware.esptoolFlashFreq=120M hardware.bluetooth=true -dependencies.useDeprecatedHal=false - storage.userDataLocation=SD display.size=4.3" diff --git a/Devices/wireless-tag-wt32-sc01-plus/device.properties b/Devices/wireless-tag-wt32-sc01-plus/device.properties index 875a0d567..18f88ac7b 100644 --- a/Devices/wireless-tag-wt32-sc01-plus/device.properties +++ b/Devices/wireless-tag-wt32-sc01-plus/device.properties @@ -12,8 +12,6 @@ hardware.tinyUsb=true hardware.esptoolFlashFreq=80M hardware.bluetooth=true -dependencies.useDeprecatedHal=false - storage.userDataLocation=SD display.size=3.5" diff --git a/Firmware/Kconfig b/Firmware/Kconfig index 3c575ca17..dd3e2ad51 100644 --- a/Firmware/Kconfig +++ b/Firmware/Kconfig @@ -77,12 +77,6 @@ menu "Tactility App" config TT_TDECK_WORKAROUND bool "Temporary work-around until we fix the T-Deck keyboard and trackball settings" default n - config TT_USE_DEPRECATED_HAL - bool "When set to false, it ensures an empty tt::hal::hardwareConfig is made automatically" - default y - help - This allows for migrating projects that don't use the old HAL. - When set to 'n', the project has an option to not depend on Tactility and can depend on TactilityKernel instead. choice TT_USER_DATA_LOCATION prompt "User Data Location" default TT_USER_DATA_LOCATION_INTERNAL diff --git a/device.py b/device.py index 2b5ec4d6f..f97a51999 100644 --- a/device.py +++ b/device.py @@ -169,13 +169,6 @@ def write_core_variables(output_file, device_properties: dict): output_file.write("CONFIG_ESP_WIFI_RX_IRAM_OPT=n\n") output_file.write("CONFIG_HEAP_PLACE_FUNCTION_INTO_FLASH=y\n") output_file.write("CONFIG_RINGBUF_PLACE_ISR_FUNCTIONS_INTO_FLASH=y\n") - # Usage of tt::hal can be disabled to simplify dependency wiring (device depends on TactilityKernel instead of Tactility) - use_deprecated_hal = get_property_or_none(device_properties, "dependencies.useDeprecatedHal") - if use_deprecated_hal is None or use_deprecated_hal.lower() == "true": - output_file.write("CONFIG_TT_USE_DEPRECATED_HAL=y\n") - else: - output_file.write("CONFIG_TT_USE_DEPRECATED_HAL=n\n") - def write_flash_variables(output_file, device_properties: dict): flash_size = get_property_or_exit(device_properties, "hardware.flashSize") if not flash_size.endswith("MB"):