summaryrefslogtreecommitdiff
path: root/keyboards/custommk/evo70
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/custommk/evo70')
-rw-r--r--keyboards/custommk/evo70/config.h2
-rw-r--r--keyboards/custommk/evo70/info.json155
-rw-r--r--keyboards/custommk/evo70/keymaps/default/keymap.c6
-rw-r--r--keyboards/custommk/evo70/keymaps/via/keymap.c58
-rw-r--r--keyboards/custommk/evo70/keymaps/via/rules.mk1
5 files changed, 88 insertions, 134 deletions
diff --git a/keyboards/custommk/evo70/config.h b/keyboards/custommk/evo70/config.h
index 3010e4989d..00f78c6339 100644
--- a/keyboards/custommk/evo70/config.h
+++ b/keyboards/custommk/evo70/config.h
@@ -20,6 +20,4 @@
#define OLED_DISABLE_TIMEOUT
-#define TAP_CODE_DELAY 10
-
#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL + 4
diff --git a/keyboards/custommk/evo70/info.json b/keyboards/custommk/evo70/info.json
index 769e2e6118..95464e691a 100644
--- a/keyboards/custommk/evo70/info.json
+++ b/keyboards/custommk/evo70/info.json
@@ -29,6 +29,9 @@
{"pin_a": "C7", "pin_b": "D5", "resolution": 2}
]
},
+ "qmk": {
+ "tap_keycode_delay": 10
+ },
"backlight": {
"pin": "B5",
"levels": 17,
@@ -65,94 +68,90 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"matrix": [0, 0], "x": 2.5, "y": 1.1},
- {"matrix": [5, 0], "x": 3.5, "y": 1.1},
- {"matrix": [0, 1], "x": 4.5, "y": 1.1},
- {"matrix": [0, 2], "x": 5.5, "y": 1.1},
- {"matrix": [0, 3], "x": 6.5, "y": 1.1},
- {"matrix": [0, 4], "x": 7.5, "y": 1.1},
- {"matrix": [0, 5], "x": 8.5, "y": 1.1},
- {"matrix": [0, 6], "x": 9.5, "y": 1.1},
- {"matrix": [0, 7], "x": 10.5, "y": 1.1},
- {"matrix": [0, 8], "x": 11.5, "y": 1.1},
- {"matrix": [0, 9], "x": 12.5, "y": 1.1},
- {"matrix": [0, 10], "x": 13.5, "y": 1.1},
- {"matrix": [0, 11], "x": 14.5, "y": 1.1},
- {"matrix": [0, 12], "x": 15.5, "y": 1.1, "w": 2},
- {"matrix": [0, 13], "x": 17.5, "y": 1.1},
-
- {"matrix": [5, 1], "x": 2.5, "y": 2.1, "w": 1.5},
- {"matrix": [1, 0], "x": 4, "y": 2.1},
- {"matrix": [1, 1], "x": 5, "y": 2.1},
- {"matrix": [1, 2], "x": 6, "y": 2.1},
- {"matrix": [1, 3], "x": 7, "y": 2.1},
- {"matrix": [1, 4], "x": 8, "y": 2.1},
- {"matrix": [1, 5], "x": 9, "y": 2.1},
- {"matrix": [1, 6], "x": 10, "y": 2.1},
- {"matrix": [1, 7], "x": 11, "y": 2.1},
- {"matrix": [1, 8], "x": 12, "y": 2.1},
- {"matrix": [1, 9], "x": 13, "y": 2.1},
- {"matrix": [1, 10], "x": 14, "y": 2.1},
- {"matrix": [1, 11], "x": 15, "y": 2.1},
- {"matrix": [1, 12], "x": 16, "y": 2.1, "w": 1.5},
- {"matrix": [1, 13], "x": 17.5, "y": 2.1},
-
- {"matrix": [5, 5], "x": 0, "y": 3.1},
- {"matrix": [2, 0], "x": 1, "y": 3.1},
+ {"matrix": [0, 0], "x": 2.5, "y": 0},
+ {"matrix": [5, 0], "x": 3.5, "y": 0},
+ {"matrix": [0, 1], "x": 4.5, "y": 0},
+ {"matrix": [0, 2], "x": 5.5, "y": 0},
+ {"matrix": [0, 3], "x": 6.5, "y": 0},
+ {"matrix": [0, 4], "x": 7.5, "y": 0},
+ {"matrix": [0, 5], "x": 8.5, "y": 0},
+ {"matrix": [0, 6], "x": 9.5, "y": 0},
+ {"matrix": [0, 7], "x": 10.5, "y": 0},
+ {"matrix": [0, 8], "x": 11.5, "y": 0},
+ {"matrix": [0, 9], "x": 12.5, "y": 0},
+ {"matrix": [0, 10], "x": 13.5, "y": 0},
+ {"matrix": [0, 11], "x": 14.5, "y": 0},
+ {"matrix": [0, 12], "x": 15.5, "y": 0, "w": 2},
+ {"matrix": [0, 13], "x": 17.5, "y": 0},
- {"matrix": [5, 2], "x": 2.5, "y": 3.1, "w": 1.75},
- {"matrix": [2, 1], "x": 4.25, "y": 3.1},
- {"matrix": [2, 2], "x": 5.25, "y": 3.1},
- {"matrix": [2, 3], "x": 6.25, "y": 3.1},
- {"matrix": [2, 4], "x": 7.25, "y": 3.1},
- {"matrix": [2, 5], "x": 8.25, "y": 3.1},
- {"matrix": [2, 6], "x": 9.25, "y": 3.1},
- {"matrix": [2, 7], "x": 10.25, "y": 3.1},
- {"matrix": [2, 8], "x": 11.25, "y": 3.1},
- {"matrix": [2, 9], "x": 12.25, "y": 3.1},
- {"matrix": [2, 10], "x": 13.25, "y": 3.1},
- {"matrix": [2, 11], "x": 14.25, "y": 3.1},
- {"matrix": [2, 12], "x": 15.25, "y": 3.1, "w": 2.25},
- {"matrix": [2, 13], "x": 17.5, "y": 3.1},
+ {"matrix": [5, 1], "x": 2.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 0], "x": 4, "y": 1},
+ {"matrix": [1, 1], "x": 5, "y": 1},
+ {"matrix": [1, 2], "x": 6, "y": 1},
+ {"matrix": [1, 3], "x": 7, "y": 1},
+ {"matrix": [1, 4], "x": 8, "y": 1},
+ {"matrix": [1, 5], "x": 9, "y": 1},
+ {"matrix": [1, 6], "x": 10, "y": 1},
+ {"matrix": [1, 7], "x": 11, "y": 1},
+ {"matrix": [1, 8], "x": 12, "y": 1},
+ {"matrix": [1, 9], "x": 13, "y": 1},
+ {"matrix": [1, 10], "x": 14, "y": 1},
+ {"matrix": [1, 11], "x": 15, "y": 1},
+ {"matrix": [1, 12], "x": 16, "y": 1, "w": 1.5},
+ {"matrix": [1, 13], "x": 17.5, "y": 1},
- {"matrix": [4, 6], "x": 0, "y": 4.1},
- {"matrix": [4, 4], "x": 1, "y": 4.1},
+ {"matrix": [5, 5], "x": 0, "y": 2},
+ {"matrix": [2, 0], "x": 1, "y": 2},
- {"matrix": [3, 0], "x": 2.5, "y": 4.1, "w": 2.25},
- {"matrix": [3, 1], "x": 4.75, "y": 4.1},
- {"matrix": [3, 2], "x": 5.75, "y": 4.1},
- {"matrix": [3, 3], "x": 6.75, "y": 4.1},
- {"matrix": [3, 4], "x": 7.75, "y": 4.1},
- {"matrix": [3, 5], "x": 8.75, "y": 4.1},
- {"matrix": [3, 6], "x": 9.75, "y": 4.1},
- {"matrix": [3, 7], "x": 10.75, "y": 4.1},
- {"matrix": [3, 8], "x": 11.75, "y": 4.1},
- {"matrix": [3, 9], "x": 12.75, "y": 4.1},
- {"matrix": [3, 10], "x": 13.75, "y": 4.1},
- {"matrix": [3, 11], "x": 14.75, "y": 4.1, "w": 1.75},
- {"matrix": [3, 12], "x": 16.5, "y": 4.1},
- {"matrix": [3, 13], "x": 17.5, "y": 4.1},
+ {"matrix": [5, 2], "x": 2.5, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 4.25, "y": 2},
+ {"matrix": [2, 2], "x": 5.25, "y": 2},
+ {"matrix": [2, 3], "x": 6.25, "y": 2},
+ {"matrix": [2, 4], "x": 7.25, "y": 2},
+ {"matrix": [2, 5], "x": 8.25, "y": 2},
+ {"matrix": [2, 6], "x": 9.25, "y": 2},
+ {"matrix": [2, 7], "x": 10.25, "y": 2},
+ {"matrix": [2, 8], "x": 11.25, "y": 2},
+ {"matrix": [2, 9], "x": 12.25, "y": 2},
+ {"matrix": [2, 10], "x": 13.25, "y": 2},
+ {"matrix": [2, 11], "x": 14.25, "y": 2},
+ {"matrix": [2, 12], "x": 15.25, "y": 2, "w": 2.25},
+ {"matrix": [2, 13], "x": 17.5, "y": 2},
- {"matrix": [4, 1], "x": 0, "y": 5.1},
- {"matrix": [4, 3], "x": 1, "y": 5.1},
+ {"matrix": [4, 6], "x": 0, "y": 3},
+ {"matrix": [4, 4], "x": 1, "y": 3},
- {"matrix": [5, 4], "x": 2.5, "y": 5.1, "w": 1.25},
- {"matrix": [4, 0], "x": 3.75, "y": 5.1, "w": 1.25},
- {"matrix": [4, 2], "x": 5, "y": 5.1, "w": 1.25},
- {"matrix": [4, 5], "x": 6.25, "y": 5.1, "w": 6.25},
+ {"matrix": [3, 0], "x": 2.5, "y": 3, "w": 2.25},
+ {"matrix": [3, 1], "x": 4.75, "y": 3},
+ {"matrix": [3, 2], "x": 5.75, "y": 3},
+ {"matrix": [3, 3], "x": 6.75, "y": 3},
+ {"matrix": [3, 4], "x": 7.75, "y": 3},
+ {"matrix": [3, 5], "x": 8.75, "y": 3},
+ {"matrix": [3, 6], "x": 9.75, "y": 3},
+ {"matrix": [3, 7], "x": 10.75, "y": 3},
+ {"matrix": [3, 8], "x": 11.75, "y": 3},
+ {"matrix": [3, 9], "x": 12.75, "y": 3},
+ {"matrix": [3, 10], "x": 13.75, "y": 3},
+ {"matrix": [3, 11], "x": 14.75, "y": 3, "w": 1.75},
+ {"matrix": [3, 12], "x": 16.5, "y": 3},
+ {"matrix": [3, 13], "x": 17.5, "y": 3},
- {"matrix": [5, 6], "x": 0.5, "y": 1.1},
+ {"matrix": [4, 1], "x": 0, "y": 4},
+ {"matrix": [4, 3], "x": 1, "y": 4},
- {"matrix": [4, 7], "x": 0, "y": 0},
+ {"matrix": [5, 4], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 0], "x": 3.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 5, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 6.25, "y": 4, "w": 6.25},
- {"matrix": [4, 8], "x": 12.5, "y": 5.1, "w": 1.25},
- {"matrix": [4, 9], "x": 13.75, "y": 5.1, "w": 1.25},
+ {"matrix": [5, 6], "x": 0.5, "y": 0},
- {"matrix": [4, 10], "x": 1, "y": 0},
+ {"matrix": [4, 8], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 9], "x": 13.75, "y": 4, "w": 1.25},
- {"matrix": [4, 11], "x": 15.5, "y": 5.1},
- {"matrix": [4, 12], "x": 16.5, "y": 5.1},
- {"matrix": [4, 13], "x": 17.5, "y": 5.1}
+ {"matrix": [4, 11], "x": 15.5, "y": 4},
+ {"matrix": [4, 12], "x": 16.5, "y": 4},
+ {"matrix": [4, 13], "x": 17.5, "y": 4}
]
}
}
diff --git a/keyboards/custommk/evo70/keymaps/default/keymap.c b/keyboards/custommk/evo70/keymaps/default/keymap.c
index 6f518dd964..b577b885b2 100644
--- a/keyboards/custommk/evo70/keymaps/default/keymap.c
+++ b/keyboards/custommk/evo70/keymaps/default/keymap.c
@@ -23,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
KC_F1, KC_F2, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN,
KC_F3, KC_F4, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END,
- KC_F5, KC_F6, KC_LCTL, KC_LWIN, KC_LALT, KC_SPACE, KC_NO, KC_VOLD, KC_RALT, KC_RCTL, KC_VOLU, KC_LEFT, KC_DOWN, KC_RGHT
+ KC_F5, KC_F6, KC_LCTL, KC_LWIN, KC_LALT, KC_SPACE, KC_NO, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
),
[1] = LAYOUT(
@@ -31,6 +31,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TRNS, KC_TRNS, KC_BSLS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_F7, KC_F8, KC_TRNS, BL_TOGG, BL_STEP, BL_BRTG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_F9, KC_F10, KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD, RGB_VAI, RGB_VAD, RGB_HUI, RGB_HUD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
- ),
+ KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+ )
};
diff --git a/keyboards/custommk/evo70/keymaps/via/keymap.c b/keyboards/custommk/evo70/keymaps/via/keymap.c
index 34de0889ee..bff3309e63 100644
--- a/keyboards/custommk/evo70/keymaps/via/keymap.c
+++ b/keyboards/custommk/evo70/keymaps/via/keymap.c
@@ -23,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
KC_F1, KC_F2, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN,
KC_F3, KC_F4, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END,
- KC_F5, KC_F6, KC_LCTL, KC_LWIN, KC_LALT, KC_SPACE, KC_NO, KC_VOLD, KC_RALT, KC_RCTL, KC_VOLU, KC_LEFT, KC_DOWN, KC_RGHT
+ KC_F5, KC_F6, KC_LCTL, KC_LWIN, KC_LALT, KC_SPACE, KC_NO, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
),
[1] = LAYOUT(
@@ -31,57 +31,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TRNS, KC_TRNS, KC_BSLS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_F7, KC_F8, KC_TRNS, BL_TOGG, BL_STEP, BL_BRTG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_F9, KC_F10, KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD, RGB_VAI, RGB_VAD, RGB_HUI, RGB_HUD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+ KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
),
};
-static bool custom_encoder_mode = false;
-
-void set_custom_encoder_mode_user(bool custom_mode) {
- custom_encoder_mode = custom_mode;
-}
-
-
-keyevent_t encoder_ccw = {
- .key = (keypos_t){.row = 4, .col = 7},
- .pressed = false,
- .type = KEY_EVENT
-};
-
-keyevent_t encoder_cw = {
- .key = (keypos_t){.row = 4, .col = 10},
- .pressed = false,
- .type = KEY_EVENT
+#ifdef ENCODER_MAP_ENABLE
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+ [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+ [1] = { ENCODER_CCW_CW(_______, _______) },
};
-
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
- if (custom_encoder_mode) {
- if (clockwise) {
- encoder_cw.pressed = true;
- encoder_cw.time = timer_read();
- action_exec(encoder_cw);
- }
- else {
- encoder_ccw.pressed = true;
- encoder_ccw.time = timer_read();
- action_exec(encoder_ccw);
- }
- return false;
- }
- return true;
-}
-
-void matrix_scan_user(void) {
- if (encoder_ccw.pressed) {
- encoder_ccw.pressed = false;
- encoder_ccw.time = timer_read();
- action_exec(encoder_ccw);
- }
-
- if (encoder_cw.pressed) {
- encoder_cw.pressed = false;
- encoder_cw.time = timer_read();
- action_exec(encoder_cw);
- }
-}
+#endif
diff --git a/keyboards/custommk/evo70/keymaps/via/rules.mk b/keyboards/custommk/evo70/keymaps/via/rules.mk
index 1e5b99807c..f1adcab005 100644
--- a/keyboards/custommk/evo70/keymaps/via/rules.mk
+++ b/keyboards/custommk/evo70/keymaps/via/rules.mk
@@ -1 +1,2 @@
VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-28 10:27:40 +0000