Get t-deck working with both UIs for tft build

variants/portduino/platformio.ini

@@ -56,7 +56,7 @@ build_flags = ${native_base.build_flags} -Os -ffunction-sections -fdata-sections
   -D USE_FRAMEBUFFER=1
   -D LV_COLOR_DEPTH=32
   -D HAS_TFT=1
-  -D HAS_SCREEN=0
+  -D HAS_SCREEN=1
   -D LV_BUILD_TEST=0
   -D LV_USE_LOG=0
   -D LV_USE_EVDEV=1

variants/t-deck/platformio.ini

@@ -26,7 +26,6 @@ build_flags =
   ${env:t-deck.build_flags}
   -D CONFIG_DISABLE_HAL_LOCKS=1 ; "feels" to be a bit more stable without locks
   -D MESHTASTIC_EXCLUDE_CANNEDMESSAGES=1
-  -D MESHTASTIC_EXCLUDE_INPUTBROKER=1
   -D MESHTASTIC_EXCLUDE_WEBSERVER=1
   -D MESHTASTIC_EXCLUDE_SERIAL=1
   -D MESHTASTIC_EXCLUDE_SOCKETAPI=1
@@ -39,7 +38,7 @@ build_flags =
   -D INPUTDRIVER_ENCODER_BTN=0
   -D INPUTDRIVER_BUTTON_TYPE=0
   -D HAS_SDCARD
-  -D HAS_SCREEN=0
+  -D HAS_SCREEN=1
   -D HAS_TFT=1
   -D USE_I2S_BUZZER
   -D RAM_SIZE=5120

variants/t-deck/variant.h

@@ -1,6 +1,5 @@
 
 #define TFT_CS 12
-#ifndef HAS_TFT // for TFT-UI the definitions are in device-ui
 #define BUTTON_PIN 0
 
 // ST7789 TFT LCD
@@ -24,7 +23,6 @@
 #define SCREEN_ROTATE
 #define SCREEN_TRANSITION_FRAMERATE 5
 #define BRIGHTNESS_DEFAULT 130 // Medium Low Brightness
-#endif
 
 #define HAS_TOUCHSCREEN 1
 #define SCREEN_TOUCH_INT 16
@@ -34,10 +32,9 @@
 #define USE_POWERSAVE
 #define SLEEP_TIME 120
 
-#ifndef HAS_TFT
 #define BUTTON_PIN 0
 // #define BUTTON_NEED_PULLUP
-#endif
+
 #define GPS_DEFAULT_NOT_PRESENT 1
 #define GPS_RX_PIN 44
 #define GPS_TX_PIN 43