pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-09-21 17:20:01 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

bug fix fast pressing multiple buttons + clean up scanI2CTwoWire.cpp

Browse Source
This commit is contained in:
nasimovy 2025-03-25 14:19:19 +00:00
parent 7415b25e2f
commit 92b3b208c4
3 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/detect/ScanI2CTwoWire.cpp
View File

@ -10,11 +10,6 @@
#include "meshUtils.h" // vformat #include "meshUtils.h" // vformat
#endif #endif
// AXP192 and AXP2101 have the same device address, we just need to identify it in Power.cpp
//#ifndef XPOWERS_AXP192_AXP2101_ADDRESS
//#define XPOWERS_AXP192_AXP2101_ADDRESS 0x34
//#endif
bool in_array(uint8_t *array, int size, uint8_t lookfor) bool in_array(uint8_t *array, int size, uint8_t lookfor)
{ {
int i; int i;
@ -230,9 +225,7 @@ void ScanI2CTwoWire::scanPort(I2CPort port, uint8_t *address, uint8_t asize)
#ifdef HAS_NCP5623 #ifdef HAS_NCP5623
SCAN_SIMPLE_CASE(NCP5623_ADDR, NCP5623, "NCP5623", (uint8_t)addr.address); SCAN_SIMPLE_CASE(NCP5623_ADDR, NCP5623, "NCP5623", (uint8_t)addr.address);
#endif #endif
//#ifdef HAS_PMU
// SCAN_SIMPLE_CASE(XPOWERS_AXP192_AXP2101_ADDRESS, PMU_AXP192_AXP2101, "AXP192/AXP2101", (uint8_t)addr.address)
//#endif
case BME_ADDR: case BME_ADDR:
case BME_ADDR_ALTERNATE: case BME_ADDR_ALTERNATE:
registerValue = getRegisterValue(ScanI2CTwoWire::RegisterLocation(addr, 0xD0), 1); // GET_ID registerValue = getRegisterValue(ScanI2CTwoWire::RegisterLocation(addr, 0xD0), 1); // GET_ID

11
src/input/TCA8418Keyboard.cpp
View File

@ -134,7 +134,7 @@ unsigned char TCA8418LongPressMap[_TCA8418_NUM_KEYS] = {
_TCA8418_NONE, // 7 _TCA8418_NONE, // 7
_TCA8418_DOWN, // 8 _TCA8418_DOWN, // 8
_TCA8418_NONE, // 9 _TCA8418_NONE, // 9
_TCA8418_NONE, // * _TCA8418_BSP, // *
_TCA8418_NONE, // 0 _TCA8418_NONE, // 0
_TCA8418_NONE, // # _TCA8418_NONE, // #
}; };
@ -142,14 +142,13 @@ unsigned char TCA8418LongPressMap[_TCA8418_NUM_KEYS] = {
#define _TCA8418_LONG_PRESS_THRESHOLD 2000 #define _TCA8418_LONG_PRESS_THRESHOLD 2000
#define _TCA8418_MULTI_TAP_THRESHOLD 750 #define _TCA8418_MULTI_TAP_THRESHOLD 750
// #define LAYOUT Adafruit3x4
TCA8418Keyboard::TCA8418Keyboard() : m_wire(nullptr), m_addr(0), readCallback(nullptr), writeCallback(nullptr) TCA8418Keyboard::TCA8418Keyboard() : m_wire(nullptr), m_addr(0), readCallback(nullptr), writeCallback(nullptr)
{ {
state = Init; state = Init;
last_key = -1; last_key = -1;
next_key = -1;
should_backspace = false;
last_tap = 0L; last_tap = 0L;
char_idx = 0; char_idx = 0;
tap_interval = 0; tap_interval = 0;
@ -330,8 +329,10 @@ void TCA8418Keyboard::pressed(uint8_t key)
// Check if the key is the same as the last one or if the time interval has passed // Check if the key is the same as the last one or if the time interval has passed
if (next_key != last_key || tap_interval > _TCA8418_MULTI_TAP_THRESHOLD) { if (next_key != last_key || tap_interval > _TCA8418_MULTI_TAP_THRESHOLD) {
char_idx = 0; // Reset char index if new key or long press char_idx = 0; // Reset char index if new key or long press
should_backspace = false; // dont backspace on new key
} else { } else {
char_idx += 1; // Cycle through characters if same key pressed char_idx += 1; // Cycle through characters if same key pressed
should_backspace = true; // allow backspace on same key
} }
// Store the current key as the last key // Store the current key as the last key
@ -354,7 +355,7 @@ void TCA8418Keyboard::released()
uint32_t now = millis(); uint32_t now = millis();
int32_t held_interval = now - last_tap; int32_t held_interval = now - last_tap;
last_tap = now; last_tap = now;
if (tap_interval < _TCA8418_MULTI_TAP_THRESHOLD) { if (tap_interval < _TCA8418_MULTI_TAP_THRESHOLD && should_backspace) {
queueEvent(_TCA8418_BSP); queueEvent(_TCA8418_BSP);
} }
if (held_interval > _TCA8418_LONG_PRESS_THRESHOLD) { if (held_interval > _TCA8418_LONG_PRESS_THRESHOLD) {

2
src/input/TCA8418Keyboard.h
View File

@ -21,6 +21,8 @@ class TCA8418Keyboard
KeyState state; KeyState state;
int8_t last_key; int8_t last_key;
int8_t next_key;
bool should_backspace;
uint32_t last_tap; uint32_t last_tap;
uint8_t char_idx; uint8_t char_idx;
int32_t tap_interval; int32_t tap_interval;