summaryrefslogtreecommitdiffstats
path: root/keyboards/custommk
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/custommk')
-rw-r--r--keyboards/custommk/evo70/info.json4
-rw-r--r--keyboards/custommk/evo70/keymaps/via/keymap.c52
-rw-r--r--keyboards/custommk/genesis/rev1/config.h9
-rw-r--r--keyboards/custommk/genesis/rev1/info.json59
-rw-r--r--keyboards/custommk/genesis/rev1/rev1.c38
-rw-r--r--keyboards/custommk/genesis/rev1/rev1.h48
-rw-r--r--keyboards/custommk/genesis/rev2/config.h9
-rw-r--r--keyboards/custommk/genesis/rev2/info.json149
-rw-r--r--keyboards/custommk/genesis/rev2/keymaps/via/keymap.c68
-rw-r--r--keyboards/custommk/genesis/rev2/rev2.c39
-rw-r--r--keyboards/custommk/genesis/rev2/rev2.h66
11 files changed, 211 insertions, 330 deletions
diff --git a/keyboards/custommk/evo70/info.json b/keyboards/custommk/evo70/info.json
index 1ea89ad92a..ee032bd5ee 100644
--- a/keyboards/custommk/evo70/info.json
+++ b/keyboards/custommk/evo70/info.json
@@ -30,7 +30,6 @@
},
"rgblight": {
"led_count": 48,
- "pin": "B2",
"hue_steps": 4,
"saturation_steps": 8,
"brightness_steps": 4,
@@ -47,6 +46,9 @@
"twinkle": true
}
},
+ "ws2812": {
+ "pin": "B2"
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/custommk/evo70/keymaps/via/keymap.c b/keyboards/custommk/evo70/keymaps/via/keymap.c
index 74f68590cf..8019834b4f 100644
--- a/keyboards/custommk/evo70/keymaps/via/keymap.c
+++ b/keyboards/custommk/evo70/keymaps/via/keymap.c
@@ -19,31 +19,31 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT(
- QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL,
- 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,
+ QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL,
+ 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),
[1] = LAYOUT(
- QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS,
- 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,
+ QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS,
+ 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),
[2] = LAYOUT(
- 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_TRNS, 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_TRNS, 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_TRNS, 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_TRNS, 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_TRNS, 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_TRNS, 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_TRNS, 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_TRNS, 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_TRNS, 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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
[3] = LAYOUT(
- 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_TRNS, 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_TRNS, 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_TRNS, 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_TRNS, 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_TRNS, 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_TRNS, 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_TRNS, 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_TRNS, 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_TRNS, 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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
};
@@ -57,12 +57,14 @@ void set_custom_encoder_mode_user(bool custom_mode) {
keyevent_t encoder_ccw = {
.key = (keypos_t){.row = 4, .col = 7},
- .pressed = false
+ .pressed = false,
+ .type = KEY_EVENT
};
keyevent_t encoder_cw = {
.key = (keypos_t){.row = 4, .col = 10},
- .pressed = false
+ .pressed = false,
+ .type = KEY_EVENT
};
@@ -70,12 +72,12 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
if (custom_encoder_mode) {
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 false;
@@ -84,15 +86,15 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
}
void matrix_scan_user(void) {
- if (IS_PRESSED(encoder_ccw)) {
+ if (encoder_ccw.pressed) {
encoder_ccw.pressed = false;
- encoder_ccw.time = (timer_read() | 1);
+ encoder_ccw.time = timer_read();
action_exec(encoder_ccw);
}
- if (IS_PRESSED(encoder_cw)) {
+ if (encoder_cw.pressed) {
encoder_cw.pressed = false;
- encoder_cw.time = (timer_read() | 1);
+ encoder_cw.time = timer_read();
action_exec(encoder_cw);
}
-} \ No newline at end of file
+}
diff --git a/keyboards/custommk/genesis/rev1/config.h b/keyboards/custommk/genesis/rev1/config.h
index c5e7661c65..2967c1a31c 100644
--- a/keyboards/custommk/genesis/rev1/config.h
+++ b/keyboards/custommk/genesis/rev1/config.h
@@ -16,17 +16,8 @@
#pragma once
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { F0, C7, C6, B6, B5 }
-#define MATRIX_COL_PINS { F4, F5, D7, B4 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
#define TAP_CODE_DELAY 10
-#define RGB_DI_PIN E6
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/custommk/genesis/rev1/info.json b/keyboards/custommk/genesis/rev1/info.json
index aaab705432..11ac7db8d0 100644
--- a/keyboards/custommk/genesis/rev1/info.json
+++ b/keyboards/custommk/genesis/rev1/info.json
@@ -8,6 +8,14 @@
"pid": "0xFAB0",
"device_version": "0.0.1"
},
+ "ws2812": {
+ "pin": "E6"
+ },
+ "matrix_pins": {
+ "cols": ["F4", "F5", "D7", "B4"],
+ "rows": ["F0", "C7", "C6", "B6", "B5"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "F6", "pin_b": "F7", "resolution": 2},
@@ -18,10 +26,57 @@
"bootloader": "qmk-dfu",
"layouts": {
"LAYOUT_ortho_5x4": {
- "layout": [{"label":"MO(1)", "x":0, "y":0}, {"label":"/", "x":1, "y":0}, {"label":"*", "x":2, "y":0}, {"label":"Mute", "x":3, "y":0}, {"label":"7", "x":0, "y":1}, {"label":"8", "x":1, "y":1}, {"label":"9", "x":2, "y":1}, {"label":"+", "x":3, "y":1}, {"label":"4", "x":0, "y":2}, {"label":"5", "x":1, "y":2}, {"label":"6", "x":2, "y":2}, {"label":"Pg Up", "x":3, "y":2}, {"label":"1", "x":0, "y":3}, {"label":"2", "x":1, "y":3}, {"label":"3", "x":2, "y":3}, {"label":"Pg Dn", "x":3, "y":3}, {"label":"0", "x":0, "y":4}, {"label":"Spc", "x":1, "y":4}, {"label":".", "x":2, "y":4}, {"label":"Enter", "x":3, "y":4}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+ {"matrix": [4, 2], "x": 2, "y": 4},
+ {"matrix": [4, 3], "x": 3, "y": 4}
+ ]
},
"LAYOUT_numpad_5x4": {
- "layout": [{"label":"MO(1)", "x":0, "y":0}, {"label":"/", "x":1, "y":0}, {"label":"*", "x":2, "y":0}, {"label":"-", "x":3, "y":0}, {"label":"7", "x":0, "y":1}, {"label":"8", "x":1, "y":1}, {"label":"9", "x":2, "y":1}, {"label":"+", "x":3, "y":1, "h":2}, {"label":"4", "x":0, "y":2}, {"label":"5", "x":1, "y":2}, {"label":"6", "x":2, "y":2}, {"label":"1", "x":0, "y":3}, {"label":"2", "x":1, "y":3}, {"label":"3", "x":2, "y":3}, {"label":"Enter", "x":3, "y":3, "h":2}, {"label":"0", "x":0, "y":4, "w":2}, {"label":".", "x":2, "y":4}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [2, 0], "x": 3, "y": 1, "h": 2},
+
+ {"matrix": [2, 1], "x": 0, "y": 2},
+ {"matrix": [2, 2], "x": 1, "y": 2},
+ {"matrix": [2, 3], "x": 2, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [4, 0], "x": 3, "y": 3, "h": 2},
+
+ {"matrix": [4, 2], "x": 0, "y": 4, "w": 2},
+ {"matrix": [4, 3], "x": 2, "y": 4}
+ ]
}
}
diff --git a/keyboards/custommk/genesis/rev1/rev1.c b/keyboards/custommk/genesis/rev1/rev1.c
deleted file mode 100644
index ac40eedbf2..0000000000
--- a/keyboards/custommk/genesis/rev1/rev1.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2020 customMK
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "rev1.h"
-
-bool encoder_update_kb(uint8_t index, bool clockwise) {
- if (!encoder_update_user(index, clockwise)) return false;
- /* top left encoder */
- if (index == 0) {
- if (clockwise) {
- tap_code(KC_VOLU);
- } else {
- tap_code(KC_VOLD);
- }
- }
- /* top right encoder */
- else if (index == 1) {
- if (clockwise) {
- tap_code(KC_VOLU);
- } else {
- tap_code(KC_VOLD);
- }
- }
- return true;
-}
diff --git a/keyboards/custommk/genesis/rev1/rev1.h b/keyboards/custommk/genesis/rev1/rev1.h
deleted file mode 100644
index 0516b41ad8..0000000000
--- a/keyboards/custommk/genesis/rev1/rev1.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Copyright 2020 customMK
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_numpad_5x4( \
- K00, K01, K02, K03, \
- K10, K11, K12, \
- K20, K21, K22, K23, \
- K30, K31, K32, \
- K40, K42, K43 \
-) { \
- { K00, K01, K02, K03 }, \
- { K10, K11, K12, KC_NO }, \
- { K20, K21, K22, K23 }, \
- { K30, K31, K32, KC_NO }, \
- { K40, KC_NO, K42, K43 } \
-}
-
-#define LAYOUT_ortho_5x4( \
- K00, K01, K02, K03, \
- K10, K11, K12, K13, \
- K20, K21, K22, K23, \
- K30, K31, K32, K33, \
- K40, K41, K42, K43 \
-) { \
- { K00, K01, K02, K03 }, \
- { K10, K11, K12, K13 }, \
- { K20, K21, K22, K23 }, \
- { K30, K31, K32, K33 }, \
- { K40, K41, K42, K43 } \
-}
-
diff --git a/keyboards/custommk/genesis/rev2/config.h b/keyboards/custommk/genesis/rev2/config.h
index f152f723fe..7f9e79ba2c 100644
--- a/keyboards/custommk/genesis/rev2/config.h
+++ b/keyboards/custommk/genesis/rev2/config.h
@@ -16,17 +16,8 @@
#pragma once
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { F0, C7, C6, B6, B5, B0}
-#define MATRIX_COL_PINS { F4, F5, D7, B4 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
#define TAP_CODE_DELAY 10
-#define RGB_DI_PIN E6
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/custommk/genesis/rev2/info.json b/keyboards/custommk/genesis/rev2/info.json
index 45b83c512a..f084e6411f 100644
--- a/keyboards/custommk/genesis/rev2/info.json
+++ b/keyboards/custommk/genesis/rev2/info.json
@@ -8,6 +8,14 @@
"pid": "0xFAB1",
"device_version": "0.0.1"
},
+ "ws2812": {
+ "pin": "E6"
+ },
+ "matrix_pins": {
+ "cols": ["F4", "F5", "D7", "B4"],
+ "rows": ["F0", "C7", "C6", "B6", "B5", "B0"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "F6", "pin_b": "F7", "resolution": 2},
@@ -18,71 +26,90 @@
"bootloader": "qmk-dfu",
"layouts": {
"LAYOUT_ortho_5x4": {
- "layout": [{"label":"MO(1)", "x":0, "y":0},
- {"label":"/", "x":1, "y":0},
- {"label":"*", "x":2, "y":0},
- {"label":"Mute", "x":3, "y":0},
- {"label":"7", "x":0, "y":1},
- {"label":"8", "x":1, "y":1},
- {"label":"9", "x":2, "y":1},
- {"label":"+", "x":3, "y":1},
- {"label":"4", "x":0, "y":2},
- {"label":"5", "x":1, "y":2},
- {"label":"6", "x":2, "y":2},
- {"label":"Pg Up", "x":3, "y":2},
- {"label":"1", "x":0, "y":3},
- {"label":"2", "x":1, "y":3},
- {"label":"3", "x":2, "y":3},
- {"label":"Pg Dn", "x":3, "y":3},
- {"label":"0", "x":0, "y":4},
- {"label":"Spc", "x":1, "y":4},
- {"label":".", "x":2, "y":4},
- {"label":"Enter", "x":3, "y":4}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+ {"matrix": [4, 2], "x": 2, "y": 4},
+ {"matrix": [4, 3], "x": 3, "y": 4}
+ ]
},
"LAYOUT_numpad_5x4": {
- "layout": [{"label":"MO(1)", "x":0, "y":0},
- {"label":"/", "x":1, "y":0},
- {"label":"*", "x":2, "y":0},
- {"label":"-", "x":3, "y":0},
- {"label":"7", "x":0, "y":1},
- {"label":"8", "x":1, "y":1},
- {"label":"9", "x":2, "y":1},
- {"label":"+", "x":3, "y":1, "h":2},
- {"label":"4", "x":0, "y":2},
- {"label":"5", "x":1, "y":2},
- {"label":"6", "x":2, "y":2},
- {"label":"1", "x":0, "y":3},
- {"label":"2", "x":1, "y":3},
- {"label":"3", "x":2, "y":3},
- {"label":"Enter", "x":3, "y":3, "h":2},
- {"label":"0", "x":0, "y":4, "w":2},
- {"label":".", "x":2, "y":4}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [2, 0], "x": 3, "y": 1, "h": 2},
+
+ {"matrix": [2, 1], "x": 0, "y": 2},
+ {"matrix": [2, 2], "x": 1, "y": 2},
+ {"matrix": [2, 3], "x": 2, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [4, 0], "x": 3, "y": 3, "h": 2},
+
+ {"matrix": [4, 2], "x": 0, "y": 4, "w": 2},
+ {"matrix": [4, 3], "x": 2, "y": 4}
+ ]
},
"LAYOUT_via_6x4": {
- "layout": [{"label":"Vol-", "x":0, "y":0},
- {"label":"Vol+", "x":1, "y":0},
- {"label":"Vol-", "x":3, "y":0},
- {"label":"Vol+", "x":4, "y":0},
- {"label":"MO(1)", "x":0.5, "y":1.1},
- {"label":"/", "x":1.5, "y":1.1},
- {"label":"*", "x":2.5, "y":1.1},
- {"label":"Mute", "x":3.5, "y":1.1},
- {"label":"7", "x":0.5, "y":2.1},
- {"label":"8", "x":1.5, "y":2.1},
- {"label":"9", "x":2.5, "y":2.1},
- {"label":"+", "x":3.5, "y":2.1},
- {"label":"4", "x":0.5, "y":3.1},
- {"label":"5", "x":1.5, "y":3.1},
- {"label":"6", "x":2.5, "y":3.1},
- {"label":"Pg Up", "x":3.5, "y":3.1},
- {"label":"1", "x":0.5, "y":4.1},
- {"label":"2", "x":1.5, "y":4.1},
- {"label":"3", "x":2.5, "y":4.1},
- {"label":"Pg Dn", "x":3.5, "y":4.1},
- {"label":"0", "x":0.5, "y":5.1},
- {"label":"Spc", "x":1.5, "y":5.1},
- {"label":".", "x":2.5, "y":5.1},
- {"label":"Enter", "x":3.5, "y":5.1}]
+ "layout": [
+ {"matrix": [5, 0], "x": 0, "y": 0},
+ {"matrix": [5, 1], "x": 1, "y": 0},
+ {"matrix": [5, 2], "x": 3, "y": 0},
+ {"matrix": [5, 3], "x": 4, "y": 0},
+
+ {"matrix": [0, 0], "x": 0.5, "y": 1.1},
+ {"matrix": [0, 1], "x": 1.5, "y": 1.1},
+ {"matrix": [0, 2], "x": 2.5, "y": 1.1},
+ {"matrix": [0, 3], "x": 3.5, "y": 1.1},
+
+ {"matrix": [1, 0], "x": 0.5, "y": 2.1},
+ {"matrix": [1, 1], "x": 1.5, "y": 2.1},
+ {"matrix": [1, 2], "x": 2.5, "y": 2.1},
+ {"matrix": [1, 3], "x": 3.5, "y": 2.1},
+
+ {"matrix": [2, 0], "x": 0.5, "y": 3.1},
+ {"matrix": [2, 1], "x": 1.5, "y": 3.1},
+ {"matrix": [2, 2], "x": 2.5, "y": 3.1},
+ {"matrix": [2, 3], "x": 3.5, "y": 3.1},
+
+ {"matrix": [3, 0], "x": 0.5, "y": 4.1},
+ {"matrix": [3, 1], "x": 1.5, "y": 4.1},
+ {"matrix": [3, 2], "x": 2.5, "y": 4.1},
+ {"matrix": [3, 3], "x": 3.5, "y": 4.1},
+
+ {"matrix": [4, 0], "x": 0.5, "y": 5.1},
+ {"matrix": [4, 1], "x": 1.5, "y": 5.1},
+ {"matrix": [4, 2], "x": 2.5, "y": 5.1},
+ {"matrix": [4, 3], "x": 3.5, "y": 5.1}
+ ]
}
}
}
diff --git a/keyboards/custommk/genesis/rev2/keymaps/via/keymap.c b/keyboards/custommk/genesis/rev2/keymaps/via/keymap.c
index eb0f7772cf..9c04a33e15 100644
--- a/keyboards/custommk/genesis/rev2/keymaps/via/keymap.c
+++ b/keyboards/custommk/genesis/rev2/keymaps/via/keymap.c
@@ -13,7 +13,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-
+
#include QMK_KEYBOARD_H
//#define GENESIS_LAYER_COLORS
@@ -26,34 +26,34 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_via_6x4(
KC_VOLD, KC_VOLU, KC_VOLD, KC_VOLU,
- MO(1), KC_PSLS, KC_PAST, KC_PMNS,
- KC_P7, KC_P8, KC_P9, KC_PGUP,
- KC_P4, KC_P5, KC_P6, KC_PPLS,
- KC_P1, KC_P2, KC_P3, KC_PGDN,
+ MO(1), KC_PSLS, KC_PAST, KC_PMNS,
+ KC_P7, KC_P8, KC_P9, KC_PGUP,
+ KC_P4, KC_P5, KC_P6, KC_PPLS,
+ KC_P1, KC_P2, KC_P3, KC_PGDN,
KC_P0, KC_SPC, KC_PDOT, KC_PENT),
[1] = LAYOUT_via_6x4(
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, RGB_TOG, RGB_MOD, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, RGB_TOG, RGB_MOD, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
RGB_HUI, RGB_HUD, KC_TRNS, KC_TRNS),
[2] = LAYOUT_via_6x4(
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_TRNS, 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_TRNS, 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_TRNS, KC_TRNS),
[3] = LAYOUT_via_6x4(
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_TRNS, 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_TRNS, 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_TRNS, KC_TRNS),
};
@@ -95,49 +95,53 @@ void keyboard_post_init_user(void) {
keyevent_t encoder_left_ccw = {
.key = (keypos_t){.row = 5, .col = 0},
- .pressed = false
+ .pressed = false,
+ .type = KEY_EVENT
};
keyevent_t encoder_left_cw = {
.key = (keypos_t){.row = 5, .col = 1},
.pressed = false
+ .type = KEY_EVENT
};
keyevent_t encoder_right_ccw = {
.key = (keypos_t){.row = 5, .col = 2},
.pressed = false
+ .type = KEY_EVENT
};
keyevent_t encoder_right_cw = {
.key = (keypos_t){.row = 5, .col = 3},
- .pressed = false
+ .pressed = false,
+ .type = KEY_EVENT
};
void matrix_scan_user(void) {
- if (IS_PRESSED(encoder_left_ccw)) {
+ if (encoder_left_ccw.pressed) {
encoder_left_ccw.pressed = false;
- encoder_left_ccw.time = (timer_read() | 1);
+ encoder_left_ccw.time = timer_read();
action_exec(encoder_left_ccw);
}
- if (IS_PRESSED(encoder_left_cw)) {
+ if (encoder_left_cw.pressed) {
encoder_left_cw.pressed = false;
- encoder_left_cw.time = (timer_read() | 1);
+ encoder_left_cw.time = timer_read();
action_exec(encoder_left_cw);
}
- if (IS_PRESSED(encoder_right_ccw)) {
+ if (encoder_right_ccw.pressed) {
encoder_right_ccw.pressed = false;
- encoder_right_ccw.time = (timer_read() | 1);
+ encoder_right_ccw.time = timer_read();
action_exec(encoder_right_ccw);
}
- if (IS_PRESSED(encoder_right_cw)) {
+ if (encoder_right_cw.pressed) {
encoder_right_cw.pressed = false;
- encoder_right_cw.time = (timer_read() | 1);
+ encoder_right_cw.time = timer_read();
action_exec(encoder_right_cw);
}
-
+
}
@@ -145,21 +149,21 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
if (index == 0) {
if (clockwise) {
encoder_left_cw.pressed = true;
- encoder_left_cw.time = (timer_read() | 1);
+ encoder_left_cw.time = timer_read();
action_exec(encoder_left_cw);
} else {
encoder_left_ccw.pressed = true;
- encoder_left_ccw.time = (timer_read() | 1);
+ encoder_left_ccw.time = timer_read();
action_exec(encoder_left_ccw);
}
} else {
if (clockwise) {
encoder_right_cw.pressed = true;
- encoder_right_cw.time = (timer_read() | 1);
+ encoder_right_cw.time = timer_read();
action_exec(encoder_right_cw);
} else {
encoder_right_ccw.pressed = true;
- encoder_right_ccw.time = (timer_read() | 1);
+ encoder_right_ccw.time = timer_read();
action_exec(encoder_right_ccw);
}
}
diff --git a/keyboards/custommk/genesis/rev2/rev2.c b/keyboards/custommk/genesis/rev2/rev2.c
deleted file mode 100644
index bfa4cb0558..0000000000
--- a/keyboards/custommk/genesis/rev2/rev2.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Copyright 2020 customMK
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "rev2.h"
-
-bool encoder_update_kb(uint8_t index, bool clockwise) {
- if (!encoder_update_user(index, clockwise)) { return false; }
- /* top left encoder */
- if (index == 0) {
- if (clockwise) {
- tap_code(KC_VOLU);
- } else {
- tap_code(KC_VOLD);
- }
- }
- /* top right encoder */
- else if (index == 1) {
- if (clockwise) {
- tap_code(KC_VOLU);
- } else {
- tap_code(KC_VOLD);
- }
- }
- return false;
-}
-
diff --git a/keyboards/custommk/genesis/rev2/rev2.h b/keyboards/custommk/genesis/rev2/rev2.h
deleted file mode 100644
index e978e706c3..0000000000
--- a/keyboards/custommk/genesis/rev2/rev2.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* Copyright 2020 customMK
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_numpad_5x4( \
- K00, K01, K02, K03, \
- K10, K11, K12, \
- K20, K21, K22, K23, \
- K30, K31, K32, \
- K40, K42, K43 \
-) { \
- { K00, K01, K02, K03 }, \
- { K10, K11, K12, KC_NO }, \
- { K20, K21, K22, K23 }, \
- { K30, K31, K32, KC_NO }, \
- { K40, KC_NO, K42, K43 }, \
- { KC_NO, KC_NO, KC_NO, KC_NO} \
-}
-
-#define LAYOUT_ortho_5x4( \
- K00, K01, K02, K03, \
- K10, K11, K12, K13, \
- K20, K21, K22, K23, \
- K30, K31, K32, K33, \
- K40, K41, K42, K43 \
-) { \
- { K00, K01, K02, K03 }, \
- { K10, K11, K12, K13 }, \
- { K20, K21, K22, K23 }, \
- { K30, K31, K32, K33 }, \
- { K40, K41, K42, K43 }, \
- { KC_NO, KC_NO, KC_NO, KC_NO} \
-}
-
-
-#define LAYOUT_via_6x4( \
- E00A, E00B, E01A, E01B, \
- K00, K01, K02, K03, \
- K10, K11, K12, K13, \
- K20, K21, K22, K23, \
- K30, K31, K32, K33, \
- K40, K41, K42, K43 \
-) { \
- { K00, K01, K02, K03 }, \
- { K10, K11, K12, K13 }, \
- { K20, K21, K22, K23 }, \
- { K30, K31, K32, K33 }, \
- { K40, K41, K42, K43 }, \
- { E00A, E00B, E01A, E01B } \
-}
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-24 00:27:27 +0000