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>
2025-06-21 06:36:04 -05:00
|
|
|
#include "ButtonThread.h"
|
|
|
|
|
#include "meshUtils.h"
|
|
|
|
|
|
|
|
|
|
#include "configuration.h"
|
|
|
|
|
#if !MESHTASTIC_EXCLUDE_GPS
|
|
|
|
|
#include "GPS.h"
|
|
|
|
|
#endif
|
|
|
|
|
#include "MeshService.h"
|
|
|
|
|
#include "RadioLibInterface.h"
|
|
|
|
|
#include "buzz.h"
|
|
|
|
|
#include "input/InputBroker.h"
|
|
|
|
|
#include "main.h"
|
|
|
|
|
#include "modules/CannedMessageModule.h"
|
|
|
|
|
#include "modules/ExternalNotificationModule.h"
|
|
|
|
|
#include "power.h"
|
|
|
|
|
#include "sleep.h"
|
|
|
|
|
#ifdef ARCH_PORTDUINO
|
|
|
|
|
#include "platform/portduino/PortduinoGlue.h"
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
using namespace concurrency;
|
|
|
|
|
|
|
|
|
|
#if HAS_BUTTON
|
|
|
|
|
#endif
|
|
|
|
|
ButtonThread::ButtonThread(const char *name) : OSThread(name)
|
|
|
|
|
{
|
|
|
|
|
_originName = name;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool ButtonThread::initButton(uint8_t pinNumber, bool activeLow, bool activePullup, uint32_t pullupSense, voidFuncPtr intRoutine,
|
|
|
|
|
input_broker_event singlePress, input_broker_event longPress, uint16_t longPressTime,
|
|
|
|
|
input_broker_event doublePress, input_broker_event longLongPress, uint16_t longLongPressTime,
|
|
|
|
|
input_broker_event triplePress, input_broker_event shortLong, bool touchQuirk)
|
|
|
|
|
{
|
|
|
|
|
if (inputBroker)
|
|
|
|
|
inputBroker->registerSource(this);
|
|
|
|
|
_longPressTime = longPressTime;
|
|
|
|
|
_longLongPressTime = longLongPressTime;
|
|
|
|
|
_pinNum = pinNumber;
|
|
|
|
|
_activeLow = activeLow;
|
|
|
|
|
_touchQuirk = touchQuirk;
|
|
|
|
|
_intRoutine = intRoutine;
|
|
|
|
|
_longLongPress = longLongPress;
|
|
|
|
|
|
|
|
|
|
userButton = OneButton(pinNumber, activeLow, activePullup);
|
|
|
|
|
|
|
|
|
|
if (pullupSense != 0) {
|
|
|
|
|
pinMode(pinNumber, pullupSense);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
_singlePress = singlePress;
|
|
|
|
|
userButton.attachClick(
|
|
|
|
|
[](void *callerThread) -> void {
|
|
|
|
|
ButtonThread *thread = (ButtonThread *)callerThread;
|
|
|
|
|
thread->btnEvent = BUTTON_EVENT_PRESSED;
|
|
|
|
|
},
|
|
|
|
|
this);
|
|
|
|
|
|
|
|
|
|
if (longPress != INPUT_BROKER_NONE) {
|
|
|
|
|
_longPress = longPress;
|
|
|
|
|
userButton.attachLongPressStart(
|
|
|
|
|
[](void *callerThread) -> void {
|
|
|
|
|
ButtonThread *thread = (ButtonThread *)callerThread;
|
|
|
|
|
if (millis() > 30000) // hold off 30s after boot
|
|
|
|
|
thread->btnEvent = BUTTON_EVENT_LONG_PRESSED;
|
|
|
|
|
},
|
|
|
|
|
this);
|
|
|
|
|
userButton.attachLongPressStop(
|
|
|
|
|
[](void *callerThread) -> void {
|
|
|
|
|
ButtonThread *thread = (ButtonThread *)callerThread;
|
|
|
|
|
if (millis() > 30000) // hold off 30s after boot
|
|
|
|
|
thread->btnEvent = BUTTON_EVENT_LONG_RELEASED;
|
|
|
|
|
},
|
|
|
|
|
this);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (doublePress != INPUT_BROKER_NONE) {
|
|
|
|
|
_doublePress = doublePress;
|
|
|
|
|
userButton.attachDoubleClick(
|
|
|
|
|
[](void *callerThread) -> void {
|
|
|
|
|
ButtonThread *thread = (ButtonThread *)callerThread;
|
|
|
|
|
thread->btnEvent = BUTTON_EVENT_DOUBLE_PRESSED;
|
|
|
|
|
},
|
|
|
|
|
this);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (triplePress != INPUT_BROKER_NONE) {
|
|
|
|
|
_triplePress = triplePress;
|
|
|
|
|
userButton.attachMultiClick(
|
|
|
|
|
[](void *callerThread) -> void {
|
|
|
|
|
ButtonThread *thread = (ButtonThread *)callerThread;
|
|
|
|
|
thread->storeClickCount();
|
|
|
|
|
thread->btnEvent = BUTTON_EVENT_MULTI_PRESSED;
|
|
|
|
|
},
|
|
|
|
|
this);
|
|
|
|
|
}
|
|
|
|
|
if (shortLong != INPUT_BROKER_NONE) {
|
|
|
|
|
_shortLong = shortLong;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
userButton.setDebounceMs(1);
|
|
|
|
|
userButton.setPressMs(_longPressTime);
|
|
|
|
|
|
|
|
|
|
if (screen) {
|
|
|
|
|
userButton.setClickMs(20);
|
|
|
|
|
} else {
|
|
|
|
|
userButton.setClickMs(BUTTON_CLICK_MS);
|
|
|
|
|
}
|
|
|
|
|
attachButtonInterrupts();
|
|
|
|
|
#ifdef ARCH_ESP32
|
|
|
|
|
// Register callbacks for before and after lightsleep
|
|
|
|
|
// Used to detach and reattach interrupts
|
|
|
|
|
lsObserver.observe(¬ifyLightSleep);
|
|
|
|
|
lsEndObserver.observe(¬ifyLightSleepEnd);
|
|
|
|
|
#endif
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int32_t ButtonThread::runOnce()
|
|
|
|
|
{
|
|
|
|
|
// If the button is pressed we suppress CPU sleep until release
|
|
|
|
|
canSleep = true; // Assume we should not keep the board awake
|
|
|
|
|
|
|
|
|
|
// Check for combination timeout
|
|
|
|
|
if (waitingForLongPress && (millis() - shortPressTime) > BUTTON_COMBO_TIMEOUT_MS) {
|
|
|
|
|
waitingForLongPress = false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
userButton.tick();
|
|
|
|
|
canSleep &= userButton.isIdle();
|
|
|
|
|
|
|
|
|
|
// Check if we should play lead-up sound during long press
|
|
|
|
|
// Play lead-up when button has been held for BUTTON_LEADUP_MS but before long press triggers
|
|
|
|
|
bool buttonCurrentlyPressed = isButtonPressed(_pinNum);
|
|
|
|
|
|
|
|
|
|
// Detect start of button press
|
|
|
|
|
if (buttonCurrentlyPressed && !buttonWasPressed) {
|
|
|
|
|
buttonPressStartTime = millis();
|
|
|
|
|
leadUpPlayed = false;
|
|
|
|
|
leadUpSequenceActive = false;
|
|
|
|
|
resetLeadUpSequence();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Progressive lead-up sound system
|
|
|
|
|
if (buttonCurrentlyPressed && (millis() - buttonPressStartTime) >= BUTTON_LEADUP_MS &&
|
|
|
|
|
(millis() - buttonPressStartTime) < _longLongPressTime) {
|
|
|
|
|
|
|
|
|
|
// Start the progressive sequence if not already active
|
|
|
|
|
if (!leadUpSequenceActive) {
|
|
|
|
|
leadUpSequenceActive = true;
|
|
|
|
|
lastLeadUpNoteTime = millis();
|
|
|
|
|
playNextLeadUpNote(); // Play the first note immediately
|
|
|
|
|
}
|
|
|
|
|
// Continue playing notes at intervals
|
|
|
|
|
else if ((millis() - lastLeadUpNoteTime) >= 400) { // 400ms interval between notes
|
|
|
|
|
if (playNextLeadUpNote()) {
|
|
|
|
|
lastLeadUpNoteTime = millis();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Reset when button is released
|
|
|
|
|
if (!buttonCurrentlyPressed && buttonWasPressed) {
|
|
|
|
|
leadUpPlayed = false;
|
|
|
|
|
leadUpSequenceActive = false;
|
|
|
|
|
resetLeadUpSequence();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
buttonWasPressed = buttonCurrentlyPressed;
|
|
|
|
|
|
|
|
|
|
// new behavior
|
|
|
|
|
if (btnEvent != BUTTON_EVENT_NONE) {
|
|
|
|
|
InputEvent evt;
|
|
|
|
|
evt.source = _originName;
|
|
|
|
|
evt.kbchar = 0;
|
|
|
|
|
evt.touchX = 0;
|
|
|
|
|
evt.touchY = 0;
|
|
|
|
|
switch (btnEvent) {
|
|
|
|
|
case BUTTON_EVENT_PRESSED: {
|
|
|
|
|
// Forward single press to InputBroker (but NOT as DOWN/SELECT, just forward a "button press" event)
|
|
|
|
|
evt.inputEvent = _singlePress;
|
|
|
|
|
// evt.kbchar = _singlePress; // todo: fix this. Some events are kb characters rather than event types
|
|
|
|
|
this->notifyObservers(&evt);
|
|
|
|
|
|
|
|
|
|
// Start tracking for potential combination
|
|
|
|
|
waitingForLongPress = true;
|
|
|
|
|
shortPressTime = millis();
|
|
|
|
|
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
case BUTTON_EVENT_LONG_PRESSED: {
|
|
|
|
|
// Ignore if: TX in progress
|
|
|
|
|
// Uncommon T-Echo hardware bug, LoRa TX triggers touch button
|
|
|
|
|
if (_touchQuirk && RadioLibInterface::instance && RadioLibInterface::instance->isSending())
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
// Check if this is part of a short-press + long-press combination
|
|
|
|
|
if (_shortLong != INPUT_BROKER_NONE && waitingForLongPress &&
|
|
|
|
|
(millis() - shortPressTime) <= BUTTON_COMBO_TIMEOUT_MS) {
|
|
|
|
|
evt.inputEvent = _shortLong;
|
|
|
|
|
// evt.kbchar = _shortLong;
|
|
|
|
|
this->notifyObservers(&evt);
|
|
|
|
|
// Play the combination tune
|
|
|
|
|
playComboTune();
|
|
|
|
|
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Forward long press to InputBroker (but NOT as DOWN/SELECT, just forward a "button long press" event)
|
|
|
|
|
evt.inputEvent = _longPress;
|
|
|
|
|
this->notifyObservers(&evt);
|
|
|
|
|
|
|
|
|
|
// Reset combination tracking
|
|
|
|
|
waitingForLongPress = false;
|
|
|
|
|
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
case BUTTON_EVENT_DOUBLE_PRESSED: { // not wired in if screen detected
|
|
|
|
|
LOG_INFO("Double press!");
|
|
|
|
|
|
|
|
|
|
// Reset combination tracking
|
|
|
|
|
waitingForLongPress = false;
|
|
|
|
|
|
|
|
|
|
evt.inputEvent = _doublePress;
|
|
|
|
|
// evt.kbchar = _doublePress;
|
|
|
|
|
this->notifyObservers(&evt);
|
|
|
|
|
playComboTune();
|
|
|
|
|
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
case BUTTON_EVENT_MULTI_PRESSED: { // not wired in when screen is present
|
|
|
|
|
LOG_INFO("Mulitipress! %hux", multipressClickCount);
|
|
|
|
|
|
|
|
|
|
// Reset combination tracking
|
|
|
|
|
waitingForLongPress = false;
|
|
|
|
|
|
|
|
|
|
switch (multipressClickCount) {
|
|
|
|
|
case 3:
|
|
|
|
|
evt.inputEvent = _triplePress;
|
|
|
|
|
// evt.kbchar = _triplePress;
|
|
|
|
|
this->notifyObservers(&evt);
|
|
|
|
|
playComboTune();
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
// No valid multipress action
|
|
|
|
|
default:
|
|
|
|
|
break;
|
|
|
|
|
} // end switch: click count
|
|
|
|
|
|
|
|
|
|
break;
|
|
|
|
|
} // end multipress event
|
|
|
|
|
|
|
|
|
|
// Do actual shutdown when button released, otherwise the button release
|
|
|
|
|
// may wake the board immediatedly.
|
|
|
|
|
case BUTTON_EVENT_LONG_RELEASED: {
|
|
|
|
|
|
|
|
|
|
LOG_INFO("LONG PRESS RELEASE");
|
|
|
|
|
if (_longLongPress != INPUT_BROKER_NONE && (millis() - buttonPressStartTime) >= _longLongPressTime) {
|
|
|
|
|
evt.inputEvent = _longLongPress;
|
|
|
|
|
this->notifyObservers(&evt);
|
|
|
|
|
}
|
|
|
|
|
// Reset combination tracking
|
|
|
|
|
waitingForLongPress = false;
|
|
|
|
|
|
|
|
|
|
break;
|
|
|
|
|
}
|
2025-06-24 18:01:04 +02:00
|
|
|
|
|
|
|
|
// doesn't handle BUTTON_EVENT_PRESSED_SCREEN BUTTON_EVENT_TOUCH_LONG_PRESSED BUTTON_EVENT_COMBO_SHORT_LONG
|
|
|
|
|
default: {
|
|
|
|
|
break;
|
|
|
|
|
}
|
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>
2025-06-21 06:36:04 -05:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
btnEvent = BUTTON_EVENT_NONE;
|
|
|
|
|
return 50;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Attach (or re-attach) hardware interrupts for buttons
|
|
|
|
|
* Public method. Used outside class when waking from MCU sleep
|
|
|
|
|
*/
|
|
|
|
|
void ButtonThread::attachButtonInterrupts()
|
|
|
|
|
{
|
|
|
|
|
// Interrupt for user button, during normal use. Improves responsiveness.
|
|
|
|
|
attachInterrupt(_pinNum, _intRoutine, CHANGE);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Detach the "normal" button interrupts.
|
|
|
|
|
* Public method. Used before attaching a "wake-on-button" interrupt for MCU sleep
|
|
|
|
|
*/
|
|
|
|
|
void ButtonThread::detachButtonInterrupts()
|
|
|
|
|
{
|
|
|
|
|
detachInterrupt(_pinNum);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#ifdef ARCH_ESP32
|
|
|
|
|
|
|
|
|
|
// Detach our class' interrupts before lightsleep
|
|
|
|
|
// Allows sleep.cpp to configure its own interrupts, which wake the device on user-button press
|
|
|
|
|
int ButtonThread::beforeLightSleep(void *unused)
|
|
|
|
|
{
|
|
|
|
|
detachButtonInterrupts();
|
|
|
|
|
return 0; // Indicates success
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Reconfigure our interrupts
|
|
|
|
|
// Our class' interrupts were disconnected during sleep, to allow the user button to wake the device from sleep
|
|
|
|
|
int ButtonThread::afterLightSleep(esp_sleep_wakeup_cause_t cause)
|
|
|
|
|
{
|
|
|
|
|
attachButtonInterrupts();
|
|
|
|
|
return 0; // Indicates success
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
// Non-static method, runs during callback. Grabs info while still valid
|
|
|
|
|
void ButtonThread::storeClickCount()
|
|
|
|
|
{
|
|
|
|
|
multipressClickCount = userButton.getNumberClicks();
|
|
|
|
|
}
|