From 0694b9e90d0c05c7c9f67bf086cc3bf2f7f7d941 Mon Sep 17 00:00:00 2001
From: mverch67 <manuel.verch@gmx.de>
Date: Sun, 22 Jun 2025 10:50:18 +0200
Subject: [PATCH] manual fixes after merge

---
 src/detect/ScanI2C.h        |  4 ++--
 src/input/TCA8418Keyboard.h |  1 +
 src/input/kbI2cBase.cpp     | 32 ++++++++++++++++----------------
 3 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/src/detect/ScanI2C.h b/src/detect/ScanI2C.h
index e9c1061bd..ab333e7cd 100644
--- a/src/detect/ScanI2C.h
+++ b/src/detect/ScanI2C.h
@@ -77,8 +77,8 @@ class ScanI2C
         BQ25896,
         BQ27220,
         LTR553ALS,
-        BHI260AP
-        BMM150,
+        BHI260AP,
+        BMM150
     } DeviceType;
 
     // typedef uint8_t DeviceAddress;
diff --git a/src/input/TCA8418Keyboard.h b/src/input/TCA8418Keyboard.h
index 7c8486615..b76916643 100644
--- a/src/input/TCA8418Keyboard.h
+++ b/src/input/TCA8418Keyboard.h
@@ -15,6 +15,7 @@ class TCA8418Keyboard : public TCA8418KeyboardBase
     void released(void) override;
 
     int8_t last_key;
+    int8_t next_key;
     uint32_t last_tap;
     uint8_t char_idx;
     int32_t tap_interval;
diff --git a/src/input/kbI2cBase.cpp b/src/input/kbI2cBase.cpp
index 22e44be93..5db1e39a9 100644
--- a/src/input/kbI2cBase.cpp
+++ b/src/input/kbI2cBase.cpp
@@ -291,31 +291,31 @@ int32_t KbI2cBase::runOnce()
                 break;
             case TCA8418KeyboardBase::ESC:
                 e.inputEvent = INPUT_BROKER_CANCEL;
-                e.kbchar = 0;
+                e.kbchar = 0x00;
                 break;
-            case 0x9E:
-                e.inputEvent = ANYKEY;
-                e.kbchar = INPUT_BROKER_MSG_GPS_TOGGLE;
+            case TCA8418KeyboardBase::GPS_TOGGLE:
+                e.inputEvent = INPUT_BROKER_ANYKEY;
+                e.kbchar = INPUT_BROKER_GPS_TOGGLE;
                 break;
-            case 0xAF:
-                e.inputEvent = ANYKEY;
-                e.kbchar = INPUT_BROKER_MSG_SEND_PING;
+            case TCA8418KeyboardBase::SEND_PING:
+                e.inputEvent = INPUT_BROKER_ANYKEY;
+                e.kbchar = INPUT_BROKER_SEND_PING;
                 break;
-            case 0xAC:
-                e.inputEvent = ANYKEY;
+            case TCA8418KeyboardBase::MUTE_TOGGLE:
+                e.inputEvent = INPUT_BROKER_ANYKEY;
                 e.kbchar = INPUT_BROKER_MSG_MUTE_TOGGLE;
                 break;
-            case 0xAA:
-                e.inputEvent = ANYKEY;
+            case TCA8418KeyboardBase::BT_TOGGLE:
+                e.inputEvent = INPUT_BROKER_ANYKEY;
                 e.kbchar = INPUT_BROKER_MSG_BLUETOOTH_TOGGLE;
                 break;
-            case 0xAB:
-                e.inputEvent = ANYKEY;
+            case TCA8418KeyboardBase::BL_TOGGLE:
+                e.inputEvent = INPUT_BROKER_ANYKEY;
                 e.kbchar = INPUT_BROKER_MSG_BLUETOOTH_TOGGLE;
                 break;
-            case 0x09:
-                e.inputEvent = ANYKEY;
-                e.kbchar = 0x09; // Tab
+            case TCA8418KeyboardBase::TAB:
+                e.inputEvent = INPUT_BROKER_ANYKEY;
+                e.kbchar = INPUT_BROKER_MSG_TAB;
                 break;
             default:
                 if (nextEvent > 127) {