summaryrefslogtreecommitdiffstats
path: root/keyboards/custommk/genesis/rev2
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/custommk/genesis/rev2')
-rw-r--r--keyboards/custommk/genesis/rev2/config.h66
-rw-r--r--keyboards/custommk/genesis/rev2/info.json76
-rw-r--r--keyboards/custommk/genesis/rev2/keymaps/default/keymap.c76
-rw-r--r--keyboards/custommk/genesis/rev2/keymaps/default/readme.md6
-rw-r--r--keyboards/custommk/genesis/rev2/keymaps/numpad/keymap.c89
-rw-r--r--keyboards/custommk/genesis/rev2/keymaps/numpad/readme.md3
-rw-r--r--keyboards/custommk/genesis/rev2/keymaps/via/keymap.c167
-rw-r--r--keyboards/custommk/genesis/rev2/keymaps/via/readme.md3
-rw-r--r--keyboards/custommk/genesis/rev2/keymaps/via/rules.mk2
-rw-r--r--keyboards/custommk/genesis/rev2/readme.md19
-rw-r--r--keyboards/custommk/genesis/rev2/rev2.c39
-rw-r--r--keyboards/custommk/genesis/rev2/rev2.h66
-rw-r--r--keyboards/custommk/genesis/rev2/rules.mk23
13 files changed, 635 insertions, 0 deletions
diff --git a/keyboards/custommk/genesis/rev2/config.h b/keyboards/custommk/genesis/rev2/config.h
new file mode 100644
index 0000000000..cbfda53f14
--- /dev/null
+++ b/keyboards/custommk/genesis/rev2/config.h
@@ -0,0 +1,66 @@
+/* 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 "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID 0xF35B
+#define PRODUCT_ID 0xFAB1
+#define DEVICE_VER 0x0001
+#define MANUFACTURER customMK
+#define PRODUCT GenesisRev2
+
+/* key matrix size */
+#define MATRIX_ROWS 6
+#define MATRIX_COLS 4
+
+/* key matrix pins */
+#define MATRIX_ROW_PINS { F0, C7, C6, B6, B5, B0}
+#define MATRIX_COL_PINS { F4, F5, D7, B4 }
+#define UNUSED_PINS
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+#define ENCODERS_PAD_A { F6, D2 }
+#define ENCODERS_PAD_B { F7, D1 }
+#define ENCODER_RESOLUTION 2
+#define TAP_CODE_DELAY 10
+
+#define RGB_DI_PIN E6
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
+#define RGBLED_NUM 13
+#define RGBLIGHT_LAYERS
+#define RGBLIGHT_HUE_STEP 8
+#define RGBLIGHT_SAT_STEP 8
+#define RGBLIGHT_VAL_STEP 8
+#define RGBLIGHT_LIMIT_VAL 128
+#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL + 4
+
diff --git a/keyboards/custommk/genesis/rev2/info.json b/keyboards/custommk/genesis/rev2/info.json
new file mode 100644
index 0000000000..8dda87c1af
--- /dev/null
+++ b/keyboards/custommk/genesis/rev2/info.json
@@ -0,0 +1,76 @@
+{
+ "keyboard_name": "Genesis Rev2",
+ "url": "https://www.customMK.com",
+ "maintainer": "customMK",
+ "width": 4,
+ "height": 6,
+ "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_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_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}]
+ }
+ }
+} \ No newline at end of file
diff --git a/keyboards/custommk/genesis/rev2/keymaps/default/keymap.c b/keyboards/custommk/genesis/rev2/keymaps/default/keymap.c
new file mode 100644
index 0000000000..7ba558ca96
--- /dev/null
+++ b/keyboards/custommk/genesis/rev2/keymaps/default/keymap.c
@@ -0,0 +1,76 @@
+/* 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 QMK_KEYBOARD_H
+
+//#define GENESIS_LAYER_COLORS
+#define GENESIS_LAYER1_COLOR HSV_CYAN
+#define GENESIS_LAYER2_COLOR HSV_GREEN
+#define GENESIS_LAYER3_COLOR HSV_WHITE
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+ [0] = LAYOUT_ortho_5x4(
+ MO(1), KC_PSLS, KC_PAST, KC_PMNS,
+ KC_P7, KC_P8, KC_P9, KC_BSPC,
+ KC_P4, KC_P5, KC_P6, KC_PPLS,
+ KC_P1, KC_P2, KC_P3, KC_CAPS,
+ KC_P0, KC_SPC, KC_PDOT, KC_ENT),
+
+ [1] = LAYOUT_ortho_5x4(
+ KC_TRNS, KC_VOLU, RGB_TOG, RGB_MOD,
+ 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, KC_TRNS, KC_TRNS, RGB_HUD),
+
+};
+
+
+#ifdef GENESIS_LAYER_COLORS
+const rgblight_segment_t PROGMEM my_layer1_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+ {0,13,GENESIS_LAYER1_COLOR}
+ );
+
+const rgblight_segment_t PROGMEM my_layer2_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+ {0,13,GENESIS_LAYER2_COLOR}
+ );
+
+const rgblight_segment_t PROGMEM my_layer3_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+ {0,13,GENESIS_LAYER3_COLOR}
+ );
+
+
+const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(
+ my_layer1_layer,
+ my_layer2_layer,
+ my_layer3_layer
+ );
+
+//Set the appropriate layer color
+layer_state_t layer_state_set_user(layer_state_t state) {
+ rgblight_set_layer_state(0, layer_state_cmp(state, 1));
+ rgblight_set_layer_state(1, layer_state_cmp(state, 2));
+ rgblight_set_layer_state(2, layer_state_cmp(state, 3));
+ return state;
+}
+
+void keyboard_post_init_user(void) {
+ //Enable the LED layers
+ rgblight_layers = my_rgb_layers;
+}
+#endif \ No newline at end of file
diff --git a/keyboards/custommk/genesis/rev2/keymaps/default/readme.md b/keyboards/custommk/genesis/rev2/keymaps/default/readme.md
new file mode 100644
index 0000000000..202402d831
--- /dev/null
+++ b/keyboards/custommk/genesis/rev2/keymaps/default/readme.md
@@ -0,0 +1,6 @@
+# Default Genesis Macro Pad Layout
+
+This is the default layout for the Genesis Macro Pad. It assumes all 1u switches
+and optional rotary encoder in the top-left or top-right corner for media volume
+control. The top left switch activates Layer 1 which enables control of the RGB
+underglow. \ No newline at end of file
diff --git a/keyboards/custommk/genesis/rev2/keymaps/numpad/keymap.c b/keyboards/custommk/genesis/rev2/keymaps/numpad/keymap.c
new file mode 100644
index 0000000000..e6b84c3f6b
--- /dev/null
+++ b/keyboards/custommk/genesis/rev2/keymaps/numpad/keymap.c
@@ -0,0 +1,89 @@
+/* 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 QMK_KEYBOARD_H
+
+//#define GENESIS_LAYER_COLORS
+#define GENESIS_LAYER1_COLOR HSV_CYAN
+#define GENESIS_LAYER2_COLOR HSV_GREEN
+#define GENESIS_LAYER3_COLOR HSV_WHITE
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+ [0] = LAYOUT_numpad_5x4(
+ MO(1), KC_PSLS, KC_PAST, KC_PMNS,
+ KC_P7, KC_P8, KC_P9,
+ KC_P4, KC_P5, KC_P6, KC_PPLS,
+ KC_P1, KC_P2, KC_P3,
+ KC_P0, KC_PDOT, KC_ENT),
+
+ [1] = LAYOUT_numpad_5x4(
+ KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD,
+ KC_TRNS, KC_TRNS, KC_TRNS,
+ RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD,
+ KC_TRNS, KC_TRNS, KC_TRNS,
+ RGB_HUI, KC_TRNS, RGB_HUD),
+
+ [2] = LAYOUT_numpad_5x4(
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, 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_numpad_5x4(
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS),
+
+};
+
+
+#ifdef GENESIS_LAYER_COLORS
+const rgblight_segment_t PROGMEM my_layer1_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+ {0,13,GENESIS_LAYER1_COLOR}
+ );
+
+const rgblight_segment_t PROGMEM my_layer2_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+ {0,13,GENESIS_LAYER2_COLOR}
+ );
+
+const rgblight_segment_t PROGMEM my_layer3_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+ {0,13,GENESIS_LAYER3_COLOR}
+ );
+
+
+const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(
+ my_layer1_layer,
+ my_layer2_layer,
+ my_layer3_layer
+ );
+
+//Set the appropriate layer color
+layer_state_t layer_state_set_user(layer_state_t state) {
+ rgblight_set_layer_state(0, layer_state_cmp(state, 1));
+ rgblight_set_layer_state(1, layer_state_cmp(state, 2));
+ rgblight_set_layer_state(2, layer_state_cmp(state, 3));
+ return state;
+}
+
+void keyboard_post_init_user(void) {
+ //Enable the LED layers
+ rgblight_layers = my_rgb_layers;
+}
+#endif \ No newline at end of file
diff --git a/keyboards/custommk/genesis/rev2/keymaps/numpad/readme.md b/keyboards/custommk/genesis/rev2/keymaps/numpad/readme.md
new file mode 100644
index 0000000000..795e4341a9
--- /dev/null
+++ b/keyboards/custommk/genesis/rev2/keymaps/numpad/readme.md
@@ -0,0 +1,3 @@
+# Numpad Genesis Macro Pad Layout
+
+This is the numpad layout for the Genesis Macro Pad. It assumes the 0, +, and enter keys are all 2u size, with an optional rotary encoder in the top-left or top-right corner for media volume control. The top left switch activates Layer 1 which enables control of the RGB underglow. \ No newline at end of file
diff --git a/keyboards/custommk/genesis/rev2/keymaps/via/keymap.c b/keyboards/custommk/genesis/rev2/keymaps/via/keymap.c
new file mode 100644
index 0000000000..eb0f7772cf
--- /dev/null
+++ b/keyboards/custommk/genesis/rev2/keymaps/via/keymap.c
@@ -0,0 +1,167 @@
+/* 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 QMK_KEYBOARD_H
+
+//#define GENESIS_LAYER_COLORS
+#define GENESIS_LAYER1_COLOR HSV_CYAN
+#define GENESIS_LAYER2_COLOR HSV_GREEN
+#define GENESIS_LAYER3_COLOR HSV_WHITE
+
+
+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,
+ 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,
+ 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),
+
+ [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),
+
+};
+
+#ifdef GENESIS_LAYER_COLORS
+const rgblight_segment_t PROGMEM my_layer1_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+ {0,13,GENESIS_LAYER1_COLOR}
+ );
+
+const rgblight_segment_t PROGMEM my_layer2_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+ {0,13,GENESIS_LAYER2_COLOR}
+ );
+
+const rgblight_segment_t PROGMEM my_layer3_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+ {0,13,GENESIS_LAYER3_COLOR}
+ );
+
+
+const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(
+ my_layer1_layer,
+ my_layer2_layer,
+ my_layer3_layer
+ );
+
+//Set the appropriate layer color
+layer_state_t layer_state_set_user(layer_state_t state) {
+ rgblight_set_layer_state(0, layer_state_cmp(state, 1));
+ rgblight_set_layer_state(1, layer_state_cmp(state, 2));
+ rgblight_set_layer_state(2, layer_state_cmp(state, 3));
+ return state;
+}
+
+void keyboard_post_init_user(void) {
+ //Enable the LED layers
+ rgblight_layers = my_rgb_layers;
+}
+#endif
+
+
+keyevent_t encoder_left_ccw = {
+ .key = (keypos_t){.row = 5, .col = 0},
+ .pressed = false
+};
+
+keyevent_t encoder_left_cw = {
+ .key = (keypos_t){.row = 5, .col = 1},
+ .pressed = false
+};
+
+keyevent_t encoder_right_ccw = {
+ .key = (keypos_t){.row = 5, .col = 2},
+ .pressed = false
+};
+
+keyevent_t encoder_right_cw = {
+ .key = (keypos_t){.row = 5, .col = 3},
+ .pressed = false
+};
+
+void matrix_scan_user(void) {
+ if (IS_PRESSED(encoder_left_ccw)) {
+ encoder_left_ccw.pressed = false;
+ encoder_left_ccw.time = (timer_read() | 1);
+ action_exec(encoder_left_ccw);
+ }
+
+ if (IS_PRESSED(encoder_left_cw)) {
+ encoder_left_cw.pressed = false;
+ encoder_left_cw.time = (timer_read() | 1);
+ action_exec(encoder_left_cw);
+ }
+
+ if (IS_PRESSED(encoder_right_ccw)) {
+ encoder_right_ccw.pressed = false;
+ encoder_right_ccw.time = (timer_read() | 1);
+ action_exec(encoder_right_ccw);
+ }
+
+ if (IS_PRESSED(encoder_right_cw)) {
+ encoder_right_cw.pressed = false;
+ encoder_right_cw.time = (timer_read() | 1);
+ action_exec(encoder_right_cw);
+ }
+
+}
+
+
+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);
+ action_exec(encoder_left_cw);
+ } else {
+ encoder_left_ccw.pressed = true;
+ encoder_left_ccw.time = (timer_read() | 1);
+ action_exec(encoder_left_ccw);
+ }
+ } else {
+ if (clockwise) {
+ encoder_right_cw.pressed = true;
+ encoder_right_cw.time = (timer_read() | 1);
+ action_exec(encoder_right_cw);
+ } else {
+ encoder_right_ccw.pressed = true;
+ encoder_right_ccw.time = (timer_read() | 1);
+ action_exec(encoder_right_ccw);
+ }
+ }
+ return false;
+}
diff --git a/keyboards/custommk/genesis/rev2/keymaps/via/readme.md b/keyboards/custommk/genesis/rev2/keymaps/via/readme.md
new file mode 100644
index 0000000000..aa70d62257
--- /dev/null
+++ b/keyboards/custommk/genesis/rev2/keymaps/via/readme.md
@@ -0,0 +1,3 @@
+# Genesis Macro Pad Layout for VIA
+
+This is the via layout for the Genesis Macro Pad. It is identical to the default 1u layout which assumes all 1u switches and optional rotary encoder in the top-left or top-right corner for media volume control. The top-left switch activates Layer 1 which enables control of the RGB underglow. \ No newline at end of file
diff --git a/keyboards/custommk/genesis/rev2/keymaps/via/rules.mk b/keyboards/custommk/genesis/rev2/keymaps/via/rules.mk
new file mode 100644
index 0000000000..43061db1dd
--- /dev/null
+++ b/keyboards/custommk/genesis/rev2/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes \ No newline at end of file
diff --git a/keyboards/custommk/genesis/rev2/readme.md b/keyboards/custommk/genesis/rev2/readme.md
new file mode 100644
index 0000000000..1b531b29c7
--- /dev/null
+++ b/keyboards/custommk/genesis/rev2/readme.md
@@ -0,0 +1,19 @@
+# Genesis
+
+Genesis Rev2 is the same as Genesis Rev1 firmware, except Rev2 allows encoder function remapping using VIA.
+
+* Keyboard Maintainer: [customMK](https://github.com/customMK)
+* Hardware Supported: Genesis Macro Pad
+* Hardware Availability: [customMK](https://shop.custommk.com/products/genesis_macropad)
+
+Make example for this keyboard (after setting up your build environment):
+
+ make custommk/genesis/rev2:default
+
+Flashing example for this keyboard:
+
+ make custommk/genesis/rev2:default:flash
+
+Genesis Macro Pad has qmk-dfu bootloader preinstalled. To enter the bootloader, run the flashing command above, and then either plug in the USB connection while holding the top-left key, or alternatively, plug in the USB connection and then press the reset button on the PCB
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/custommk/genesis/rev2/rev2.c b/keyboards/custommk/genesis/rev2/rev2.c
new file mode 100644
index 0000000000..bfa4cb0558
--- /dev/null
+++ b/keyboards/custommk/genesis/rev2/rev2.c
@@ -0,0 +1,39 @@
+/* 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
new file mode 100644
index 0000000000..e978e706c3
--- /dev/null
+++ b/keyboards/custommk/genesis/rev2/rev2.h
@@ -0,0 +1,66 @@
+/* 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 } \
+}
diff --git a/keyboards/custommk/genesis/rev2/rules.mk b/keyboards/custommk/genesis/rev2/rules.mk
new file mode 100644
index 0000000000..1556125ec7
--- /dev/null
+++ b/keyboards/custommk/genesis/rev2/rules.mk
@@ -0,0 +1,23 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = qmk-dfu
+
+# Build Options
+# change yes to no to disable
+#
+BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = yes # Mouse keys
+EXTRAKEY_ENABLE = yes # Audio control and System control
+CONSOLE_ENABLE = no # Console for debug
+COMMAND_ENABLE = no # Commands for debug and configuration
+# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
+SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
+# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+NKRO_ENABLE = yes # USB Nkey Rollover
+BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no # Enable Bluetooth
+AUDIO_ENABLE = no # Audio output
+ENCODER_ENABLE = yes \ No newline at end of file