summaryrefslogtreecommitdiff
path: root/keyboards/rmi_kb
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/rmi_kb')
-rw-r--r--keyboards/rmi_kb/chevron/keymaps/via/keymap.c14
-rw-r--r--keyboards/rmi_kb/herringbone/pro/keymaps/via/keymap.c16
-rw-r--r--keyboards/rmi_kb/squishytkl/keymaps/via/keymap.c14
-rw-r--r--keyboards/rmi_kb/wete/v2/keymaps/via/keymap.c14
4 files changed, 33 insertions, 25 deletions
diff --git a/keyboards/rmi_kb/chevron/keymaps/via/keymap.c b/keyboards/rmi_kb/chevron/keymaps/via/keymap.c
index 190a39e257..4dd5f34817 100644
--- a/keyboards/rmi_kb/chevron/keymaps/via/keymap.c
+++ b/keyboards/rmi_kb/chevron/keymaps/via/keymap.c
@@ -48,24 +48,26 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
keyevent_t encoder_ccw = {
.key = (keypos_t){.row = 4, .col = 0},
- .pressed = false
+ .pressed = false,
+ .type = KEY_EVENT
};
keyevent_t encoder_cw = {
.key = (keypos_t){.row = 4, .col = 1},
- .pressed = false
+ .pressed = false,
+ .type = KEY_EVENT
};
void matrix_scan_user(void) {
if (IS_PRESSED(encoder_ccw)) {
encoder_ccw.pressed = false;
- encoder_ccw.time = (timer_read() | 1);
+ encoder_ccw.time = timer_read();
action_exec(encoder_ccw);
}
if (IS_PRESSED(encoder_cw)) {
encoder_cw.pressed = false;
- encoder_cw.time = (timer_read() | 1);
+ encoder_cw.time = timer_read();
action_exec(encoder_cw);
}
}
@@ -73,12 +75,12 @@ void matrix_scan_user(void) {
bool encoder_update_user(uint8_t index, bool clockwise) {
if (clockwise) {
encoder_cw.pressed = true;
- encoder_cw.time = (timer_read() | 1);
+ encoder_cw.time = timer_read();
action_exec(encoder_cw);
wait_ms(20);
} else {
encoder_ccw.pressed = true;
- encoder_ccw.time = (timer_read() | 1);
+ encoder_ccw.time = timer_read();
action_exec(encoder_ccw);
wait_ms(20);
}
diff --git a/keyboards/rmi_kb/herringbone/pro/keymaps/via/keymap.c b/keyboards/rmi_kb/herringbone/pro/keymaps/via/keymap.c
index 71622cddcf..fa85436e48 100644
--- a/keyboards/rmi_kb/herringbone/pro/keymaps/via/keymap.c
+++ b/keyboards/rmi_kb/herringbone/pro/keymaps/via/keymap.c
@@ -54,24 +54,26 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
keyevent_t encoder_ccw = {
.key = (keypos_t){.row = 6, .col = 0},
- .pressed = false
-};
+ .pressed = false,
+ .type = KEY_EVENT
+ };
keyevent_t encoder_cw = {
.key = (keypos_t){.row = 6, .col = 1},
- .pressed = false
+ .pressed = false,
+ .type = KEY_EVENT
};
void matrix_scan_user(void) {
if (IS_PRESSED(encoder_ccw)) {
encoder_ccw.pressed = false;
- encoder_ccw.time = (timer_read() | 1);
+ encoder_ccw.time = timer_read();
action_exec(encoder_ccw);
}
if (IS_PRESSED(encoder_cw)) {
encoder_cw.pressed = false;
- encoder_cw.time = (timer_read() | 1);
+ encoder_cw.time = timer_read();
action_exec(encoder_cw);
}
}
@@ -86,14 +88,14 @@ uint8_t current_frame = 0;
bool encoder_update_user(uint8_t index, bool clockwise) {
if (clockwise) {
encoder_cw.pressed = true;
- encoder_cw.time = (timer_read() | 1);
+ encoder_cw.time = timer_read();
action_exec(encoder_cw);
wait_ms(20);
anim_sleep = timer_read32();
oled_on();
} else {
encoder_ccw.pressed = true;
- encoder_ccw.time = (timer_read() | 1);
+ encoder_ccw.time = timer_read();
action_exec(encoder_ccw);
wait_ms(20);
anim_sleep = timer_read32();
diff --git a/keyboards/rmi_kb/squishytkl/keymaps/via/keymap.c b/keyboards/rmi_kb/squishytkl/keymaps/via/keymap.c
index 7bd524f9d9..825b11c95d 100644
--- a/keyboards/rmi_kb/squishytkl/keymaps/via/keymap.c
+++ b/keyboards/rmi_kb/squishytkl/keymaps/via/keymap.c
@@ -29,24 +29,26 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
keyevent_t encoder_ccw = {
.key = (keypos_t){.row = 13, .col = 0},
- .pressed = false
+ .pressed = false,
+ .type = KEY_EVENT
};
keyevent_t encoder_cw = {
.key = (keypos_t){.row = 13, .col = 1},
- .pressed = false
+ .pressed = false,
+ .type = KEY_EVENT
};
void matrix_scan_user(void) {
if (IS_PRESSED(encoder_ccw)) {
encoder_ccw.pressed = false;
- encoder_ccw.time = (timer_read() | 1);
+ encoder_ccw.time = timer_read();
action_exec(encoder_ccw);
}
if (IS_PRESSED(encoder_cw)) {
encoder_cw.pressed = false;
- encoder_cw.time = (timer_read() | 1);
+ encoder_cw.time = timer_read();
action_exec(encoder_cw);
}
}
@@ -54,11 +56,11 @@ void matrix_scan_user(void) {
bool encoder_update_user(uint8_t index, bool clockwise) {
if (clockwise) {
encoder_cw.pressed = true;
- encoder_cw.time = (timer_read() | 1);
+ encoder_cw.time = timer_read();
action_exec(encoder_cw);
} else {
encoder_ccw.pressed = true;
- encoder_ccw.time = (timer_read() | 1);
+ encoder_ccw.time = timer_read();
action_exec(encoder_ccw);
}
return true;
diff --git a/keyboards/rmi_kb/wete/v2/keymaps/via/keymap.c b/keyboards/rmi_kb/wete/v2/keymaps/via/keymap.c
index 8afc6f9c25..1feb3d4686 100644
--- a/keyboards/rmi_kb/wete/v2/keymaps/via/keymap.c
+++ b/keyboards/rmi_kb/wete/v2/keymaps/via/keymap.c
@@ -37,24 +37,26 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
keyevent_t encoder_ccw = {
.key = (keypos_t){.row = 12, .col = 0},
- .pressed = false
+ .pressed = false,
+ .type = KEY_EVENT
};
keyevent_t encoder_cw = {
.key = (keypos_t){.row = 12, .col = 1},
- .pressed = false
+ .pressed = false,
+ .type = KEY_EVENT
};
void matrix_scan_user(void) {
if (IS_PRESSED(encoder_ccw)) {
encoder_ccw.pressed = false;
- encoder_ccw.time = (timer_read() | 1);
+ encoder_ccw.time = timer_read();
action_exec(encoder_ccw);
}
if (IS_PRESSED(encoder_cw)) {
encoder_cw.pressed = false;
- encoder_cw.time = (timer_read() | 1);
+ encoder_cw.time = timer_read();
action_exec(encoder_cw);
}
}
@@ -62,11 +64,11 @@ void matrix_scan_user(void) {
bool encoder_update_user(uint8_t index, bool clockwise) {
if (clockwise) {
encoder_cw.pressed = true;
- encoder_cw.time = (timer_read() | 1);
+ encoder_cw.time = timer_read();
action_exec(encoder_cw);
} else {
encoder_ccw.pressed = true;
- encoder_ccw.time = (timer_read() | 1);
+ encoder_ccw.time = timer_read();
action_exec(encoder_ccw);
}
return true;
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-09 17:55:02 +0000