Unify the native display config between legacy display and MUI (#6838)

* Add missed include * Another Warning fix * Add another HAS_SCREEN * Namespace fixes * Removed depricated destination types and re-factored destination screen * Get rid of Arduino Strings * Clean up after Copilot * SixthLine Def, Screen Rename Added Sixth Line Definition Screen Rename, and Automatic Line Adjustment * Consistency is hard - fixed "Sixth" * System Frame Updates Adjusted line construction to ensure we fit maximum content per screen. * Fix up notifications * Add a couple more ifdef HAS_SCREEN lines * Add screen->isOverlayBannerShowing() * Don't forget the invert! * Adjust Nodelist Center Divider Adjust Nodelist Center Divider * Fix variable casting * Fix entryText variable as empty before update to fix validation * Altitude is int32_t * Update PowerTelemetry to have correct data type * Fix cppcheck warnings (#6945) * Fix cppcheck warnings * Adjust logic in Power.cpp for power sensor --------- Co-authored-by: Jason P <applewiz@mac.com> * More pixel wrangling so things line up NodeList edition * Adjust NodeList alignments and plumb some background padding for a possible title fix * Better alignment for banner notifications * Move title into drawCommonHeader; initial screen tested * Fonts make spacing items difficult * Improved beeping booping and other buzzer based feedback (#6947) * Improved beeping booping and other buzzer based feedback * audible button feedback (#6949) * Refactor --------- Co-authored-by: todd-herbert <herbert.todd@gmail.com> * Sandpapered the corners of the notification popup * Finalize drawCommonHeader migration * Update Title of Favorite Node Screens * Update node metric alignment on LoRa screen * Update the border for popups to separate it from background * Update PaxcounterModule.cpp with CommonHeader * Update WiFi screen with CommonHeader and related data reflow * It was not, in fact, pointing up * Fix build on wismeshtap * T-deck trackball debounce * Fix uptime on Device Focused page to actually detail * Update Sys screen for new uptime, add label to Freq/Chan on LoRa * Don't display DOP any longer, make Uptime consistent * Revert Uptime change on Favorites, Apply to Device Focused * Label the satelite number to avoid confusion * Boop boop boop boop * Correct GPS positioning and string consistency across strings for GPS * Fix GPS text alignment * Enable canned messages by default * Don't wake screen on new nodes * Cannedmessage list emote support added * Fn+e emote picker for freetext screen * Actually block CannedInput actions while display is shown * Add selection menu to bannerOverlay * Off by one * Move to unified text layouts and spacing * Still my Fav without an "e" * Fully remove EVENT_NODEDB_UPDATED * Simply LoRa screen * Make some char pointers const to fix compilation on native targets * Update drawCompassNorth to include radius * Fix warning * button thread cleanup * Pull OneButton handling from PowerFSM and add MUI switch (#6973) * Trunk * Onebutton Menu Support * Add temporary clock icon * Add gps location to fsi * Banner message state reset * Cast to char to satisfy compiler * Better fast handling of input during banner * Fix warning * Derp * oops * Update ref * Wire buzzer_mode * remove legacy string->print() * Only init screen if one found * Unsigned Char * More buttonThread cleaning * screen.cpp button handling cleanup * The Great Event Rename of 2025 * Fix the Radiomaster * Missed trackball type change * Remove unused function * Make ButtonThread an InputBroker * Coffee hadn't kicked in yet * Add clock icon for Navigation Bar * Restore clock screen definition code - whoops * ExternalNotifications now observe inputBroker * Clock rework (#6992) * Move Clock bits into ClockRenderer space * Rework clock into all device navigation * T-Watch Actually Builds Different * Compile fix --------- Co-authored-by: Jonathan Bennett <jbennett@incomsystems.biz> * Add AM/PM to Digital Clock * Flip Seconds and AM/PM on Clock Display * Tik-tok pixels are hard * Fix builds on Thinknode M1 * Check for GPS and don't crash * Don't endif til the end * Rework the OneButton thread to be much less of a mess. (#6997) * Rework the OneButton thread to be much less of a mess. And break lots of targets temporarily * Update src/input/ButtonThread.h Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * fix GPS toggle * Send the shutdown event, not just the kbchar * Honor the back button in a notificaiton popup * Draw the right size box for popup with options * Try to un-break all the things --------- Co-authored-by: Ben Meadors <benmmeadors@gmail.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * 24-hour Clock Should have leading zero, but not 12-hour * Fixup some compile errors * Add intRoutine to ButtonThread init, to get more responsive user button back * Add Timezone picker * Fix Warning * Optionally set the initial selection for the chooser popup * Make back buttons work in canned messages * Drop the wrapper classes * LonPressTime now configurable * Clock Frame can not longer be blank; just add valid time * Back buttons everywhere! * Key Verification confirm banner * Make Elecrow M* top button a back button * Add settings saves * EInk responsiveness fixes * Linux Input Fixes * Add Native Trackball/Joystick support, and move UserButton to Input * No Flight Stick Mode * Send input event * Add Channel Utilization to Device Focused frame * Don't shift screens when we draw new ones * Add showOverlayBanner arguments to no-op * trunk * Default Native trackball to NC * Fix crash in simulator mode * Add longLong button press * Get the args right * Adjust Bluetooth Pairing Screen to account for bottom navigation. * Trackball everywhere, and unPhone buttons * Remap visionmaster secondary button to TB_UP * Kill ScanAndSelect * trunk * No longer need the canned messages input filter * All Canned All the time * Fix stm32 compile error regarding inputBroker * Unify tft lineheights (#7033) * Create variable line heights based upon SCREEN_HEIGHT * Refactor textPositions into method -> getTextPositions * Update SharedUIDisplay.h --------- Co-authored-by: Jason P <applewiz@mac.com> * Adjust top distance for larger displays * Adjust icon sizes for larger displays * Fix Paxcounter compile errors after code updates * Pixel wrangling to make larger screens fit better * Alert frame has precedence over banner -- for now * Unify on ALT_BUTTON * Align AM/PM to the digit, not the segment on larger displays * Move some global pin defines into configuration.h * Scaffolding for BMM150 9-axis gyro * Alt button behavior * Don't add the blank GPS frames without HAS_GPS * EVENT_NODEDB_UPDATED has been retired * Clean out LOG_WARN messages from debugging * Add dismiss message function * Minor buttonThread cleanup * Add BMM150 support * Clean up last warning from dev * Simplify bmm150 init return logic * Add option to reply to messages * Add minimal menu upon selecting home screen * Move Messages to slot 2, rename GPS to Position, move variables nearer functional usage in Screen.cpp * Properly dismiss message * T-Deck Trackball press is not user button * Add select on favorite frame to launch cannedMessage DM * Minor wording change * Less capital letters * Fix empty message check, time isn't reliable * drop dead code * Make UIRenderer a static class instead of namespace * Fix the select on favorite * Check if message is empty early and then 'return' * Add kb_found, and show the option to launch freetype if appropriate * Ignore impossible touchscreen touches * Auto scroll fix * Move linebreak after "from" for banners to maximize screen usage. * Center "No messages to show" on Message frame * Start consolidating buzzer behavior * Fixed signed / unsigned warning * Cast second parameter of max() to make some targets happy * Cast kbchar to (char) to make arduino string happy * Shorten the notice of "No messages" * Add buzzer mode chooser * Add regionPicker to Lora icon * Reduce line spacing and reorder Position screen to resolve overlapping issues * Update message titles, fix GPS icons, add Back options * Leftover boops * Remove chirp * Make the region selection dismissable when a region is already set * Add read-aloud functionality on messages w/ esp8266sam * "Last Heard" is a better label * tweak the beep * 5 options * properly tear down freetext upon cancel * de-convelute canned messages just a bit * Correct height of Mail icon in navigation bar * Remove unused warning * Consolidate time methods into TimeFormatters * Oops * Change LoRa Picker Cancel to Back * Tweak selection characters on Banner * Message render not scrolling on 5th line * More fixes for message scrolling * Remove the safety next on text overflow - we found that root cause * Add pin definitions to fix compilation for obscure target * Don't let the touchscreen send unitialized kbchar values * Make virtual KB just a bit quicker * No more double tap, swipe! * Left is left, and Right is right * Update horizontal lightning bolt design * Move from solid to dashed separator for Message Frame * Single emote feature fix * Manually sort overlapping elements for now * Freetext and clearer choices * Fix ESP32 InkHUD builds on the unify-tft branch (#7087) * Remove BaseUI branding * Capitalization is fun * Revert Meshtastic Boot Frame Changes * Add ANZ_433 LoRa region to picker * Update settings.json --------- Co-authored-by: HarukiToreda <116696711+HarukiToreda@users.noreply.github.com> Co-authored-by: Ben Meadors <benmmeadors@gmail.com> Co-authored-by: Jason P <applewiz@mac.com> Co-authored-by: todd-herbert <herbert.todd@gmail.com> Co-authored-by: Thomas Göttgens <tgoettgens@gmail.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
2026-01-27 20:21:52 +00:00 · 2025-06-21 06:36:04 -05:00
parent 82b7cb5dd0
commit 4feaec651f
154 changed files with 9852 additions and 4501 deletions
--- a/variants/ELECROW-ThinkNode-M1/nicheGraphics.h
+++ b/variants/ELECROW-ThinkNode-M1/nicheGraphics.h
@@ -22,6 +22,9 @@
 #include "graphics/niche/Drivers/EInk/GDEY0154D67.h"
 #include "graphics/niche/Inputs/TwoButton.h"

+// Button feedback
+#include "buzz.h"
+
 void setupNicheGraphics()
 {
    using namespace NicheGraphics;
@@ -98,8 +101,14 @@ void setupNicheGraphics()
    buttons->setWiring(1, PIN_BUTTON1);
    buttons->setTiming(1, 50, 500); // 500ms before latch
    buttons->setHandlerDown(1, [backlight]() { backlight->peek(); });
-    buttons->setHandlerLongPress(1, [backlight]() { backlight->latch(); });
-    buttons->setHandlerShortPress(1, [backlight]() { backlight->off(); });
+    buttons->setHandlerLongPress(1, [backlight]() {
+        backlight->latch();
+        playBeep();
+    });
+    buttons->setHandlerShortPress(1, [backlight]() {
+        backlight->off();
+        playBoop();
+    });

    // Begin handling button events
    buttons->start();
--- a/variants/ELECROW-ThinkNode-M1/variant.h
+++ b/variants/ELECROW-ThinkNode-M1/variant.h
@@ -63,6 +63,9 @@ extern "C" {
 * Buttons
 */
 #define PIN_BUTTON2 (32 + 10)
+#define ALT_BUTTON_PIN PIN_BUTTON2
+#define ALT_BUTTON_ACTIVE_LOW true
+#define ALT_BUTTON_ACTIVE_PULLUP true
 #define PIN_BUTTON1 (32 + 7)

 // #define PIN_BUTTON1 (0 + 11)
--- a/variants/ELECROW-ThinkNode-M2/variant.h
+++ b/variants/ELECROW-ThinkNode-M2/variant.h
@@ -3,6 +3,9 @@

 #define PIN_BUTTON1 47 // 功能键
 #define PIN_BUTTON2 4  // 电源键
+#define ALT_BUTTON_PIN PIN_BUTTON2
+#define ALT_BUTTON_ACTIVE_LOW false
+#define ALT_BUTTON_ACTIVE_PULLUP false

 #define LED_POWER 6
 #define ADC_V 42
@@ -60,4 +63,3 @@
 #define HAS_GPS 0

 #define BUTTON_PIN PIN_BUTTON1
-#define BUTTON_PIN_ALT PIN_BUTTON2
--- a/variants/heltec_capsule_sensor_v3/variant.h
+++ b/variants/heltec_capsule_sensor_v3/variant.h
@@ -3,6 +3,8 @@
 #define EXT_PWR_DETECT 35

 #define BUTTON_PIN 18
+#define BUTTON_ACTIVE_LOW false
+#define BUTTON_ACTIVE_PULLUP false

 #define BATTERY_PIN 7 // A battery voltage measurement pin, voltage divider connected here to measure battery voltage
 #define ADC_CHANNEL ADC1_GPIO7_CHANNEL
--- a/variants/heltec_mesh_node_t114/variant.h
+++ b/variants/heltec_mesh_node_t114/variant.h
@@ -56,6 +56,7 @@ extern "C" {
 #define TFT_WIDTH 240
 #define TFT_OFFSET_X 0
 #define TFT_OFFSET_Y 0
+
 // #define TFT_OFFSET_ROTATION 0
 // #define SCREEN_ROTATE
 // #define SCREEN_TRANSITION_FRAMERATE 5
--- a/variants/heltec_sensor_hub/variant.h
+++ b/variants/heltec_sensor_hub/variant.h
@@ -1,6 +1,8 @@
 #define EXT_PWR_DETECT 20

 #define BUTTON_PIN 17
+#define BUTTON_ACTIVE_LOW false
+#define BUTTON_ACTIVE_PULLUP false

 #define BATTERY_PIN 7 // A battery voltage measurement pin, voltage divider connected here to measure battery voltage
 #define ADC_CHANNEL ADC1_GPIO7_CHANNEL
--- a/variants/heltec_vision_master_e213/nicheGraphics.h
+++ b/variants/heltec_vision_master_e213/nicheGraphics.h
@@ -21,6 +21,9 @@
 #include "graphics/niche/Drivers/EInk/LCMEN2R13EFC1.h"
 #include "graphics/niche/Inputs/TwoButton.h"

+// Button feedback
+#include "buzz.h"
+
 void setupNicheGraphics()
 {
    using namespace NicheGraphics;
@@ -84,8 +87,11 @@ void setupNicheGraphics()
    buttons->setHandlerLongPress(0, [inkhud]() { inkhud->longpress(); });

    // #1: Aux Button
-    buttons->setWiring(1, BUTTON_PIN_SECONDARY);
-    buttons->setHandlerShortPress(1, [inkhud]() { inkhud->nextTile(); });
+    buttons->setWiring(1, PIN_BUTTON2);
+    buttons->setHandlerShortPress(1, [inkhud]() {
+        inkhud->nextTile();
+        playBoop();
+    });

    // Begin handling button events
    buttons->start();
--- a/variants/heltec_vision_master_e213/variant.h
+++ b/variants/heltec_vision_master_e213/variant.h
@@ -1,7 +1,7 @@
 #define LED_PIN 45 // LED is not populated on earliest board variant
 #define BUTTON_PIN 0
-#define BUTTON_PIN_SECONDARY 21         // Second built-in button
-#define BUTTON_SECONDARY_CANNEDMESSAGES // By default, use the secondary button as canned message input
+#define PIN_BUTTON2 21             // Second built-in button
+#define ALT_BUTTON_PIN PIN_BUTTON2 // Send the up event

 // I2C
 #define I2C_SDA SDA
--- a/variants/heltec_vision_master_e290/nicheGraphics.h
+++ b/variants/heltec_vision_master_e290/nicheGraphics.h
@@ -34,6 +34,9 @@ Different NicheGraphics UIs and different hardware variants will each have their
 #include "graphics/niche/Drivers/EInk/DEPG0290BNS800.h"
 #include "graphics/niche/Inputs/TwoButton.h"

+// Button feedback
+#include "buzz.h"
+
 void setupNicheGraphics()
 {
    using namespace NicheGraphics;
@@ -97,8 +100,11 @@ void setupNicheGraphics()
    buttons->setHandlerLongPress(0, [inkhud]() { inkhud->longpress(); });

    // #1: Aux Button
-    buttons->setWiring(1, BUTTON_PIN_SECONDARY);
-    buttons->setHandlerShortPress(1, [inkhud]() { inkhud->nextTile(); });
+    buttons->setWiring(1, PIN_BUTTON2);
+    buttons->setHandlerShortPress(1, [inkhud]() {
+        inkhud->nextTile();
+        playBoop();
+    });

    // Begin handling button events
    buttons->start();
--- a/variants/heltec_vision_master_e290/variant.h
+++ b/variants/heltec_vision_master_e290/variant.h
@@ -1,7 +1,7 @@
 #define LED_PIN 45 // LED is not populated on earliest board variant
 #define BUTTON_PIN 0
-#define BUTTON_PIN_SECONDARY 21         // Second built-in button
-#define BUTTON_SECONDARY_CANNEDMESSAGES // By default, use the secondary button as canned message input
+#define PIN_BUTTON2 21             // Second built-in button
+#define ALT_BUTTON_PIN PIN_BUTTON2 // Send the up event

 // I2C
 #define I2C_SDA SDA
--- a/variants/heltec_vision_master_t190/variant.h
+++ b/variants/heltec_vision_master_t190/variant.h
@@ -1,6 +1,7 @@
+#ifndef HAS_TFT
 #define BUTTON_PIN 0
-#define BUTTON_PIN_SECONDARY 21         // Second built-in button
-#define BUTTON_SECONDARY_CANNEDMESSAGES // By default, use the secondary button as canned message input
+#define PIN_BUTTON2 21             // Second built-in button
+#define ALT_BUTTON_PIN PIN_BUTTON2 // Send the up event

 // I2C
 #define I2C_SDA SDA
@@ -68,4 +69,5 @@
 #define SX126X_RESET LORA_RESET

 #define SX126X_DIO2_AS_RF_SWITCH
-#define SX126X_DIO3_TCXO_VOLTAGE 1.8
+#define SX126X_DIO3_TCXO_VOLTAGE 1.8
+#endif // HAS_TFT
--- a/variants/link32_s3_v1/variant.h
+++ b/variants/link32_s3_v1/variant.h
@@ -6,7 +6,9 @@
 #define USE_SSD1306

 #define BUTTON_PIN 0 // Button pin for this board
-#define BUTTON_PIN_ALT 36
+#define CANCEL_BUTTON_PIN 36
+#define CANCEL_BUTTON_ACTIVE_LOW true
+#define CANCEL_BUTTON_ACTIVE_PULLUP true

 #define HAS_NEOPIXEL                         // If defined, we will use the neopixel library
 #define NEOPIXEL_DATA 35                     // Neopixel pin for this board
--- a/variants/nano-g1-explorer/variant.h
+++ b/variants/nano-g1-explorer/variant.h
@@ -3,9 +3,7 @@
 #define I2C_SDA 21
 #define I2C_SCL 22

-#define BUTTON_PIN 36 // The user button (information button) GPIO on the Nano G1 explorer
-// #define BUTTON_PIN_ALT 13 // Alternate GPIO for an external button if needed. Does anyone use this? It is not documented
-//  anywhere.
+#define BUTTON_PIN 36     // The user button (information button) GPIO on the Nano G1 explorer
 #define EXT_NOTIFY_OUT 13 // Default pin to use for Ext Notify Module.

 // common pinout for their SX1262 vs RF95 modules - both can be enabled and we will probe at runtime for RF95 and if
--- a/variants/nano-g1/variant.h
+++ b/variants/nano-g1/variant.h
@@ -3,9 +3,7 @@
 #define I2C_SDA 21
 #define I2C_SCL 22

-#define BUTTON_PIN 36 // The middle button GPIO on the Nano G1
-// #define BUTTON_PIN_ALT 13 // Alternate GPIO for an external button if needed. Does anyone use this? It is not documented
-//  anywhere.
+#define BUTTON_PIN 36     // The middle button GPIO on the Nano G1
 #define EXT_NOTIFY_OUT 13 // Default pin to use for Ext Notify Module.

 // common pinout for their SX1262 vs RF95 modules - both can be enabled and we will probe at runtime for RF95 and if
--- a/variants/picomputer-s3/platformio.ini
+++ b/variants/picomputer-s3/platformio.ini
@@ -26,21 +26,15 @@ extends = env:picomputer-s3

 build_flags =
  ${env:picomputer-s3.build_flags}
-  -D MESHTASTIC_EXCLUDE_CANNEDMESSAGES=1
-  -D MESHTASTIC_EXCLUDE_INPUTBROKER=1
-  -D MESHTASTIC_EXCLUDE_BLUETOOTH=1
-  -D MESHTASTIC_EXCLUDE_WEBSERVER=1
-  -D MESHTASTIC_EXCLUDE_SERIAL=1
-  -D MESHTASTIC_EXCLUDE_SOCKETAPI=1
  -D INPUTDRIVER_MATRIX_TYPE=1
  -D USE_PIN_BUZZER=PIN_BUZZER
  -D USE_SX127x
-  -D HAS_SCREEN=0
+  -D HAS_SCREEN=1
  -D HAS_TFT=1
-  -D RAM_SIZE=1024
-	-D LV_LVGL_H_INCLUDE_SIMPLE
-	-D LV_CONF_INCLUDE_SIMPLE
-	-D LV_COMP_CONF_INCLUDE_SIMPLE
+  -D RAM_SIZE=1560
+  -D LV_LVGL_H_INCLUDE_SIMPLE
+  -D LV_CONF_INCLUDE_SIMPLE
+  -D LV_COMP_CONF_INCLUDE_SIMPLE
  -D LV_USE_SYSMON=0
  -D LV_USE_PROFILER=0
  -D LV_USE_PERF_MONITOR=0
@@ -51,7 +45,7 @@ build_flags =
  -D LGFX_DRIVER=LGFX_PICOMPUTER_S3
  -D GFX_DRIVER_INC=\"graphics/LGFX/LGFX_PICOMPUTER_S3.h\"
  -D VIEW_320x240
-;	-D USE_DOUBLE_BUFFER
+;  -D USE_DOUBLE_BUFFER
  -D USE_PACKET_API

 lib_deps =
--- a/variants/portduino/platformio.ini
+++ b/variants/portduino/platformio.ini
@@ -26,7 +26,8 @@ build_flags = ${native_base.build_flags} -Os -lX11 -linput -lxkbcommon -ffunctio
  -D RAM_SIZE=16384
  -D USE_X11=1
  -D HAS_TFT=1
-  -D HAS_SCREEN=0
+  -D HAS_SCREEN=1
+
  -D LV_CACHE_DEF_SIZE=6291456
  -D LV_BUILD_TEST=0
  -D LV_USE_LIBINPUT=1
@@ -41,7 +42,6 @@ build_flags = ${native_base.build_flags} -Os -lX11 -linput -lxkbcommon -ffunctio
  !pkg-config --libs openssl --silence-errors || :
 build_src_filter =
  ${native_base.build_src_filter}
-  -<graphics/TFTDisplay.cpp>

 [env:native-fb]
 extends = native_base
@@ -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
@@ -72,7 +72,6 @@ build_flags = ${native_base.build_flags} -Os -ffunction-sections -fdata-sections
  !pkg-config --libs openssl --silence-errors || :
 build_src_filter =
  ${native_base.build_src_filter}
-  -<graphics/TFTDisplay.cpp>

 [env:native-tft-debug]
 extends = native_base
--- a/variants/seeed-sensecap-indicator/platformio.ini
+++ b/variants/seeed-sensecap-indicator/platformio.ini
@@ -36,17 +36,9 @@ upload_speed = 460800

 build_flags =
  ${env:seeed-sensecap-indicator.build_flags}
-  -D MESHTASTIC_EXCLUDE_CANNEDMESSAGES=1
-  -D MESHTASTIC_EXCLUDE_INPUTBROKER=1
-  -D MESHTASTIC_EXCLUDE_SCREEN=1
-  -D MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR=1
-  -D MESHTASTIC_EXCLUDE_WEBSERVER=1
-  -D MESHTASTIC_EXCLUDE_SERIAL=1
-  -D MESHTASTIC_EXCLUDE_SOCKETAPI=1
  -D INPUTDRIVER_BUTTON_TYPE=38
-  -D HAS_TELEMETRY=0
  -D CONFIG_DISABLE_HAL_LOCKS=1
-  -D HAS_SCREEN=0
+  -D HAS_SCREEN=1
  -D HAS_TFT=1
  -D DISPLAY_SET_RESOLUTION
  -D RAM_SIZE=4096
--- a/variants/seeed-sensecap-indicator/variant.h
+++ b/variants/seeed-sensecap-indicator/variant.h
@@ -7,9 +7,10 @@
 #define SENSOR_PORT_NUM 2
 #define SENSOR_BAUD_RATE 115200

-#if !HAS_TFT
 #define BUTTON_PIN 38
-#endif
+#define BUTTON_ACTIVE_LOW true
+#define BUTTON_ACTIVE_PULLUP true
+
 // #define BUTTON_NEED_PULLUP

 // #define BATTERY_PIN 27 // A battery voltage measurement pin, voltage divider connected here to measure battery voltage
--- a/variants/seeed_wio_tracker_L1/variant.h
+++ b/variants/seeed_wio_tracker_L1/variant.h
@@ -33,15 +33,15 @@
 // ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
 //  Button Configuration
 // ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
-#define BUTTON_PIN D13 // This is the Program Button
+#define CANCEL_BUTTON_PIN D13 // This is the Program Button
 // #define BUTTON_NEED_PULLUP   1
-#define BUTTON_ACTIVE_LOW true
-#define BUTTON_ACTIVE_PULLUP false
+#define CANCEL_BUTTON_ACTIVE_LOW true
+#define CANCEL_BUTTON_ACTIVE_PULLUP false

-#define BUTTON_PIN_TOUCH 13 // Touch button
-// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
-//  Digital Pin Mapping (D0-D10)
-// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+// #define BUTTON_PIN_TOUCH 13 // Touch button
+//  ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+//   Digital Pin Mapping (D0-D10)
+//  ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
 #define D0 0   // P1.06 GNSS_WAKEUP/IO0
 #define D1 1   // P0.07 LORA_DIO1
 #define D2 2   // P1.07 LORA_RESET
--- a/variants/station-g1/variant.h
+++ b/variants/station-g1/variant.h
@@ -6,9 +6,7 @@
 #define I2C_SDA1 14 // Second i2c channel on external IO connector
 #define I2C_SCL1 15 // Second i2c channel on external IO connector

-#define BUTTON_PIN 36 // The middle button GPIO on the Nano G1
-// #define BUTTON_PIN_ALT 13 // Alternate GPIO for an external button if needed. Does anyone use this? It is not documented
-//  anywhere.
+#define BUTTON_PIN 36     // The middle button GPIO on the Nano G1
 #define EXT_NOTIFY_OUT 13 // Default pin to use for Ext Notify Module.

 // common pinout for their SX1262 vs RF95 modules - both can be enabled and we will probe at runtime for RF95 and if
--- a/variants/t-deck/platformio.ini
+++ b/variants/t-deck/platformio.ini
@@ -25,11 +25,6 @@ extends = env:t-deck
 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
  -D INPUTDRIVER_I2C_KBD_TYPE=0x55
  -D INPUTDRIVER_ENCODER_TYPE=3
  -D INPUTDRIVER_ENCODER_LEFT=1
@@ -39,7 +34,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
--- a/variants/t-deck/variant.h
+++ b/variants/t-deck/variant.h
@@ -1,7 +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
 #define ST7789_CS TFT_CS
@@ -24,7 +22,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 +31,10 @@
 #define USE_POWERSAVE
 #define SLEEP_TIME 120

-#ifndef HAS_TFT
-#define BUTTON_PIN 0
-// #define BUTTON_NEED_PULLUP
-#endif
+#define TB_PRESS 0
+#define BUTTON_ACTIVE_LOW true
+#define BUTTON_ACTIVE_PULLUP true
+
 #define GPS_DEFAULT_NOT_PRESENT 1
 #define GPS_RX_PIN 44
 #define GPS_TX_PIN 43
--- a/variants/t-echo/variant.h
+++ b/variants/t-echo/variant.h
@@ -61,8 +61,12 @@ extern "C" {
 * Buttons
 */
 #define PIN_BUTTON1 (32 + 10)
+#define BUTTON_ACTIVE_LOW true
+#define BUTTON_ACTIVE_PULLUP true
 #define PIN_BUTTON2 (0 + 18)      // 0.18 is labeled on the board as RESET but we configure it in the bootloader as a regular GPIO
 #define PIN_BUTTON_TOUCH (0 + 11) // 0.11 is the soft touch button on T-Echo
+#define BUTTON_TOUCH_ACTIVE_LOW true
+#define BUTTON_TOUCH_ACTIVE_PULLUP true

 #define BUTTON_CLICK_MS 400
 #define BUTTON_TOUCH_MS 200
--- a/variants/tbeam-s3-core/variant.h
+++ b/variants/tbeam-s3-core/variant.h
@@ -7,8 +7,6 @@
 #define I2C_SCL 18 // For QMC6310 sensors and screens

 #define BUTTON_PIN 0 // The middle button GPIO on the T-Beam S3
-// #define BUTTON_PIN_ALT 13 // Alternate GPIO for an external button if needed. Does anyone use this? It is not documented
-//  anywhere.
 //  #define EXT_NOTIFY_OUT 13 // Default pin to use for Ext Notify Module.

 #define LED_STATE_ON 0 // State when LED is lit
--- a/variants/tbeam/variant.h
+++ b/variants/tbeam/variant.h
@@ -4,8 +4,8 @@
 #define I2C_SCL 22

 #define BUTTON_PIN 38 // The middle button GPIO on the T-Beam
-// #define BUTTON_PIN_ALT 13 // Alternate GPIO for an external button if needed. Does anyone use this? It is not documented
-//  anywhere.
+#define BUTTON_ACTIVE_LOW true
+#define BUTTON_ACTIVE_PULLUP true
 #define EXT_NOTIFY_OUT 13 // Default pin to use for Ext Notify Module.

 #define LED_STATE_ON 0 // State when LED is lit
--- a/variants/unphone/platformio.ini
+++ b/variants/unphone/platformio.ini
@@ -36,21 +36,16 @@ extends = env:unphone
 build_flags =
  ${env:unphone.build_flags}
  -D CONFIG_DISABLE_HAL_LOCKS=1
-  -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
  -D INPUTDRIVER_BUTTON_TYPE=21
-  -D HAS_SCREEN=0
+  -D HAS_SCREEN=1
  -D HAS_TFT=1
  -D HAS_SDCARD
  -D DISPLAY_SET_RESOLUTION
  -D RAM_SIZE=6144
  -D LV_CACHE_DEF_SIZE=2097152
-	-D LV_LVGL_H_INCLUDE_SIMPLE
-	-D LV_CONF_INCLUDE_SIMPLE
-	-D LV_COMP_CONF_INCLUDE_SIMPLE
+  -D LV_LVGL_H_INCLUDE_SIMPLE
+  -D LV_CONF_INCLUDE_SIMPLE
+  -D LV_COMP_CONF_INCLUDE_SIMPLE
  -D LV_BUILD_TEST=0
  -D LV_USE_SYSMON=0
  -D LV_USE_PROFILER=0
--- a/variants/unphone/variant.h
+++ b/variants/unphone/variant.h
@@ -57,9 +57,13 @@
 #define LED_PIN 13     // the red part of the RGB LED
 #define LED_STATE_ON 0 // State when LED is lit

-#define BUTTON_PIN 21      // Button 3 - square - top button in landscape mode
-#define BUTTON_NEED_PULLUP // we do need a helping hand up
-#define BUTTON_PIN_ALT 45  // Button 1 - triangle - bottom button in landscape mode
+#define ALT_BUTTON_PIN 21 // Button 3 - square - top button in landscape mode
+#define BUTTON_NEED_PULLUP2 TB_UP
+#define BUTTON_PIN 0         // Circle button
+#define BUTTON_NEED_PULLUP   // we do need a helping hand up
+#define CANCEL_BUTTON_PIN 45 // Button 1 - triangle - bottom button in landscape mode
+#define CANCEL_BUTTON_ACTIVE_LOW true
+#define CANCEL_BUTTON_ACTIVE_PULLUP true

 #define I2C_SDA 3 // I2C pins for this board
 #define I2C_SCL 4