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.

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

Crkbd implementing return value for matrix_scan() #10422

Merged
merged 2 commits into from
Oct 1, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 11 additions & 7 deletions keyboards/crkbd/rev1/legacy/matrix.c
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,7 @@ void matrix_init(void)

uint8_t _matrix_scan(void)
{
bool changed = false;
// Right hand is stored after the left in the matirx so, we need to offset it
int offset = isLeftHand ? 0 : (ROWS_PER_HAND);

Expand All @@ -163,6 +164,7 @@ uint8_t _matrix_scan(void)
_delay_us(30); // without this wait read unstable value.
matrix_row_t cols = read_cols();
if (matrix_debouncing[i+offset] != cols) {
changed = true;
matrix_debouncing[i+offset] = cols;
debouncing = DEBOUNCE;
}
Expand All @@ -179,7 +181,7 @@ uint8_t _matrix_scan(void)
}
}

return 1;
return changed;
}

#ifdef USE_MATRIX_I2C
Expand Down Expand Up @@ -237,16 +239,17 @@ int serial_transaction(int master_changed) {

uint8_t matrix_scan(void)
{
bool changed = false;
if (is_master) {
matrix_master_scan();
changed |= matrix_master_scan();
}else{
matrix_slave_scan();
changed |= matrix_slave_scan();
int offset = (isLeftHand) ? ROWS_PER_HAND : 0;
memcpy(&matrix[offset],
(void *)serial_master_buffer, SERIAL_MASTER_BUFFER_LENGTH);
matrix_scan_quantum();
}
return 1;
return (uint8_t) changed;
}


Expand Down Expand Up @@ -297,8 +300,8 @@ uint8_t matrix_master_scan(void) {
return ret;
}

void matrix_slave_scan(void) {
_matrix_scan();
uint8_t matrix_slave_scan(void) {
int ret = _matrix_scan();

int offset = (isLeftHand) ? 0 : ROWS_PER_HAND;

Expand All @@ -314,14 +317,15 @@ void matrix_slave_scan(void) {
for (int i = 0; i < ROWS_PER_HAND; ++i) {
#ifdef SERIAL_USE_MULTI_TRANSACTION
if( serial_slave_buffer[i] != matrix[offset+i] )
change = 1;
change = 1;
#endif
serial_slave_buffer[i] = matrix[offset+i];
}
#ifdef SERIAL_USE_MULTI_TRANSACTION
slave_buffer_change_count += change;
#endif
#endif
return ret;
}

bool matrix_is_modified(void)
Expand Down
2 changes: 1 addition & 1 deletion keyboards/crkbd/rev1/legacy/split_util.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
extern volatile bool isLeftHand;

// slave version of matix scan, defined in matrix.c
void matrix_slave_scan(void);
uint8_t matrix_slave_scan(void);

void split_keyboard_setup(void);
bool has_usb(void);
Expand Down