pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-02-26 22:33:24 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Enable the autoconf settings for MPR121 based keyboards, to make it more flexible for varying implementations. (#5680)

Browse Source 
Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
This commit is contained in:
aussieklutz 2024-12-27 23:16:08 +10:00 committed by GitHub
parent 26a4d6c87a
commit e5accf4e1d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/input/MPR121Keyboard.cpp
View File

@ -29,6 +29,8 @@
#define _MPR121_REG_CONFIG1 0x5C #define _MPR121_REG_CONFIG1 0x5C
#define _MPR121_REG_CONFIG2 0x5D #define _MPR121_REG_CONFIG2 0x5D
#define _MPR121_REG_ELECTRODE_CONFIG 0x5E #define _MPR121_REG_ELECTRODE_CONFIG 0x5E
#define _MPR121_REG_AUTOCONF_CTRL0 0x7B
#define _MPR121_REG_AUTOCONF_CTRL1 0x7C
#define _MPR121_REG_SOFT_RESET 0x80 #define _MPR121_REG_SOFT_RESET 0x80
#define _KEY_MASK 0x0FFF // Key mask for the first 12 bits #define _KEY_MASK 0x0FFF // Key mask for the first 12 bits
@ -132,18 +134,18 @@ void MPR121Keyboard::reset()
writeRegister(_MPR121_REG_ELECTRODE_CONFIG, 0x00); writeRegister(_MPR121_REG_ELECTRODE_CONFIG, 0x00);
delay(100); delay(100);
LOG_DEBUG("MPR121 Configure"); LOG_DEBUG("MPR121 Configuring");
// Set touch release thresholds // Set touch release thresholds
for (uint8_t i = 0; i < 12; i++) { for (uint8_t i = 0; i < 12; i++) {
// Set touch threshold // Set touch threshold
writeRegister(_MPR121_REG_TOUCH_THRESHOLD + (i * 2), 15); writeRegister(_MPR121_REG_TOUCH_THRESHOLD + (i * 2), 10);
delay(20); delay(20);
// Set release threshold // Set release threshold
writeRegister(_MPR121_REG_RELEASE_THRESHOLD + (i * 2), 7); writeRegister(_MPR121_REG_RELEASE_THRESHOLD + (i * 2), 5);
delay(20); delay(20);
} }
// Configure filtering and baseline registers // Configure filtering and baseline registers
writeRegister(_MPR121_REG_MAX_HALF_DELTA_RISING, 0x01); writeRegister(_MPR121_REG_MAX_HALF_DELTA_RISING, 0x05);
delay(20); delay(20);
writeRegister(_MPR121_REG_MAX_HALF_DELTA_FALLING, 0x01); writeRegister(_MPR121_REG_MAX_HALF_DELTA_FALLING, 0x01);
delay(20); delay(20);
@ -153,7 +155,7 @@ void MPR121Keyboard::reset()
delay(20); delay(20);
writeRegister(_MPR121_REG_NOISE_HALF_DELTA_TOUCHED, 0x00); writeRegister(_MPR121_REG_NOISE_HALF_DELTA_TOUCHED, 0x00);
delay(20); delay(20);
writeRegister(_MPR121_REG_NOISE_COUNT_LIMIT_RISING, 0x0e); writeRegister(_MPR121_REG_NOISE_COUNT_LIMIT_RISING, 0x05);
delay(20); delay(20);
writeRegister(_MPR121_REG_NOISE_COUNT_LIMIT_FALLING, 0x01); writeRegister(_MPR121_REG_NOISE_COUNT_LIMIT_FALLING, 0x01);
delay(20); delay(20);
@ -165,18 +167,19 @@ void MPR121Keyboard::reset()
delay(20); delay(20);
writeRegister(_MPR121_REG_FILTER_DELAY_COUNT_TOUCHED, 0x00); writeRegister(_MPR121_REG_FILTER_DELAY_COUNT_TOUCHED, 0x00);
delay(20); delay(20);
// Set Debounce to 0x02 writeRegister(_MPR121_REG_AUTOCONF_CTRL0, 0x04); // Auto-config enable
writeRegister(_MPR121_REG_DEBOUNCE, 0x00);
delay(20); delay(20);
// Set Filter1 itterations and discharge current 6x and 16uA respectively (0x10) writeRegister(_MPR121_REG_AUTOCONF_CTRL1, 0x00); // Ensure no auto-config interrupt
writeRegister(_MPR121_REG_CONFIG1, 0x10);
delay(20); delay(20);
// Set CDT to 0.5us, Filter2 itterations to 4x, and Sample interval = 0 (0x20) writeRegister(_MPR121_REG_DEBOUNCE, 0x02);
writeRegister(_MPR121_REG_CONFIG2, 0x20); delay(20);
writeRegister(_MPR121_REG_CONFIG1, 0x20);
delay(20);
writeRegister(_MPR121_REG_CONFIG2, 0x21);
delay(20); delay(20);
// Enter run mode by Seting partial filter calibration tracking, disable proximity detection, enable 12 channels // Enter run mode by Seting partial filter calibration tracking, disable proximity detection, enable 12 channels
writeRegister(_MPR121_REG_ELECTRODE_CONFIG, writeRegister(_MPR121_REG_ELECTRODE_CONFIG,
ECR_CALIBRATION_TRACK_FROM_PARTIAL_FILTER | ECR_PROXIMITY_DETECTION_OFF | ECR_TOUCH_DETECTION_12CH); ECR_CALIBRATION_TRACK_FROM_FULL_FILTER | ECR_PROXIMITY_DETECTION_OFF | ECR_TOUCH_DETECTION_12CH);
delay(100); delay(100);
LOG_DEBUG("MPR121 Run"); LOG_DEBUG("MPR121 Run");
state = Idle; state = Idle;
@ -427,4 +430,4 @@ void MPR121Keyboard::writeRegister(uint8_t reg, uint8_t value)
if (writeCallback) { if (writeCallback) {
writeCallback(m_addr, data[0], &(data[1]), 1); writeCallback(m_addr, data[0], &(data[1]), 1);
} }
} }