summaryrefslogtreecommitdiff
path: root/keyboards/maxr1998
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/maxr1998')
-rw-r--r--keyboards/maxr1998/pulse4k/info.json2
-rw-r--r--keyboards/maxr1998/pulse4k/keymaps/default/keymap.c13
-rw-r--r--keyboards/maxr1998/pulse4k/pulse4k.c16
3 files changed, 20 insertions, 11 deletions
diff --git a/keyboards/maxr1998/pulse4k/info.json b/keyboards/maxr1998/pulse4k/info.json
index 0ac4f063c0..a653f8e09a 100644
--- a/keyboards/maxr1998/pulse4k/info.json
+++ b/keyboards/maxr1998/pulse4k/info.json
@@ -6,7 +6,7 @@
"width": 3,
"height": 2,
"layouts": {
- "LAYOUT_pulse4k": {
+ "LAYOUT": {
"key_count": 6,
"layout": [
{ "w": 1, "x": 0, "y": 0 },
diff --git a/keyboards/maxr1998/pulse4k/keymaps/default/keymap.c b/keyboards/maxr1998/pulse4k/keymaps/default/keymap.c
index 873c87d1f9..67331235ba 100644
--- a/keyboards/maxr1998/pulse4k/keymaps/default/keymap.c
+++ b/keyboards/maxr1998/pulse4k/keymaps/default/keymap.c
@@ -31,18 +31,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
void matrix_init_user(void) {
}
+// Override if necessary
+/*
void encoder_one_update(bool clockwise) {
- if (clockwise) {
- tap_code(KC_PGDN);
- } else {
- tap_code(KC_PGUP);
- }
}
void encoder_two_update(bool clockwise) {
- if (clockwise) {
- tap_code(KC_VOLU);
- } else {
- tap_code(KC_VOLD);
- }
}
+//*/
diff --git a/keyboards/maxr1998/pulse4k/pulse4k.c b/keyboards/maxr1998/pulse4k/pulse4k.c
index ee3d41ccd1..2ec9dca739 100644
--- a/keyboards/maxr1998/pulse4k/pulse4k.c
+++ b/keyboards/maxr1998/pulse4k/pulse4k.c
@@ -59,3 +59,19 @@ void encoder_update_kb(uint8_t index, bool clockwise) {
} else encoder_two_update(clockwise);
}
}
+
+__attribute__((weak)) void encoder_one_update(bool clockwise) {
+ if (clockwise) {
+ tap_code(KC_PGDN);
+ } else {
+ tap_code(KC_PGUP);
+ }
+}
+
+__attribute__((weak)) void encoder_two_update(bool clockwise) {
+ if (clockwise) {
+ tap_code(KC_VOLU);
+ } else {
+ tap_code(KC_VOLD);
+ }
+}