mirror of
https://github.com/alexhopeoconnor/firmware.git
synced 2026-10-13 23:21:19 +10:00
* Migrate esp32 families to pioarduino platform
* ESP32c6 align text.handler_execute same as C3
* Use pioarduino `develop`
The latest fixes and the latest bugs!
* preliminary esp32p4.ini
* pioarduino: Update LovyanGFX
Includes Manuel's recent commit
* pioarduino 3.3.6
* pioarduino 3.3.6 *release*
chasing the release
* pioarduino: Fix OG ESP32 duplicate libs
* pioarduino: T-Beam 1W CDC mode
* pioarduino: disable network provisioning (wifiprov)
* pioarduino: use legacy esptoolpy naming (forward-compatible)
* Update lovyangfx from `develop` commit to 1.2.19
* fix esp32p4.ini
* check for esp32 w/ wifi
* esp32-p4 specific adaptations
* Switch to meshtastic/esp32_https_server fork (idf5 branch)
* don't ignore esp_lcd
* config for MUI
* fix/workaround SDMMC
* revert a6f6175, update to 3.3.8
* enable esp_hosted for esp32-p4 (experimental)
* Pioarduino 55.03.38-1
* NimBLE-Arduino -> Arduino "BLE" (3.3.x) migration (#10164)
* NimBLE-Arduino -> Arduino "BLE" (3.3.x) migration
* More NimBLE
* Fix Device Name in ATT Read Request (0x2A00).
Device Name is exposed in two places:
- Advertisement data: this is set properly in startAdvertising.
- GATT attribute Device Name (0x2A00). This one is handled internally in NimBLE
and comes from ble_svc_gap_device_name_set. This is set initially, but then
BLEDevice::createServer calls ble_svc_gap_init which resets the device name.
This causes the device to apparently "change name after pairing":
< ACL Data TX:... flags 0x00 dlen 7 #113 [hci0] 14.241149
ATT: Read Request (0x0a) len 2
Handle: 0x0003 Type: Device Name (0x2a00)
> ACL Data RX: Handle 2048 flags 0x02 dlen 11 #115 [hci0] 14.269050
ATT: Read Response (0x0b) len 6
Value[6]: 6e696d626c65 # "nimble"
Workaround this by setting the device name once again after
BLEDevice::createServer.
* Temporarily lower CORE_DEBUG_LEVEL to INFO to avoid triggering an apparent ESP-IDF Bluetooth bug when re-connecting to Pixel 8 Android devices.
Initial pairing works, but after ESP32 is rebooted, phone fails to reconnect. Meshtastic app shows it as disconnecting immediately. LightBlue shows a more detailed error "Peripheral Connection - Warning: onConnectionStatusChange: status 61" (0x3D - MIC Failure).
Bug report to Espresssif: https://github.com/espressif/esp-idf/issues/18126#issuecomment-4286197744
* Temporarily disable ble_gap_set_data_len, causes crash with Pixel 8 Android reconnect.
Crash looks like this:
[ 11966][E][BLEAdvertising.cpp:341] setScanResponseData(): ble_gap_adv_rsp_set_data: 22
[ 11975][E][BLEAdvertising.cpp:1554] start(): Host reset, wait for sync.
ERROR | ??:??:?? 11 BLE failed to start advertising
Guru Meditation Error: Core 0 panic'ed (LoadProhibited). Exception was unhandled.
Core 0 register dump:
PC : 0x420e6190 PS : 0x00060730 A0 : 0x820e158b A1 : 0x3fce50c0
A2 : 0x00000000 A3 : 0x3fcb8600 A4 : 0x3fcb85cc A5 : 0x00000000
A6 : 0x00000000 A7 : 0x00000c03 A8 : 0x00000000 A9 : 0x3fce50b0
A10 : 0x0000000e A11 : 0x00000000 A12 : 0x00000010 A13 : 0x3fce50e0
A14 : 0x00000c03 A15 : 0x00000001 SAR : 0x0000001e EXCCAUSE: 0x0000001c
EXCVADDR: 0x00000000 LBEG : 0x400570e8 LEND : 0x400570f3 LCOUNT : 0x00000000
Backtrace: 0x420e618d:0x3fce50c0 0x420e1588:0x3fce5110 0x420dfe87:0x3fce5200 0x420dfefb:0x3fce5220 0x420dff3f:0x3fce5240 0x4219602b:0x3fce5260 0x4037b0e5:0x3fce5280 0x4201edf3:0x3fce52a0
Connection seems fast enough even without this. We'll investigate the
reason for the crash and re-enable once it's safe.
---------
Co-authored-by: Catalin Patulea <cronos586@gmail.com>
* Add extension from pioarduino nag
"Jason2866.esp-decoder"
* Cleanup after merge
* ESP32: Disable classic bluetooth
* Cleanup: Fix ADC channels on new variants
* InkHUD: Fix type casting for message size in saveToFlash method
inkhud compiles again!
* update p4 esp_hosted for BT
* I thought I fixed this
* fix linker error using response file (p4 only)
* fix infinite loop
* Fix Power.cpp check warning
Local variable 'config' shadows outer variable [shadowVariable]
* Build ESP32 original with NimBLE ('custom_sdkconfig' approach). (#10235)
* Re-enable littlefs json manifest
This works locally again :)
Not sure what changed
* Re-add tool-mklittlefs
* sensecap indicator fixes after upgrade arduino-esp & lovyanGFX libs
* hackaday fix
* robot tbeam cache error fix
Co-authored-by: Copilot <copilot@github.com>
* trunk fmt
* ignore trunk
* BLEDevice::deinit() added
Co-authored-by: Copilot <copilot@github.com>
* platformio-custom: Modify mtjson target dependency to prevent fake-success. (#10291)
Co-authored-by: Copilot <copilot@github.com>
* Fix ESP32-C6 linker errors.
Align .text.handler_execute section to 4 bytes and update watchdog timer core mask configuration
Co-authored-by: Copilot <copilot@github.com>
* tlora-c6: Disable Screen
MESHTASTIC_EXCLUDE_SCREEN=1 on tlora-c6.
It doesn't have a screen, and this gets it compiling again (saving flash).
* Use mverch's iram_memset hack for all OG-ESP32
* Refactor watchdog timer initialization and handling
* use adc_channel_t in variant.h
* Fix variant headers
* More idiomatic default ethernet that doesn't break the build
* Elecrows: Delete problematic variant.cpp
Not needed after USE_ETHERNET_DEFAULT
---------
Co-authored-by: mverch67 <manuel.verch@gmx.de>
Co-authored-by: Manuel <71137295+mverch67@users.noreply.github.com>
Co-authored-by: Catalin Patulea <cronos586@gmail.com>
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: vidplace7 <1779290+vidplace7@users.noreply.github.com>
Co-authored-by: Copilot <copilot@github.com>
Co-authored-by: thebentern <9000580+thebentern@users.noreply.github.com>
Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
231 lines
7.3 KiB
C++
231 lines
7.3 KiB
C++
#if defined(T_LORA_PAGER)
|
|
|
|
#include "TLoraPagerKeyboard.h"
|
|
#include "main.h"
|
|
|
|
#ifndef LEDC_BACKLIGHT_CHANNEL
|
|
#define LEDC_BACKLIGHT_CHANNEL 4
|
|
#endif
|
|
|
|
#ifndef LEDC_BACKLIGHT_BIT_WIDTH
|
|
#define LEDC_BACKLIGHT_BIT_WIDTH 8
|
|
#endif
|
|
|
|
#ifndef LEDC_BACKLIGHT_FREQ
|
|
#define LEDC_BACKLIGHT_FREQ 1000 // Hz
|
|
#endif
|
|
|
|
#define _TCA8418_COLS 10
|
|
#define _TCA8418_ROWS 4
|
|
#define _TCA8418_NUM_KEYS 31
|
|
|
|
#define _TCA8418_MULTI_TAP_THRESHOLD 1500
|
|
|
|
using Key = TCA8418KeyboardBase::TCA8418Key;
|
|
|
|
constexpr uint8_t modifierRightShiftKey = 29 - 1; // keynum -1
|
|
constexpr uint8_t modifierRightShift = 0b0001;
|
|
constexpr uint8_t modifierSymKey = 21 - 1;
|
|
constexpr uint8_t modifierSym = 0b0010;
|
|
|
|
// Num chars per key, Modulus for rotating through characters
|
|
static uint8_t TLoraPagerTapMod[_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};
|
|
|
|
static unsigned char TLoraPagerTapMap[_TCA8418_NUM_KEYS][3] = {{'q', 'Q', '1'},
|
|
{'w', 'W', '2'},
|
|
{'e', 'E', '3'},
|
|
{'r', 'R', '4'},
|
|
{'t', 'T', '5'},
|
|
{'y', 'Y', '6'},
|
|
{'u', 'U', '7'},
|
|
{'i', 'I', '8'},
|
|
{'o', 'O', '9'},
|
|
{'p', 'P', '0'},
|
|
{'a', 'A', '*'},
|
|
{'s', 'S', '/'},
|
|
{'d', 'D', '+'},
|
|
{'f', 'F', '-'},
|
|
{'g', 'G', '='},
|
|
{'h', 'H', ':'},
|
|
{'j', 'J', '\''},
|
|
{'k', 'K', '"'},
|
|
{'l', 'L', '@'},
|
|
{Key::SELECT, 0x00, Key::TAB},
|
|
{0x00, 0x00, 0x00},
|
|
{'z', 'Z', '_'},
|
|
{'x', 'X', '$'},
|
|
{'c', 'C', ';'},
|
|
{'v', 'V', '?'},
|
|
{'b', 'B', '!'},
|
|
{'n', 'N', ','},
|
|
{'m', 'M', '.'},
|
|
{0x00, 0x00, 0x00},
|
|
{Key::BSP, 0x00, Key::ESC},
|
|
{' ', 0x00, Key::BL_TOGGLE}};
|
|
|
|
TLoraPagerKeyboard::TLoraPagerKeyboard()
|
|
: TCA8418KeyboardBase(_TCA8418_ROWS, _TCA8418_COLS), modifierFlag(0), last_modifier_time(0), last_key(UINT8_MAX),
|
|
next_key(UINT8_MAX), last_tap(0L), char_idx(0), tap_interval(0)
|
|
{
|
|
#if ESP_ARDUINO_VERSION >= ESP_ARDUINO_VERSION_VAL(3, 0, 0)
|
|
ledcAttach(KB_BL_PIN, LEDC_BACKLIGHT_FREQ, LEDC_BACKLIGHT_BIT_WIDTH);
|
|
#else
|
|
ledcSetup(LEDC_BACKLIGHT_CHANNEL, LEDC_BACKLIGHT_FREQ, LEDC_BACKLIGHT_BIT_WIDTH);
|
|
ledcAttachPin(KB_BL_PIN, LEDC_BACKLIGHT_CHANNEL);
|
|
#endif
|
|
reset();
|
|
}
|
|
|
|
void TLoraPagerKeyboard::reset(void)
|
|
{
|
|
TCA8418KeyboardBase::reset();
|
|
pinMode(KB_BL_PIN, OUTPUT);
|
|
digitalWrite(KB_BL_PIN, LOW);
|
|
setBacklight(false);
|
|
}
|
|
|
|
// handle multi-key presses (shift and alt)
|
|
void TLoraPagerKeyboard::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 TLoraPagerKeyboard::setBacklight(bool on)
|
|
{
|
|
uint32_t _brightness = 0;
|
|
if (on)
|
|
_brightness = brightness;
|
|
#if ESP_ARDUINO_VERSION >= ESP_ARDUINO_VERSION_VAL(3, 0, 0)
|
|
ledcWrite(KB_BL_PIN, _brightness);
|
|
#else
|
|
ledcWrite(LEDC_BACKLIGHT_CHANNEL, _brightness);
|
|
#endif
|
|
}
|
|
|
|
void TLoraPagerKeyboard::pressed(uint8_t key)
|
|
{
|
|
if (state == Init || state == Busy) {
|
|
return;
|
|
}
|
|
if (config.device.buzzer_mode == meshtastic_Config_DeviceConfig_BuzzerMode_ALL_ENABLED ||
|
|
config.device.buzzer_mode == meshtastic_Config_DeviceConfig_BuzzerMode_SYSTEM_ONLY) {
|
|
hapticFeedback();
|
|
}
|
|
|
|
if (modifierFlag && (millis() - last_modifier_time > _TCA8418_MULTI_TAP_THRESHOLD)) {
|
|
modifierFlag = 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 TLoraPagerKeyboard::released()
|
|
{
|
|
if (state != Held) {
|
|
return;
|
|
}
|
|
|
|
if (last_key >= _TCA8418_NUM_KEYS) {
|
|
last_key = UINT8_MAX;
|
|
state = Idle;
|
|
return;
|
|
}
|
|
|
|
uint32_t now = millis();
|
|
last_tap = now;
|
|
|
|
if (TLoraPagerTapMap[last_key][modifierFlag % TLoraPagerTapMod[last_key]] == Key::BL_TOGGLE) {
|
|
toggleBacklight();
|
|
return;
|
|
}
|
|
|
|
queueEvent(TLoraPagerTapMap[last_key][modifierFlag % TLoraPagerTapMod[last_key]]);
|
|
if (isModifierKey(last_key) == false)
|
|
modifierFlag = 0;
|
|
}
|
|
|
|
void TLoraPagerKeyboard::hapticFeedback()
|
|
{
|
|
drv.setWaveform(0, 14); // strong buzz 100%
|
|
drv.setWaveform(1, 0); // end waveform
|
|
drv.go();
|
|
}
|
|
|
|
// toggle brightness of the backlight in three steps
|
|
void TLoraPagerKeyboard::toggleBacklight(bool off)
|
|
{
|
|
if (off) {
|
|
brightness = 0;
|
|
} else {
|
|
if (brightness == 0) {
|
|
brightness = 40;
|
|
} else if (brightness == 40) {
|
|
brightness = 127;
|
|
} else if (brightness >= 127) {
|
|
brightness = 0;
|
|
}
|
|
}
|
|
LOG_DEBUG("Toggle backlight: %d", brightness);
|
|
|
|
setBacklight(true);
|
|
}
|
|
|
|
void TLoraPagerKeyboard::updateModifierFlag(uint8_t key)
|
|
{
|
|
if (key == modifierRightShiftKey) {
|
|
modifierFlag ^= modifierRightShift;
|
|
} else if (key == modifierSymKey) {
|
|
modifierFlag ^= modifierSym;
|
|
}
|
|
}
|
|
|
|
bool TLoraPagerKeyboard::isModifierKey(uint8_t key)
|
|
{
|
|
return (key == modifierRightShiftKey || key == modifierSymKey);
|
|
}
|
|
|
|
#endif |