Merge remote-tracking branch 'origin/main' into main

Firmware/CMakeLists.txt

@@ -22,7 +22,7 @@ set(DEVICETREE_LOCATION "${PROJECT_ROOT}/Devices/${TACTILITY_DEVICE_ID}")
 # Fixes the sdkconfig bluetooth enable options from getting nuked on non-P4+C6 builds when idf build runs
 if (DEFINED ENV{ESP_IDF_VERSION})
     file(READ "${DEVICETREE_LOCATION}/device.properties" device_properties_content)
-    if (device_properties_content MATCHES "bluetooth=true")
+    if (device_properties_content MATCHES "hardware\\.bluetooth=true")
         list(APPEND REQUIRES_LIST bt)
     endif()
 endif()

Firmware/Kconfig

@@ -4,8 +4,18 @@ menu "Tactility App"
         string "Device Name"
         default ""
         help
-            Human-readable device name, including vendor
-    config TT_DEVICE_ID
+            Human-readable device name, including vendor (e.g. "M5Stack Cardputer")
+    config TT_DEVICE_NAME_SIMPLE
+        string "Device Name (simple)"
+        default ""
+        help
+            Human-readable simple device name, excluding vendor (e.g. "Cardputer")
+     config TT_DEVICE_VENDOR
+         string "Device Vendor Name"
+         default ""
+         help
+             Human-readable device vendor name (e.g. "LilyGO")
+     config TT_DEVICE_ID
         string "Device Identifier"
         default ""
         help
@@ -67,6 +77,18 @@ menu "Tactility App"
     config TT_TDECK_WORKAROUND
         bool "Temporary work-around until we fix the T-Deck keyboard and trackball settings"
         default n
+    choice TT_USER_DATA_LOCATION
+        prompt "User Data Location"
+        default TT_USER_DATA_LOCATION_INTERNAL
+        help
+            Where user data is stored on this device.
+            "Internal Flash" assumes /data always exists.
+            "SD Card" looks for the first mounted SD card at runtime and requires one to be present.
+        config TT_USER_DATA_LOCATION_SD
+            bool "SD Card"
+        config TT_USER_DATA_LOCATION_INTERNAL
+            bool "Internal Flash"
+    endchoice
     config TT_SPLASH_DURATION
        int "Splash Duration (ms)"
        default 1000