Skip to content

Conversation

@todd-herbert
Copy link
Contributor

@todd-herbert todd-herbert commented Jun 21, 2025

Adds canned messages to InkHUD's on-screen menu, without disturbing existing CannedMessageModule code.

Rebases #7077 against master. I had previously been advised that this PR should be made against the unify-tft branch, but it seems like the work there is now complete (#6838).

🤝 Attestations

  • I have tested that my proposed changes behave as described.
  • I have tested that my proposed changes do not cause any obvious regressions on the following devices:
    • Heltec (Lora32) V3
    • LilyGo T-Deck
    • LilyGo T-Beam
    • RAK WisBlock 4631
    • Seeed Studio T-1000E tracker card
    • Other (please specify below)
      • LilyGo T-Echo
      • Elecrow ThinkNode M1
      • Heltec VM-E290

@todd-herbert todd-herbert marked this pull request as draft June 21, 2025 13:24
@todd-herbert
Copy link
Contributor Author

Something's gone weird with the rebase, one minute

Wasn't critical in ths specific case, but definitely a mistake.
@todd-herbert
Copy link
Contributor Author

todd-herbert commented Jun 21, 2025

Ahh, didn't have the CI holding my hand on the unify-tft branch, so hadn't noticed that the changes were upsetting the BaseUI builds. I think it's all sorted now.

@todd-herbert todd-herbert marked this pull request as ready for review June 21, 2025 14:42
@Planktonicker
Copy link

Hi @todd-herbert, I am not sure if this is the right platform, but is it possible to get this build for T-Echo INKHud, as the canned message is the exact feature I need now. Thank you! and sorry for any inconvenience caused.

@thebentern thebentern requested a review from Copilot June 25, 2025 10:58
Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

This PR adds functionality for sending canned messages via the InkHUD menu while integrating with the AdminModule’s observer system. Key changes include updating AdminModule’s observable data type to a custom structure, implementing a new CannedMessageStore for loading and parsing canned messages, and extending several InkHUD-related modules (MenuApplet, Events, ThreadedMessageApplet, and Screen) to support selecting and sending canned messages.

Reviewed Changes

Copilot reviewed 16 out of 17 changed files in this pull request and generated 2 comments.

Show a summary per file
File Description
src/modules/AdminModule.{h,cpp} Updated observable type to AdminModule_ObserverData and refined logging.
src/main.cpp Adjusted preprocessor condition to include canned message logic.
src/graphics/niche/Utils/CannedMessageStore.{h,cpp} Introduced a new self-contained store for canned messages with loading and admin API support.
src/graphics/niche/InkHUD/{Persistence.h,Events.{h,cpp}} Updated admin message callbacks to use AdminModule_ObserverData.
src/graphics/niche/InkHUD/Applets/{ThreadedMessage,MenuApplet}.{h,cpp} Integrated canned message handling into UI applets and menu pages.
src/graphics/Screen.{h,cpp} Adjusted admin message handling to support the new observer data structure.

@thebentern thebentern merged commit ecfaf3a into meshtastic:master Jun 25, 2025
52 checks passed
@todd-herbert
Copy link
Contributor Author

@Planktonicker looks like Ben has sorted it (Thanks!).
It'll be in the 2.7.1 release, or if you like to live dangerously, you can grab the very latest build from here: https://nightly.link/meshtastic/firmware/workflows/main_matrix/master/firmware-nrf52840-t-echo-inkhud-2.7.1.ecfaf3a.zip

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants