summaryrefslogtreecommitdiff
path: root/keyboards/meletrix/zoom75
diff options
context:
space:
mode:
authorNick Brassel <nick@tzarc.org>2023-05-29 06:17:24 +1000
committerNick Brassel <nick@tzarc.org>2023-05-29 06:17:24 +1000
commit5024370dd0b441e86ace3089193e84c5b050d892 (patch)
treeb661d5b154be987f9c3dba3a526b70e0b63f9fef /keyboards/meletrix/zoom75
parent16767e4d59c2334fcd2d5e6556a68d5ff60ffd7b (diff)
parent8b1d86eabf399e82af7738fb675b9c74195d0f98 (diff)
Merge branch 'develop'
Diffstat (limited to 'keyboards/meletrix/zoom75')
-rw-r--r--keyboards/meletrix/zoom75/info.json188
-rw-r--r--keyboards/meletrix/zoom75/keymaps/default/keymap.c2
-rw-r--r--keyboards/meletrix/zoom75/keymaps/via/keymap.c2
3 files changed, 88 insertions, 104 deletions
diff --git a/keyboards/meletrix/zoom75/info.json b/keyboards/meletrix/zoom75/info.json
index 9fd3bb8522..20d7dc064a 100644
--- a/keyboards/meletrix/zoom75/info.json
+++ b/keyboards/meletrix/zoom75/info.json
@@ -29,119 +29,103 @@
},
"matrix_pins": {
"rows": ["F4", "F1", "F0", "C6", "B6", "F5"],
- "cols": [
- "C7",
- "D5",
- "B5",
- "B4",
- "D7",
- "D6",
- "D4",
- "D3",
- "D2",
- "D1",
- "D0",
- "B7",
- "B2",
- "B3",
- "F7"
- ]
+ "cols": ["C7", "D5", "B5", "B4", "D7", "D6", "D4", "D3", "D2", "D1", "D0", "B7", "B2", "B3", "F7"]
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT": {
"layout": [
- { "matrix": [0, 0], "label": "Esc", "x": 0, "y": 0 },
- { "matrix": [0, 1], "label": "F1", "x": 1.25, "y": 0 },
- { "matrix": [0, 2], "label": "F2", "x": 2.25, "y": 0 },
- { "matrix": [0, 3], "label": "F3", "x": 3.25, "y": 0 },
- { "matrix": [0, 4], "label": "F4", "x": 4.25, "y": 0 },
- { "matrix": [0, 5], "label": "F5", "x": 5.5, "y": 0 },
- { "matrix": [0, 6], "label": "F6", "x": 6.5, "y": 0 },
- { "matrix": [0, 7], "label": "F7", "x": 7.5, "y": 0 },
- { "matrix": [0, 8], "label": "F8", "x": 8.5, "y": 0 },
- { "matrix": [0, 9], "label": "F9", "x": 9.75, "y": 0 },
- { "matrix": [0, 10], "label": "F10", "x": 10.75, "y": 0 },
- { "matrix": [0, 11], "label": "F11", "x": 11.75, "y": 0 },
- { "matrix": [0, 12], "label": "F12", "x": 12.75, "y": 0 },
- { "matrix": [0, 13], "label": "F13", "x": 14, "y": 0 },
- { "matrix": [0, 14], "label": "Encoder", "x": 15, "y": 0 },
+ {"matrix": [0, 0], "label": "Esc", "x": 0, "y": 0},
+ {"matrix": [0, 1], "label": "F1", "x": 1.25, "y": 0},
+ {"matrix": [0, 2], "label": "F2", "x": 2.25, "y": 0},
+ {"matrix": [0, 3], "label": "F3", "x": 3.25, "y": 0},
+ {"matrix": [0, 4], "label": "F4", "x": 4.25, "y": 0},
+ {"matrix": [0, 5], "label": "F5", "x": 5.5, "y": 0},
+ {"matrix": [0, 6], "label": "F6", "x": 6.5, "y": 0},
+ {"matrix": [0, 7], "label": "F7", "x": 7.5, "y": 0},
+ {"matrix": [0, 8], "label": "F8", "x": 8.5, "y": 0},
+ {"matrix": [0, 9], "label": "F9", "x": 9.75, "y": 0},
+ {"matrix": [0, 10], "label": "F10", "x": 10.75, "y": 0},
+ {"matrix": [0, 11], "label": "F11", "x": 11.75, "y": 0},
+ {"matrix": [0, 12], "label": "F12", "x": 12.75, "y": 0},
+ {"matrix": [0, 13], "label": "F13", "x": 14, "y": 0},
+ {"matrix": [0, 14], "label": "Encoder", "x": 15, "y": 0},
- { "matrix": [1, 0], "label": "~", "x": 0, "y": 1.25 },
- { "matrix": [1, 1], "label": "1", "x": 1, "y": 1.25 },
- { "matrix": [1, 2], "label": "2", "x": 2, "y": 1.25 },
- { "matrix": [1, 3], "label": "3", "x": 3, "y": 1.25 },
- { "matrix": [1, 4], "label": "4", "x": 4, "y": 1.25 },
- { "matrix": [1, 5], "label": "5", "x": 5, "y": 1.25 },
- { "matrix": [1, 6], "label": "6", "x": 6, "y": 1.25 },
- { "matrix": [1, 7], "label": "7", "x": 7, "y": 1.25 },
- { "matrix": [1, 8], "label": "8", "x": 8, "y": 1.25 },
- { "matrix": [1, 9], "label": "9", "x": 9, "y": 1.25 },
- { "matrix": [1, 10], "label": "0", "x": 10, "y": 1.25 },
- { "matrix": [1, 11], "label": "-", "x": 11, "y": 1.25 },
- { "matrix": [1, 12], "label": "=", "x": 12, "y": 1.25 },
- { "matrix": [1, 13], "label": "Backspace", "x": 13, "y": 1.25 },
- { "matrix": [3, 13], "label": "Backspace1", "x": 14, "y": 1.25 },
- { "matrix": [1, 14], "label": "Delect", "x": 15, "y": 1.25 },
+ {"matrix": [1, 0], "label": "~", "x": 0, "y": 1.25},
+ {"matrix": [1, 1], "label": "1", "x": 1, "y": 1.25},
+ {"matrix": [1, 2], "label": "2", "x": 2, "y": 1.25},
+ {"matrix": [1, 3], "label": "3", "x": 3, "y": 1.25},
+ {"matrix": [1, 4], "label": "4", "x": 4, "y": 1.25},
+ {"matrix": [1, 5], "label": "5", "x": 5, "y": 1.25},
+ {"matrix": [1, 6], "label": "6", "x": 6, "y": 1.25},
+ {"matrix": [1, 7], "label": "7", "x": 7, "y": 1.25},
+ {"matrix": [1, 8], "label": "8", "x": 8, "y": 1.25},
+ {"matrix": [1, 9], "label": "9", "x": 9, "y": 1.25},
+ {"matrix": [1, 10], "label": "0", "x": 10, "y": 1.25},
+ {"matrix": [1, 11], "label": "-", "x": 11, "y": 1.25},
+ {"matrix": [1, 12], "label": "=", "x": 12, "y": 1.25},
+ {"matrix": [1, 13], "label": "Backspace", "x": 13, "y": 1.25},
+ {"matrix": [3, 13], "label": "Backspace1", "x": 14, "y": 1.25},
+ {"matrix": [1, 14], "label": "Delect", "x": 15, "y": 1.25},
- { "matrix": [2, 0], "label": "Tab", "x": 0, "y": 2.25, "w": 1.5 },
- { "matrix": [2, 1], "label": "Q", "x": 1.5, "y": 2.25 },
- { "matrix": [2, 2], "label": "W", "x": 2.5, "y": 2.25 },
- { "matrix": [2, 3], "label": "E", "x": 3.5, "y": 2.25 },
- { "matrix": [2, 4], "label": "R", "x": 4.5, "y": 2.25 },
- { "matrix": [2, 5], "label": "T", "x": 5.5, "y": 2.25 },
- { "matrix": [2, 6], "label": "Y", "x": 6.5, "y": 2.25 },
- { "matrix": [2, 7], "label": "U", "x": 7.5, "y": 2.25 },
- { "matrix": [2, 8], "label": "I", "x": 8.5, "y": 2.25 },
- { "matrix": [2, 9], "label": "O", "x": 9.5, "y": 2.25 },
- { "matrix": [2, 10], "label": "P", "x": 10.5, "y": 2.25 },
- { "matrix": [2, 11], "label": "[", "x": 11.5, "y": 2.25 },
- { "matrix": [2, 12], "label": "]", "x": 12.5, "y": 2.25 },
- { "matrix": [2, 13], "label": "\\", "x": 13.5, "y": 2.25, "w": 1.5 },
- { "matrix": [2, 14], "label": "PageUp", "x": 15, "y": 2.25 },
+ {"matrix": [2, 0], "label": "Tab", "x": 0, "y": 2.25, "w": 1.5},
+ {"matrix": [2, 1], "label": "Q", "x": 1.5, "y": 2.25},
+ {"matrix": [2, 2], "label": "W", "x": 2.5, "y": 2.25},
+ {"matrix": [2, 3], "label": "E", "x": 3.5, "y": 2.25},
+ {"matrix": [2, 4], "label": "R", "x": 4.5, "y": 2.25},
+ {"matrix": [2, 5], "label": "T", "x": 5.5, "y": 2.25},
+ {"matrix": [2, 6], "label": "Y", "x": 6.5, "y": 2.25},
+ {"matrix": [2, 7], "label": "U", "x": 7.5, "y": 2.25},
+ {"matrix": [2, 8], "label": "I", "x": 8.5, "y": 2.25},
+ {"matrix": [2, 9], "label": "O", "x": 9.5, "y": 2.25},
+ {"matrix": [2, 10], "label": "P", "x": 10.5, "y": 2.25},
+ {"matrix": [2, 11], "label": "[", "x": 11.5, "y": 2.25},
+ {"matrix": [2, 12], "label": "]", "x": 12.5, "y": 2.25},
+ {"matrix": [2, 13], "label": "\\", "x": 13.5, "y": 2.25, "w": 1.5},
+ {"matrix": [2, 14], "label": "PageUp", "x": 15, "y": 2.25},
- { "matrix": [3, 0], "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75 },
- { "matrix": [3, 1], "label": "A", "x": 1.75, "y": 3.25 },
- { "matrix": [3, 2], "label": "S", "x": 2.75, "y": 3.25 },
- { "matrix": [3, 3], "label": "D", "x": 3.75, "y": 3.25 },
- { "matrix": [3, 4], "label": "F", "x": 4.75, "y": 3.25 },
- { "matrix": [3, 5], "label": "G", "x": 5.75, "y": 3.25 },
- { "matrix": [3, 6], "label": "H", "x": 6.75, "y": 3.25 },
- { "matrix": [3, 7], "label": "J", "x": 7.75, "y": 3.25 },
- { "matrix": [3, 8], "label": "K", "x": 8.75, "y": 3.25 },
- { "matrix": [3, 9], "label": "L", "x": 9.75, "y": 3.25 },
- { "matrix": [3, 10], "label": ";", "x": 10.75, "y": 3.25 },
- { "matrix": [3, 11], "label": "'", "x": 11.75, "y": 3.25 },
- { "matrix": [3, 12], "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25 },
- { "matrix": [3, 14], "label": "PageDown", "x": 15, "y": 3.25 },
+ {"matrix": [3, 0], "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75},
+ {"matrix": [3, 1], "label": "A", "x": 1.75, "y": 3.25},
+ {"matrix": [3, 2], "label": "S", "x": 2.75, "y": 3.25},
+ {"matrix": [3, 3], "label": "D", "x": 3.75, "y": 3.25},
+ {"matrix": [3, 4], "label": "F", "x": 4.75, "y": 3.25},
+ {"matrix": [3, 5], "label": "G", "x": 5.75, "y": 3.25},
+ {"matrix": [3, 6], "label": "H", "x": 6.75, "y": 3.25},
+ {"matrix": [3, 7], "label": "J", "x": 7.75, "y": 3.25},
+ {"matrix": [3, 8], "label": "K", "x": 8.75, "y": 3.25},
+ {"matrix": [3, 9], "label": "L", "x": 9.75, "y": 3.25},
+ {"matrix": [3, 10], "label": ";", "x": 10.75, "y": 3.25},
+ {"matrix": [3, 11], "label": "'", "x": 11.75, "y": 3.25},
+ {"matrix": [3, 12], "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25},
+ {"matrix": [3, 14], "label": "PageDown", "x": 15, "y": 3.25},
- { "matrix": [4, 0], "label": "Shift1", "x": 0, "y": 4.25, "w": 1.25 },
- { "matrix": [4, 1], "label": "Shift2", "x": 1.25, "y": 4.25 },
- { "matrix": [4, 2], "label": "Z", "x": 2.25, "y": 4.25 },
- { "matrix": [4, 3], "label": "X", "x": 3.25, "y": 4.25 },
- { "matrix": [4, 4], "label": "C", "x": 4.25, "y": 4.25 },
- { "matrix": [4, 5], "label": "V", "x": 5.25, "y": 4.25 },
- { "matrix": [4, 6], "label": "B", "x": 6.25, "y": 4.25 },
- { "matrix": [4, 7], "label": "N", "x": 7.25, "y": 4.25 },
- { "matrix": [4, 8], "label": "M", "x": 8.25, "y": 4.25 },
- { "matrix": [4, 9], "label": ",", "x": 9.25, "y": 4.25 },
- { "matrix": [4, 10], "label": ".", "x": 10.25, "y": 4.25 },
- { "matrix": [4, 11], "label": "/", "x": 11.25, "y": 4.25 },
- { "matrix": [4, 12], "label": "Shift1", "x": 12.25, "y": 4.25, "w": 1.75 },
- { "matrix": [4, 13], "label": "\u2191", "x": 14, "y": 4.25 },
+ {"matrix": [4, 0], "label": "Shift1", "x": 0, "y": 4.25, "w": 1.25},
+ {"matrix": [4, 1], "label": "Shift2", "x": 1.25, "y": 4.25},
+ {"matrix": [4, 2], "label": "Z", "x": 2.25, "y": 4.25},
+ {"matrix": [4, 3], "label": "X", "x": 3.25, "y": 4.25},
+ {"matrix": [4, 4], "label": "C", "x": 4.25, "y": 4.25},
+ {"matrix": [4, 5], "label": "V", "x": 5.25, "y": 4.25},
+ {"matrix": [4, 6], "label": "B", "x": 6.25, "y": 4.25},
+ {"matrix": [4, 7], "label": "N", "x": 7.25, "y": 4.25},
+ {"matrix": [4, 8], "label": "M", "x": 8.25, "y": 4.25},
+ {"matrix": [4, 9], "label": ",", "x": 9.25, "y": 4.25},
+ {"matrix": [4, 10], "label": ".", "x": 10.25, "y": 4.25},
+ {"matrix": [4, 11], "label": "/", "x": 11.25, "y": 4.25},
+ {"matrix": [4, 12], "label": "Shift1", "x": 12.25, "y": 4.25, "w": 1.75},
+ {"matrix": [4, 13], "label": "\u2191", "x": 14, "y": 4.25},
- { "matrix": [5, 0], "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.25 },
- { "matrix": [5, 1], "label": "Win", "x": 1.25, "y": 5.25, "w": 1.25 },
- { "matrix": [5, 2], "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.25 },
- { "matrix": [5, 5], "label": "Space","x": 3.75, "y": 5.25, "w": 2.25 },
- { "matrix": [5, 6], "label": "Space","x": 6, "y": 5.25, "w": 1.25 },
- { "matrix": [5, 7], "label": "Space","x": 7.25, "y": 5.25, "w": 2.75 },
- { "matrix": [5, 9], "label": "Alt", "x": 10, "y": 5.25, "w": 1.25 },
- { "matrix": [5, 10], "label": "Fn", "x": 11.25, "y": 5.25, "w": 1.25 },
- { "matrix": [5, 12], "label": "\u2190", "x": 13, "y": 5.25 },
- { "matrix": [5, 13], "label": "\u2193", "x": 14, "y": 5.25 },
- { "matrix": [5, 14], "label": "\u2192", "x": 15, "y": 5.25 }
+ {"matrix": [5, 0], "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 1], "label": "Win", "x": 1.25, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 2], "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 5], "label": "Space", "x": 3.75, "y": 5.25, "w": 2.25},
+ {"matrix": [5, 6], "label": "Space", "x": 6, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 7], "label": "Space", "x": 7.25, "y": 5.25, "w": 2.75},
+ {"matrix": [5, 9], "label": "Alt", "x": 10, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 10], "label": "Fn", "x": 11.25, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 12], "label": "\u2190", "x": 13, "y": 5.25},
+ {"matrix": [5, 13], "label": "\u2193", "x": 14, "y": 5.25},
+ {"matrix": [5, 14], "label": "\u2192", "x": 15, "y": 5.25}
]
}
}
diff --git a/keyboards/meletrix/zoom75/keymaps/default/keymap.c b/keyboards/meletrix/zoom75/keymaps/default/keymap.c
index b1cbfb9e9f..6e9cc098e5 100644
--- a/keyboards/meletrix/zoom75/keymaps/default/keymap.c
+++ b/keyboards/meletrix/zoom75/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
#include QMK_KEYBOARD_H
#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_MPRV, KC_MNXT), },
};
diff --git a/keyboards/meletrix/zoom75/keymaps/via/keymap.c b/keyboards/meletrix/zoom75/keymaps/via/keymap.c
index 00fa34dd13..e3e2fbaea5 100644
--- a/keyboards/meletrix/zoom75/keymaps/via/keymap.c
+++ b/keyboards/meletrix/zoom75/keymaps/via/keymap.c
@@ -18,7 +18,7 @@
#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_MNXT, KC_MPRV) },
};