309359b32f
Before this change, if a matrix position was not present in the transform, various incorrect behaviors would happen: 1) In some cases out-of-bounds accesses: Note that the size of the`transform[]` array does not necessarily match the size of the matrix. So for example if key position (ZMK_MATRIX_COLS-1, ZMK_MATRIX_ROWS-1) is not present in the transform, but ends up being pressed, then the array will be accessed beyond its size, and any data could be returned. 2) In other cases the 0th position in the keymap will be used because the `transform[]` array is initialized to all zeros.
81 lines
2.4 KiB
C
81 lines
2.4 KiB
C
/*
|
|
* Copyright (c) 2020 The ZMK Contributors
|
|
*
|
|
* SPDX-License-Identifier: MIT
|
|
*/
|
|
|
|
#include <zephyr/kernel.h>
|
|
#include <zephyr/device.h>
|
|
#include <zephyr/bluetooth/addr.h>
|
|
#include <zephyr/drivers/kscan.h>
|
|
#include <zephyr/logging/log.h>
|
|
|
|
LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
|
|
|
|
#include <zmk/matrix_transform.h>
|
|
#include <zmk/event_manager.h>
|
|
#include <zmk/events/position_state_changed.h>
|
|
|
|
#define ZMK_KSCAN_EVENT_STATE_PRESSED 0
|
|
#define ZMK_KSCAN_EVENT_STATE_RELEASED 1
|
|
|
|
struct zmk_kscan_event {
|
|
uint32_t row;
|
|
uint32_t column;
|
|
uint32_t state;
|
|
};
|
|
|
|
struct zmk_kscan_msg_processor {
|
|
struct k_work work;
|
|
} msg_processor;
|
|
|
|
K_MSGQ_DEFINE(zmk_kscan_msgq, sizeof(struct zmk_kscan_event), CONFIG_ZMK_KSCAN_EVENT_QUEUE_SIZE, 4);
|
|
|
|
static void zmk_kscan_callback(const struct device *dev, uint32_t row, uint32_t column,
|
|
bool pressed) {
|
|
struct zmk_kscan_event ev = {
|
|
.row = row,
|
|
.column = column,
|
|
.state = (pressed ? ZMK_KSCAN_EVENT_STATE_PRESSED : ZMK_KSCAN_EVENT_STATE_RELEASED)};
|
|
|
|
k_msgq_put(&zmk_kscan_msgq, &ev, K_NO_WAIT);
|
|
k_work_submit(&msg_processor.work);
|
|
}
|
|
|
|
void zmk_kscan_process_msgq(struct k_work *item) {
|
|
struct zmk_kscan_event ev;
|
|
|
|
while (k_msgq_get(&zmk_kscan_msgq, &ev, K_NO_WAIT) == 0) {
|
|
bool pressed = (ev.state == ZMK_KSCAN_EVENT_STATE_PRESSED);
|
|
int32_t position = zmk_matrix_transform_row_column_to_position(ev.row, ev.column);
|
|
|
|
if (position < 0) {
|
|
LOG_WRN("Not found in transform: row: %d, col: %d, pressed: %s", ev.row, ev.column,
|
|
(pressed ? "true" : "false"));
|
|
continue;
|
|
}
|
|
|
|
LOG_DBG("Row: %d, col: %d, position: %d, pressed: %s", ev.row, ev.column, position,
|
|
(pressed ? "true" : "false"));
|
|
ZMK_EVENT_RAISE(new_zmk_position_state_changed(
|
|
(struct zmk_position_state_changed){.source = ZMK_POSITION_STATE_CHANGE_SOURCE_LOCAL,
|
|
.state = pressed,
|
|
.position = position,
|
|
.timestamp = k_uptime_get()}));
|
|
}
|
|
}
|
|
|
|
int zmk_kscan_init(const struct device *dev) {
|
|
if (dev == NULL) {
|
|
LOG_ERR("Failed to get the KSCAN device");
|
|
return -EINVAL;
|
|
}
|
|
|
|
k_work_init(&msg_processor.work, zmk_kscan_process_msgq);
|
|
|
|
kscan_config(dev, zmk_kscan_callback);
|
|
kscan_enable_callback(dev);
|
|
|
|
return 0;
|
|
}
|