summaryrefslogtreecommitdiff
path: root/quantum
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2023-04-30 01:57:38 +0000
committerQMK Bot <hello@qmk.fm>2023-04-30 01:57:38 +0000
commit9c9670b25f803fe15b8733770c6103a35fb1461c (patch)
tree1ef9d4eb9d02d4023dc682e34174fa74615cad0c /quantum
parent4887f03dbd0b5aa3f804309a7293d2c7e632c1a7 (diff)
parent7138fa4582118a477fed293a647af52c0ad13919 (diff)
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'quantum')
-rw-r--r--quantum/keyboard.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/quantum/keyboard.c b/quantum/keyboard.c
index 90f6d6f8da..5115709748 100644
--- a/quantum/keyboard.c
+++ b/quantum/keyboard.c
@@ -189,9 +189,9 @@ static matrix_row_t get_real_keys(uint8_t row, matrix_row_t rowdata) {
matrix_row_t out = 0;
for (uint8_t col = 0; col < MATRIX_COLS; col++) {
// read each key in the row data and check if the keymap defines it as a real key
- if (keycode_at_keymap_location(0, row, col) && (rowdata & (1 << col))) {
+ if (keycode_at_keymap_location(0, row, col) && (rowdata & (((matrix_row_t)1) << col))) {
// this creates new row data, if a key is defined in the keymap, it will be set here
- out |= 1 << col;
+ out |= ((matrix_row_t)1) << col;
}
}
return out;