mirror of
https://github.com/meshtastic/firmware.git
synced 2026-02-02 15:11:48 +00:00
7bbfe99fbe
* Added keyboard option to menu. Shows a keyboard layout but does not type. * Keyboard types into text box and wraps. * send FreeText messages from the send submenu - renamed `KEYBOARD` action to `FREE_TEXT` and moved its menu location to the send submenu - opening the FreeText applet from the menu keeps the menu open and disabled the timeout - the FreeText applet writes to inkhud->freetext - the sending a canned message checks inkhud->freetext and if it isn't empty, sends and clears the inkhud->freetext * Text scrolls along with input * handle free text message completion as an event implements `handleFreeText` and `OnFreeText()` for system applets to interface with the FreeText Applet The FreeText Applet generates an `OnFreeText` event when completing a message which is handled by the first system applet with the `handleFreeText` flag set to true. The Menu Applet now handles this event. * call `onFreeText` whenever the FreeText Applet exits allows the menu to consistently restart its auto-close timeout * Add text cursor * Change UI to remove the header and make text box longer Keyboard displays captial letters for legibility Keyboard types captial letters with long press * center FreeText keys and draw symbolic buttons Move input field and keyboard drawing to their own functions: - `drawInputField()` - `drawKeyboard()` Store the keys in a 1-dimensional array Implement a matching array, `keyWidths`, to set key widths relative to the font size * Add character limit and counter * Fix softlock when hitting character limit * Move text box as its own menu page * rework FreeTextApplet into KeyboardApplet - The Keyboard Applet renders an on-screen keyboard at the lower portion of the screen. - Calling `inkhud->openKeyboard()` sends all the user applets to the background and resizes the first system applet with `handleFreeText` set to True to fit above the on-screen keyboard - `inkhud->closeKeyboard()` reverses this layout change * Fix input box rendering and add character limit to menu free text * remove FREE_TEXT menu page and use the FREE_TEXT menu action solely * force update when changing the free text message * reorganize KeyboardApplet - add comments after each row of `key[]` and `keyWidths[]` to preserve formatting - The selected key is now set using the key index directly - rowWidths are pre-calculated in the KeyboardApplet constructor - removed `drawKeyboard()` and implemented `drawKeyLabel()` * implement `Renderer::clearTile()` to clear the region below a tile * add parameter to forceUpdate() for re-rendering the full screen setting the `all` parameter to true in `inkhud->forceUpdate()` now causes the full screen buffer to clear an re-render. This is helpful for when sending applets to the background and the UI needs a clean canvas. System Applets can now set the `alwaysRender` flag true which causes it to re-render on every screen update. This is set to true in the Battery Icon Applet. * clean up tile clearing loops * implement dirty rendering to let applets draw over their previous render - `Applet::requestUpdate()` now has an optional flag to keep the old canvas - If honored, the renderer calls `render(true)` which runs `onDirtyRender()` instead of `onRender()` for said applet - The renderer will not call a dirty render if the full screen is getting re-rendered * simplify arithmetic in clearTile for better understanding * combine Applet::onRender() and Applet::onDirtyRender() into Applet::onRender(bool full) - add new `full` parameter to onRender() in every applet. This parameter can be ignored by most applets. - `Applet::requestUpdate()` has an optional flag that requests a full render by default * implement tile and partial rendering in KeyboardApplet * add comment for drawKeyLabel() * improve clarity of byte operations in clearTile() * remove typo and commented code * fix inaccurate comments * add null check to openKeyboard() and closeKeyboard() --------- Co-authored-by: zeropt <ferr0fluidmann@gmail.com> Co-authored-by: HarukiToreda <116696711+HarukiToreda@users.noreply.github.com>
77 lines
2.7 KiB
C++
77 lines
2.7 KiB
C++
#ifdef MESHTASTIC_INCLUDE_INKHUD
|
|
|
|
#include "./PairingApplet.h"
|
|
|
|
using namespace NicheGraphics;
|
|
|
|
InkHUD::PairingApplet::PairingApplet()
|
|
{
|
|
bluetoothStatusObserver.observe(&bluetoothStatus->onNewStatus);
|
|
}
|
|
|
|
void InkHUD::PairingApplet::onRender(bool full)
|
|
{
|
|
// Header
|
|
setFont(fontMedium);
|
|
printAt(X(0.5), Y(0.25), "Bluetooth", CENTER, BOTTOM);
|
|
setFont(fontSmall);
|
|
printAt(X(0.5), Y(0.25), "Enter this code", CENTER, TOP);
|
|
|
|
// Passkey
|
|
setFont(fontMedium);
|
|
printThick(X(0.5), Y(0.5), passkey.substr(0, 3) + " " + passkey.substr(3), 3, 2);
|
|
|
|
// Device's bluetooth name, if it will fit
|
|
setFont(fontSmall);
|
|
std::string name = "Name: " + parse(getDeviceName());
|
|
if (getTextWidth(name) > width()) // Too wide, try without the leading "Name: "
|
|
name = parse(getDeviceName());
|
|
if (getTextWidth(name) < width()) // Does it fit?
|
|
printAt(X(0.5), Y(0.75), name, CENTER, MIDDLE);
|
|
}
|
|
|
|
void InkHUD::PairingApplet::onForeground()
|
|
{
|
|
// Prevent most other applets from requesting update, and skip their rendering entirely
|
|
// Another system applet with a higher precedence can potentially ignore this
|
|
SystemApplet::lockRendering = true;
|
|
SystemApplet::lockRequests = true;
|
|
}
|
|
void InkHUD::PairingApplet::onBackground()
|
|
{
|
|
// Allow normal update behavior to resume
|
|
SystemApplet::lockRendering = false;
|
|
SystemApplet::lockRequests = false;
|
|
|
|
// Need to force an update, as a polite request wouldn't be honored, seeing how we are now in the background
|
|
// Usually, onBackground is followed by another applet's onForeground (which requests update), but not in this case
|
|
inkhud->forceUpdate(EInk::UpdateTypes::FULL, true);
|
|
}
|
|
|
|
int InkHUD::PairingApplet::onBluetoothStatusUpdate(const meshtastic::Status *status)
|
|
{
|
|
// The standard Meshtastic convention is to pass these "generic" Status objects,
|
|
// check their type, and then cast them.
|
|
// We'll mimic that behavior, just to keep in line with the other Statuses,
|
|
// even though I'm not sure what the original reason for jumping through these extra hoops was.
|
|
assert(status->getStatusType() == STATUS_TYPE_BLUETOOTH);
|
|
meshtastic::BluetoothStatus *bluetoothStatus = (meshtastic::BluetoothStatus *)status;
|
|
|
|
// When pairing begins
|
|
if (bluetoothStatus->getConnectionState() == meshtastic::BluetoothStatus::ConnectionState::PAIRING) {
|
|
// Store the passkey for rendering
|
|
passkey = bluetoothStatus->getPasskey();
|
|
|
|
// Show pairing screen
|
|
bringToForeground();
|
|
}
|
|
|
|
// When pairing ends
|
|
// or rather, when something changes, and we shouldn't be showing the pairing screen
|
|
else if (isForeground())
|
|
sendToBackground();
|
|
|
|
return 0; // No special result to report back to Observable
|
|
}
|
|
|
|
#endif |