Cardputer Kit (#9540)
* Cardputer Kit BMI270 WIP * BMI270 support * verify that the number of bytes read matches the requested length Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * trunk'd * remove excessive logging * Kick the screen when unsleeping * Update the st7789 library, and enable displayon and displayoff * Battery detection * Default to arrow keys and enter, while in menus. * Enable Backlight control * Update src/detect/ScanI2CTwoWire.cpp Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * updateState method now accepts shouldRequestFocus parameter for better maintainability --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: Jonathan Bennett <jbennett@incomsystems.biz> Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
This commit is contained in:
Thomas Göttgens
co-authored by
GitHub
Copilot
Jonathan Bennett
Ben Meadors
GitHub
Copilot
Jonathan Bennett
Ben Meadors
parent
afd5e29bce
commit
969aefa551
@@ -0,0 +1,200 @@
|
||||
#if defined(M5STACK_CARDPUTER_ADV)
|
||||
|
||||
#include "CardputerKeyboard.h"
|
||||
#include "main.h"
|
||||
|
||||
#define _TCA8418_COLS 8
|
||||
#define _TCA8418_ROWS 7
|
||||
#define _TCA8418_NUM_KEYS 56
|
||||
|
||||
#define _TCA8418_MULTI_TAP_THRESHOLD 1500
|
||||
|
||||
using Key = TCA8418KeyboardBase::TCA8418Key;
|
||||
|
||||
constexpr uint8_t modifierFnKey = 2;
|
||||
constexpr uint8_t modifierFn = 0b0010;
|
||||
constexpr uint8_t modifierCtrlKey = 3;
|
||||
constexpr uint8_t modifierShiftKey = 6;
|
||||
constexpr uint8_t modifierShift = 0b0001;
|
||||
constexpr uint8_t modifierOptKey = 7;
|
||||
constexpr uint8_t modifierAltKey = 11;
|
||||
|
||||
// Num chars per key, Modulus for rotating through characters
|
||||
static uint8_t CardputerTapMod[_TCA8418_NUM_KEYS] = {3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3};
|
||||
|
||||
static unsigned char CardputerTapMap[_TCA8418_NUM_KEYS][3] = {{'`', '~', Key::ESC},
|
||||
{Key::TAB, 0x00, 0x00},
|
||||
{0x00, 0x00, 0x00},
|
||||
{0x00, 0x00, 0x00},
|
||||
{'1', '!', 0x00},
|
||||
{'q', 'Q', Key::REBOOT},
|
||||
{0x00, 0x00, 0x00},
|
||||
{0x00, 0x00, 0x00},
|
||||
{'2', '@', 0x00},
|
||||
{'w', 'W', 0x00},
|
||||
{'a', 'A', 0x00},
|
||||
{0x00, 0x00, 0x00},
|
||||
{'3', '#', 0x00},
|
||||
{'e', 'E', 0x00},
|
||||
{'s', 'S', 0x00},
|
||||
{'z', 'Z', 0x00},
|
||||
{'4', '$', 0x00},
|
||||
{'r', 'R', 0x00},
|
||||
{'d', 'D', 0x00},
|
||||
{'x', 'X', 0x00},
|
||||
{'5', '%', 0x00},
|
||||
{'t', 'T', 0x00},
|
||||
{'f', 'F', 0x00},
|
||||
{'c', 'C', 0x00},
|
||||
{'6', '^', 0x00},
|
||||
{'y', 'Y', 0x00},
|
||||
{'g', 'G', Key::GPS_TOGGLE},
|
||||
{'v', 'V', 0x00},
|
||||
{'7', '&', 0x00},
|
||||
{'u', 'U', 0x00},
|
||||
{'h', 'H', 0x00},
|
||||
{'b', 'B', Key::BT_TOGGLE},
|
||||
{'8', '*', 0x00},
|
||||
{'i', 'I', 0x00},
|
||||
{'j', 'J', 0x00},
|
||||
{'n', 'N', 0x00},
|
||||
{'9', '(', 0x00},
|
||||
{'o', 'O', 0x00},
|
||||
{'k', 'K', 0x00},
|
||||
{'m', 'M', Key::MUTE_TOGGLE},
|
||||
{'0', ')', 0x00},
|
||||
{'p', 'P', Key::SEND_PING},
|
||||
{'l', 'L', 0x00},
|
||||
{',', '<', Key::LEFT},
|
||||
{'_', '-', 0x00},
|
||||
{'[', '{', 0x00},
|
||||
{';', ':', Key::UP},
|
||||
{'.', '>', Key::DOWN},
|
||||
{'=', '+', 0x00},
|
||||
{']', '}', 0x00},
|
||||
{'\'', '"', 0x00},
|
||||
{'/', '?', Key::RIGHT},
|
||||
{Key::BSP, 0x00, 0x00},
|
||||
{'\\', '|', 0x00},
|
||||
{Key::SELECT, 0x00, 0x00},
|
||||
{' ', ' ', ' '}};
|
||||
|
||||
CardputerKeyboard::CardputerKeyboard()
|
||||
: TCA8418KeyboardBase(_TCA8418_ROWS, _TCA8418_COLS), modifierFlag(0), last_modifier_time(0), last_key(-1), next_key(-1),
|
||||
last_tap(0L), char_idx(0), tap_interval(0)
|
||||
{
|
||||
reset();
|
||||
}
|
||||
|
||||
void CardputerKeyboard::reset(void)
|
||||
{
|
||||
TCA8418KeyboardBase::reset();
|
||||
}
|
||||
|
||||
// handle multi-key presses (shift and alt)
|
||||
void CardputerKeyboard::trigger()
|
||||
{
|
||||
uint8_t count = keyCount();
|
||||
if (count == 0)
|
||||
return;
|
||||
for (uint8_t i = 0; i < count; ++i) {
|
||||
uint8_t k = readRegister(TCA8418_REG_KEY_EVENT_A + i);
|
||||
uint8_t key = k & 0x7F;
|
||||
if (k & 0x80) {
|
||||
pressed(key);
|
||||
} else {
|
||||
released();
|
||||
state = Idle;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void CardputerKeyboard::pressed(uint8_t key)
|
||||
{
|
||||
if (state == Init || state == Busy) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (modifierFlag && (millis() - last_modifier_time > _TCA8418_MULTI_TAP_THRESHOLD)) {
|
||||
modifierFlag = 0;
|
||||
}
|
||||
|
||||
uint8_t next_key = 0;
|
||||
int row = (key - 1) / 10;
|
||||
int col = (key - 1) % 10;
|
||||
|
||||
if (row >= _TCA8418_ROWS || col >= _TCA8418_COLS) {
|
||||
return; // Invalid key
|
||||
}
|
||||
|
||||
next_key = row * _TCA8418_COLS + col;
|
||||
state = Held;
|
||||
|
||||
uint32_t now = millis();
|
||||
tap_interval = now - last_tap;
|
||||
|
||||
updateModifierFlag(next_key);
|
||||
if (isModifierKey(next_key)) {
|
||||
last_modifier_time = now;
|
||||
}
|
||||
|
||||
if (tap_interval < 0) {
|
||||
last_tap = 0;
|
||||
state = Busy;
|
||||
return;
|
||||
}
|
||||
|
||||
if (next_key != last_key || tap_interval > _TCA8418_MULTI_TAP_THRESHOLD) {
|
||||
char_idx = 0;
|
||||
} else {
|
||||
char_idx += 1;
|
||||
}
|
||||
|
||||
last_key = next_key;
|
||||
last_tap = now;
|
||||
}
|
||||
|
||||
void CardputerKeyboard::released()
|
||||
{
|
||||
if (state != Held) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (last_key < 0 || last_key >= _TCA8418_NUM_KEYS) {
|
||||
last_key = -1;
|
||||
state = Idle;
|
||||
return;
|
||||
}
|
||||
|
||||
uint32_t now = millis();
|
||||
last_tap = now;
|
||||
|
||||
if (inputBroker->menuMode && modifierFlag == 0) {
|
||||
if (last_key == 0 || last_key == 43 || last_key == 46 || last_key == 47 ||
|
||||
last_key == 51) { // esc, left, up, down, right key
|
||||
modifierFlag = modifierFn;
|
||||
}
|
||||
}
|
||||
|
||||
queueEvent(CardputerTapMap[last_key][modifierFlag % CardputerTapMod[last_key]]);
|
||||
if (isModifierKey(last_key) == false)
|
||||
modifierFlag = 0;
|
||||
}
|
||||
|
||||
void CardputerKeyboard::updateModifierFlag(uint8_t key)
|
||||
{
|
||||
if (key == modifierShiftKey) {
|
||||
modifierFlag ^= modifierShift;
|
||||
} else if (key == modifierFnKey) {
|
||||
modifierFlag ^= modifierFn;
|
||||
}
|
||||
}
|
||||
|
||||
bool CardputerKeyboard::isModifierKey(uint8_t key)
|
||||
{
|
||||
return (key == modifierShiftKey || key == modifierFnKey);
|
||||
}
|
||||
|
||||
#endif
|
||||
@@ -0,0 +1,26 @@
|
||||
#include "TCA8418KeyboardBase.h"
|
||||
|
||||
class CardputerKeyboard : public TCA8418KeyboardBase
|
||||
{
|
||||
public:
|
||||
CardputerKeyboard();
|
||||
void reset(void);
|
||||
void trigger(void) override;
|
||||
virtual ~CardputerKeyboard() {}
|
||||
|
||||
protected:
|
||||
void pressed(uint8_t key) override;
|
||||
void released(void) override;
|
||||
|
||||
void updateModifierFlag(uint8_t key);
|
||||
bool isModifierKey(uint8_t key);
|
||||
|
||||
private:
|
||||
uint8_t modifierFlag;
|
||||
uint32_t last_modifier_time;
|
||||
int8_t last_key;
|
||||
int8_t next_key;
|
||||
uint32_t last_tap;
|
||||
uint8_t char_idx;
|
||||
int32_t tap_interval;
|
||||
};
|
||||
@@ -70,6 +70,7 @@ class InputBroker : public Observable<const InputEvent *>
|
||||
|
||||
public:
|
||||
InputBroker();
|
||||
bool menuMode = true;
|
||||
void registerSource(Observable<const InputEvent *> *source);
|
||||
void injectInputEvent(const InputEvent *event) { handleInputEvent(event); }
|
||||
#if defined(HAS_FREE_RTOS) && !defined(ARCH_RP2040)
|
||||
|
||||
@@ -7,6 +7,8 @@
|
||||
#include "TDeckProKeyboard.h"
|
||||
#elif defined(T_LORA_PAGER)
|
||||
#include "TLoraPagerKeyboard.h"
|
||||
#elif defined(M5STACK_CARDPUTER_ADV)
|
||||
#include "CardputerKeyboard.h"
|
||||
#elif defined(HACKADAY_COMMUNICATOR)
|
||||
#include "HackadayCommunicatorKeyboard.h"
|
||||
#else
|
||||
@@ -22,6 +24,8 @@ KbI2cBase::KbI2cBase(const char *name)
|
||||
TCAKeyboard(*(new TDeckProKeyboard()))
|
||||
#elif defined(T_LORA_PAGER)
|
||||
TCAKeyboard(*(new TLoraPagerKeyboard()))
|
||||
#elif defined(M5STACK_CARDPUTER_ADV)
|
||||
TCAKeyboard(*(new CardputerKeyboard()))
|
||||
#elif defined(HACKADAY_COMMUNICATOR)
|
||||
TCAKeyboard(*(new HackadayCommunicatorKeyboard()))
|
||||
#else
|
||||
|
||||
Reference in New Issue
Block a user