Conversation
mverch67
commented
Jun 19, 2026
mverch67
commented
Collaborator
skrashevich
added a commit
to skrashevich/device-ui
that referenced
this pull request
Jun 30, 2026
Upstream commits merged: - ci-build workflow (PR meshtastic#329) - fix-cmake improvements (PR meshtastic#328) - tdeck-touch-fix — keyboard scan retry + I2C reset (PR meshtastic#327) - copilot/fix-lint-pr-validate-title (PR meshtastic#323) - trunk-io/update-trunk (PR meshtastic#321) - zmiguel/map-tiles README updates (PR meshtastic#322) - New ui_event_trace_route_node, removeSpinner functions - I2CKeyboardScanner: multi-pass scan with retry logic + I2C bus reset Resolved conflicts: - TFTView_320x240.cpp: kept fork's tab-switching (LV_KEY_NEXT/PREV) in ui_event_GlobalKeyHandler, added upstream's new functions - I2CKeyboardScanner.cpp: combined upstream's scan-retry constants with fork's T-Pager conditional keyboard list
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.