summaryrefslogtreecommitdiff
path: root/keyboards/doio
diff options
context:
space:
mode:
authorJames Young <18669334+noroadsleft@users.noreply.github.com>2023-06-15 05:18:56 -0700
committerGitHub <noreply@github.com>2023-06-15 13:18:56 +0100
commit9b36ec53512f89ee834a894e23a64a8b4fcf3fc8 (patch)
treeeb40a62550fa6c9c378a19b7b934e485d015447d /keyboards/doio
parent66f06a175f13851ae1d3c37a85b1d2d3ffea58b7 (diff)
DOIO KB30 Refactor (#21250)
* refactor keymaps - remove extra blank lines - convert tabs to spaces - use four-space indent - grid-align keycodes - use QMK-native keycode aliases * info.json: correct layout data * add readme.md * info.json: correct maintainer field Updates the value to reference the maintainer's GitHub username.
Diffstat (limited to 'keyboards/doio')
-rw-r--r--keyboards/doio/kb30/info.json42
-rw-r--r--keyboards/doio/kb30/keymaps/default/keymap.c74
-rw-r--r--keyboards/doio/kb30/keymaps/via/keymap.c63
-rw-r--r--keyboards/doio/kb30/readme.md27
4 files changed, 103 insertions, 103 deletions
diff --git a/keyboards/doio/kb30/info.json b/keyboards/doio/kb30/info.json
index 3f3fa1c332..71a300b9cd 100644
--- a/keyboards/doio/kb30/info.json
+++ b/keyboards/doio/kb30/info.json
@@ -2,7 +2,7 @@
2 "keyboard_name": "KB30-01", 2 "keyboard_name": "KB30-01",
3 "manufacturer": "DOIO", 3 "manufacturer": "DOIO",
4 "url": "", 4 "url": "",
5 "maintainer": "Alice", 5 "maintainer": "DOIO2022",
6 "usb": { 6 "usb": {
7 "vid": "0xD010", 7 "vid": "0xD010",
8 "pid": "0x3001", 8 "pid": "0x3001",
@@ -49,33 +49,31 @@
49 {"matrix": [1, 5], "x": 5.25, "y": 1}, 49 {"matrix": [1, 5], "x": 5.25, "y": 1},
50 {"matrix": [1, 6], "x": 6.25, "y": 1}, 50 {"matrix": [1, 6], "x": 6.25, "y": 1},
51 51
52 {"matrix": [2, 0], "x": 8.25, "y": 2}, 52 {"matrix": [2, 0], "x": 0, "y": 2},
53 {"matrix": [2, 1], "x": 1, "y": 2},
54 {"matrix": [2, 2], "x": 2, "y": 2},
53 55
54 {"matrix": [2, 1], "x": 0, "y": 2}, 56 {"matrix": [2, 3], "x": 4.25, "y": 2},
55 {"matrix": [2, 2], "x": 1, "y": 2}, 57 {"matrix": [2, 4], "x": 5.25, "y": 2},
56 {"matrix": [2, 3], "x": 2, "y": 2}, 58 {"matrix": [2, 5], "x": 6.25, "y": 2},
57 59
58 {"matrix": [2, 4], "x": 4.25, "y": 2}, 60 {"matrix": [3, 0], "x": 0, "y": 3},
59 {"matrix": [2, 5], "x": 5.25, "y": 2}, 61 {"matrix": [3, 1], "x": 1, "y": 3},
60 {"matrix": [3, 0], "x": 6.25, "y": 2}, 62 {"matrix": [3, 2], "x": 2, "y": 3},
63 {"matrix": [3, 3], "x": 3, "y": 3, "h": 2},
61 64
62 {"matrix": [3, 1], "x": 11, "y": 2}, 65 {"matrix": [3, 5], "x": 5.25, "y": 3},
63 66
64 {"matrix": [3, 2], "x": 0, "y": 3}, 67 {"matrix": [4, 0], "x": 0, "y": 4, "w": 2},
65 {"matrix": [3, 3], "x": 1, "y": 3}, 68 {"matrix": [4, 1], "x": 2, "y": 4},
66 {"matrix": [3, 5], "x": 2, "y": 3},
67 69
68 {"matrix": [4, 0], "x": 4.25, "y": 3, "h": 2}, 70 {"matrix": [4, 2], "x": 4.25, "y": 4},
69 {"matrix": [4, 1], "x": 5.25, "y": 3}, 71 {"matrix": [4, 3], "x": 5.25, "y": 4},
72 {"matrix": [4, 4], "x": 6.25, "y": 4},
70 73
71 {"matrix": [4, 2], "x": 9, "y": 4}, 74 {"matrix": [5, 4], "x": 7.75, "y": 1},
72 75 {"matrix": [5, 5], "x": 9.75, "y": 1},
73 {"matrix": [4, 3], "x": 0, "y": 4, "w": 2}, 76 {"matrix": [5, 6], "x": 7.75, "y": 2, "w": 3, "h": 3}
74 {"matrix": [4, 4], "x": 2, "y": 4},
75
76 {"matrix": [5, 4], "x": 4.25, "y": 4},
77 {"matrix": [5, 5], "x": 5.25, "y": 4},
78 {"matrix": [5, 6], "x": 6.25, "y": 4}
79 ] 77 ]
80 } 78 }
81 } 79 }
diff --git a/keyboards/doio/kb30/keymaps/default/keymap.c b/keyboards/doio/kb30/keymaps/default/keymap.c
index fb06acfd80..2e385d24e3 100644
--- a/keyboards/doio/kb30/keymaps/default/keymap.c
+++ b/keyboards/doio/kb30/keymaps/default/keymap.c
@@ -15,65 +15,47 @@
15 * along with this program. If not, see <http://www.gnu.org/licenses/>. 15 * along with this program. If not, see <http://www.gnu.org/licenses/>.
16 */ 16 */
17 17
18
19#include QMK_KEYBOARD_H 18#include QMK_KEYBOARD_H
20 19
21
22enum layer_names { 20enum layer_names {
23_LAY0, 21 _LAY0,
24_LAY1, 22 _LAY1,
25_LAY2, 23 _LAY2,
26_LAY3 24 _LAY3
27}; 25};
28 26
29
30
31
32
33const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 27const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
34 [_LAY0] = LAYOUT( 28 [_LAY0] = LAYOUT(
35 KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, KC_PSCR, KC_SCRL, KC_PAUSE, 29 KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, KC_PSCR, KC_SCRL, KC_PAUS,
36 KC_P7, KC_P8, KC_P9, KC_PPLS, KC_INS, KC_HOME, KC_PGUP, 30 KC_P7, KC_P8, KC_P9, KC_PPLS, KC_INS, KC_HOME, KC_PGUP,
37 KC_P4, KC_P5, KC_P6, KC_DEL, KC_END, KC_PGDN, 31 KC_P4, KC_P5, KC_P6, KC_DEL, KC_END, KC_PGDN,
38 KC_P1, KC_P2, KC_P3, LT(3,KC_PENT), KC_UP, 32 KC_P1, KC_P2, KC_P3, LT(3,KC_PENT), KC_UP,
39 KC_P0, KC_PDOT, KC_LEFT, KC_DOWN, KC_RGHT, 33 KC_P0, KC_PDOT, KC_LEFT, KC_DOWN, KC_RGHT,
40 KC_MPLY, TO(1), KC_TRNS), 34 KC_MPLY, TO(1), KC_TRNS),
41 [_LAY1] = LAYOUT( 35 [_LAY1] = LAYOUT(
42 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 36 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
43 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 37 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
44 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 38 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
45 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 39 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
46 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 40 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
47 KC_TRNS, TO(2), KC_TRNS), 41 KC_TRNS, TO(2), KC_TRNS),
48 [_LAY2] = LAYOUT( 42 [_LAY2] = LAYOUT(
49 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 43 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
50 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 44 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
51 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 45 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
52 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 46 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
53 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 47 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
54 KC_TRNS, TO(3), KC_TRNS), 48 KC_TRNS, TO(3), KC_TRNS),
55 [_LAY3] = LAYOUT( 49 [_LAY3] = LAYOUT(
56 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_HUI, RGB_SAI, RGB_SPI, 50 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_HUI, RGB_SAI, RGB_SPI,
57 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_HUD, RGB_SAD, RGB_SPD, 51 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_HUD, RGB_SAD, RGB_SPD,
58 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 52 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
59 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_MOD, 53 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_MOD,
60 KC_TRNS, KC_TRNS, RGB_VAD, RGB_TOG, RGB_VAI, 54 KC_TRNS, KC_TRNS, RGB_VAD, RGB_TOG, RGB_VAI,
61 KC_TRNS, TO(0), KC_TRNS) 55 KC_TRNS, TO(0), KC_TRNS)
62 56
63}; 57};
64 58
65
66
67
68
69
70
71
72
73
74
75
76
77#ifdef ENCODER_MAP_ENABLE 59#ifdef ENCODER_MAP_ENABLE
78const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { 60const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
79 [_LAY0] = { ENCODER_CCW_CW(KC_MPRV, KC_MNXT), ENCODER_CCW_CW(KC_PGUP, KC_PGDN), ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, 61 [_LAY0] = { ENCODER_CCW_CW(KC_MPRV, KC_MNXT), ENCODER_CCW_CW(KC_PGUP, KC_PGDN), ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
diff --git a/keyboards/doio/kb30/keymaps/via/keymap.c b/keyboards/doio/kb30/keymaps/via/keymap.c
index 2890fe604a..2e385d24e3 100644
--- a/keyboards/doio/kb30/keymaps/via/keymap.c
+++ b/keyboards/doio/kb30/keymaps/via/keymap.c
@@ -15,54 +15,47 @@
15 * along with this program. If not, see <http://www.gnu.org/licenses/>. 15 * along with this program. If not, see <http://www.gnu.org/licenses/>.
16 */ 16 */
17 17
18
19#include QMK_KEYBOARD_H 18#include QMK_KEYBOARD_H
20 19
21
22enum layer_names { 20enum layer_names {
23_LAY0, 21 _LAY0,
24_LAY1, 22 _LAY1,
25_LAY2, 23 _LAY2,
26_LAY3 24 _LAY3
27}; 25};
28 26
29
30
31
32
33const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 27const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
34 [_LAY0] = LAYOUT( 28 [_LAY0] = LAYOUT(
35 KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, KC_PSCR, KC_SCRL, KC_PAUSE, 29 KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, KC_PSCR, KC_SCRL, KC_PAUS,
36 KC_P7, KC_P8, KC_P9, KC_PPLS, KC_INS, KC_HOME, KC_PGUP, 30 KC_P7, KC_P8, KC_P9, KC_PPLS, KC_INS, KC_HOME, KC_PGUP,
37 KC_P4, KC_P5, KC_P6, KC_DEL, KC_END, KC_PGDN, 31 KC_P4, KC_P5, KC_P6, KC_DEL, KC_END, KC_PGDN,
38 KC_P1, KC_P2, KC_P3, LT(3,KC_PENT), KC_UP, 32 KC_P1, KC_P2, KC_P3, LT(3,KC_PENT), KC_UP,
39 KC_P0, KC_PDOT, KC_LEFT, KC_DOWN, KC_RGHT, 33 KC_P0, KC_PDOT, KC_LEFT, KC_DOWN, KC_RGHT,
40 KC_MPLY, TO(1), KC_TRNS), 34 KC_MPLY, TO(1), KC_TRNS),
41 [_LAY1] = LAYOUT( 35 [_LAY1] = LAYOUT(
42 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 36 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
43 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 37 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
44 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 38 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
45 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 39 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
46 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 40 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
47 KC_TRNS, TO(2), KC_TRNS), 41 KC_TRNS, TO(2), KC_TRNS),
48 [_LAY2] = LAYOUT( 42 [_LAY2] = LAYOUT(
49 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 43 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
50 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 44 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
51 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 45 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
52 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 46 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
53 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 47 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
54 KC_TRNS, TO(3), KC_TRNS), 48 KC_TRNS, TO(3), KC_TRNS),
55 [_LAY3] = LAYOUT( 49 [_LAY3] = LAYOUT(
56 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_HUI, RGB_SAI, RGB_SPI, 50 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_HUI, RGB_SAI, RGB_SPI,
57 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_HUD, RGB_SAD, RGB_SPD, 51 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_HUD, RGB_SAD, RGB_SPD,
58 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 52 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
59 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_MOD, 53 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_MOD,
60 KC_TRNS, KC_TRNS, RGB_VAD, RGB_TOG, RGB_VAI, 54 KC_TRNS, KC_TRNS, RGB_VAD, RGB_TOG, RGB_VAI,
61 KC_TRNS, TO(0), KC_TRNS) 55 KC_TRNS, TO(0), KC_TRNS)
62 56
63}; 57};
64 58
65
66#ifdef ENCODER_MAP_ENABLE 59#ifdef ENCODER_MAP_ENABLE
67const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { 60const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
68 [_LAY0] = { ENCODER_CCW_CW(KC_MPRV, KC_MNXT), ENCODER_CCW_CW(KC_PGUP, KC_PGDN), ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, 61 [_LAY0] = { ENCODER_CCW_CW(KC_MPRV, KC_MNXT), ENCODER_CCW_CW(KC_PGUP, KC_PGDN), ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
diff --git a/keyboards/doio/kb30/readme.md b/keyboards/doio/kb30/readme.md
new file mode 100644
index 0000000000..9e66c8993f
--- /dev/null
+++ b/keyboards/doio/kb30/readme.md
@@ -0,0 +1,27 @@
1# Megalodon DOIO 30% Designer Keyboard
2
3![Megalodon DOIO 30% Designer Keyboard](https://raw.githubusercontent.com/noroadsleft/qmk_images/master/keyboards/doio/kb30/KB30-01-_0000_778b3a43-228a-433d-94ae-9129f20b2ede_1024xc.jpg)
4
5A hotswappable 30-key macropad with 3 rotary encoders (2 are clickable), an OLED screen, and RGB lighting.
6
7* Keyboard Maintainer: [DOIO2022](https://github.com/DOIO2022)
8* Hardware Supported: Megalodon DOIO 30% Designer Keyboard with STM32F103
9* Hardware Availability: [KeebMonkey](https://www.keebmonkey.com/products/megalodon-doio-30-designer-keyboard)
10
11Make example for this keyboard (after setting up your build environment):
12
13 make doio/kb30:default
14
15## Accessing Bootloader Mode and Flashing
16
17To access Bootloader Mode, do one of the following:
18
19* **Bootmagic reset**: Hold the top left key of the keyboard while connecting the USB cable.
20* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead.
21* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available.
22
23Flashing example for this keyboard:
24
25 make doio/kb30:default:flash
26
27See 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).