summaryrefslogtreecommitdiff
path: root/keyboards/om60
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/om60')
-rw-r--r--keyboards/om60/config.h3
-rw-r--r--keyboards/om60/info.json95
-rw-r--r--keyboards/om60/keymaps/default/keymap.c2
-rw-r--r--keyboards/om60/keymaps/via/keymap.c2
-rw-r--r--keyboards/om60/om60.c19
-rw-r--r--keyboards/om60/om60.h41
6 files changed, 90 insertions, 72 deletions
diff --git a/keyboards/om60/config.h b/keyboards/om60/config.h
index 9af406eec5..16957f9a0a 100644
--- a/keyboards/om60/config.h
+++ b/keyboards/om60/config.h
@@ -34,9 +34,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-/* ws2812 RGB LED */
-#define RGB_DI_PIN D3
-
#ifndef RGBLED_NUM
#define RGBLED_NUM 69
#define RGBLIGHT_LED_MAP { \
diff --git a/keyboards/om60/info.json b/keyboards/om60/info.json
index c33231efe8..7efa8097d6 100644
--- a/keyboards/om60/info.json
+++ b/keyboards/om60/info.json
@@ -1,8 +1,8 @@
{
- "keyboard_name": "OM60",
+ "keyboard_name": "OM60",
"manufacturer": "jun10000",
- "url": "https://github.com/jun10000",
- "maintainer": "jun10000",
+ "url": "https://github.com/jun10000",
+ "maintainer": "jun10000",
"usb": {
"vid": "0x6A6E",
"pid": "0x0001",
@@ -13,11 +13,92 @@
{"pin_a": "B4", "pin_b": "B5"}
]
},
+ "ws2812": {
+ "pin": "D3"
+ },
"processor": "atmega32u4",
"bootloader": "caterina",
"layouts": {
- "LAYOUT": {
- "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"4,0", "x":1.5, "y":0}, {"label":"4,1", "x":2.5, "y":0}, {"label":"4,2", "x":3.5, "y":0}, {"label":"4,3", "x":4.5, "y":0}, {"label":"4,4", "x":5.5, "y":0}, {"label":"4,5", "x":6.5, "y":0}, {"label":"4,6", "x":7.5, "y":0}, {"label":"4,7", "x":8.5, "y":0}, {"label":"9,0", "x":9.5, "y":0}, {"label":"9,1", "x":10.5, "y":0}, {"label":"9,2", "x":11.5, "y":0}, {"label":"9,3", "x":12.5, "y":0}, {"label":"9,4", "x":13.5, "y":0}, {"label":"0,1", "x":1.5, "y":1}, {"label":"0,2", "x":2.5, "y":1}, {"label":"0,3", "x":3.5, "y":1}, {"label":"0,4", "x":4.5, "y":1}, {"label":"0,5", "x":5.5, "y":1}, {"label":"0,6", "x":6.5, "y":1}, {"label":"0,7", "x":7.5, "y":1}, {"label":"5,0", "x":8.5, "y":1}, {"label":"5,1", "x":9.5, "y":1}, {"label":"5,2", "x":10.5, "y":1}, {"label":"5,3", "x":11.5, "y":1}, {"label":"5,4", "x":12.5, "y":1}, {"label":"5,5", "x":13.5, "y":1}, {"label":"1,0", "x":0, "y":2}, {"label":"1,1", "x":1.5, "y":2}, {"label":"1,2", "x":2.5, "y":2}, {"label":"1,3", "x":3.5, "y":2}, {"label":"1,4", "x":4.5, "y":2}, {"label":"1,5", "x":5.5, "y":2}, {"label":"1,6", "x":6.5, "y":2}, {"label":"1,7", "x":7.5, "y":2}, {"label":"6,0", "x":8.5, "y":2}, {"label":"6,1", "x":9.5, "y":2}, {"label":"6,2", "x":10.5, "y":2}, {"label":"6,3", "x":11.5, "y":2}, {"label":"6,4", "x":12.5, "y":2}, {"label":"6,5", "x":13.5, "y":2}, {"label":"2,0", "x":0, "y":3}, {"label":"2,1", "x":1.5, "y":3}, {"label":"2,2", "x":2.5, "y":3}, {"label":"2,3", "x":3.5, "y":3}, {"label":"2,4", "x":4.5, "y":3}, {"label":"2,5", "x":5.5, "y":3}, {"label":"2,6", "x":6.5, "y":3}, {"label":"2,7", "x":7.5, "y":3}, {"label":"7,0", "x":8.5, "y":3}, {"label":"7,1", "x":9.5, "y":3}, {"label":"7,2", "x":10.5, "y":3}, {"label":"7,3", "x":11.5, "y":3}, {"label":"7,4", "x":12.5, "y":3}, {"label":"7,5", "x":13.5, "y":3}, {"label":"3,0", "x":0, "y":4}, {"label":"3,1", "x":1.5, "y":4}, {"label":"3,2", "x":2.5, "y":4}, {"label":"3,3", "x":3.5, "y":4}, {"label":"3,4", "x":4.5, "y":4}, {"label":"3,5", "x":5.5, "y":4}, {"label":"3,6", "x":6.5, "y":4}, {"label":"3,7", "x":7.5, "y":4}, {"label":"8,0", "x":8.5, "y":4}, {"label":"8,1", "x":9.5, "y":4}, {"label":"8,2", "x":10.5, "y":4}, {"label":"8,3", "x":11.5, "y":4}, {"label":"8,4", "x":12.5, "y":4}, {"label":"8,5", "x":13.5, "y":4}]
- }
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [4, 0], "x": 1.5, "y": 0},
+ {"matrix": [4, 1], "x": 2.5, "y": 0},
+ {"matrix": [4, 2], "x": 3.5, "y": 0},
+ {"matrix": [4, 3], "x": 4.5, "y": 0},
+ {"matrix": [4, 4], "x": 5.5, "y": 0},
+ {"matrix": [4, 5], "x": 6.5, "y": 0},
+ {"matrix": [4, 6], "x": 7.5, "y": 0},
+ {"matrix": [4, 7], "x": 8.5, "y": 0},
+ {"matrix": [9, 0], "x": 9.5, "y": 0},
+ {"matrix": [9, 1], "x": 10.5, "y": 0},
+ {"matrix": [9, 2], "x": 11.5, "y": 0},
+ {"matrix": [9, 3], "x": 12.5, "y": 0},
+ {"matrix": [9, 4], "x": 13.5, "y": 0},
+
+ {"matrix": [0, 1], "x": 1.5, "y": 1},
+ {"matrix": [0, 2], "x": 2.5, "y": 1},
+ {"matrix": [0, 3], "x": 3.5, "y": 1},
+ {"matrix": [0, 4], "x": 4.5, "y": 1},
+ {"matrix": [0, 5], "x": 5.5, "y": 1},
+ {"matrix": [0, 6], "x": 6.5, "y": 1},
+ {"matrix": [0, 7], "x": 7.5, "y": 1},
+ {"matrix": [5, 0], "x": 8.5, "y": 1},
+ {"matrix": [5, 1], "x": 9.5, "y": 1},
+ {"matrix": [5, 2], "x": 10.5, "y": 1},
+ {"matrix": [5, 3], "x": 11.5, "y": 1},
+ {"matrix": [5, 4], "x": 12.5, "y": 1},
+ {"matrix": [5, 5], "x": 13.5, "y": 1},
+
+ {"matrix": [1, 0], "x": 0, "y": 2},
+
+ {"matrix": [1, 1], "x": 1.5, "y": 2},
+ {"matrix": [1, 2], "x": 2.5, "y": 2},
+ {"matrix": [1, 3], "x": 3.5, "y": 2},
+ {"matrix": [1, 4], "x": 4.5, "y": 2},
+ {"matrix": [1, 5], "x": 5.5, "y": 2},
+ {"matrix": [1, 6], "x": 6.5, "y": 2},
+ {"matrix": [1, 7], "x": 7.5, "y": 2},
+ {"matrix": [6, 0], "x": 8.5, "y": 2},
+ {"matrix": [6, 1], "x": 9.5, "y": 2},
+ {"matrix": [6, 2], "x": 10.5, "y": 2},
+ {"matrix": [6, 3], "x": 11.5, "y": 2},
+ {"matrix": [6, 4], "x": 12.5, "y": 2},
+ {"matrix": [6, 5], "x": 13.5, "y": 2},
+
+ {"matrix": [2, 0], "x": 0, "y": 3},
+
+ {"matrix": [2, 1], "x": 1.5, "y": 3},
+ {"matrix": [2, 2], "x": 2.5, "y": 3},
+ {"matrix": [2, 3], "x": 3.5, "y": 3},
+ {"matrix": [2, 4], "x": 4.5, "y": 3},
+ {"matrix": [2, 5], "x": 5.5, "y": 3},
+ {"matrix": [2, 6], "x": 6.5, "y": 3},
+ {"matrix": [2, 7], "x": 7.5, "y": 3},
+ {"matrix": [7, 0], "x": 8.5, "y": 3},
+ {"matrix": [7, 1], "x": 9.5, "y": 3},
+ {"matrix": [7, 2], "x": 10.5, "y": 3},
+ {"matrix": [7, 3], "x": 11.5, "y": 3},
+ {"matrix": [7, 4], "x": 12.5, "y": 3},
+ {"matrix": [7, 5], "x": 13.5, "y": 3},
+
+ {"matrix": [3, 0], "x": 0, "y": 4},
+
+ {"matrix": [3, 1], "x": 1.5, "y": 4},
+ {"matrix": [3, 2], "x": 2.5, "y": 4},
+ {"matrix": [3, 3], "x": 3.5, "y": 4},
+ {"matrix": [3, 4], "x": 4.5, "y": 4},
+ {"matrix": [3, 5], "x": 5.5, "y": 4},
+ {"matrix": [3, 6], "x": 6.5, "y": 4},
+ {"matrix": [3, 7], "x": 7.5, "y": 4},
+ {"matrix": [8, 0], "x": 8.5, "y": 4},
+ {"matrix": [8, 1], "x": 9.5, "y": 4},
+ {"matrix": [8, 2], "x": 10.5, "y": 4},
+ {"matrix": [8, 3], "x": 11.5, "y": 4},
+ {"matrix": [8, 4], "x": 12.5, "y": 4},
+ {"matrix": [8, 5], "x": 13.5, "y": 4}
+ ]
+ }
}
-} \ No newline at end of file
+}
diff --git a/keyboards/om60/keymaps/default/keymap.c b/keyboards/om60/keymaps/default/keymap.c
index 4ade0c80a9..06cb2814c5 100644
--- a/keyboards/om60/keymaps/default/keymap.c
+++ b/keyboards/om60/keymaps/default/keymap.c
@@ -20,7 +20,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#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(_______, _______) },
[2] = { ENCODER_CCW_CW(_______, _______) },
diff --git a/keyboards/om60/keymaps/via/keymap.c b/keyboards/om60/keymaps/via/keymap.c
index b79b6353f8..eaa625b6f3 100644
--- a/keyboards/om60/keymaps/via/keymap.c
+++ b/keyboards/om60/keymaps/via/keymap.c
@@ -20,7 +20,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#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(_______, _______) },
[2] = { ENCODER_CCW_CW(_______, _______) },
diff --git a/keyboards/om60/om60.c b/keyboards/om60/om60.c
deleted file mode 100644
index 9e66d6721c..0000000000
--- a/keyboards/om60/om60.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
-Copyright 2021 Salicylic_Acid
-Copyright 2022 jun10000
-
-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 "om60.h"
diff --git a/keyboards/om60/om60.h b/keyboards/om60/om60.h
deleted file mode 100644
index 669a610031..0000000000
--- a/keyboards/om60/om60.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-Copyright 2021 Salicylic_Acid
-Copyright 2022 jun10000
-
-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( \
- L01, L05, L10, L15, L20, L25, L30, L35, L40, R45, R50, R55, R60, R65, \
- L06, L11, L16, L21, L26, L31, L36, R41, R46, R51, R56, R61, R66, \
- L02, L07, L12, L17, L22, L27, L32, L37, R42, R47, R52, R57, R62, R67, \
- L03, L08, L13, L18, L23, L28, L33, L38, R43, R48, R53, R58, R63, R68, \
- L04, L09, L14, L19, L24, L29, L34, L39, R44, R49, R54, R59, R64, R69 \
- ) \
- { \
- { L01, L06, L11, L16, L21, L26, L31, L36 }, \
- { L02, L07, L12, L17, L22, L27, L32, L37 }, \
- { L03, L08, L13, L18, L23, L28, L33, L38 }, \
- { L04, L09, L14, L19, L24, L29, L34, L39 }, \
- { L05, L10, L15, L20, L25, L30, L35, L40 }, \
- { R41, R46, R51, R56, R61, R66, KC_NO, KC_NO }, \
- { R42, R47, R52, R57, R62, R67, KC_NO, KC_NO }, \
- { R43, R48, R53, R58, R63, R68, KC_NO, KC_NO }, \
- { R44, R49, R54, R59, R64, R69, KC_NO, KC_NO }, \
- { R45, R50, R55, R60, R65, KC_NO, KC_NO, KC_NO } \
- }
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-04 14:06:57 +0000