Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Small fix for setups with only a slave touch bar. #16952

Merged
merged 2 commits into from
Apr 28, 2022
Merged

Small fix for setups with only a slave touch bar. #16952

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a786fbe
Small fix for setups with only a slave touch bar.
XScorpion2 Apr 28, 2022
f62bda8
Readded throttling
XScorpion2 Apr 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions keyboards/rgbkb/common/touch_encoder.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,12 +244,21 @@ void touch_encoder_update_slave(slave_touch_status_t slave_state) {
}

void touch_encoder_update(int8_t transaction_id) {
if (!touch_initialized) return;
#if TOUCH_UPDATE_INTERVAL > 0
if (!timer_expired(timer_read(), touch_update_timer)) return;
touch_update_timer = timer_read() + TOUCH_UPDATE_INTERVAL;
#endif

if (is_keyboard_master()) {
XScorpion2 marked this conversation as resolved.
Show resolved Hide resolved
slave_touch_status_t slave_state;
if (transaction_rpc_exec(transaction_id, sizeof(bool), &touch_disabled, sizeof(slave_touch_status_t), &slave_state)) {
if (memcmp(&touch_slave_state, &slave_state, sizeof(slave_touch_status_t)))
touch_encoder_update_slave(slave_state);
}
}

if (!touch_initialized) return;

read_register(QT_DETECTION_STATUS, &touch_raw[0], sizeof(touch_raw));
touch_processed[1] = touch_raw[1];
touch_processed[2] = touch_raw[2];
Expand Down Expand Up @@ -277,14 +286,6 @@ void touch_encoder_update(int8_t transaction_id) {
if ((touch_raw[0] & SLIDER_BIT) && touch_processed[3] != touch_raw[3]) {
touch_encoder_update_position();
}

if (is_keyboard_master()) {
slave_touch_status_t slave_state;
if (transaction_rpc_exec(transaction_id, sizeof(bool), &touch_disabled, sizeof(slave_touch_status_t), &slave_state)) {
if (memcmp(&touch_slave_state, &slave_state, sizeof(slave_touch_status_t)))
touch_encoder_update_slave(slave_state);
}
}
}

void touch_encoder_calibrate(void) {
Expand Down