summaryrefslogtreecommitdiff
path: root/keyboards
diff options
context:
space:
mode:
authorJames Young <18669334+noroadsleft@users.noreply.github.com>2021-07-12 10:14:18 -0700
committerGitHub <noreply@github.com>2021-07-12 10:14:18 -0700
commit8f0bf52b250406d0063726d4c62c78e84c1d1f2b (patch)
treeb2005f35c08eec3ce9a07d5007310c771a9db451 /keyboards
parentc024acd75243034d7d70d3bfb2fd6d3eacc0b62a (diff)
ID67 codebase touch-up (#13521)
* correct layout data Fix incorrect key sizes/positions. * rename LAYOUT to LAYOUT_65_ansi_blocker * tweak human-friendly formatting for info.json Add new lines for new rows. * adjust keycode alignment in via keymap * clean up extra lines in readme file * enable 65_ansi_blocker Community Layout support * clean up rules.mk Aligns the inline comments.
Diffstat (limited to 'keyboards')
-rw-r--r--keyboards/id67/id67.h2
-rw-r--r--keyboards/id67/info.json19
-rw-r--r--keyboards/id67/keymaps/default/keymap.c4
-rw-r--r--keyboards/id67/keymaps/via/keymap.c26
-rw-r--r--keyboards/id67/readme.md3
-rw-r--r--keyboards/id67/rules.mk12
6 files changed, 36 insertions, 30 deletions
diff --git a/keyboards/id67/id67.h b/keyboards/id67/id67.h
index c5a4c5126e..c9e6fb5d9c 100644
--- a/keyboards/id67/id67.h
+++ b/keyboards/id67/id67.h
@@ -18,7 +18,7 @@
#include "quantum.h"
-#define LAYOUT( \
+#define LAYOUT_65_ansi_blocker( \
K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K2E, \
diff --git a/keyboards/id67/info.json b/keyboards/id67/info.json
index 92181a6019..cc7ab57104 100644
--- a/keyboards/id67/info.json
+++ b/keyboards/id67/info.json
@@ -4,8 +4,11 @@
"maintainer": "qmk",
"width": 16,
"height": 5,
+ "layout_aliases": {
+ "LAYOUT": "LAYOUT_65_ansi_blocker"
+ },
"layouts": {
- "LAYOUT": {
+ "LAYOUT_65_ansi_blocker": {
"layout": [
{"label":"K00 (B0,C7)", "x":0, "y":0},
{"label":"K01 (B0,F6)", "x":1, "y":0},
@@ -22,6 +25,7 @@
{"label":"K0C (B0,D6)", "x":12, "y":0},
{"label":"K0D (B0,D7)", "x":13, "y":0, "w":2},
{"label":"K0E (B0,B4)", "x":15, "y":0},
+
{"label":"K10 (B1,C7)", "x":0, "y":1, "w":1.5},
{"label":"K11 (B1,F6)", "x":1.5, "y":1},
{"label":"K12 (B1,F5)", "x":2.5, "y":1},
@@ -37,6 +41,7 @@
{"label":"K1C (B1,D6)", "x":12.5, "y":1},
{"label":"K1D (B1,D7)", "x":13.5, "y":1, "w":1.5},
{"label":"K1E (B1,B4)", "x":15, "y":1},
+
{"label":"K20 (B2,C7)", "x":0, "y":2, "w":1.75},
{"label":"K21 (B2,F6)", "x":1.75, "y":2},
{"label":"K22 (B2,F5)", "x":2.75, "y":2},
@@ -51,6 +56,7 @@
{"label":"K2B (B2,D0)", "x":11.75, "y":2},
{"label":"K2D (B2,D7)", "x":12.75, "y":2, "w":2.25},
{"label":"K2E (B2,B4)", "x":15, "y":2},
+
{"label":"K30 (B3,C7)", "x":0, "y":3, "w":2.25},
{"label":"K32 (B3,F5)", "x":2.25, "y":3},
{"label":"K33 (B3,F4)", "x":3.25, "y":3},
@@ -62,19 +68,20 @@
{"label":"K39 (B3,D3)", "x":9.25, "y":3},
{"label":"K3A (B3,D4)", "x":10.25, "y":3},
{"label":"K3B (B3,D0)", "x":11.25, "y":3},
- {"label":"K3C (B3,D6)", "x":12.25, "y":3},
- {"label":"K3D (B3,D7)", "x":13.25, "y":3, "w":1.75},
+ {"label":"K3C (B3,D6)", "x":12.25, "y":3, "w":1.75},
+ {"label":"K3D (B3,D7)", "x":14, "y":3},
{"label":"K3E (B3,B4)", "x":15, "y":3},
+
{"label":"K40 (F7,C7)", "x":0, "y":4, "w":1.25},
{"label":"K41 (F7,F6)", "x":1.25, "y":4, "w":1.25},
{"label":"K43 (F7,F4)", "x":2.5, "y":4, "w":1.25},
{"label":"K46 (F7,D5)", "x":3.75, "y":4, "w":6.25},
{"label":"K4A (F7,D4)", "x":10, "y":4, "w":1.25},
{"label":"K4B (F7,D0)", "x":11.25, "y":4, "w":1.25},
- {"label":"K4C (F7,D6)", "x":12.5, "y":4, "w":1.25},
- {"label":"K4D (F7,D7)", "x":13.75, "y":4, "w":1.25},
+ {"label":"K4C (F7,D6)", "x":13, "y":4},
+ {"label":"K4D (F7,D7)", "x":14, "y":4},
{"label":"K4E (F7,B4)", "x":15, "y":4}
]
}
}
-} \ No newline at end of file
+}
diff --git a/keyboards/id67/keymaps/default/keymap.c b/keyboards/id67/keymaps/default/keymap.c
index 2aa62f83f9..d3fead64ff 100644
--- a/keyboards/id67/keymaps/default/keymap.c
+++ b/keyboards/id67/keymaps/default/keymap.c
@@ -17,14 +17,14 @@
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [0] = LAYOUT(
+ [0] = LAYOUT_65_ansi_blocker(
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_TILD,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
),
- [1] = LAYOUT(
+ [1] = LAYOUT_65_ansi_blocker(
_______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______,
_______, RGB_TOG, KC_UP, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______,
_______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, KC_INS, KC_HOME, KC_PGUP, _______, _______,
diff --git a/keyboards/id67/keymaps/via/keymap.c b/keyboards/id67/keymaps/via/keymap.c
index 41a8446871..0651d8aae8 100644
--- a/keyboards/id67/keymaps/via/keymap.c
+++ b/keyboards/id67/keymaps/via/keymap.c
@@ -17,32 +17,32 @@
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [0] = LAYOUT(
+ [0] = LAYOUT_65_ansi_blocker(
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_TILD,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
),
- [1] = LAYOUT(
- KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______,
+ [1] = LAYOUT_65_ansi_blocker(
+ KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______,
_______, RGB_TOG, KC_UP, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______,
_______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, KC_INS, KC_HOME, KC_PGUP, _______, _______,
_______, RESET, BL_DEC, BL_TOGG, BL_INC, KC_VOLD, KC_MUTE, KC_VOLU, _______, KC_DEL, KC_END, KC_PGDN, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______
),
- [2] = LAYOUT(
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ [2] = LAYOUT_65_ansi_blocker(
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______
),
- [3] = LAYOUT(
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ [3] = LAYOUT_65_ansi_blocker(
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______
),
};
diff --git a/keyboards/id67/readme.md b/keyboards/id67/readme.md
index 78e7619606..eca398184a 100644
--- a/keyboards/id67/readme.md
+++ b/keyboards/id67/readme.md
@@ -10,13 +10,10 @@ A 65% hotswap keyboard from IDOBAO.
Make example for this keyboard (after setting up your build environment):
-Make example for this keyboard (after setting up your build environment):
-
make id67:default
Flashing example for this keyboard:
make id67:default:flash
-
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/id67/rules.mk b/keyboards/id67/rules.mk
index 7d38f98865..411e7f4d32 100644
--- a/keyboards/id67/rules.mk
+++ b/keyboards/id67/rules.mk
@@ -8,10 +8,10 @@ BOOTLOADER = atmel-dfu
# change yes to no to disable
#
BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration
-MOUSEKEY_ENABLE = yes # Mouse keys
+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
+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
@@ -21,7 +21,9 @@ RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
BLUETOOTH_ENABLE = no # Enable Bluetooth
AUDIO_ENABLE = no # Audio output
-KEY_LOCK_ENABLE = yes # Enable KC_LOCK support
+KEY_LOCK_ENABLE = yes # Enable KC_LOCK support
+
+LAYOUTS = 65_ansi_blocker
# generated by KBFirmware JSON to QMK Parser
-# https://noroadsleft.github.io/kbf_qmk_converter/ \ No newline at end of file
+# https://noroadsleft.github.io/kbf_qmk_converter/
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-24 18:19:51 +0000