nikrozman/air-mouse
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects 2 Releases Activity

Harder clicks

Browse Source
This commit is contained in:
Nik Rozman
2026-03-01 11:27:29 +01:00
parent 78484efe39
commit 3132ac554e
1 changed files with 18 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
air-mouse.ino
+18 -25
View File
@@ -219,8 +219,7 @@ const float BATT_EMPTY = 3.00f;
const float BATT_CRITICAL = 3.10f; const float BATT_CRITICAL = 3.10f;
#ifdef FEATURE_TAP_DETECTION #ifdef FEATURE_TAP_DETECTION
const unsigned long CLICK_HOLD_MS = 40; const unsigned long CLICK_HOLD_MS = 60;
const unsigned long DOUBLE_TAP_WINDOW_MS = 400;
#endif #endif
#ifdef FEATURE_TEMP_COMPENSATION #ifdef FEATURE_TEMP_COMPENSATION
const float TEMP_COMP_COEFF_DPS_C = 0.004f; const float TEMP_COMP_COEFF_DPS_C = 0.004f;
@@ -237,10 +236,8 @@ float calTempC = 25.0f;
float cachedTempC = 25.0f; float cachedTempC = 25.0f;
#ifdef FEATURE_TAP_DETECTION #ifdef FEATURE_TAP_DETECTION
bool tapPending = false;
bool clickButtonDown = false; bool clickButtonDown = false;
uint8_t clickButton = 0; uint8_t clickButton = 0;
unsigned long tapSeenMs = 0;
unsigned long clickDownMs= 0; unsigned long clickDownMs= 0;
uint32_t statLeftClicks = 0; uint32_t statLeftClicks = 0;
uint32_t statRightClicks = 0; uint32_t statRightClicks = 0;
@@ -293,44 +290,40 @@ float readIMUTemp() {
void setupTapDetection() { void setupTapDetection() {
imuWriteReg(REG_CTRL1_XL, 0x60); // ODR=416Hz, FS=±2g imuWriteReg(REG_CTRL1_XL, 0x60); // ODR=416Hz, FS=±2g
imuWriteReg(REG_TAP_CFG, 0x8E); // INT_EN + LIR + TAP_Z/Y/X imuWriteReg(REG_TAP_CFG, 0x8E); // INT_EN + LIR + TAP_Z/Y/X
imuWriteReg(REG_TAP_THS_6D, 0x08); // threshold 500 mg imuWriteReg(REG_TAP_THS_6D, 0x0C); // threshold 750 mg (was 500 mg — too easy to false-trigger)
imuWriteReg(REG_INT_DUR2, 0x77); // DUR=7, QUIET=01, SHOCK=11 imuWriteReg(REG_INT_DUR2, 0x7A); // DUR=7(538ms), QUIET=2(19ms), SHOCK=2(38ms)
imuWriteReg(REG_WAKE_UP_THS, 0x80); // enable double-tap imuWriteReg(REG_WAKE_UP_THS, 0x80); // enable double-tap
imuWriteReg(REG_MD1_CFG, 0x48); // route taps to INT1 imuWriteReg(REG_MD1_CFG, 0x48); // route taps to INT1
Serial.println("[TAP] Engine configured — single=LEFT, double=RIGHT"); Serial.println("[TAP] Engine configured — single=LEFT, double=RIGHT");
} }
void processTaps(unsigned long now) { void processTaps(unsigned long now) {
// Release held button after CLICK_HOLD_MS
if (clickButtonDown && (now - clickDownMs >= CLICK_HOLD_MS)) { if (clickButtonDown && (now - clickDownMs >= CLICK_HOLD_MS)) {
blehid.mouseButtonPress(clickButton, false); blehid.mouseButtonPress(clickButton, false);
clickButtonDown = false; clickButton = 0; clickButtonDown = false; clickButton = 0;
} }
if (clickButtonDown) return; // Don't start a new click while one is held
// The LSM6DS3 (with D_TAP_EN) already disambiguates at hardware level:
// SINGLE_TAP is only set after the DUR window expires with no second tap.
// DOUBLE_TAP is set immediately when the second tap arrives within DUR.
// We trust this directly — no software delay needed.
uint8_t tapSrc = imuReadReg(REG_TAP_SRC); uint8_t tapSrc = imuReadReg(REG_TAP_SRC);
bool singleTap = (tapSrc & 0x20) != 0; if (!(tapSrc & 0x40)) return; // TAP_IA not set — no event
bool doubleTap = (tapSrc & 0x10) != 0;
bool tapEvent = (tapSrc & 0x40) != 0; if (tapSrc & 0x10) { // DOUBLE_TAP → right click
if (!tapEvent) { Serial.println("[TAP] Double → RIGHT");
if (tapPending && (now - tapSeenMs >= DOUBLE_TAP_WINDOW_MS)) { blehid.mouseButtonPress(MOUSE_BUTTON_RIGHT, true);
tapPending = false; clickButton = MOUSE_BUTTON_RIGHT; clickButtonDown = true; clickDownMs = now;
if (!clickButtonDown) { statRightClicks++;
} else if (tapSrc & 0x20) { // SINGLE_TAP → left click
Serial.println("[TAP] Single → LEFT"); Serial.println("[TAP] Single → LEFT");
blehid.mouseButtonPress(MOUSE_BUTTON_LEFT, true); blehid.mouseButtonPress(MOUSE_BUTTON_LEFT, true);
clickButton = MOUSE_BUTTON_LEFT; clickButtonDown = true; clickDownMs = now; clickButton = MOUSE_BUTTON_LEFT; clickButtonDown = true; clickDownMs = now;
statLeftClicks++; statLeftClicks++;
} }
} }
return;
}
if (doubleTap && !clickButtonDown) {
tapPending = false;
Serial.println("[TAP] Double → RIGHT");
blehid.mouseButtonPress(MOUSE_BUTTON_RIGHT, true);
clickButton = MOUSE_BUTTON_RIGHT; clickButtonDown = true; clickDownMs = now;
statRightClicks++;
return;
}
if (singleTap && !tapPending && !clickButtonDown) { tapPending = true; tapSeenMs = now; }
}
#endif // FEATURE_TAP_DETECTION #endif // FEATURE_TAP_DETECTION
// ─── Charge mode ────────────────────────────────────────────────────────────── // ─── Charge mode ──────────────────────────────────────────────────────────────