aboutsummaryrefslogtreecommitdiff
path: root/keyboards/mk65
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/mk65')
-rw-r--r--keyboards/mk65/info.json146
-rw-r--r--keyboards/mk65/keymaps/via/keymap.c2
-rw-r--r--keyboards/mk65/mk65.c31
3 files changed, 75 insertions, 104 deletions
diff --git a/keyboards/mk65/info.json b/keyboards/mk65/info.json
index 84cd0fbca1..0ad1476419 100644
--- a/keyboards/mk65/info.json
+++ b/keyboards/mk65/info.json
@@ -33,7 +33,6 @@
"key_lock": false
},
"rgblight": {
- "pin": "B0",
"led_count": 7,
"hue_steps": 8,
"saturation_steps": 8,
@@ -53,80 +52,83 @@
"twinkle": true
}
},
+ "ws2812": {
+ "pin": "B0"
+ },
"layouts": {
"LAYOUT": {
"layout": [
- {"matrix": [0, 0], "x": 0, "y": 0.25},
- {"matrix": [0, 1], "x": 1, "y": 0.25},
- {"matrix": [0, 2], "x": 2, "y": 0.25},
- {"matrix": [0, 3], "x": 3, "y": 0.25},
- {"matrix": [0, 4], "x": 4, "y": 0.25},
- {"matrix": [0, 5], "x": 5, "y": 0.25},
- {"matrix": [0, 6], "x": 6, "y": 0.25},
- {"matrix": [0, 7], "x": 7, "y": 0.25},
- {"matrix": [0, 8], "x": 8, "y": 0.25},
- {"matrix": [0, 9], "x": 9, "y": 0.25},
- {"matrix": [0, 10], "x": 10, "y": 0.25},
- {"matrix": [0, 11], "x": 11, "y": 0.25},
- {"matrix": [0, 12], "x": 12, "y": 0.25},
- {"matrix": [0, 13], "x": 13, "y": 0.25},
- {"matrix": [0, 14], "x": 14, "y": 0.25},
- {"matrix": [0, 15], "x": 15.5, "y": 0},
- {"matrix": [1, 0], "x": 0, "y": 1.25, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1.25},
- {"matrix": [1, 2], "x": 2.5, "y": 1.25},
- {"matrix": [1, 3], "x": 3.5, "y": 1.25},
- {"matrix": [1, 4], "x": 4.5, "y": 1.25},
- {"matrix": [1, 5], "x": 5.5, "y": 1.25},
- {"matrix": [1, 6], "x": 6.5, "y": 1.25},
- {"matrix": [1, 7], "x": 7.5, "y": 1.25},
- {"matrix": [1, 8], "x": 8.5, "y": 1.25},
- {"matrix": [1, 9], "x": 9.5, "y": 1.25},
- {"matrix": [1, 10], "x": 10.5, "y": 1.25},
- {"matrix": [1, 11], "x": 11.5, "y": 1.25},
- {"matrix": [1, 12], "x": 12.5, "y": 1.25},
- {"matrix": [1, 13], "x": 13.5, "y": 1.25, "w": 1.5},
- {"matrix": [1, 15], "x": 15.5, "y": 1.25},
- {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2.25},
- {"matrix": [2, 2], "x": 2.75, "y": 2.25},
- {"matrix": [2, 3], "x": 3.75, "y": 2.25},
- {"matrix": [2, 4], "x": 4.75, "y": 2.25},
- {"matrix": [2, 5], "x": 5.75, "y": 2.25},
- {"matrix": [2, 6], "x": 6.75, "y": 2.25},
- {"matrix": [2, 7], "x": 7.75, "y": 2.25},
- {"matrix": [2, 8], "x": 8.75, "y": 2.25},
- {"matrix": [2, 9], "x": 9.75, "y": 2.25},
- {"matrix": [2, 10], "x": 10.75, "y": 2.25},
- {"matrix": [2, 11], "x": 11.75, "y": 2.25},
- {"matrix": [2, 13], "x": 12.75, "y": 2.25, "w": 2.25},
- {"matrix": [2, 15], "x": 15.5, "y": 2.25},
- {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.25},
- {"matrix": [3, 1], "x": 1.25, "y": 3.25},
- {"matrix": [3, 2], "x": 2.25, "y": 3.25},
- {"matrix": [3, 3], "x": 3.25, "y": 3.25},
- {"matrix": [3, 4], "x": 4.25, "y": 3.25},
- {"matrix": [3, 5], "x": 5.25, "y": 3.25},
- {"matrix": [3, 6], "x": 6.25, "y": 3.25},
- {"matrix": [3, 7], "x": 7.25, "y": 3.25},
- {"matrix": [3, 8], "x": 8.25, "y": 3.25},
- {"matrix": [3, 9], "x": 9.25, "y": 3.25},
- {"matrix": [3, 10], "x": 10.25, "y": 3.25},
- {"matrix": [3, 11], "x": 11.25, "y": 3.25},
- {"matrix": [3, 12], "x": 12.25, "y": 3.25, "w": 1.75},
- {"matrix": [3, 15], "x": 15.5, "y": 3.25},
- {"matrix": [3, 14], "x": 14.25, "y": 3.5},
- {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4.25, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4.25, "w": 1.25},
- {"matrix": [4, 6], "x": 3.75, "y": 4.25, "w": 6.25},
- {"matrix": [4, 10], "x": 10, "y": 4.25},
- {"matrix": [4, 11], "x": 11, "y": 4.25},
- {"matrix": [4, 12], "x": 12, "y": 4.25},
- {"matrix": [4, 13], "x": 13.25, "y": 4.5},
- {"matrix": [4, 14], "x": 14.25, "y": 4.5},
- {"matrix": [4, 15], "x": 15.25, "y": 4.5}
+ {"matrix": [0, 0], "x": 0, "y": 0.25},
+ {"matrix": [0, 1], "x": 1, "y": 0.25},
+ {"matrix": [0, 2], "x": 2, "y": 0.25},
+ {"matrix": [0, 3], "x": 3, "y": 0.25},
+ {"matrix": [0, 4], "x": 4, "y": 0.25},
+ {"matrix": [0, 5], "x": 5, "y": 0.25},
+ {"matrix": [0, 6], "x": 6, "y": 0.25},
+ {"matrix": [0, 7], "x": 7, "y": 0.25},
+ {"matrix": [0, 8], "x": 8, "y": 0.25},
+ {"matrix": [0, 9], "x": 9, "y": 0.25},
+ {"matrix": [0, 10], "x": 10, "y": 0.25},
+ {"matrix": [0, 11], "x": 11, "y": 0.25},
+ {"matrix": [0, 12], "x": 12, "y": 0.25},
+ {"matrix": [0, 13], "x": 13, "y": 0.25},
+ {"matrix": [0, 14], "x": 14, "y": 0.25},
+ {"matrix": [0, 15], "x": 15.5, "y": 0},
+ {"matrix": [1, 0], "x": 0, "y": 1.25, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1.25},
+ {"matrix": [1, 2], "x": 2.5, "y": 1.25},
+ {"matrix": [1, 3], "x": 3.5, "y": 1.25},
+ {"matrix": [1, 4], "x": 4.5, "y": 1.25},
+ {"matrix": [1, 5], "x": 5.5, "y": 1.25},
+ {"matrix": [1, 6], "x": 6.5, "y": 1.25},
+ {"matrix": [1, 7], "x": 7.5, "y": 1.25},
+ {"matrix": [1, 8], "x": 8.5, "y": 1.25},
+ {"matrix": [1, 9], "x": 9.5, "y": 1.25},
+ {"matrix": [1, 10], "x": 10.5, "y": 1.25},
+ {"matrix": [1, 11], "x": 11.5, "y": 1.25},
+ {"matrix": [1, 12], "x": 12.5, "y": 1.25},
+ {"matrix": [1, 13], "x": 13.5, "y": 1.25, "w": 1.5},
+ {"matrix": [1, 15], "x": 15.5, "y": 1.25},
+ {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2.25},
+ {"matrix": [2, 2], "x": 2.75, "y": 2.25},
+ {"matrix": [2, 3], "x": 3.75, "y": 2.25},
+ {"matrix": [2, 4], "x": 4.75, "y": 2.25},
+ {"matrix": [2, 5], "x": 5.75, "y": 2.25},
+ {"matrix": [2, 6], "x": 6.75, "y": 2.25},
+ {"matrix": [2, 7], "x": 7.75, "y": 2.25},
+ {"matrix": [2, 8], "x": 8.75, "y": 2.25},
+ {"matrix": [2, 9], "x": 9.75, "y": 2.25},
+ {"matrix": [2, 10], "x": 10.75, "y": 2.25},
+ {"matrix": [2, 11], "x": 11.75, "y": 2.25},
+ {"matrix": [2, 13], "x": 12.75, "y": 2.25, "w": 2.25},
+ {"matrix": [2, 15], "x": 15.5, "y": 2.25},
+ {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3.25},
+ {"matrix": [3, 3], "x": 3.25, "y": 3.25},
+ {"matrix": [3, 4], "x": 4.25, "y": 3.25},
+ {"matrix": [3, 5], "x": 5.25, "y": 3.25},
+ {"matrix": [3, 6], "x": 6.25, "y": 3.25},
+ {"matrix": [3, 7], "x": 7.25, "y": 3.25},
+ {"matrix": [3, 8], "x": 8.25, "y": 3.25},
+ {"matrix": [3, 9], "x": 9.25, "y": 3.25},
+ {"matrix": [3, 10], "x": 10.25, "y": 3.25},
+ {"matrix": [3, 11], "x": 11.25, "y": 3.25},
+ {"matrix": [3, 12], "x": 12.25, "y": 3.25, "w": 1.75},
+ {"matrix": [3, 15], "x": 15.5, "y": 3.25},
+ {"matrix": [3, 14], "x": 14.25, "y": 3.5},
+ {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4.25, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4.25, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.75, "y": 4.25, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4.25},
+ {"matrix": [4, 11], "x": 11, "y": 4.25},
+ {"matrix": [4, 12], "x": 12, "y": 4.25},
+ {"matrix": [4, 13], "x": 13.25, "y": 4.5},
+ {"matrix": [4, 14], "x": 14.25, "y": 4.5},
+ {"matrix": [4, 15], "x": 15.25, "y": 4.5}
]
}
}
-} \ No newline at end of file
+}
diff --git a/keyboards/mk65/keymaps/via/keymap.c b/keyboards/mk65/keymaps/via/keymap.c
index 4c74523b71..311bc0e240 100644
--- a/keyboards/mk65/keymaps/via/keymap.c
+++ b/keyboards/mk65/keymaps/via/keymap.c
@@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
};
#if defined(ENCODER_MAP_ENABLE)
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
[0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
[1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
[2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
diff --git a/keyboards/mk65/mk65.c b/keyboards/mk65/mk65.c
deleted file mode 100644
index 8afb0ac415..0000000000
--- a/keyboards/mk65/mk65.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Copyright 2022 DeskDaily
- *
- * 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
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_kb(uint8_t index, bool clockwise) {
- if (!encoder_update_user(index, clockwise)) { return false; }
- if (index == 0) {
- if (clockwise) {
- tap_code_delay(KC_VOLU, 10);
- } else {
- tap_code_delay(KC_VOLD, 10);
- }
- }
- return true;
-}
-#endif \ No newline at end of file