mirror of
https://github.com/meshtastic/firmware.git
synced 2026-01-15 14:27:19 +00:00
beb268ff25
I thought git would be smart enough to understand all the whitespace changes but even with all the flags I know to make it ignore theses it still blows up if there are identical changes on both sides.
I have a solution but it require creating a new commit at the merge base for each conflicting PR and merging it into develop.
I don't think blowing up all PRs is worth for now, maybe if we can coordinate this for V3 let's say.
This reverts commit 0d11331d18.
81 lines
2.2 KiB
C++
81 lines
2.2 KiB
C++
#pragma once
|
|
|
|
#include "configuration.h"
|
|
#include <OLEDDisplay.h>
|
|
#include <functional>
|
|
#include <string>
|
|
|
|
namespace graphics
|
|
{
|
|
|
|
enum VirtualKeyType { VK_CHAR, VK_BACKSPACE, VK_ENTER, VK_SHIFT, VK_ESC, VK_SPACE };
|
|
|
|
struct VirtualKey {
|
|
char character;
|
|
VirtualKeyType type;
|
|
uint8_t x;
|
|
uint8_t y;
|
|
uint8_t width;
|
|
uint8_t height;
|
|
};
|
|
|
|
class VirtualKeyboard
|
|
{
|
|
public:
|
|
VirtualKeyboard();
|
|
~VirtualKeyboard();
|
|
|
|
void draw(OLEDDisplay *display, int16_t offsetX, int16_t offsetY);
|
|
void setInputText(const std::string &text);
|
|
std::string getInputText() const;
|
|
void setHeader(const std::string &header);
|
|
void setCallback(std::function<void(const std::string &)> callback);
|
|
|
|
// Navigation methods for encoder input
|
|
void moveCursorUp();
|
|
void moveCursorDown();
|
|
void moveCursorLeft();
|
|
void moveCursorRight();
|
|
void handlePress();
|
|
void handleLongPress();
|
|
|
|
// Timeout management
|
|
void resetTimeout();
|
|
bool isTimedOut() const;
|
|
|
|
private:
|
|
static const uint8_t KEYBOARD_ROWS = 4;
|
|
static const uint8_t KEYBOARD_COLS = 11;
|
|
static const uint8_t KEY_WIDTH = 9;
|
|
static const uint8_t KEY_HEIGHT = 9; // Compressed to fit 4 rows on 64px displays
|
|
static const uint8_t KEYBOARD_START_Y = 26; // Start just below input box bottom
|
|
|
|
VirtualKey keyboard[KEYBOARD_ROWS][KEYBOARD_COLS];
|
|
|
|
std::string inputText;
|
|
std::string headerText;
|
|
std::function<void(const std::string &)> onTextEntered;
|
|
|
|
uint8_t cursorRow;
|
|
uint8_t cursorCol;
|
|
|
|
// Timeout management for auto-exit
|
|
uint32_t lastActivityTime;
|
|
static const uint32_t TIMEOUT_MS = 60000; // 1 minute timeout
|
|
|
|
void initializeKeyboard();
|
|
void drawKey(OLEDDisplay *display, const VirtualKey &key, bool selected, int16_t x, int16_t y, uint8_t w, uint8_t h,
|
|
bool isLastCol);
|
|
void drawInputArea(OLEDDisplay *display, int16_t offsetX, int16_t offsetY, int16_t keyboardStartY);
|
|
|
|
// Unified cursor movement helper
|
|
void moveCursorDelta(int dRow, int dCol);
|
|
|
|
char getCharForKey(const VirtualKey &key, bool isLongPress = false);
|
|
void insertCharacter(char c);
|
|
void deleteCharacter();
|
|
void submitText();
|
|
};
|
|
|
|
} // namespace graphics
|