codebase into one branch consolidation

variants/lilygo_tdeck_pro/platformio.ini

@@ -92,14 +92,21 @@ lib_deps =
   adafruit/Adafruit GFX Library@^1.11.0
   bakercp/CRC32@^2.0.0
 
-[env:LilyGo_TDeck_Pro_companion_radio_usb]
+; ---------------------------------------------------------------------------
+; Meck unified builds — one codebase, three variants via build flags
+; ---------------------------------------------------------------------------
+
+; Audio + BLE companion (audio-player hardware with BLE phone bridging)
+[env:meck_audio_ble]
 extends = LilyGo_TDeck_Pro
 build_flags =
   ${LilyGo_TDeck_Pro.build_flags}
   -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=350
-  -D MAX_GROUP_CHANNELS=40
+  -D MAX_CONTACTS=400
+  -D MAX_GROUP_CHANNELS=20
+  -D BLE_PIN_CODE=123456
   -D OFFLINE_QUEUE_SIZE=256
+  -D MECK_AUDIO_VARIANT
 build_src_filter = ${LilyGo_TDeck_Pro.build_src_filter}
   +<helpers/esp32/*.cpp>
   +<helpers/ui/MomentaryButton.cpp>
@@ -109,8 +116,33 @@ build_src_filter = ${LilyGo_TDeck_Pro.build_src_filter}
 lib_deps =
   ${LilyGo_TDeck_Pro.lib_deps}
   densaugeo/base64 @ ~1.4.0
+  https://github.com/schreibfaul1/ESP32-audioI2S.git#2.0.6
+  bitbank2/JPEGDEC
 
-[env:LilyGo_TDeck_Pro_companion_radio_ble]
+; Audio standalone (audio-player hardware, no BLE/WiFi — maximum battery life)
+[env:meck_audio_standalone]
+extends = LilyGo_TDeck_Pro
+build_flags =
+  ${LilyGo_TDeck_Pro.build_flags}
+  -I examples/companion_radio/ui-new
+  -D MAX_CONTACTS=350
+  -D MAX_GROUP_CHANNELS=40
+  -D OFFLINE_QUEUE_SIZE=256
+  -D MECK_AUDIO_VARIANT
+build_src_filter = ${LilyGo_TDeck_Pro.build_src_filter}
+  +<helpers/esp32/*.cpp>
+  +<helpers/ui/MomentaryButton.cpp>
+  +<../examples/companion_radio/*.cpp>
+  +<../examples/companion_radio/ui-new/*.cpp>
+  +<helpers/ui/GxEPDDisplay.cpp>
+lib_deps =
+  ${LilyGo_TDeck_Pro.lib_deps}
+  densaugeo/base64 @ ~1.4.0
+  https://github.com/schreibfaul1/ESP32-audioI2S.git#2.0.6
+  bitbank2/JPEGDEC
+
+; 4G + BLE companion (4G modem hardware, no audio — GPIO conflict with PCM5102A)
+[env:meck_4g_ble]
 extends = LilyGo_TDeck_Pro
 build_flags =
   ${LilyGo_TDeck_Pro.build_flags}
@@ -128,55 +160,3 @@ build_src_filter = ${LilyGo_TDeck_Pro.build_src_filter}
 lib_deps =
   ${LilyGo_TDeck_Pro.lib_deps}
   densaugeo/base64 @ ~1.4.0
-  https://github.com/schreibfaul1/ESP32-audioI2S.git#2.0.6
-  bitbank2/JPEGDEC
-
-[env:LilyGo_TDeck_Pro_standalone]
-extends = LilyGo_TDeck_Pro
-build_flags =
-  ${LilyGo_TDeck_Pro.build_flags}
-  -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=700
-  -D MAX_GROUP_CHANNELS=20
-  -D OFFLINE_QUEUE_SIZE=256
-  -D NO_OTA=1
-  -D FIRMWARE_VERSION='"Meck v0.9.1A-NB"'
-; === NO BLE_PIN_CODE, NO WIFI_SSID ===
-; By omitting these, the preprocessor selects ArduinoSerialInterface (USB only).
-; The BLE stack is never initialized, never linked, and the ESP32-S3 BT/WiFi
-; radio hardware stays in its boot-default OFF state — zero RF power draw.
-; This is the ONLY reliable way to fully disable BLE on the ESP32-S3.
-; Calling esp_bt_controller_disable() after init does NOT fully power off the radio.
-build_src_filter = ${LilyGo_TDeck_Pro.build_src_filter}
-  +<helpers/esp32/*.cpp>
-  +<helpers/ui/MomentaryButton.cpp>
-  +<../examples/companion_radio/*.cpp>
-  +<../examples/companion_radio/ui-new/*.cpp>
-  +<helpers/ui/GxEPDDisplay.cpp>
-lib_deps =
-  ${LilyGo_TDeck_Pro.lib_deps}
-  densaugeo/base64 @ ~1.4.0
-  https://github.com/schreibfaul1/ESP32-audioI2S.git#2.0.6
-  bitbank2/JPEGDEC
-; Audio libs included because AudiobookPlayerScreen.h unconditionally #includes
-; Audio.h when LilyGo_TDeck_Pro is defined. No power cost — the Audio object is
-; only heap-allocated when user presses 'P'. Without BLE competing for heap,
-; audiobook playback actually works better in standalone mode.
-
-[env:LilyGo_TDeck_Pro_repeater]
-extends = LilyGo_TDeck_Pro
-build_flags =
-  ${LilyGo_TDeck_Pro.build_flags}
-  -D ADVERT_NAME='"TDeck Pro Repeater"'
-  -D ADVERT_LAT=0.0
-  -D ADVERT_LON=0.0
-  -D ADMIN_PASSWORD='"password"'
-  -D MAX_NEIGHBOURS=50
-  -D NO_OTA=1
-build_src_filter = ${LilyGo_TDeck_Pro.build_src_filter}
-  +<../examples/simple_repeater>
-  +<helpers/ui/GxEPDDisplay.cpp>
-lib_deps =
-  ${LilyGo_TDeck_Pro.lib_deps}
-  me-no-dev/AsyncTCP @ ^1.1.1
-  me-no-dev/ESPAsyncWebServer @ ^1.2.3