pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-04-30 11:23:53 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

reset sym after second keypress

Browse Source 
also remove debug print and non-working scancodes.
This commit is contained in:
Thomas Göttgens 2023-08-23 09:44:20 +02:00
parent 7f1b58a222
commit 5bb207d88b
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/input/kbI2cBase.cpp
View File

@ -79,50 +79,53 @@ int32_t KbI2cBase::runOnce()
e.kbchar = key.key; e.kbchar = key.key;
break; break;
case 'e': // sym e case 'e': // sym e
case '2': // sym shift+2
if (is_sym) { if (is_sym) {
e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_UP; e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_UP;
e.kbchar = 0xb5; e.kbchar = 0xb5;
is_sym = false; // reset sym state after second keypress
} else { } else {
e.inputEvent = ANYKEY; e.inputEvent = ANYKEY;
e.kbchar = key.key; e.kbchar = key.key;
} }
break; break;
case 'x': // sym x case 'x': // sym x
case '8': // sym shift+8
if (is_sym) { if (is_sym) {
e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_DOWN; e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_DOWN;
e.kbchar = 0xb6; e.kbchar = 0xb6;
is_sym = false; // reset sym state after second keypress
} else { } else {
e.inputEvent = ANYKEY; e.inputEvent = ANYKEY;
e.kbchar = key.key; e.kbchar = key.key;
} }
break; break;
case 's': // sym s case 's': // sym s
case '4': // Left (sym shift+4)
if (is_sym) { if (is_sym) {
e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_LEFT; e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_LEFT;
e.kbchar = 0x00; // tweak for destSelect e.kbchar = 0x00; // tweak for destSelect
is_sym = false; // reset sym state after second keypress
} else { } else {
e.inputEvent = ANYKEY; e.inputEvent = ANYKEY;
e.kbchar = key.key; e.kbchar = key.key;
} }
break; break;
case 'f': // sym f case 'f': // sym f
case '6': // Right (sym shift+6)
if (is_sym) { if (is_sym) {
e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_RIGHT; e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_RIGHT;
e.kbchar = 0x00; // tweak for destSelect e.kbchar = 0x00; // tweak for destSelect
is_sym = false; // reset sym state after second keypress
} else { } else {
e.inputEvent = ANYKEY; e.inputEvent = ANYKEY;
e.kbchar = key.key; e.kbchar = key.key;
} }
break; break;
case KEY_MOD_SYM: // toggle SYM Key
case 0x13: // Code scanner says the SYM key ias 0x13 case 0x13: // Code scanner says the SYM key is 0x13
is_sym = !is_sym; is_sym = !is_sym;
break; break;
case 0x0d: // Enter
case 0x0a: // apparently Enter on Q10 is a line feed instead of carriage return case 0x0a: // apparently Enter on Q10 is a line feed instead of carriage return
e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_SELECT; e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_SELECT;
break; break;
@ -132,6 +135,7 @@ int32_t KbI2cBase::runOnce()
default: // all other keys default: // all other keys
e.inputEvent = ANYKEY; e.inputEvent = ANYKEY;
e.kbchar = key.key; e.kbchar = key.key;
is_sym = false; // reset sym state after second keypress
break; break;
} }

4
src/modules/CannedMessageModule.cpp
View File

@ -171,7 +171,7 @@ int CannedMessageModule::handleInputEvent(const InputEvent *event)
(event->inputEvent == static_cast<char>(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_LEFT)) || (event->inputEvent == static_cast<char>(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_LEFT)) ||
(event->inputEvent == static_cast<char>(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_RIGHT))) { (event->inputEvent == static_cast<char>(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_RIGHT))) {
// LOG_DEBUG("Canned message event (%x)\n", event->kbchar); // LOG_DEBUG("Canned message event (%x)\n", event->kbchar);
// tweak for left/right events generated via trackball/touch with empty kbchar // tweak for left/right events generated via trackball/touch with empty kbchar
if (!event->kbchar) { if (!event->kbchar) {
if (event->inputEvent == static_cast<char>(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_LEFT)) { if (event->inputEvent == static_cast<char>(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_LEFT)) {
this->payload = 0xb4; this->payload = 0xb4;
@ -195,7 +195,7 @@ int CannedMessageModule::handleInputEvent(const InputEvent *event)
this->runState = CANNED_MESSAGE_RUN_STATE_FREETEXT; this->runState = CANNED_MESSAGE_RUN_STATE_FREETEXT;
} }
// pass the pressed key // pass the pressed key
LOG_DEBUG("Canned message ANYKEY (%x)\n", event->kbchar); // LOG_DEBUG("Canned message ANYKEY (%x)\n", event->kbchar);
this->payload = event->kbchar; this->payload = event->kbchar;
this->lastTouchMillis = millis(); this->lastTouchMillis = millis();
validEvent = true; validEvent = true;